Updated docs for upgrade procedure

diff --git a/docs/01_setup.mkd b/docs/01_setup.mkd
index cea1d692516e604628bc0df8e8445620e685f008..a7f752641cd08dea3403421c96e98c607c88bb60 100644 (file)
--- a/docs/01_setup.mkd
+++ b/docs/01_setup.mkd
@@ -259,15 +259,28 @@ All platforms support the *--baseFolder* command-line argument.
 \r
 ### Upgrading Gitblit GO (pre-1.2.1)\r
 1. Create a `data` folder and copy the following files and folders to it:\r
-    - users.conf\r
-       - projects.conf *(if you have one)*\r
-       - gitblit.properties\r
-       - serverKeystore.jks\r
-       - serverTrustStore.jks\r
-       - certs folder\r
-       - groovy folder\r
-       - proposals folder\r
+    - **users.conf*\r
+       - **projects.conf** *(if you have one)*\r
+       - **gitblit.properties**\r
+       - **serverKeystore.jks**\r
+       - **serverTrustStore.jks**\r
+       - *certs** folder\r
+       - **git** folder\r
+       - **groovy** folder\r
+       - **proposals** folder\r
     - and any other custom files (robots.txt, welcome/login markdown files, etc)\r
+       - then edit your `gitblit.properties` file and adjust the following settings:\r
+        - *git.repositoriesFolder* = ${baseFolder}/git\r
+        - *groovy.scriptsFolder* = ${baseFolder}/groovy\r
+        - *groovy.grapeFolder* = ${baseFolder}/groovy/grape\r
+        - *web.projectsFile* = ${baseFolder}/projects.conf\r
+        - *realm.userService* = ${baseFolder}/users.conf\r
+        - *web.robots.txt* = ${baseFolder}/robots.txt\r
+        - *federation.proposalsFolder* = ${baseFolder}/proposals\r
+        - *realm.ldap.backingUserService* = ${baseFolder}/users.conf\r
+        - *realm.redmine.backingUserService* = ${baseFolder}/users.conf\r
+        - *server.tempFolder* = ${baseFolder}/temp\r
+\r
 2. Unzip Gitblit GO to a new folder\r
 3. Copy your `data` folder and overwrite the folder of the same name in the just-unzipped version\r
 4. Review and optionally apply any new settings as indicated in the [release log](releases.html) to `data/gitblit.properties`.\r