From a502d96a860456ec5e8c96761db70f7cabb74751 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 30 Apr 2016 04:19:14 -0400
Subject: [PATCH] Merge pull request #1073 from gitblit/1062-DocEditorUpdates

---
 src/site/upgrade_go.mkd |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/site/upgrade_go.mkd b/src/site/upgrade_go.mkd
index cd51601..a009258 100644
--- a/src/site/upgrade_go.mkd
+++ b/src/site/upgrade_go.mkd
@@ -1,3 +1,17 @@
+## Upgrading Gitblit GO (1.7.0+)
+
+The default `gitblit.properties` file has been split into two files: `gitblit.properties`, which is the recommended file for setting your configuration, and `defaults.properties` which are Gitblit's default settings.
+
+    # Include Gitblit's 'defaults.properties' within your configuration.
+    #
+    # COMMA-DELIMITED
+    # SINCE 1.7.0
+    include = defaults.properties
+
+Notice that the default settings are *included* by your `gitblit.properties` file.  The disadvantage to this approach is you must flip between discovering/reading the settings in `defaults.properties` and setting them in `gitblit.properties`, but there are some clear advantages too.  This setup is not required.  You may continue to keep all your settings in `gitblit.properties` like before.
+
+Additionally you may find it useful if you are maintaining several Gitblit instances to share common properties files.
+
 ## Upgrading Gitblit GO (1.2.1+)
  
 1. Unzip Gitblit GO to a new folder
@@ -9,12 +23,12 @@
 
 ## Upgrading Gitblit GO (pre-1.2.1)
 1. Create a `data` folder and copy the following files and folders to it:
-    - **users.conf*
+    - **users.conf**
 	- **projects.conf** *(if you have one)*
 	- **gitblit.properties**
 	- **serverKeystore.jks**
 	- **serverTrustStore.jks**
-	- *certs** folder
+	- **certs** folder
 	- **git** folder
 	- **groovy** folder
 	- **proposals** folder

--
Gitblit v1.9.1