From 308c9d40f106157b43add0869888a49dee5b9478 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 21 Feb 2014 11:16:11 -0500
Subject: [PATCH] Merge commit 'refs/tickets/11/11/1' of https://dev.gitblit.com/git/gitblit

---
 src/site/setup_go.mkd |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/site/setup_go.mkd b/src/site/setup_go.mkd
index 5d422fa..2e8f864 100644
--- a/src/site/setup_go.mkd
+++ b/src/site/setup_go.mkd
@@ -124,6 +124,7 @@
     --alias                Alias in keystore of SSL cert to use for https serving
     --storePassword        Password for SSL (https) keystore.
     --shutdownPort         Port for Shutdown Monitor to listen on. (port <= 0 will disable this monitor)
+	--dailyLogFile         Redirect logging to a rolling, daily log file instead of stdout
     --tempFolder           Folder for server to extract built-in webapp
     
 **Example**
@@ -135,6 +136,6 @@
 You can override Gitblit GO's default Log4j configuration with a command-line parameter to the JVM.
 
     java -Dlog4j.configuration=file:///home/james/log4j.properties -jar gitblit.jar <optional_gitblit_args>
-    
-For reference, here is [Gitblit's default Log4j configuration](https://github.com/gitblit/gitblit/blob/master/src/log4j.properties).  It includes some file appenders that are disabled by default. 
+
+You can not use override the default log4j configuration *AND* specify the `--dailyLogFile` parameter.  For reference, here is [Gitblit's default Log4j configuration](https://github.com/gitblit/gitblit/blob/master/src/log4j.properties).  It includes some file appenders that are disabled by default. 
 

--
Gitblit v1.9.1