Merge pull request #4341 from boykoc/patch-3

Clarify branch naming for upgrades.
ckan · Jul 31, 2018 · e51d4dd · e51d4dd
2 parents dc395bf + f23a227
commit e51d4dd
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/doc/maintaining/upgrading/upgrade-source.rst b/doc/maintaining/upgrading/upgrade-source.rst
@@ -1,3 +1,5 @@
+.. include:: /_substitutions.rst
+
 ==========================
 Upgrading a source install
 ==========================
@@ -22,14 +24,20 @@ CKAN release you're upgrading to:
     |activate|
     cd |virtualenv|/src/ckan
 
-#. Checkout the new CKAN version from git, for example::
+#. Checkout the new CKAN version from git, for example:
+
+   .. parsed-literal::
 
     git fetch
-    git checkout release-v2.0
+    git checkout |latest_release_tag|
 
    If you have any CKAN extensions installed from source, you may need to
    checkout newer versions of the extensions at this point as well. Refer to
    the documentation for each extension.
+
+   As of CKAN 2.6 branch naming has changed. See :doc:`/contributing/release-process`
+   for naming conventions. Specific patches and minor versions can be checked-out
+   using tags. 
 
 #. Update CKAN's dependencies: