From fe7c01a8bd76dff240e74bb770212911e227ba59 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 03 Feb 2012 17:24:51 -0500
Subject: [PATCH] Return to Users page after add/edit team

---
 docs/00_index.mkd |  110 +++++++++++++++++++++++++-----------------------------
 1 files changed, 51 insertions(+), 59 deletions(-)

diff --git a/docs/00_index.mkd b/docs/00_index.mkd
index 9f38ebe..e49750e 100644
--- a/docs/00_index.mkd
+++ b/docs/00_index.mkd
@@ -1,23 +1,58 @@
-## Why use Gitblit?
-<a href="screenshots.html" title="Screenshots"><img class="overview" src="thumbs/00.png" alt="Screenshots" /></a>
+## What is Gitblit?
+<div class="well" style="margin-left:5px;float:right;width:275px;padding: 10px 10px;">
+<b>Current Release %VERSION% (%BUILDDATE%)</b> <a href="releases.html">changelog</a>
+<div style="padding:5px;"><a style="width:150px;text-decoration:none;" class="btn success" href="http://code.google.com/p/gitblit/downloads/detail?name=%GO%">Download Gitblit GO</a></div>
+<div style="padding:5px;"><a style="width:150px;text-decoration:none;" class="btn danger" href="http://code.google.com/p/gitblit/downloads/detail?name=%WAR%">Download Gitblit WAR</a></div>
+<div style="padding:5px;"><a style="width:150px;text-decoration:none;" class="btn info" href="http://code.google.com/p/gitblit/downloads/detail?name=%EXPRESS%">Download Gitblit Express</a> <span class="label warning">BETA</span></div>
+<div style="padding:5px;"><a style="width:150px;text-decoration:none;" class="btn primary" href="http://code.google.com/p/gitblit/downloads/detail?name=%MANAGER%">Download Gitblit Manager</a></div>
+	<div style="text-align:center">
+		<a href="http://code.google.com/p/gitblit/downloads/detail?name=%API%">Gitblit API</a> | <a href="http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%">Gitblit Federation Client</a>
+		<br/>
+		<a href="screenshots.html" title="Screenshots"><img style="margin-top:5px;border:1px solid #ccc;" src="thumbs/00.png" alt="Screenshots" /></a>
+	</div>
+
+	<div style="padding-top:5px;">
+	<table class="condensed-table">
+		<tbody>
+		<tr><th>License</th><td><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, version 2.0</a></td></tr>
+		<tr><th>Sources</th><td><a href="http://github.com/gitblit">GitHub</a> &amp; <a href="http://code.google.com/p/gitblit/source/list">GoogleCode</a></td></tr>		
+		<tr><th>Issues</th><td><a href="http://code.google.com/p/gitblit/issues/list">GoogleCode</a></td></tr>
+		<tr><th>Discussion</th><td><a href="http://groups.google.com/group/gitblit">Gitblit Group</a></td></tr>
+		<tr><th>Google+</th><td><a href="https://plus.google.com/114464678392593421684">Gitblit+</a></td></tr>
+		<tr><th>Ohloh</th><td><a target="_top" href="http://www.ohloh.net/p/gitblit"><img border="0" width="100" height="16" src="http://www.ohloh.net/p/gitblit/widgets/project_thin_badge.gif" alt="Ohloh project report for Gitblit" /></a></td></tr>
+		<tr><th>Donations</th><td>If you enjoy Gitblit and want to support its development, please consider making a donation to <a href="http://www.helpmegivetostjude.org/gitblit">St. Jude Children's Research Hospital</a>.
+		<a href="http://www.helpmegivetostjude.org/gitblit" alt="St. Jude Children's Research Hospital"><img style="padding-top:10px;" src="stjude_150x150.gif"/></a></td></tr>
+		</tbody>
+		</table>
+	</div>
+</div>
 
 Gitblit is an open-source, pure Java stack for managing, viewing, and serving [Git][git] repositories.  
 It's designed primarily as a tool for small workgroups who want to host centralized repositories.
 
