From 6e788b45f2f17063c46e2ac1610bc622a5065b74 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Apr 22 2016 15:44:14 +0000
Subject: [PATCH 1/3] Include the doc git repo in the migration as well as an example


The git repo for the documentation of the project follows the same
structure as the git repos for requests and tickets and should therefore
be migrated as well.

This commit also includes a small shell command that can be used to
migrate the git repo into the `forks/` folder.

---

diff --git a/UPGRADING.rst b/UPGRADING.rst
index 143fc06..fe9e3b1 100644
--- a/UPGRADING.rst
+++ b/UPGRADING.rst
@@ -49,8 +49,8 @@ So the entire ``forks`` folder is moved under the ``repos`` folder where
 the other repositories are, containing the sources of the projects.
 
 
-Git repos for ``tickets`` and ``requests`` will be trickier to move as the
-structure changes from: ::
+Git repos for ``tickets``, ``requests`` and ``docs`` will be trickier to
+move as the structure changes from: ::
 
     tickets/
     ├── foo.git
@@ -75,12 +75,17 @@ to: ::
             ├── foo.git
             └── bar.git
 
-Same for the ``requests`` git repos.
+Same for the ``requests`` and the ``docs`` git repos.
 
-As you can see in the ``tickets`` and the ``requests`` folders there are two
-types of folders, git repos which are folder with a name ending with ``.git``,
-and folder corresponding to usernames. These last ones are the ones to be
-moved into a subfolder ``forks/``.
+As you can see in the ``tickets``, ``requests`` and ``docs`` folders there
+are two types of folders, git repos which are folder with a name ending
+with ``.git``, and folder corresponding to usernames. These last ones are
+the ones to be moved into a subfolder ``forks/``.
+
+This can be done using something like: ::
+
+    mkdir forks
+    for i in `ls -1 |grep -v '\.git'`; do mv $i forks/; done
 
 * Re-generate the gitolite configuration.
 

From 226c9aa8c0588c3b6234d090060d84d9a50d8684 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Apr 22 2016 15:45:55 +0000
Subject: [PATCH 2/3] Mention the new configuration key used to keep URLs backward compatible


---

diff --git a/UPGRADING.rst b/UPGRADING.rst
index fe9e3b1..ef19dae 100644
--- a/UPGRADING.rst
+++ b/UPGRADING.rst
@@ -91,3 +91,19 @@ This can be done using something like: ::
 
 This can be done via the ``Re-generate gitolite ACLs file`` button in the
 admin page.
+
+* Keep URLs backward compatible
+
+The support of pseudo-namespace in pagure 2.0 has required some changes made
+to the URL schema:
+https://pagure.io/pagure/053d8cc95fcd50c23a8b0a7f70e55f8d1cc7aebb
+became:
+https://pagure.io/pagure/c/053d8cc95fcd50c23a8b0a7f70e55f8d1cc7aebb
+(Note the added /c/ in it)
+
+We introduced a backward compatibility fix for this.
+
+This fix is however *disabled* by default so if you wish to keep the URLs
+valid, you will need to adjust you configuration file to include: ::
+
+    OLD_VIEW_COMMIT_ENABLED = True

From 6e59c1b4441cc89ca331d228905da63810ce7ec5 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Apr 23 2016 08:33:09 +0000
Subject: [PATCH 3/3] Adjust wording in the UPGRADING doc as per @puiterwijk's suggestion


---

diff --git a/UPGRADING.rst b/UPGRADING.rst
index ef19dae..3fd2de4 100644
--- a/UPGRADING.rst
+++ b/UPGRADING.rst
@@ -94,7 +94,7 @@ admin page.
 
 * Keep URLs backward compatible
 
-The support of pseudo-namespace in pagure 2.0 has required some changes made
+The support of pseudo-namespace in pagure 2.0 has required some changes
 to the URL schema:
 https://pagure.io/pagure/053d8cc95fcd50c23a8b0a7f70e55f8d1cc7aebb
 became: