Documentation.

diff --git a/docs/01_features.mkd b/docs/01_features.mkd
index cd4fecf1dd83bfc1df39bbfa26a58e74a5022c6b..927df892619e1afc16a0254d1018ac1050584765 100644 (file)
--- a/docs/01_features.mkd
+++ b/docs/01_features.mkd
@@ -1,4 +1,35 @@
-## Gitblit Features\r
+## Why Gitblit?\r
+\r
+### Single-Stack Solution\r
+\r
+*Gitblit GO* is an integrated, single-stack solution for serving and browsing Git repositories with a per-repository authentication and authorization mechanism.  \r
+You do not need Apache httpd, Perl, Git, Gitweb, or Gitolite.  Should you want to use some or all of those, you still can; Gitblit plays nice with the other kids on the block.  It should be noted that Gitblit does not currently offer fine-grained access controls like [Gitolite](http://sitaramc.github.com/gitolite).\r
+\r
+*Gitblit WAR = Gitblit GO - integrated Jetty*  \r
+You provide the servlet container (e.g. Tomcat, Resin, etc) and deploy the WAR like any other webapp.  Gitblit WAR offers all the same capabilities as the GO integrated stack except as noted below. \r
+\r
+### You decide how to use Gitblit\r
+\r
+Gitblit can be used as a dumb repository viewer with no administrative controls or user accounts.  \r
+Gitblit can be used as a complete Git stack for cloning, pushing, and repository access control.\r
+\r
+### Easy Web Management\r
+\r
+Administrators can create and manage all repositories & user accounts from the *web UI*.  \r
+Administrators can create and manage all repositories & user accounts from the *JSON RPC interface* using the [Gitblit Manager](%MANAGER%) or your own custom tooling. \r
+\r
+### Integration\r
+\r
+Gitblit has a pluggable user service mechanism which allows you to implement your own authentication, authorization, and user management.\r
+\r
+Gitblit offers RSS feeds, a JSON-based RPC mechanism, and a [Java client API library](%API%) which allow you to integrate Gitblit into your systems.\r
+\r
+### Backup Strategy\r
+\r
+Gitblit includes a backup mechanism (*federation*) which can be used to backup repositories and, optionally, user accounts & server settings from your Gitblit instance to another Gitblit instance or to a [Gitblit Federation Client](%FEDCLIENT%).  Similarly you can use the federation mechanism to aggregate individual workspace Gitblit instances to a common, centralized server.\r
+\r
+\r
+## Standard Features (GO/WAR)\r
 - JGit SmartHTTP servlet\r
 - Browser and git client authentication\r
 - Four *per-repository* access control configurations with a Read-Only control flag\r

diff --git a/docs/02_rpc.mkd b/docs/02_rpc.mkd
index d1bb1f33b210e38133cf4945ab2730dc315afc82..7fe7634fece01d0548eaf41830d97eb066a0ee87 100644 (file)
--- a/docs/02_rpc.mkd
+++ b/docs/02_rpc.mkd
@@ -5,6 +5,7 @@
 Gitblit optionally allows a remote client to administer the Gitblit server.  This client could be a Java-based tool or perhaps a tool written in another language.\r
 \r
     web.enableRpcServlet=true\r
+    web.enableRpcManagement=false\r
     web.enableRpcAdministration=false\r
 \r
 **https** is strongly recommended because passwords are insecurely transmitted form your browser/rpc client using Basic authentication!\r
@@ -15,14 +16,14 @@ The Gitblit JSON RPC mechanism, like the Gitblit JGit servlet, syndication/feed
 \r
 [Gitblit Manager](http://code.google.com/p/gitblit/downloads/detail?name=%MANAGER%) is an example Java/Swing application that allows remote management (repository and user objects) and administration (server settings) of a Gitblit server.\r
   \r
-This application uses a combination of RSS feeds and the JSON RPC interface, both of which are part of the [Gitblit API](http://code.google.com/p/gitblit/downloads/detail?name=%API%) library.  Some JSON RPC methods from the utility class `com.gitblit.utils.RpcUtils` are not currently used by the Gitblit Manager.\r
+This application uses a combination of RSS feeds and the JSON RPC interface, both of which are part of the [Gitblit API](http://code.google.com/p/gitblit/downloads/detail?name=%API%) library, to present live information from a Gitblit server.  Some JSON RPC methods from the utility class `com.gitblit.utils.RpcUtils` are not currently used by the Gitblit Manager.\r
 \r
 **NOTE:**  \r
 Gitblit Manager stores your login credentials **INSECURELY** in homedir/.gitblit/config.\r
 \r
-### EGit "Import from Gitblit" Feature (Planning)\r
+### Eclipse/EGit "Import from Gitblit" Feature (Planning)\r
 \r
-One obvious goal of a Gitblit RPC mechanism would be to have an EGit Feature that allows authentication and enumeration of Gitblit repositories from the Eclipse *Import...* menu.  Cloning (hopefully batch) would be delegated to EGit.\r
+One obvious goal of a Gitblit RPC mechanism would be to have an Eclipse/EGit Feature that allows authentication and enumeration of Gitblit repositories from the Eclipse *Import...* menu.  Batch cloning would be supported and delegated to EGit.\r
 \r
 This particular project should not be difficult as the only external dependency for `com.gitblit.utils.RpcUtils` is [google-gson](http://google-gson.googlecode.com) which is already a dependency of the EGit/GitHub Mylyn feature.\r
 \r

diff --git a/docs/05_roadmap.mkd b/docs/05_roadmap.mkd
index a7f21a3b536e94156b4d88b3ded306cfaa47f497..da84a6a3d8133c98c384d1ba7de763bbd721ecaa 100644 (file)
--- a/docs/05_roadmap.mkd
+++ b/docs/05_roadmap.mkd
@@ -19,6 +19,7 @@ This list is volatile.
     * optional automatic push to origin/remotes?\r
     * optional manual push to origin/remotes?\r
 * Gitblit: Lucene integration with multi-repository search (issue 16)\r
+* Gitblit: Repository regex substitutions should be stored in .git/.config, not gitblit.properties\r
 \r
 ### TODO (low priority)\r
 \r