Browse Source

Unify `master` and `1.4-maint` install docs

Daniel Rudolf 3 weeks ago
parent
commit
465937f5a3
1 changed files with 4 additions and 4 deletions
  1. 4 4
      docs/installation.rst

+ 4 - 4
docs/installation.rst

@@ -318,12 +318,12 @@ Use the Cygwin installer to install the dependencies::
 Using pip
 Using pip
 ~~~~~~~~~
 ~~~~~~~~~
 
 
-Ensure to install the dependencies as described within :ref:`source-install`.
-
 Virtualenv_ can be used to build and install Borg without affecting
 Virtualenv_ can be used to build and install Borg without affecting
 the system Python or requiring root access.  Using a virtual environment is
 the system Python or requiring root access.  Using a virtual environment is
 optional, but recommended except for the most simple use cases.
 optional, but recommended except for the most simple use cases.
 
 
+Ensure to install the dependencies as described within :ref:`source-install`.
+
 .. note::
 .. note::
     If you install into a virtual environment, you need to **activate** it
     If you install into a virtual environment, you need to **activate** it
     first (``source borg-env/bin/activate``), before running ``borg``.
     first (``source borg-env/bin/activate``), before running ``borg``.
@@ -367,11 +367,11 @@ locally::
 Using git
 Using git
 ~~~~~~~~~
 ~~~~~~~~~
 
 
-Ensure to install the dependencies as described within :ref:`source-install`.
-
 This uses latest, unreleased development code from git.
 This uses latest, unreleased development code from git.
 While we try not to break master, there are no guarantees on anything.
 While we try not to break master, there are no guarantees on anything.
 
 
+Ensure to install the dependencies as described within :ref:`source-install`.
+
 Version metadata is obtained dynamically at install time using ``setuptools-scm``.
 Version metadata is obtained dynamically at install time using ``setuptools-scm``.
 Please ensure that your git repo either has correct tags, or provide the version
 Please ensure that your git repo either has correct tags, or provide the version
 manually using the ``SETUPTOOLS_SCM_PRETEND_VERSION`` environment variable.
 manually using the ``SETUPTOOLS_SCM_PRETEND_VERSION`` environment variable.