From 9006b07d2ea8aa224a479682f21a2feecf029b28 Mon Sep 17 00:00:00 2001
From: Sitaram Chamarty <sitaram@atc.tcs.com>
Date: Mon, 16 Apr 2012 10:37:45 +0530
Subject: [PATCH] (doc) switch g2 <-> g3

---
 doc/index.mkd | 4 ++--
 doc/mkdoc     | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/doc/index.mkd b/doc/index.mkd
index 25e3da1..a44f76f 100644
--- a/doc/index.mkd
+++ b/doc/index.mkd
@@ -7,9 +7,9 @@ Here's more on [what][] it is and [why][] you might need it.
 
 <font color="gray">
 
-## #g2 (for current gitolite (v2) users)
+## #g2 (for older gitolite (v1.x and v2.x) users)
 
-For current gitolite (call it "g2" for convenience) users,
+For users of gitolite v2.x (call it "g2" for convenience),
 
   * [Why][g3why] I rewrote gitolite.
   * Development [status][dev-status].
diff --git a/doc/mkdoc b/doc/mkdoc
index d03372b..8646988 100755
--- a/doc/mkdoc
+++ b/doc/mkdoc
@@ -28,12 +28,11 @@ try "
     git checkout gh-pages;              ok
     git reset --hard github/gh-pages;   ok
     cd ..;                              ok
-    git rm g3/*.html;                   ok
-    mkdir g3;                           ok
-    mv html/*.html g3;                  ok
-    git add g3;                         ok
+    git rm *.html;                      ok
+    mv html/*.html .;                   ok
+    git add *.html;                     ok
     git commit -m '$head';              ok
-    git checkout g3;                    ok
+    git checkout master;                ok
     rmdir html;                         ok
 " or die 2;