From dd9ae71bc1cb13b90dcc8d9689550eb7dfe7d035 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 25 Sep 2011 09:45:45 -0400
Subject: [PATCH] Revised federation proposal mechanism. Added SendProposalPage.

---
 docs/00_index.mkd |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/docs/00_index.mkd b/docs/00_index.mkd
index 3a6e540..e499abe 100644
--- a/docs/00_index.mkd
+++ b/docs/00_index.mkd
@@ -18,23 +18,26 @@
 ### Java Runtime Requirement
 
 Gitblit requires a Java 6 Runtime Environment (JRE) or a Java 6 Development Kit (JDK).
- 
+
 ### Current Release
 
 **%VERSION%** ([go](http://code.google.com/p/gitblit/downloads/detail?name=%GO%)|[war](http://code.google.com/p/gitblit/downloads/detail?name=%WAR%)) based on [%JGIT%][jgit] &nbsp; *released %BUILDDATE%*
 
 - added: federation feature to allow gitblit instances to pull repositories and, optionally, settings and accounts from other gitblit instances.<br/>
 This is something like svn-sync for gitblit.
+<br/>**New:** *federation.name =*
+<br/>**New:** *federation.passphrase =*
 <br/>**New:** *federation.allowProposals = false*
 <br/>**New:** *federation.proposalsFolder = proposals*
 <br/>**New:** *federation.defaultFrequency = 60 mins*
-<br/>**New:** *federation.uuid =*
-<br/>**New:** *federation.name =*
+<br/>**New:** *federation.sets =*
 <br/>**New:** *mail.* settings for sending emails
 <br/>**New:** user role *#notfederated* to prevent a user account from being pulled by a federated Gitblit instance
 - added: google-gson dependency
 - added: javamail dependency
 - updated: MarkdownPapers 1.1.1
+- updated: Wicket 1.4.18
+- updated: JGit 1.1.0
 
 issues, binaries, and sources @ [Google Code][googlecode]<br/>
 sources @ [Github][gitbltsrc]

--
Gitblit v1.9.1