From bfa998a3d04e759be555dd8136aaa9450960a879 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 27 Mar 2014 10:13:26 -0400
Subject: [PATCH] Documentation

---
 build.xml                  | 4 ++++
 releases.moxie             | 9 +++++++++
 src/site/setup_plugins.mkd | 6 ++++++
 3 files changed, 19 insertions(+)
 create mode 100644 src/site/setup_plugins.mkd

diff --git a/build.xml b/build.xml
index 87f306ab..a802c827 100644
--- a/build.xml
+++ b/build.xml
@@ -558,6 +558,8 @@
 						<page name="mirrors" src="setup_mirrors.mkd" />
 						<page name="scaling" src="setup_scaling.mkd" />
 						<divider />
+						<page name="plugins" src="setup_plugins.mkd" />
+						<divider />
 						<page name="Gitblit as a viewer" src="setup_viewer.mkd" />
 					</menu>
 					<divider />
@@ -875,6 +877,8 @@
 							<page name="mirrors" src="setup_mirrors.mkd" />
 							<page name="scaling" src="setup_scaling.mkd" />
 							<divider />
+							<page name="plugins" src="setup_plugins.mkd" />
+							<divider />
 							<page name="Gitblit as a viewer" src="setup_viewer.mkd" />
 						</menu>
 						<divider />
diff --git a/releases.moxie b/releases.moxie
index bba8de3f..7f910618 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -24,6 +24,8 @@ r22: {
     - Option to allow LDAP users to directly authenticate without performing LDAP searches (pr-162)
     - Replace JCommander with args4j to be consistent with other tools (ticket-28)
     additions:
+    - Added an SSH daemon with public key authentication (issue-369, ticket-6)
+    - Added beginnings of a plugin framework for extending Gitblit (issue-381, ticket-23)
     - Added a French translation (pr-163)
     dependencyChanges:
     - args4j 2.0.26
@@ -37,6 +39,13 @@ r22: {
     settings:
     - { name: 'realm.ldap.bindpattern', defaultValue: ' ' }
     - { name: 'tickets.closeOnPushCommitMessageRegex', defaultValue: '(?:fixes|closes)[\\s-]+#?(\\d+)' }
+    - { name: 'git.sshPort', defaultValue: '29418' }
+    - { name: 'git.sshBindInterface', defaultValue: ' ' }
+    - { name: 'git.sshKeysManager', defaultValue: 'com.gitblit.transport.ssh.FileKeyManager' }
+    - { name: 'git.sshKeysFolder', defaultValue: '${baseFolder}/ssh' }
+    - { name: 'git.sshBackend', defaultValue: 'NIO2' }
+    - { name: 'git.sshCommandStartThreads', defaultValue: '2' }
+    - { name: 'plugins.folder', defaultValue: '${baseFolder}/plugins' }
 }
 
 #
diff --git a/src/site/setup_plugins.mkd b/src/site/setup_plugins.mkd
new file mode 100644
index 00000000..4e5c733a
--- /dev/null
+++ b/src/site/setup_plugins.mkd
@@ -0,0 +1,6 @@
+
+## Gitblit Plugins
+
+*SINCE 1.5.0*
+
+Document (limited) plugin infrastructure.
-- 
2.39.5