From ed552ba47c02779c270ffd62841d6d1048dade70 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Sun, 22 Nov 2015 14:37:16 -0500 Subject: [PATCH] Merge branch 'develop' --- src/site/setup_war.mkd | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/site/setup_war.mkd b/src/site/setup_war.mkd index a060bae..21492b2 100644 --- a/src/site/setup_war.mkd +++ b/src/site/setup_war.mkd @@ -31,3 +31,8 @@ 1. Open TOMCAT_HOME/conf/context.xml 2. Insert an *Environment* node within the *Context* node.<pre><Environment name="baseFolder" type="java.lang.String" value="c:/projects/git/gitblit/data" override="false" /></pre> + +### Including Other Properties +SINCE 1.7.0 + +Gitblit supports loading it's settings from multiple properties files. You can achieve this using the `include=filename` key. This setting supports loading multiple files using a *comma* as the delimiter. They are processed in the order defined and they may be nested (i.e. your included properties may include properties, etc, etc). -- Gitblit v1.9.1