1 files changed, 20 insertions, 12 deletions
diff --git a/distrib/gitblit.properties b/distrib/gitblit.properties
index e41f12ce..4b5d3af0 100644
--- a/distrib/gitblit.properties
+++ b/distrib/gitblit.properties
@@ -2,9 +2,6 @@
 # Git Servlet Settings
 #
 
-# Allow push/pull over http/https with JGit servlet.
-git.enableGitServlet = true
-
 # Base folder for repositories
 # Changing this value requires a server restart.
 # Use forward slashes even on Windows!!
@@ -18,6 +15,9 @@ git.repositoriesFolder = git
 #      c:/gitrepos/libraries/myotherlibrary.git
 git.searchRepositoriesSubfolders = true
 
+# Allow push/pull over http/https with JGit servlet.
+git.enableGitServlet = true
+
 #
 # Authentication Settings
 #
@@ -30,11 +30,15 @@ web.authenticateViewPages = false
 # Changing this value requires a server restart.
 web.authenticateAdminPages = true
 
-# Either a simple user realm file to authenticate users
-# OR a fully qualified class name that implements the ILoginService interface.
+# Allow Gitblit to store a cookie in the user's browser for automatic
+# authentication.  The cookie is generated by the user service.
+web.allowCookieAuthentication = true
+
+# Either the path to a simple user properties file
+# OR a fully qualified class name that implements the IUserService interface.
 # Any custom implementation must have a public default constructor.
 # Changing this value requires a server restart.
-realm.realmFile = users.properties
+realm.userService = users.properties
 
 # How to store passwords.
 # Valid values are plain or md5.  Default is md5. 
@@ -60,7 +64,7 @@ web.allowAdministration = true
 # Allow dyanamic zip downloads.   
 web.allowZipDownloads = true
 
-# Default number of entries to include in RSS/Atom Syndication links
+# Default number of entries to include in RSS Syndication links
 web.syndicationEntries = 25
 
 # This is the message display above the repositories table.
@@ -69,7 +73,9 @@ web.syndicationEntries = 25
 web.repositoriesMessage = gitblit
 
 # Use the client timezone when formatting dates.
-# This uses AJAX to determine the browser's timezone.
+# This uses AJAX to determine the browser's timezone and may require more
+# server overhead because a Wicket session is created.  All Gitblit pages
+# attempt to be stateless, if possible.
 # Changing this value requires a server restart.
 web.useClientTimezone = false
 
@@ -118,8 +124,10 @@ web.generateActivityGraph = true
 # Value must exceed 0 else default of 20 is used
 web.summaryCommitCount = 16
 
-# The number of tags/heads to display on the summary page
-# Value must exceed 0 else default of 5 is used
+# The number of tags/branches to display on the summary page.
+# -1 = all tags/branches
+# 0 = hide tags/branches
+# N = N tags/branches
 web.summaryRefsCount = 5
 
 # The number of items to show on a page before showing the first, prev, next
@@ -144,7 +152,7 @@ web.binaryExtensions = jar pdf tar.gz zip
 
 # Aggressive heap management will run the garbage collector on every generated
 # page.  This slows down page generation a little but improves heap consumption. 
-web.aggressiveHeapManagement = true
+web.aggressiveHeapManagement = false
 
 # Run the webapp in debug mode
 # Changing this value requires a server restart.
@@ -171,7 +179,7 @@ regex.myrepository.bug = \\b(Bug:)(\\s*[#]?|-){0,1}(\\d+)\\b!!!<a href="http://e
 server.tempFolder = temp
 
 #
-# Jetty Settings
+# Jetty Http/Https Server Settings
 #
 
 # Use Jetty NIO connectors.  If false, Jetty Socket connectors will be used.