From cc5ad8d53bcf953eb60e11dcf72aa9f69ec043f3 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 06 Oct 2011 21:03:52 -0400
Subject: [PATCH] Merge branch 'master' into rpc

---
 distrib/gitblit.properties |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/distrib/gitblit.properties b/distrib/gitblit.properties
index 5493b25..14ec79f 100644
--- a/distrib/gitblit.properties
+++ b/distrib/gitblit.properties
@@ -87,6 +87,18 @@
 # SINCE 0.5.0 
 web.allowAdministration = true
 
+# Allows remote clients to list repositories and possibly administer the Gitblit
+# server, if the authenticated account has administrator permissions.
+#
+# SINCE 0.6.1 
+web.enableRpcServlet = true
+
+# Allows remote clients to administer the Gitblit instance, if the authenticated
+# account has administrator permissions.  Requires *web.enableRpcServlet=true*.
+#
+# SINCE 0.6.1 
+web.enableRpcAdministration = false
+
 # Allow dynamic zip downloads.
 #
 # SINCE 0.5.0   
@@ -110,7 +122,14 @@
 # SINCE 0.6.0
 web.showFederationRegistrations = false
 
-# This is the message display above the repositories table.
+# This is the message displayed when *web.authenticateViewPages=true*.
+# This can point to a file with Markdown content.
+# Specifying "gitblit" uses the internal login message.
+#
+# SINCE 0.6.1
+web.loginMessage = gitblit
+
+# This is the message displayed above the repositories table.
 # This can point to a file with Markdown content.
 # Specifying "gitblit" uses the internal welcome message.
 #

--
Gitblit v1.9.1