Documentation

3 files changed, 6 insertions, 8 deletions

diff --git a/src/site/design.mkd b/src/site/design.mkd
index 6d4b29ca..cd4b1b71 100644
--- a/src/site/design.mkd
+++ b/src/site/design.mkd
@@ -55,6 +55,8 @@ The following dependencies are automatically downloaded by Gitblit GO (or alread
 - [commons-codec](http://commons.apache.org/proper/commons-codec) (Apache 2.0)

 - [pegdown](https://github.com/sirthias/pegdown) (Apache 2.0)

 - [jedis](https://github.com/xetorthio/jedis) (MIT)

+- [Mina SSHD](https://mina.apache.org) (Apache 2.0)

+- [pf4j](https://github.com/decebals/pf4j) (Apache 2.0)

 

 ### Other Build Dependencies

 - [Fancybox image viewer](http://fancybox.net) (MIT and GPL dual-licensed)

diff --git a/src/site/faq.mkd b/src/site/faq.mkd
index a631797a..1b522f82 100644
--- a/src/site/faq.mkd
+++ b/src/site/faq.mkd
@@ -111,7 +111,7 @@ Yes.  You can manually manipulate all of them and (most) changes will be immedia
 Care must be taken to preserve the relationship between user roles and repository names.<br/>Please see the *User Roles* section of the [setup](/setup.html) page for details.

 

 ### Can I restrict access to branches or paths within a repository?

-No, not out-of-the-box.  Access restrictions apply to the repository as a whole.

+No, not yet.  Access restrictions apply to the repository as a whole.

 

 Gitblit's simple authentication and authorization mechanism can be used to facilitate one or more of the [workflows outlined here](http://progit.org/book/ch5-1.html).

 

@@ -122,10 +122,6 @@ Alternatively, you could use [gitolite](https://github.com/sitaramc/gitolite) an
 ### Can I authenticate users against XYZ?

 Yes.  The user service is pluggable.  You may write your own complete user service by implementing the *com.gitblit.IUserService* interface.  Or you may subclass *com.gitblit.GitblitUserService* and override just the authentication. Set the fully qualified classname as the *realm.userService* property.

 

-### Why doesn't Gitblit support SSH?

-

-It will.  This feature is in development and should land in the 1.5.0 release.

-

 ### What types of Search does Gitblit support?

 

 As of 0.9.0, Gitblit supports Lucene-based searching.

diff --git a/src/site/features.mkd b/src/site/features.mkd
index 2d3daa56..6d933cc1 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

@@ -77,7 +78,6 @@
 - 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"