Merge pull request matplotlib#25845 from story645/remote

more explict about what remote means in context

Author: timhoffm

doc/devel/development_setup.rst

@@ -35,8 +35,8 @@ Retrieve the latest version of the code
 =======================================
 
 Now that your fork of the repository lives under your GitHub username, you can
-retrieve the latest sources with one of the following commands (where your
-should replace ``<your-username>`` with your GitHub username):
+retrieve the most recent version of the source code with one of the following
+commands (replace ``<your-username>`` with your GitHub username):
 
 .. tab-set::
 
@@ -59,14 +59,12 @@ should replace ``<your-username>`` with your GitHub username):
 
 
 This will place the sources in a directory :file:`matplotlib` below your
-current working directory and set up the ``origin`` remote to point to your own
-fork.  Change into this directory before continuing::
+current working directory and set the remote name ``origin`` to point to your
+fork. Change into this directory before continuing::
 
     cd matplotlib
 
-Now set up the ``upstream`` remote to point to the Matplotlib main repository,
-so that you can access the latest changes there (see also `Managing remote repositories
-<https://docs.github.com/en/get-started/getting-started-with-git/managing-remote-repositories>`__.):
+Now set the remote name ``upstream`` to point to the Matplotlib main repository:
 
 .. tab-set::
 
@@ -82,18 +80,25 @@ so that you can access the latest changes there (see also `Managing remote repos
 
          git remote add upstream [email protected]:matplotlib/matplotlib.git
 
-.. note::
+You can now use ``upstream`` to retrieve the most current snapshot of the source
+code, as described in :ref:`development-workflow`.
 
-  For more information on ``git`` and ``GitHub``, check the following resources.
+.. dropdown:: Additional ``git`` and ``GitHub`` resources
+   :color: info
+   :open:
+
+   For more information on ``git`` and ``GitHub``, see:
+
+   * `Git documentation <https://git-scm.com/doc>`_
+   * `GitHub-Contributing to a Project <https://git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project>`_
+   * `GitHub Skills <https://skills.github.com/>`_
+   * :ref:`using-git`
+   * :ref:`git-resources`
+   * `Installing git <https://git-scm.com/book/en/v2/Getting-Started-Installing-Git>`_
+   * `Managing remote repositories <https://docs.github.com/en/get-started/getting-started-with-git/managing-remote-repositories>`_
+   * https://tacaswell.github.io/think-like-git.html
+   * https://tom.preston-werner.com/2009/05/19/the-git-parable.html
 
-  * `Git documentation <https://git-scm.com/doc>`_
-  * `GitHub-Contributing to a Project <https://git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project>`_
-  * `GitHub Skills <https://skills.github.com/>`_
-  * :ref:`using-git`
-  * :ref:`git-resources`
-  * `Installing git <https://git-scm.com/book/en/v2/Getting-Started-Installing-Git>`_
-  * https://tacaswell.github.io/think-like-git.html
-  * https://tom.preston-werner.com/2009/05/19/the-git-parable.html
 
 .. _dev-environment:
 

doc/devel/development_workflow.rst

@@ -13,7 +13,7 @@ To keep your work well organized, with readable history, and in turn make it
 easier for project maintainers (that might be you) to see what you've done, and
 why you did it, we recommend the following:
 
-* Don't use your ``main`` branch for anything.  Consider deleting it.
+* Don't make changes in your local ``main`` branch! Consider deleting it.
 * Before starting a new set of changes, fetch all changes from
   ``upstream/main``, and start a new *feature branch* from that.
 * Make a new branch for each feature or bug fix — "one task, one branch".