From bd01eebfa57b4012bc7a7abc1aaaa1b69278b9de Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 19 Feb 2012 15:38:50 -0500
Subject: [PATCH] Merged issues/lucene branch

---
 docs/01_features.mkd |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/docs/01_features.mkd b/docs/01_features.mkd
index 9364710..7eb9e64 100644
--- a/docs/01_features.mkd
+++ b/docs/01_features.mkd
@@ -1,4 +1,4 @@
-## Gitblit Features
+## Standard Features (GO/WAR)
 - JGit SmartHTTP servlet
 - Browser and git client authentication
 - Four *per-repository* access control configurations with a Read-Only control flag
@@ -8,12 +8,18 @@
     - ![view](shield_16x16.png) *Authenticated View, Clone & Push*
     - ![freeze](cold_16x16.png) Freeze repository (i.e. deny push, make read-only)
 - Ability to federate with one or more other Gitblit instances
-- JSON RPC interface
+- RSS/JSON RPC interface
+- Java/Swing Gitblit Manager tool 
 - Gitweb inspired web UI
-- Administrators may create, edit, rename, or delete repositories through the web UI
-- Administrators may create, edit, rename, or delete users through the web UI
+- Groovy pre- and post- push hook scripts, per-repository or globally for all repositories
+- Email push notifications *(via sendmail.groovy push script)*
+- Administrators may create, edit, rename, or delete repositories through the web UI or RPC interface
+- Administrators may create, edit, rename, or delete users through the web UI or RPC interface
+- Administrators may create, edit, rename, or delete teams through the web UI or RPC interface
 - Repository Owners may edit repositories through the web UI
-- Git-notes support
+- Gravatar integration
+- Git-notes display support
+- gh-pages display support (Jekyll is not supported)
 - Branch metrics (uses Google Charts)
 - HEAD and Branch RSS feeds
 - Blame annotations view
@@ -37,11 +43,11 @@
 - A Windows service installation script and configuration tool
 
 ## Limitations
-- HTTP/HTTPS are the only supported protocols
-- Access controls are not path-based, they are repository-based
+- HTTP/HTTPS are the only supported Git protocols
+- Built-in access controls are not path-based, they are repository-based.  
 - Only Administrators can create, rename or delete repositories
 - Only Administrators can create, modify or delete users
-- Commit hooks are not supported
+- Only Administrators can create, modify or delete teams
 - Native Git may be needed to periodically run git-gc as [JGit][jgit] does not fully support the git-gc featureset.
 
 ### Caveats

--
Gitblit v1.9.1