From fcc9367bc9d05580ada72b8e9253fd67c8b3260c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 05 Mar 2014 11:31:08 -0500
Subject: [PATCH] Merge pull request #144 from ds5apn/master

---
 src/site/features.mkd |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/site/features.mkd b/src/site/features.mkd
index 31ad007..0f4e7f8 100644
--- a/src/site/features.mkd
+++ b/src/site/features.mkd
@@ -19,6 +19,8 @@
 - 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
+- Optional feature to automatically fetch ref updates for repository mirrors
+- Optional Issue Tracker and Pull-Request-like mechanism
 - *Experimental* built-in Garbage Collection
 - Ability to federate with one or more other Gitblit instances
 - RSS/JSON RPC interface
@@ -51,7 +53,7 @@
 - Display of Author and Committer email addresses can be disabled
 - Case-insensitive searching of commit messages, authors, or committers
 - Dynamic zip downloads feature
-- Markdown file view support
+- Markdown, Confluence, Textile, Twiki, Tracwiki, & Mediawiki markup rendering support
 - Syntax highlighting for popular source code types
 - Customizable regular expression substitution for commit messages (i.e. bug or code review link integration)
 - Single text file for users configuration
@@ -76,7 +78,7 @@
 - Built-in AJP connector for Apache httpd
 
 ## Limitations
-- HTTP/HTTPS/GIT are the only supported Git protocols
+- HTTP/HTTPS/GIT are the only supported Git protocols (SSH is in progress)
 - Built-in access controls are not path-based, they are repository-based.
 
 [jgit]: http://eclipse.org/jgit "Eclipse JGit Site"

--
Gitblit v1.9.1