+You can browse a live demo [here](http://demo-gitblit.rhcloud.com) hosted on [RedHat's OpenShift][rhcloud] cloud service.
+
+**NOTE:**  
+The demo is a bit unstable due to a bug in JBossAS7/Tomcat when running in LOW_MEMORY mode which OpenShift mandates.  RedHat engineers hope to have this issue resolved soon.
+
 ### GO: Single-Stack Solution
 
 *Gitblit GO* is an integrated, single-stack solution based on Jetty.
-  
+
 You do not need Apache httpd, Perl, Git, or Gitweb.  Should you want to use some or all of those, you still can; Gitblit plays nice with the other kids on the block.
 
 This is what you should download if you want to go from zero to Git in less than 5 mins.
-   
-All dependencies are downloaded on first execution.
+
+All dependencies are bundled.
 
 ### WAR: For Your Servlet Container
-*Gitblit WAR* is what you should download if you already have a servlet container available that you wish to use.  
-Jetty 6/7/8 and Tomcat 6/7 are known to work.  Generally, any Servlet 2.5 or Servlet 3.0 container should work.
-    
+*Gitblit WAR* is what you should download if you already have a servlet container available that you wish to use.  Jetty 6/7/8 and Tomcat 6/7 are known to work.  Generally, any Servlet 2.5 or Servlet 3.0 container should work.
+
+All dependencies are bundled.
+
+### Express: For the Cloud <span class="label warning" style="vertical-align: middle;">BETA</span>
+*Gitblit Express* is a prepared distribution for [RedHat's OpenShift][rhcloud] cloud service.
+
 All dependencies are bundled.
 
 ### You decide how to use Gitblit
@@ -26,70 +61,27 @@
 Gitblit can be used as a complete Git stack for cloning, pushing, and repository access control.  
 Gitblit can be used without any other Git tooling (including actual Git) or it can cooperate with your established tools.
 
-### Easy Web Management
+### Easy Remote Management
 
-Administrators can create and manage all repositories & user accounts from the *Web UI*.  
-Administrators can create and manage all repositories & user accounts from the *JSON RPC interface* using the [Gitblit Manager](http://code.google.com/p/gitblit/downloads/detail?name=%MANAGER%) or your own custom tooling. 
+Administrators can create and manage all repositories, user accounts, and teams from the *Web UI*.  
+Administrators can create and manage all repositories, user accounts, and teams from the *JSON RPC interface* using the [Gitblit Manager](http://code.google.com/p/gitblit/downloads/detail?name=%MANAGER%) or your own custom tooling. 
 
-### Integration and Mining
+### Integration with Your Infrastructure
 
+- Groovy push hook scripts
 - Pluggable user service mechanism for custom authentication, authorization, and user management
 - Rich RSS feeds
 - JSON-based RPC mechanism
-- [Java Client API library](http://code.google.com/p/gitblit/downloads/detail?name=%API%) for custom integration
+- [Java Client RSS/JSON API library](http://code.google.com/p/gitblit/downloads/detail?name=%API%) for custom integration
 
 ### Backup Strategy
 
-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](http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%).  Similarly, you can use the federation mechanism to aggregate individual workspace Gitblit instances to a common, centralized server.
-
-### Current Release
-
-**%VERSION%** ([go](http://code.google.com/p/gitblit/downloads/detail?name=%GO%) | [war](http://code.google.com/p/gitblit/downloads/detail?name=%WAR%) | [fedclient](http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%) | [manager](http://code.google.com/p/gitblit/downloads/detail?name=%MANAGER%) | [api](http://code.google.com/p/gitblit/downloads/detail?name=%API%)) based on [%JGIT%][jgit] &nbsp; *released %BUILDDATE%*
-
-- **security**: fixed security hole when cloning clone-restricted repository with TortoiseGit (issue 28)
-- improved: updated ui with Twitter's Bootstrap CSS toolkit  
-    **New:** *web.loginMessage = gitblit*
-- improved: repositories list performance by caching repository sizes (issue 27)
-- improved: summary page performance by caching metric calculations (issue 25)
-- added: authenticated JSON RPC mechanism   
-    **New:** *web.enableRpcServlet = true*  
-    **New:** *web.enableRpcManagement = false*  
-    **New:** *web.enableRpcAdministration = false*
-- added: Gitblit API RSS/JSON RPC library
-- added: Gitblit Manager (Java/Swing Application) for remote administration of a Gitblit server.
-- added: per-repository setting to skip size calculation (faster repositories page loading)
-- added: per-repository setting to skip summary metrics calculation (faster summary page loading)
-- added: IUserService.setup(IStoredSettings) for custom user service implementations
-- added: setting to control Gitblit GO context path for proxy setups *(Github/trygvis)*  
-    **New:** *server.contextPath = /*
-- added: *combined-md5* password storage option which stores the hash of username+password as the password *(Github/alyandon)*
-- added: repository owners are automatically granted access for git, feeds, and zip downloads without explicitly selecting them *(Github/dadalar)*
-- added: RSS feeds now include regex substitutions on commit messages for bug trackers, etc
-- fixed: federation protocol timestamps.  dates are now serialized to the [iso8601](http://en.wikipedia.org/wiki/ISO_8601) standard.  
-    **This breaks 0.6.0 federation clients/servers.**
-- fixed: collision on rename for repositories and users
-- fixed: Gitblit can now browse the Linux kernel repository (issue 25)
-- fixed: Gitblit now runs on Servlet 3.0 webservers (e.g. Tomcat 7, Jetty 8) (issue 23)
-- fixed: Set the RSS content type of syndication feeds for Firefox 4 (issue 22)
-- fixed: RSS feeds are now properly encoded to UTF-8
-- fixed: RSS feeds now properly generate parameterized links if *web.mountParameters=false*
-- fixed: Null pointer exception if did not set federation strategy (issue 20)
-- fixed: Gitblit GO allows SSL renegotiation if running on Java 1.6.0_22 or later
-- updated: MarkdownPapers 1.2.5
-- updated: Wicket 1.4.19
-
-issues, binaries, and sources @ [Google Code][googlecode]<br/>
-sources @ [Github][gitbltsrc]
+Gitblit includes a backup mechanism (*federation*) which can be used to backup repositories and, optionally, user accounts, team definitions, server settings, & Groovy push hook scripts from your Gitblit instance to another Gitblit instance or to a [Gitblit Federation Client](http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%).  Similarly, you can use the federation mechanism to aggregate individual workspace Gitblit instances to a common, centralized server.
 
 ### Java Runtime Requirement
 
 Gitblit requires a Java 6 Runtime Environment (JRE) or a Java 6 Development Kit (JDK).
 
-### License
-Gitblit is distributed under the terms of the [Apache Software Foundation license, version 2.0][apachelicense]
-
 [jgit]: http://eclipse.org/jgit "Eclipse JGit Site"
 [git]: http://git-scm.com "Official Git Site"
-[gitbltsrc]: http://github.com/gitblit "gitblit git repository"
-[googlecode]: http://code.google.com/p/gitblit "gitblit project management"
-[apachelicense]: http://www.apache.org/licenses/LICENSE-2.0 "Apache License, Version 2.0"
+[rhcloud]: https://openshift.redhat.com/app "RedHat OpenShift"
\ No newline at end of file

--
Gitblit v1.9.1