From 51e21e040c65781cea10b54365e87fa8e0459737 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 10 Oct 2011 19:12:00 -0400
Subject: [PATCH] Merge branch 'master' into rpc

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

diff --git a/distrib/gitblit.properties b/distrib/gitblit.properties
index e8acfa9..2d9bb03 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.7.0
+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.
 #
@@ -391,6 +410,13 @@
 #   if unspecified, the folder is *git.repositoriesFolder*
 #   if specified, the folder is relative to *git.repositoriesFolder*
 #
+# bare:
+#   if true, each repository will be created as a *bare* repository and will not
+#   have a working directory.
+#
+#   if false, each repository will be created as a normal repository suitable
+#   for local work.
+#
 # mirror:
 #   if true, each repository HEAD is reset to *origin/master* after each pull.
 #   The repository will be flagged *isFrozen* after the initial clone.
@@ -439,6 +465,12 @@
 # RESTART REQUIRED
 server.useNio = true
 
+# Context path for the application.
+#
+# SINCE 0.7.0
+# RESTART REQUIRED
+server.contextPath = /
+
 # Standard http port to serve.  <= 0 disables this connector.
 # On Unix/Linux systems, ports < 1024 require root permissions.
 # Recommended value: 80 or 8080

--
Gitblit v1.9.1