From a502d96a860456ec5e8c96761db70f7cabb74751 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 30 Apr 2016 04:19:14 -0400
Subject: [PATCH] Merge pull request #1073 from gitblit/1062-DocEditorUpdates

---
 src/site/features.mkd |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/site/features.mkd b/src/site/features.mkd
index 2d3daa5..d9ceba7 100644
--- a/src/site/features.mkd
+++ b/src/site/features.mkd
@@ -1,6 +1,7 @@
 ## Standard Features (GO/WAR)
-- JGit http/https SmartHTTP servlet
-- JGit git protocol daemon
+- Integrated JGit http/https SmartHTTP servlet
+- Integrated JGit git protocol daemon
+- Integrated Mina SSHD daemon
 - Optional feature to allow users to create personal repositories
 - Optional feature to fork a repository to a personal repository
 - Optional feature to create a repository on push
@@ -20,9 +21,10 @@
     - **RWD** (clone and push with ref creation, deletion)
     - **RW+** (clone and push with ref creation, deletion, rewind)
 - Menu driven native platform clone links for all popular Git clients
-- *Experimental* built-in Garbage Collection
+- Garbage Collection service
 - Ability to federate with one or more other Gitblit instances
 - RSS/JSON RPC interface
+- An evolving plugin infrastructure
 - Java/Swing Gitblit Manager tool
 - Responsive web UI that subtracts elements to be usable on phones, tablets, and desktop browsers
 - Groovy pre- and post- push hook scripts, per-repository or globally for all repositories
@@ -45,7 +47,7 @@
 - User-tracked reflog for pushes, tags, etc.
 - Fanout PubSub notifications service for self-hosted [Sparkleshare](http://sparkleshare.org) use
 - gh-pages display support (Jekyll is not supported)
-- Branch metrics (uses Google Charts)
+- Branch metrics
 - HEAD and Branch RSS feeds
 - Blame annotations view
 - Dates can optionally be displayed using the browser's reported timezone
@@ -58,15 +60,18 @@
 - Customizable regular expression substitution for commit messages (i.e. bug or code review link integration)
 - Single text file for users configuration
 - Translations
-    - English
-    - Japanese
-    - Spanish
-    - Polish
-    - Korean
-    - Brazilian Portuguese
-    - Dutch
+    - German (de)
+    - English (en)
+    - Spanish (es)
+    - French (fr)
+    - Italian (it)
+    - Japanese (ja)
+    - Korean (ko)
+    - Dutch (nl)
+    - Norwegian (no)
+    - Polish (pl)
+    - Brazilian Portuguese (pt_BR)
     - Simplified Chinese (zh_CN)
-    - French
 
 ## Gitblit GO Features
 - Out-of-the-box integrated stack requiring minimal configuration
@@ -74,10 +79,8 @@
 - Integrated GUI tool to facilitate x509 PKI including ssl and client certificate generation, client certificate revocation, and client certificate distribution
 - Single text file for configuring server and gitblit
 - A Windows service installation script and configuration tool
-- Built-in AJP connector for Apache httpd
 
 ## Limitations
-- HTTP/HTTPS/GIT are the only supported Git protocols (SSH is in progress, ticket-6)
 - Built-in access controls are not branch-based, they are repository-based.
 
 [jgit]: http://eclipse.org/jgit "Eclipse JGit Site"

--
Gitblit v1.9.1