diff --git a/check-g2-compat b/check-g2-compat
index 58c6b2f..11fe7a7 100755
--- a/check-g2-compat
+++ b/check-g2-compat
@@ -39,7 +39,7 @@ sub intro {
     msg( ''   => "It does NOT attempt to catch all the differences described in the docs." );
     msg( '', '' );
     msg( INFO => "'see docs' usually means doc/g2migr.mkd" );
-    msg( '',  => "(online at http://sitaramc.github.com/gitolite/g3/g2migr.html)" );
+    msg( '',  => "(online at http://sitaramc.github.com/gitolite/g2migr.html)" );
     msg( '', '' );
 }
 
@@ -54,14 +54,13 @@ sub rc_basic {
 sub rest_of_rc {
     msg( SEVERE  => "GIT_PATH found; see docs" )                          if $GIT_PATH;
     msg( SEVERE  => "GL_ALL_INCLUDES_SPECIAL found; see docs" )           if $GL_ALL_INCLUDES_SPECIAL;
-    msg( SEVERE  => "GL_GET_MEMBERSHIPS_PGM not yet implemented" )        if $GL_GET_MEMBERSHIPS_PGM;
     msg( SEVERE  => "GL_NO_CREATE_REPOS not yet implemented" )            if $GL_NO_CREATE_REPOS;
-    msg( SEVERE  => 'htpasswd, rsync, and svnserve not yet implemented' ) if $HTPASSWD_FILE or $RSYNC_BASE or $SVNSERVE;
+    msg( SEVERE  => "rsync not yet implemented" )                         if $RSYNC_BASE;
     msg( WARNING => "ADMIN_POST_UPDATE_CHAINS_TO found; see docs" )       if $ADMIN_POST_UPDATE_CHAINS_TO;
     msg( WARNING => "GL_NO_DAEMON_NO_GITWEB found; see docs" )            if $GL_NO_DAEMON_NO_GITWEB;
     msg( WARNING => "GL_NO_SETUP_AUTHKEYS found; see docs" )              if $GL_NO_SETUP_AUTHKEYS;
     msg( WARNING => "UPDATE_CHAINS_TO found; see docs" )                  if $UPDATE_CHAINS_TO;
-    msg( WARNING => "GL_ADC_PATH found; many ADCs not yet implemented" )  if $GL_ADC_PATH;
+    msg( WARNING => "GL_ADC_PATH found; see docs" )                       if $GL_ADC_PATH;
     msg( WARNING => "non-default GL_WILDREPOS_PERM_CATS found" ) if $GL_WILDREPOS_PERM_CATS ne 'READERS WRITERS';
 }
 
diff --git a/doc/dev-status.mkd b/doc/dev-status.mkd
index 03ef93f..6d40949 100644
--- a/doc/dev-status.mkd
+++ b/doc/dev-status.mkd
@@ -10,7 +10,7 @@ Help needed:
 
   * I'd like distro packagers to play with it and help with migration advice
     for distro-upgrades
-  * rsync, htpasswd
+  * rsync
   * git-annexe support (but this has a pre-requisite in the previous list)
 
 Won't be done unless someone asks (saw no evidence that anyone used them in g2
@@ -33,3 +33,4 @@ Done:
   * migration advice for common cases
   * smart http
   * svnserve
+  * htpasswd
diff --git a/doc/g2incompat.mkd b/doc/g2incompat.mkd
index 02a3d85..ca54ebc 100644
--- a/doc/g2incompat.mkd
+++ b/doc/g2incompat.mkd
@@ -92,7 +92,7 @@ There are several changes with regard to mirroring:
         option mirror.nightly       =   merry pippin
 
     but they will not be processed by gitolite.  Your cron jobs should use
-    `gitolite git-config` to query this variable, grab the list of repos, and
+    `gitolite git-config` to query this variable, grab the list of peers, and
     run `gitolite mirror` on each of them.
 
   * The external command to resync mirrors is 'mirror', run just like any
diff --git a/doc/g2migr-example.mkd b/doc/g2migr-example.mkd
index 18c2ba8..28ec8b2 100644
--- a/doc/g2migr-example.mkd
+++ b/doc/g2migr-example.mkd
@@ -93,7 +93,7 @@ This is a quick and dirty program to catch some of the big issues.
                 It does NOT attempt to catch all the differences described in the docs.
 
     INFO        'see docs' usually means doc/g2migr.mkd
-                (online at http://sitaramc.github.com/gitolite/g3/g2migr.html)
+                (online at http://sitaramc.github.com/gitolite/g2migr.html)
 
     checking rc file...
     NOTE        GL_ADMINDIR is in the right place; assuming you did not mess with
diff --git a/doc/g2migr.mkd b/doc/g2migr.mkd
index e7f2864..916aab2 100644
--- a/doc/g2migr.mkd
+++ b/doc/g2migr.mkd
@@ -161,8 +161,7 @@ Some of them have links where there is more detail than I want to put here.
 
   * `GL_WILDREPOS_PERM_CATS` -- is now the ROLES hash in the rc file.
 
-  * `HTPASSWD_FILE`, `RSYNC_BASE`, `SVNSERVE` -- need work.  Email me if you
-    are using any of these.
+  * `RSYNC_BASE` -- needs work.  Email me if you are using this.
 
   * `NICE_VALUE` -- **dropped**.  Uncomment the 'renice 10' line in the rc
     file.  You can also change the 10 to something else if you wish.