From 8f73a7cc630bb61d088c7cdad30a6708870184ee Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 14 Sep 2011 09:13:51 -0400
Subject: [PATCH] Implemented Federation Sets. Documentation.

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

diff --git a/distrib/gitblit.properties b/distrib/gitblit.properties
index 5ea43cd..2ae6468 100644
--- a/distrib/gitblit.properties
+++ b/distrib/gitblit.properties
@@ -226,22 +226,26 @@
 
 # Registered extensions for google-code-prettify
 #
+# SPACE-DELIMITED
 # SINCE 0.5.0
 web.prettyPrintExtensions = c cpp cs css htm html java js php pl prefs properties py rb sh sql xml vb
 
 # Registered extensions for markdown transformation
 #
+# SPACE-DELIMITED
 # CASE-SENSITIVE
 # SINCE 0.5.0
 web.markdownExtensions = md mkd markdown MD MKD
 
 # Image extensions
 #
+# SPACE-DELIMITED
 # SINCE 0.5.0
 web.imageExtensions = bmp jpg gif png 
 
 # Registered extensions for binary blobs
 #
+# SPACE-DELIMITED
 # SINCE 0.5.0
 web.binaryExtensions = jar pdf tar.gz zip
 
@@ -304,8 +308,9 @@
 # SINCE 0.6.0
 mail.fromAddress = 
 
-# Space-separated list of email addresses for the Gitblit administrators
+# List of email addresses for the Gitblit administrators
 #
+# SPACE-DELIMITED
 # SINCE 0.6.0
 mail.adminAddresses = 
 
@@ -338,7 +343,7 @@
 #
 # CASE-SENSITIVE
 # SINCE 0.6.0
-# RESTART REQUIRED
+# RESTART REQUIRED *(only to enable or disable federation)*
 federation.passphrase =
 
 # Control whether or not this Gitblit instance can receive federation proposals
@@ -360,6 +365,17 @@
 # SINCE 0.6.0
 federation.defaultFrequency = 60 mins
 
+# Federation Sets are named groups of repositories.  The Federation Sets are 
+# available for selection in the repository settings page.  You can assign a
+# repository to one or more sets and then distribute the token for the set.
+# This allows you to grant federation pull access to a subset of your available
+# repositories.  Tokens for federation sets only grant repository pull access.
+#
+# SPACE-DELIMITED
+# CASE-SENSITIVE
+# SINCE 0.6.0
+federation.sets = 
+
 # Federation pull registrations
 # Registrations are read once, at startup.
 #
@@ -369,10 +385,10 @@
 #   The shortest frequency allowed is every 5 minutes
 #   Decimal frequency values are cast to integers
 #   Frequency values may be specified in mins, hours, or days
-#   Values that can not be parsed default to *federation.defaultFrequency*
+#   Values that can not be parsed or are unspecified default to *federation.defaultFrequency*
 #
 # folder:
-#   if blank, the folder is *git.repositoriesFolder*
+#   if unspecified, the folder is *git.repositoriesFolder*
 #   if specified, the folder is relative to *git.repositoriesFolder*
 #
 # mergeAccounts:
@@ -384,7 +400,7 @@
 #   notified by email of pull failures
 #
 # include and exclude:
-#   space-separated list of repositories to include or exclude from pull
+#   Space-delimited list of repositories to include or exclude from pull
 #   may be * wildcard to include or exclude all
 #   may use fuzzy match (e.g. org.eclipse.*)
 

--
Gitblit v1.9.1