Merge remote-tracking branch 'origin/2.0.x'

2 files changed, 9 insertions, 3 deletions

diff --git a/CHANGES.rst b/CHANGES.rst
index e15be20..3f98624 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -52,7 +52,7 @@ Released 2018-11-05
 -   Build wheels for Linux, Mac, and Windows, allowing systems without
     a compiler to take advantage of the C extension speedups. :pr:`104`
 -   Use newer CPython API on Python 3, resulting in a 1.5x speedup.
-    :pr`64`
+    :pr:`64`
 -   ``escape`` wraps ``__html__`` result in ``Markup``, consistent with
     documented behavior. :pr:`69`
 
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index c58ad8c..5c999c6 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -92,7 +92,7 @@ First time setup
 
     .. code-block:: text
 
-        git remote add fork https://github.com/{username}/markupsafe
+        $ git remote add fork https://github.com/{username}/markupsafe
 
 -   Create a virtualenv.
 
@@ -107,6 +107,12 @@ First time setup
 
         > env\Scripts\activate
 
+-   Upgrade pip and setuptools.
+
+    .. code-block:: text
+
+        $ python -m pip install --upgrade pip setuptools
+
 -   Install the development dependencies, then install MarkupSafe in
     editable mode.
 
@@ -138,7 +144,7 @@ Start coding
     .. code-block:: text
 
         $ git fetch origin
-        $ git checkout -b your-branch-name origin/1.0.x
+        $ git checkout -b your-branch-name origin/2.0.x
 
     If you're submitting a feature addition or change, branch off of the
     "main" branch.