diff --git a/master-toc.html b/master-toc.html
index d80348a..c1398a1 100644
--- a/master-toc.html
+++ b/master-toc.html
@@ -15,7 +15,7 @@
 <h3>1000-words</h3>
 
 <ul>
-<li><a href="pictures.html">gitolite in pictures</a> (pictures)
+<li><a href="pictures.html">gitolite in pictures</a>
 <ul>
 <li><a href="pictures.html#_installation_and_setup">installation and setup</a></li>
 <li><a href="pictures.html#_adding_users_to_gitolite">adding users to gitolite</a></li>
@@ -30,7 +30,7 @@
 <h3>admin-defined-commands</h3>
 
 <ul>
-<li><a href="ADCs.html">admin defined commands</a> (ADCs)
+<li><a href="ADCs.html">admin defined commands</a>
 <ul>
 <li><a href="ADCs.html#_ADC_background">ADC background</a></li>
 <li><a href="ADCs.html#_ADC_details">ADC details</a>
@@ -45,9 +45,9 @@
 <li><a href="ADCs.html#_anatomy_of_a_command">anatomy of a command</a></li>
 <li><a href="ADCs.html#_example_uses_and_sample_commands_in_contrib_adc_">example uses and sample commands in <code>contrib/adc</code></a>
 <ul>
-<li><a href="ADCs.html#fork">the 'fork' ADC</a> (fork)</li>
+<li><a href="ADCs.html#fork">the 'fork' ADC</a></li>
 <li><a href="ADCs.html#_deleting_trashing_repos">deleting/trashing repos</a></li>
-<li><a href="ADCs.html#able">enable/disable push access temporarily</a> (able)</li>
+<li><a href="ADCs.html#able">enable/disable push access temporarily</a></li>
 </ul></li>
 <li><a href="ADCs.html#_how_the_ADC_feature_came_about">how the ADC feature came about</a></li>
 </ul></li>
@@ -60,22 +60,22 @@
 <h3>admin</h3>
 
 <ul>
-<li><a href="admin.html">administering and running gitolite</a> (admin)
+<li><a href="admin.html">administering and running gitolite</a>
 <ul>
 <li><a href="admin.html#_please_read_this_first">please read this first</a></li>
-<li><a href="add.html">adding users and repos</a> (add)</li>
-<li><a href="hooks.html">using hooks</a> (hooks)
+<li><a href="add.html">adding users and repos</a></li>
+<li><a href="hooks.html">using hooks</a>
 <ul>
-<li><a href="hooks.html#customhooks">custom hooks</a> (customhooks)</li>
-<li><a href="hooks.html#hookchaining">hook chaining</a> (hookchaining)</li>
+<li><a href="hooks.html#customhooks">custom hooks</a></li>
+<li><a href="hooks.html#hookchaining">hook chaining</a></li>
 <li><a href="hooks.html#_environment_variables_available_to_hooks">environment variables available to hooks</a></li>
 <li><a href="hooks.html#_gl_post_init_hook">"gl-post-init" hook</a></li>
 <li><a href="hooks.html#_gl_pre_git_hook">"gl-pre-git" hook</a></li>
 </ul></li>
 <li><a href="admin.html#_other_features">other features</a>
 <ul>
-<li><a href="moverepos.html">moving pre-existing repos into gitolite</a> (moverepos)</li>
-<li><a href="moveserver.html">moving the whole thing from one server to another</a> (moveserver)</li>
+<li><a href="moverepos.html">moving pre-existing repos into gitolite</a></li>
+<li><a href="moveserver.html">moving the whole thing from one server to another</a></li>
 <li><a href="admin.html#_custom_git_config">custom git config</a></li>
 </ul></li>
 </ul></li>
@@ -88,7 +88,7 @@
 <h3>auth</h3>
 
 <ul>
-<li><a href="auth.html">authentication versus authorisation</a> (auth)
+<li><a href="auth.html">authentication versus authorisation</a>
 <ul>
 <li><a href="auth.html#_but_but_you_have_all_that_ssh_stuff_in_there_">but... but... you have all that ssh stuff in there!</a></li>
 <li><a href="auth.html#_so_you_re_basically_saying_you_won_t_support_X_">so you're basically saying you won't support "X"</a></li>
@@ -103,7 +103,7 @@
 <h3>big-config</h3>
 
 <ul>
-<li><a href="bc.html">what is a "big-config"</a> (bc)
+<li><a href="bc.html">what is a "big-config"</a>
 <ul>
 <li><a href="bc.html#_when_why_do_we_need_it_">when/why do we need it?</a>
 <ul>
@@ -118,9 +118,9 @@
 <li><a href="bc.html#_other_optimisations">other optimisations</a>
 <ul>
 <li><a href="bc.html#_disabling_various_defaults">disabling various defaults</a></li>
-<li><a href="bc.html#authkeyopt">optimising the authkeys file</a> (authkeyopt)</li>
+<li><a href="bc.html#authkeyopt">optimising the authkeys file</a></li>
 </ul></li>
-<li><a href="ldap.html">storing usergroup information outside gitolite (like in LDAP)</a> (ldap)
+<li><a href="ldap.html">storing usergroup information outside gitolite (like in LDAP)</a>
 <ul>
 <li><a href="ldap.html#_ldapwhy">why</a></li>
 <li><a href="ldap.html#_ldaphow">how</a></li>
@@ -141,12 +141,12 @@
 <h3>delegation</h3>
 
 <ul>
-<li><a href="deleg.html">delegating access control responsibilities</a> (deleg)
+<li><a href="deleg.html">delegating access control responsibilities</a>
 <ul>
 <li><a href="deleg.html#_lots_of_repos_lots_of_users">lots of repos, lots of users</a></li>
 <li><a href="deleg.html#_how_to_use_delegation">how to use delegation</a>
 <ul>
-<li><a href="deleg.html#subconf">the subconf command</a> (subconf)</li>
+<li><a href="deleg.html#subconf">the subconf command</a></li>
 <li><a href="deleg.html#_backward_compatibility">backward compatibility</a></li>
 </ul></li>
 <li><a href="deleg.html#_security_notes">security notes</a>
@@ -164,7 +164,7 @@
 <h3>developer-notes</h3>
 
 <ul>
-<li><a href="dev_notes.html">developer/patch maintainer notes</a> (dev_notes)
+<li><a href="dev_notes.html">developer/patch maintainer notes</a>
 <ul>
 <li><a href="dev_notes.html#_general_stuff">general stuff</a></li>
 <li><a href="dev_notes.html#_the_rc_file">the rc file</a></li>
@@ -190,7 +190,7 @@
 <h3>gitolite-and-ssh</h3>
 
 <ul>
-<li><a href="gl_ssh.html">how gitolite uses ssh</a> (gl_ssh)
+<li><a href="gl_ssh.html">how gitolite uses ssh</a>
 <ul>
 <li><a href="gl_ssh.html#_ssh_basics">ssh basics</a></li>
 <li><a href="gl_ssh.html#_how_does_gitolite_use_all_this_ssh_magic_">how does gitolite use all this ssh magic?</a>
@@ -208,15 +208,15 @@
 <h3>gitolite.conf-by-example</h3>
 
 <ul>
-<li><a href="conf_examples.html">gitolite.conf -- by example</a> (conf_examples)
+<li><a href="conf_examples.html">gitolite.conf -- by example</a>
 <ul>
 <li><a href="conf_examples.html#_general_notes">general notes</a></li>
-<li><a href="regexov.html">extremely brief regex overview</a> (regexov)</li>
-<li><a href="exbac.html">basic access control</a> (exbac)</li>
-<li><a href="exaac.html">advanced access control</a> (exaac)
+<li><a href="regexov.html">extremely brief regex overview</a></li>
+<li><a href="exbac.html">basic access control</a></li>
+<li><a href="exaac.html">advanced access control</a>
 <ul>
 <li><a href="exaac.html#_deny_rules">"deny" rules</a></li>
-<li><a href="exaac.html#ruleaccum2">rule accumulation</a> (ruleaccum2)</li>
+<li><a href="exaac.html#ruleaccum2">rule accumulation</a></li>
 <li><a href="exaac.html#_gitweb_and_daemon">gitweb and daemon</a></li>
 </ul></li>
 </ul></li>
@@ -229,14 +229,14 @@
 <h3>gitolite.conf</h3>
 
 <ul>
-<li><a href="conf.html">the access control file <code>gitolite.conf</code></a> (conf)
+<li><a href="conf.html">the access control file <code>gitolite.conf</code></a>
 <ul>
-<li><a href="conf.html#syntax">syntax</a> (syntax)
+<li><a href="conf.html#syntax">syntax</a>
 <ul>
 <li><a href="conf.html#_continuation_lines">continuation lines</a></li>
 <li><a href="conf.html#_include_files">include files</a></li>
 </ul></li>
-<li><a href="bac.html">basic access control</a> (bac)
+<li><a href="bac.html">basic access control</a>
 <ul>
 <li><a href="bac.html#_how_rules_are_matched">how rules are matched</a></li>
 <li><a href="bac.html#_branches_tags_and_specifying_refex_es">branches, tags, and specifying "refex"es</a></li>
@@ -245,23 +245,23 @@
 <li><a href="bac.html#_the_special_all_group">the special <code>@all</code> group</a></li>
 </ul></li>
 </ul></li>
-<li><a href="aac.html">advanced access control</a> (aac)
+<li><a href="aac.html">advanced access control</a>
 <ul>
-<li><a href="aac.html#deny">"deny" rules</a> (deny)
+<li><a href="aac.html#deny">"deny" rules</a>
 <ul>
 <li><a href="aac.html#_warnings_and_required_reading">warnings and required reading</a></li>
 <li><a href="aac.html#_deny_rules_for_refs_in_a_repo">"deny" rules for refs in a repo</a></li>
 <li><a href="aac.html#_deny_rules_for_the_entire_repo">"deny" rules for the entire repo</a></li>
 </ul></li>
-<li><a href="aac.html#rwcd">creating and deleting branches</a> (rwcd)</li>
+<li><a href="aac.html#rwcd">creating and deleting branches</a></li>
 </ul></li>
 <li><a href="conf.html#_summary_permissions">summary: permissions</a></li>
 <li><a href="_confother.html">other tips</a>
 <ul>
 <li><a href="_confother.html#_personal_branches">personal branches</a></li>
-<li><a href="_confother.html#ruleaccum">rule accumulation</a> (ruleaccum)</li>
-<li><a href="_confother.html#gwd">specifying gitweb and daemon access</a> (gwd)</li>
-<li><a href="_confother.html#rsgc">repo specific <code>git config</code> commands</a> (rsgc)</li>
+<li><a href="_confother.html#ruleaccum">rule accumulation</a></li>
+<li><a href="_confother.html#gwd">specifying gitweb and daemon access</a></li>
+<li><a href="_confother.html#rsgc">repo specific <code>git config</code> commands</a></li>
 </ul></li>
 </ul></li>
 </ul>
@@ -273,7 +273,7 @@
 <h3>gitolite-gitweb-http-backend</h3>
 
 <ul>
-<li><a href="ggshb.html">how to set up gitolite+gitweb+ssh+http-backend</a> (ggshb)
+<li><a href="ggshb.html">how to set up gitolite+gitweb+ssh+http-backend</a>
 <ul>
 <li><a href="ggshb.html#_NAME">NAME</a></li>
 <li><a href="ggshb.html#_DESCRIPTION">DESCRIPTION</a></li>
@@ -302,12 +302,12 @@
 <h3>gitolite.rc</h3>
 
 <ul>
-<li><a href="rc.html">configuring gitolite's advanced features -- the <code>.gitolite.rc</code> file</a> (rc)
+<li><a href="rc.html">configuring gitolite's advanced features -- the <code>.gitolite.rc</code> file</a>
 <ul>
 <li><a href="rc.html#_variables_that_should_not_be_touched_at_all">variables that should not be touched at all</a></li>
 <li><a href="rc.html#_most_often_used_changed_variables">most often used/changed variables</a></li>
 <li><a href="rc.html#_variables_with_an_efficiency_performance_impact">variables with an efficiency/performance impact</a></li>
-<li><a href="rc.html#rcsecurity">variables with a security impact</a> (rcsecurity)</li>
+<li><a href="rc.html#rcsecurity">variables with a security impact</a></li>
 <li><a href="rc.html#_less_used_changed_variables">less used/changed variables</a></li>
 <li><a href="rc.html#_rarely_changed_variables">rarely changed variables</a></li>
 <li><a href="rc.html#_constants_that_aren_t_">constants that aren't!</a></li>
@@ -321,7 +321,7 @@
 <h3>hook-propagation</h3>
 
 <ul>
-<li><a href="hook_prop.html">hook propagation in gitolite</a> (hook_prop)
+<li><a href="hook_prop.html">hook propagation in gitolite</a>
 <ul>
 <li><a href="hook_prop.html#_hooks_used_by_gitolite">hooks used by gitolite</a></li>
 <li><a href="hook_prop.html#_where_do_I_the_admin_put_the_hooks_"><strong>where</strong> do I (the admin) put the hooks?</a>
@@ -342,7 +342,7 @@
 <h3>http-backend</h3>
 
 <ul>
-<li><a href="http.html">how to setup gitolite to use smart http mode</a> (http)
+<li><a href="http.html">how to setup gitolite to use smart http mode</a>
 <ul>
 <li><a href="http.html#_WARNINGS_plus_stuff_I_need_help_with">WARNINGS, plus stuff I need help with</a></li>
 <li><a href="http.html#_additional_requirements">additional requirements</a></li>
@@ -364,14 +364,14 @@
 <h3>index</h3>
 
 <ul>
-<li><a href="index.html">Hosting git repositories</a> (index)
+<li><a href="index.html">Hosting git repositories</a>
 <ul>
-<li><a href="index.html#qi">quick install</a> (qi)</li>
-<li><a href="index.html#rtfm">what should you read?</a> (rtfm)
+<li><a href="index.html#qi">quick install</a></li>
+<li><a href="index.html#rtfm">what should you read?</a>
 <ul>
-<li><a href="other_docs.html">what do the other docs contain</a> (other<em>docs)</li>
+<li><a href="other_docs.html">what do the other docs contain</a></li>
 </ul></li>
-<li><a href="index.html#gl_what">what is gitolite?</a> (gl</em>what)</li>
+<li><a href="index.html#gl_what">what is gitolite?</a></li>
 <li><a href="_need.html">why is gitolite needed?</a></li>
 <li><a href="index.html#_why_did_I_write_it_">why did I write it?</a>
 <ul>
@@ -389,24 +389,24 @@
 <h3>install</h3>
 
 <ul>
-<li><a href="install.html">gitolite installation</a> (install)
+<li><a href="install.html">gitolite installation</a>
 <ul>
 <li><a href="install.html#_installing_and_upgrading_gitolite">installing and upgrading gitolite</a>
 <ul>
-<li><a href="rpmdeb.html">package method</a> (rpmdeb)</li>
-<li><a href="nonroot.html">non-root method</a> (nonroot)
+<li><a href="rpmdeb.html">package method</a></li>
+<li><a href="nonroot.html">non-root method</a>
 <ul>
-<li><a href="upgrfromclient.html">upgrading from from-client method to non-root method</a> (upgrfromclient)</li>
+<li><a href="upgrfromclient.html">upgrading from from-client method to non-root method</a></li>
 </ul></li>
-<li><a href="root.html">root method</a> (root)</li>
-<li><a href="install.html#upgrade">upgrading</a> (upgrade)</li>
+<li><a href="root.html">root method</a></li>
+<li><a href="install.html#upgrade">upgrading</a></li>
 </ul></li>
-<li><a href="install.html#insttrouble">if you run into trouble...</a> (insttrouble)
+<li><a href="install.html#insttrouble">if you run into trouble...</a>
 <ul>
 <li><a href="install.html#_common_install_problems">common install problems</a></li>
-<li><a href="install.html#instnameconv">naming conventions used</a> (instnameconv)</li>
-<li><a href="instbg.html">helpful background information</a> (instbg)</li>
-<li><a href="instrequire.html">requirements</a> (instrequire)
+<li><a href="install.html#instnameconv">naming conventions used</a></li>
+<li><a href="instbg.html">helpful background information</a></li>
+<li><a href="instrequire.html">requirements</a>
 <ul>
 <li><a href="instrequire.html#_client_workstation">client/workstation</a></li>
 <li><a href="instrequire.html#_server">server</a></li>
@@ -419,8 +419,8 @@
 </ul></li>
 <li><a href="install.html#_instappendices">appendixes</a>
 <ul>
-<li><a href="install.html#instpath">appendix a: PATH issues for gl-setup</a> (instpath)</li>
-<li><a href="install.html#clean">appendix b: cleaning out a botched install</a> (clean)</li>
+<li><a href="install.html#instpath">appendix a: PATH issues for gl-setup</a></li>
+<li><a href="install.html#clean">appendix b: cleaning out a botched install</a></li>
 <li><a href="_uninstall.html">appendix c: uninstalling gitolite completely</a></li>
 </ul></li>
 </ul></li>
@@ -433,7 +433,7 @@
 <h3>migrate</h3>
 
 <ul>
-<li><a href="migr.html">migrating from gitosis to gitolite</a> (migr)</li>
+<li><a href="migr.html">migrating from gitosis to gitolite</a></li>
 </ul>
 
 <hr />
@@ -443,42 +443,42 @@
 <h3>mirroring</h3>
 
 <ul>
-<li><a href="mirroring.html">mirroring gitolite servers</a> (mirroring)
+<li><a href="mirroring.html">mirroring gitolite servers</a>
 <ul>
 <li><a href="mirroring.html#_mirrwhy">why</a></li>
 <li><a href="mirroring.html#_RULE_NUMBER_ONE_">RULE NUMBER ONE!</a></li>
 <li><a href="mirroring.html#_concepts_and_terminology">concepts and terminology</a></li>
 <li><a href="mirroring.html#_setting_up_mirroring">setting up mirroring</a>
 <ul>
-<li><a href="mirrcautions.html">IMPORTANT cautions</a> (mirrcautions)</li>
-<li><a href="mirrsetup.html">setup and usage</a> (mirrsetup)
+<li><a href="mirrcautions.html">IMPORTANT cautions</a></li>
+<li><a href="mirrsetup.html">setup and usage</a>
 <ul>
 <li><a href="mirrsetup.html#_server_level_setup">server level setup</a></li>
 <li><a href="mirrsetup.html#_repository_level_setup">repository level setup</a></li>
 </ul></li>
-<li><a href="mirrsync.html">commands to (re-)sync mirrors</a> (mirrsync)</li>
+<li><a href="mirrsync.html">commands to (re-)sync mirrors</a></li>
 </ul></li>
-<li><a href="mirroring.html#ad/m-dtls">details</a> (ad/m-dtls)
+<li><a href="mirroring.html#ad/m-dtls">details</a>
 <ul>
-<li><a href="mirrconf.html">the <code>conf/gitolite.conf</code> file</a> (mirrconf)</li>
-<li><a href="mirrredirect.html">redirecting pushes</a> (mirrredirect)</li>
+<li><a href="mirrconf.html">the <code>conf/gitolite.conf</code> file</a></li>
+<li><a href="mirrredirect.html">redirecting pushes</a></li>
 </ul></li>
 <li><a href="mirroring.html#_example_setups">example setups</a>
 <ul>
-<li><a href="mirrnonauto.html">non-autonomous</a> (mirrnonauto)</li>
-<li><a href="mirrnonautolocal.html">non-autonomous with local repos</a> (mirrnonautolocal)</li>
-<li><a href="mirrsemiauto.html">semi-autonomous</a> (mirrsemiauto)</li>
-<li><a href="mirrauto.html">autonomous</a> (mirrauto)</li>
+<li><a href="mirrnonauto.html">non-autonomous</a></li>
+<li><a href="mirrnonautolocal.html">non-autonomous with local repos</a></li>
+<li><a href="mirrsemiauto.html">semi-autonomous</a></li>
+<li><a href="mirrauto.html">autonomous</a></li>
 </ul></li>
-<li><a href="mirrdisc.html">discussion</a> (mirrdisc)
+<li><a href="mirrdisc.html">discussion</a>
 <ul>
 <li><a href="mirrdisc.html#_problems_with_the_old_mirroring_model">problems with the old mirroring model</a></li>
 <li><a href="mirrdisc.html#_the_new_mirroring_model">the new mirroring model</a></li>
 </ul></li>
 <li><a href="mirroring.html#_appendices">appendices</a>
 <ul>
-<li><a href="mirrcron.html">appendix A: example cronjob based mirroring</a> (mirrcron)</li>
-<li><a href="mirrparanoia.html">appendix B: efficiency versus paranoia</a> (mirrparanoia)</li>
+<li><a href="mirrcron.html">appendix A: example cronjob based mirroring</a></li>
+<li><a href="mirrparanoia.html">appendix B: efficiency versus paranoia</a></li>
 </ul></li>
 </ul></li>
 </ul>
@@ -490,7 +490,7 @@
 <h3>mob-branches</h3>
 
 <ul>
-<li><a href="mob.html">mob branches in gitolite</a> (mob)</li>
+<li><a href="mob.html">mob branches in gitolite</a></li>
 </ul>
 
 <hr />
@@ -500,7 +500,7 @@
 <h3>nagp</h3>
 
 <ul>
-<li><a href="nagp.html">...not a gitolite problem!</a> (nagp)
+<li><a href="nagp.html">...not a gitolite problem!</a>
 <ul>
 <li><a href="nagp.html#_ssh">ssh</a></li>
 <li><a href="nagp.html#_git">git</a></li>
@@ -521,7 +521,7 @@
 <h3>packaging</h3>
 
 <ul>
-<li><a href="packaging.html">packaging gitolite</a> (packaging)</li>
+<li><a href="packaging.html">packaging gitolite</a></li>
 </ul>
 
 <hr />
@@ -531,7 +531,7 @@
 <h3>progit-article</h3>
 
 <ul>
-<li><a href="progit.html">(master copy of progit chapter on gitolite)</a> (progit)
+<li><a href="progit.html">(master copy of progit chapter on gitolite)</a>
 <ul>
 <li><a href="progit.html#_Gitolite_">Gitolite ##</a>
 <ul>
@@ -554,15 +554,15 @@
 <h3>report-output</h3>
 
 <ul>
-<li><a href="info_expand.html">output of the "info" and "expand" commands</a> (info_expand)
+<li><a href="info_expand.html">output of the "info" and "expand" commands</a>
 <ul>
-<li><a href="info_expand.html#info">the "info" command</a> (info)
+<li><a href="info_expand.html#info">the "info" command</a>
 <ul>
 <li><a href="info_expand.html#_interpreting_the_output">interpreting the output</a></li>
-<li><a href="info_expand.html#limitoutput">using patterns to limit output</a> (limitoutput)</li>
-<li><a href="info_expand.html#openssh5.6">side note: openssh 5.6</a> (openssh5.6)</li>
+<li><a href="info_expand.html#limitoutput">using patterns to limit output</a></li>
+<li><a href="info_expand.html#openssh5.6">side note: openssh 5.6</a></li>
 </ul></li>
-<li><a href="info_expand.html#expand">the "expand" command</a> (expand)</li>
+<li><a href="info_expand.html#expand">the "expand" command</a></li>
 </ul></li>
 </ul>
 
@@ -573,7 +573,7 @@
 <h3>ssh-troubleshooting</h3>
 
 <ul>
-<li><a href="sts.html">ssh troubleshooting</a> (sts)
+<li><a href="sts.html">ssh troubleshooting</a>
 <ul>
 <li><a href="sts.html#_IMPORTANT_READ_THIS_FIRST">IMPORTANT -- READ THIS FIRST</a>
 <ul>
@@ -599,7 +599,7 @@
 <li><a href="sts.html#_typical_cause_s_">typical cause(s)</a></li>
 </ul></li>
 <li><a href="sts.html#_appendix_3_ssh_client_may_not_be_offering_the_right_key">appendix 3: ssh client may not be offering the right key</a></li>
-<li><a href="sshhostaliases.html">appendix 4: host aliases</a> (sshhostaliases)</li>
+<li><a href="sshhostaliases.html">appendix 4: host aliases</a></li>
 <li><a href="sts.html#_appendix_5_why_bypassing_gitolite_causes_a_problem">appendix 5: why bypassing gitolite causes a problem</a></li>
 </ul></li>
 </ul>
@@ -611,7 +611,7 @@
 <h3>tips-notes</h3>
 
 <ul>
-<li><a href="tips.html">assorted tips and notes</a> (tips)
+<li><a href="tips.html">assorted tips and notes</a>
 <ul>
 <li><a href="tips.html#_common_errors_and_mistakes">common errors and mistakes</a></li>
 <li><a href="tips.html#_other_errors_warnings_notes_">other errors, warnings, notes...</a>
@@ -623,14 +623,14 @@
 <ul>
 <li><a href="tips.html#_syntax_and_normal_usage">syntax and normal usage</a>
 <ul>
-<li><a href="tips.html#multikey">one user, many keys</a> (multikey)
+<li><a href="tips.html#multikey">one user, many keys</a>
 <ul>
-<li><a href="oldmultikeys.html">old style multi keys</a> (oldmultikeys)</li>
+<li><a href="oldmultikeys.html">old style multi keys</a></li>
 </ul></li>
 </ul></li>
 <li><a href="_tipssec.html">security, access control, and auditing</a>
 <ul>
-<li><a href="_tipssec.html#2levels">two levels of access rights checking</a> (2levels)</li>
+<li><a href="_tipssec.html#2levels">two levels of access rights checking</a></li>
 <li><a href="_tipssec.html#_better_logging">better logging</a></li>
 <li><a href="_tipssec.html#_delegating_parts_of_the_config_file">delegating parts of the config file</a></li>
 </ul></li>
@@ -638,21 +638,21 @@
 <ul>
 <li><a href="_tnconv.html#_what_repos_do_I_have_access_to_">what repos do I have access to?</a></li>
 <li><a href="_tnconv.html#_support_for_git_installed_outside_default_PATH">support for git installed outside default PATH</a></li>
-<li><a href="_tnconv.html#pers">"personal" branches</a> (pers)</li>
+<li><a href="_tnconv.html#pers">"personal" branches</a></li>
 <li><a href="_tnconv.html#_custom_hooks_and_custom_git_config">custom hooks and custom git config</a></li>
 <li><a href="_tnconv.html#_bypassing_gitolite">bypassing gitolite</a></li>
-<li><a href="adminpush.html">gl-admin-push: bypassing gitolite for the gitolite-admin repo</a> (adminpush)</li>
-<li><a href="_tnconv.html#disable">disabling write access to take backups</a> (disable)</li>
+<li><a href="adminpush.html">gl-admin-push: bypassing gitolite for the gitolite-admin repo</a></li>
+<li><a href="_tnconv.html#disable">disabling write access to take backups</a></li>
 </ul></li>
 <li><a href="tips.html#_INconvenience_features">INconvenience features</a>
 <ul>
-<li><a href="tips.html#repodel">deleting a repo</a> (repodel)</li>
+<li><a href="tips.html#repodel">deleting a repo</a></li>
 <li><a href="tips.html#_renaming_a_repo">renaming a repo</a></li>
 </ul></li>
 <li><a href="tips.html#_helping_with_gitweb">helping with gitweb</a>
 <ul>
-<li><a href="tips.html#gitwebauth">easier to link gitweb authorisation with gitolite</a> (gitwebauth)</li>
-<li><a href="tips.html#umask">umask setting</a> (umask)</li>
+<li><a href="tips.html#gitwebauth">easier to link gitweb authorisation with gitolite</a></li>
+<li><a href="tips.html#umask">umask setting</a></li>
 </ul></li>
 <li><a href="tips.html#_advanced_features">advanced features</a></li>
 <li><a href="tips.html#_odds_and_ends">odds and ends</a>
@@ -670,7 +670,7 @@
 <h3>user</h3>
 
 <ul>
-<li><a href="user.html">what users (not admins) need to know about gitolite</a> (user)
+<li><a href="user.html">what users (not admins) need to know about gitolite</a>
 <ul>
 <li><a href="user.html#_accessing_gitolite">accessing gitolite</a></li>
 <li><a href="user.html#_always_available_commands">always available commands</a></li>
@@ -679,7 +679,7 @@
 <ul>
 <li><a href="user.html#_listing_repos_you_created">listing repos you created</a></li>
 <li><a href="user.html#_set_get_additional_permissions_for_repos_you_created">set/get additional permissions for repos you created</a></li>
-<li><a href="user.html#setdesc">adding a description to repos you created</a> (setdesc)</li>
+<li><a href="user.html#setdesc">adding a description to repos you created</a></li>
 </ul></li>
 <li><a href="user.html#_site_local_commands">"site-local" commands</a></li>
 </ul></li>
@@ -720,7 +720,7 @@
 <h3>who-uses-it</h3>
 
 <ul>
-<li><a href="who.html">who uses gitolite</a> (who)</li>
+<li><a href="who.html">who uses gitolite</a></li>
 </ul>
 
 <hr />
@@ -730,7 +730,7 @@
 <h3>wildcard-repositories</h3>
 
 <ul>
-<li><a href="wild.html">repositories named with wildcards</a> (wild)
+<li><a href="wild.html">repositories named with wildcards</a>
 <ul>
 <li><a href="wild.html#_quick_introduction">quick introduction</a></li>
 <li><a href="wild.html#_rc_file_setting_required">rc file setting required</a></li>
@@ -739,7 +739,7 @@
 <li><a href="wild.html#_wildcard_repos_with_creator_name_in_them">wildcard repos with creator name in them</a></li>
 <li><a href="wild.html#_wildcard_repos_without_creator_name_in_them">wildcard repos without creator name in them</a></li>
 </ul></li>
-<li><a href="wildregex.html">valid regexes and how they are used</a> (wildregex)
+<li><a href="wildregex.html">valid regexes and how they are used</a>
 <ul>
 <li><a href="wildregex.html#_side_note_valid_regexes">side-note: valid regexes</a></li>
 <li><a href="wildregex.html#_side_note_line_anchored_regexes">side-note: line-anchored regexes</a>
@@ -747,11 +747,11 @@
 <li><a href="wildregex.html#_contrast_with_refexes">contrast with refexes</a></li>
 </ul></li>
 </ul></li>
-<li><a href="setperms.html">handing out rights to wildcard-matched repos</a> (setperms)
+<li><a href="setperms.html">handing out rights to wildcard-matched repos</a>
 <ul>
 <li><a href="setperms.html#_admin_adding_other_roles_than_READERS_and_WRITERS">(admin) adding other roles than READERS and WRITERS</a>
 <ul>
-<li><a href="setperms.html#rolenamewarn"><strong>IMPORTANT WARNING ABOUT THIS FEATURE</strong></a> (rolenamewarn)</li>
+<li><a href="setperms.html#rolenamewarn"><strong>IMPORTANT WARNING ABOUT THIS FEATURE</strong></a></li>
 </ul></li>
 </ul></li>
 <li><a href="wild.html#_setting_a_gitweb_description_for_a_wildcard_matched_repo">setting a gitweb description for a wildcard-matched repo</a></li>
@@ -768,7 +768,7 @@
 <h3>gerrit</h3>
 
 <ul>
-<li><a href="gerrit.html">comparing gerrit and gitolite</a> (gerrit)</li>
+<li><a href="gerrit.html">comparing gerrit and gitolite</a></li>
 </ul>
 
 <hr />
@@ -791,7 +791,7 @@
 <h3>mirroring-complex-example</h3>
 
 <ul>
-<li><a href="mirr_complex_example.html">semi-autonomous mirroring setup example</a> (mirr<em>complex</em>example)
+<li><a href="mirr_complex_example.html">semi-autonomous mirroring setup example</a>
 <ul>
 <li><a href="mirr_complex_example.html#_overview_of_problem">overview of problem</a></li>
 <li><a href="mirr_complex_example.html#_overview_of_setup">overview of setup</a>
@@ -821,7 +821,7 @@
 <h3>monkeysphere</h3>
 
 <ul>
-<li><a href="monkeysphere.html">(contributed doc: integrating gitolite with monkeysphere)</a> (monkeysphere)</li>
+<li><a href="monkeysphere.html">(contributed doc: integrating gitolite with monkeysphere)</a></li>
 </ul>
 
 <hr />
@@ -831,7 +831,7 @@
 <h3>putty</h3>
 
 <ul>
-<li><a href="contrib_putty.html">putty and msysgit</a> (contrib_putty)
+<li><a href="contrib_putty.html">putty and msysgit</a>
 <ul>
 <li><a href="contrib_putty.html#_msysgit_setup">msysgit setup</a></li>
 <li><a href="contrib_putty.html#_Going_back_to_OpenSSH">Going back to OpenSSH</a></li>
@@ -859,7 +859,7 @@
 <h3>hub</h3>
 
 <ul>
-<li><a href="hub.html">the 'hub' ADC</a> (hub)
+<li><a href="hub.html">the 'hub' ADC</a>
 <ul>
 <li><a href="hub.html#_a_home_grown_hub_for_git_repos">a home grown 'hub' for git repos</a></li>
 <li><a href="hub.html#_general_syntax">general syntax</a>
@@ -880,7 +880,7 @@
 <h3>README-adc</h3>
 
 <ul>
-<li><a href="shipped_ADCs.html">brief descriptions of the shipped ADCs (admin-defined commands)</a> (shipped_ADCs)</li>
+<li><a href="shipped_ADCs.html">brief descriptions of the shipped ADCs (admin-defined commands)</a></li>
 </ul>
 
 <hr />
@@ -890,7 +890,7 @@
 <h3>repo-deletion</h3>
 
 <ul>
-<li><a href="wild_repodel.html">deleting repos safely</a> (wild_repodel)</li>
+<li><a href="wild_repodel.html">deleting repos safely</a></li>
 </ul>
 
 <hr />
@@ -900,7 +900,7 @@
 <h3>sskm</h3>
 
 <ul>
-<li><a href="sskm.html">changing keys -- self service key management</a> (sskm)
+<li><a href="sskm.html">changing keys -- self service key management</a>
 <ul>
 <li><a href="sskm.html#_Important_">Important!</a>
 <ul>
@@ -933,7 +933,7 @@
 <h3>password-access</h3>
 
 <ul>
-<li><a href="password_access.html">password access to gitolite</a> (password_access)
+<li><a href="password_access.html">password access to gitolite</a>
 <ul>
 <li><a href="password_access.html#_problems">problems</a></li>
 <li><a href="password_access.html#_solution">solution</a></li>
@@ -950,7 +950,7 @@
 <h3>README-ldap</h3>
 
 <ul>
-<li><a href="ldap_helpers.html">ldap helper programs</a> (ldap_helpers)</li>
+<li><a href="ldap_helpers.html">ldap helper programs</a></li>
 </ul>
 
 <hr />
diff --git a/master-toc.mkd b/master-toc.mkd
index b6b056e..14a8cfc 100644
--- a/master-toc.mkd
+++ b/master-toc.mkd
@@ -13,7 +13,7 @@
 
 ### 1000-words
 
-  * [gitolite in pictures](pictures.html) (pictures)
+  * [gitolite in pictures](pictures.html)
       * [installation and setup](pictures.html#_installation_and_setup)
       * [adding users to gitolite](pictures.html#_adding_users_to_gitolite)
       * [adding repos to gitolite](pictures.html#_adding_repos_to_gitolite)
@@ -24,7 +24,7 @@
 
 ### admin-defined-commands
 
-  * [admin defined commands](ADCs.html) (ADCs)
+  * [admin defined commands](ADCs.html)
       * [ADC background](ADCs.html#_ADC_background)
       * [ADC details](ADCs.html#_ADC_details)
           * [installing ADCs](ADCs.html#_installing_ADCs)
@@ -35,9 +35,9 @@
       * ["fake" repos and access control for non-git programs](ADCs.html#_fake_repos_and_access_control_for_non_git_programs)
       * [anatomy of a command](ADCs.html#_anatomy_of_a_command)
       * [example uses and sample commands in `contrib/adc`](ADCs.html#_example_uses_and_sample_commands_in_contrib_adc_)
-          * [the 'fork' ADC](ADCs.html#fork) (fork)
+          * [the 'fork' ADC](ADCs.html#fork)
           * [deleting/trashing repos](ADCs.html#_deleting_trashing_repos)
-          * [enable/disable push access temporarily](ADCs.html#able) (able)
+          * [enable/disable push access temporarily](ADCs.html#able)
       * [how the ADC feature came about](ADCs.html#_how_the_ADC_feature_came_about)
 
 ----
@@ -46,18 +46,18 @@
 
 ### admin
 
-  * [administering and running gitolite](admin.html) (admin)
+  * [administering and running gitolite](admin.html)
       * [please read this first](admin.html#_please_read_this_first)
-      * [adding users and repos](add.html) (add)
-      * [using hooks](hooks.html) (hooks)
-          * [custom hooks](hooks.html#customhooks) (customhooks)
-          * [hook chaining](hooks.html#hookchaining) (hookchaining)
+      * [adding users and repos](add.html)
+      * [using hooks](hooks.html)
+          * [custom hooks](hooks.html#customhooks)
+          * [hook chaining](hooks.html#hookchaining)
           * [environment variables available to hooks](hooks.html#_environment_variables_available_to_hooks)
           * ["gl-post-init" hook](hooks.html#_gl_post_init_hook)
           * ["gl-pre-git" hook](hooks.html#_gl_pre_git_hook)
       * [other features](admin.html#_other_features)
-          * [moving pre-existing repos into gitolite](moverepos.html) (moverepos)
-          * [moving the whole thing from one server to another](moveserver.html) (moveserver)
+          * [moving pre-existing repos into gitolite](moverepos.html)
+          * [moving the whole thing from one server to another](moveserver.html)
           * [custom git config](admin.html#_custom_git_config)
 
 ----
@@ -66,7 +66,7 @@
 
 ### auth
 
-  * [authentication versus authorisation](auth.html) (auth)
+  * [authentication versus authorisation](auth.html)
       * [but... but... you have all that ssh stuff in there!](auth.html#_but_but_you_have_all_that_ssh_stuff_in_there_)
       * [so you're basically saying you won't support "X"](auth.html#_so_you_re_basically_saying_you_won_t_support_X_)
       * [appendix: how to use other authentication systems with gitolite](auth.html#_appendix_how_to_use_other_authentication_systems_with_gitolite)
@@ -77,7 +77,7 @@
 
 ### big-config
 
-  * [what is a "big-config"](bc.html) (bc)
+  * [what is a "big-config"](bc.html)
       * [when/why do we need it?](bc.html#_when_why_do_we_need_it_)
           * [the problem](bc.html#_the_problem)
       * [how do we use it?](bc.html#_how_do_we_use_it_)
@@ -86,8 +86,8 @@
       * [what are the downsides?](bc.html#_what_are_the_downsides_)
       * [other optimisations](bc.html#_other_optimisations)
           * [disabling various defaults](bc.html#_disabling_various_defaults)
-          * [optimising the authkeys file](bc.html#authkeyopt) (authkeyopt)
-      * [storing usergroup information outside gitolite (like in LDAP)](ldap.html) (ldap)
+          * [optimising the authkeys file](bc.html#authkeyopt)
+      * [storing usergroup information outside gitolite (like in LDAP)](ldap.html)
           * [why](ldap.html#_ldapwhy)
           * [how](ldap.html#_ldaphow)
       * [implementation notes](bc.html#_implementation_notes)
@@ -101,10 +101,10 @@
 
 ### delegation
 
-  * [delegating access control responsibilities](deleg.html) (deleg)
+  * [delegating access control responsibilities](deleg.html)
       * [lots of repos, lots of users](deleg.html#_lots_of_repos_lots_of_users)
       * [how to use delegation](deleg.html#_how_to_use_delegation)
-          * [the subconf command](deleg.html#subconf) (subconf)
+          * [the subconf command](deleg.html#subconf)
           * [backward compatibility](deleg.html#_backward_compatibility)
       * [security notes](deleg.html#_security_notes)
           * [group names](deleg.html#_group_names)
@@ -116,7 +116,7 @@
 
 ### developer-notes
 
-  * [developer/patch maintainer notes](dev_notes.html) (dev_notes)
+  * [developer/patch maintainer notes](dev_notes.html)
       * [general stuff](dev_notes.html#_general_stuff)
       * [the rc file](dev_notes.html#_the_rc_file)
       * [modules](dev_notes.html#_modules)
@@ -134,7 +134,7 @@
 
 ### gitolite-and-ssh
 
-  * [how gitolite uses ssh](gl_ssh.html) (gl_ssh)
+  * [how gitolite uses ssh](gl_ssh.html)
       * [ssh basics](gl_ssh.html#_ssh_basics)
       * [how does gitolite use all this ssh magic?](gl_ssh.html#_how_does_gitolite_use_all_this_ssh_magic_)
           * [restricting shell access/distinguishing one user from another](gl_ssh.html#_restricting_shell_access_distinguishing_one_user_from_another)
@@ -146,13 +146,13 @@
 
 ### gitolite.conf-by-example
 
-  * [gitolite.conf -- by example](conf_examples.html) (conf_examples)
+  * [gitolite.conf -- by example](conf_examples.html)
       * [general notes](conf_examples.html#_general_notes)
-      * [extremely brief regex overview](regexov.html) (regexov)
-      * [basic access control](exbac.html) (exbac)
-      * [advanced access control](exaac.html) (exaac)
+      * [extremely brief regex overview](regexov.html)
+      * [basic access control](exbac.html)
+      * [advanced access control](exaac.html)
           * ["deny" rules](exaac.html#_deny_rules)
-          * [rule accumulation](exaac.html#ruleaccum2) (ruleaccum2)
+          * [rule accumulation](exaac.html#ruleaccum2)
           * [gitweb and daemon](exaac.html#_gitweb_and_daemon)
 
 ----
@@ -161,27 +161,27 @@
 
 ### gitolite.conf
 
-  * [the access control file `gitolite.conf`](conf.html) (conf)
-      * [syntax](conf.html#syntax) (syntax)
+  * [the access control file `gitolite.conf`](conf.html)
+      * [syntax](conf.html#syntax)
           * [continuation lines](conf.html#_continuation_lines)
           * [include files](conf.html#_include_files)
-      * [basic access control](bac.html) (bac)
+      * [basic access control](bac.html)
           * [how rules are matched](bac.html#_how_rules_are_matched)
           * [branches, tags, and specifying "refex"es](bac.html#_branches_tags_and_specifying_refex_es)
           * [groups](bac.html#_groups)
               * [the special `@all` group](bac.html#_the_special_all_group)
-      * [advanced access control](aac.html) (aac)
-          * ["deny" rules](aac.html#deny) (deny)
+      * [advanced access control](aac.html)
+          * ["deny" rules](aac.html#deny)
               * [warnings and required reading](aac.html#_warnings_and_required_reading)
               * ["deny" rules for refs in a repo](aac.html#_deny_rules_for_refs_in_a_repo)
               * ["deny" rules for the entire repo](aac.html#_deny_rules_for_the_entire_repo)
-          * [creating and deleting branches](aac.html#rwcd) (rwcd)
+          * [creating and deleting branches](aac.html#rwcd)
       * [summary: permissions](conf.html#_summary_permissions)
       * [other tips](_confother.html)
           * [personal branches](_confother.html#_personal_branches)
-          * [rule accumulation](_confother.html#ruleaccum) (ruleaccum)
-          * [specifying gitweb and daemon access](_confother.html#gwd) (gwd)
-          * [repo specific `git config` commands](_confother.html#rsgc) (rsgc)
+          * [rule accumulation](_confother.html#ruleaccum)
+          * [specifying gitweb and daemon access](_confother.html#gwd)
+          * [repo specific `git config` commands](_confother.html#rsgc)
 
 ----
 
@@ -189,7 +189,7 @@
 
 ### gitolite-gitweb-http-backend
 
-  * [how to set up gitolite+gitweb+ssh+http-backend](ggshb.html) (ggshb)
+  * [how to set up gitolite+gitweb+ssh+http-backend](ggshb.html)
       * [NAME](ggshb.html#_NAME)
       * [DESCRIPTION](ggshb.html#_DESCRIPTION)
       * [EXAMPLE ENVIRONMENT](ggshb.html#_EXAMPLE_ENVIRONMENT)
@@ -210,11 +210,11 @@
 
 ### gitolite.rc
 
-  * [configuring gitolite's advanced features -- the `.gitolite.rc` file](rc.html) (rc)
+  * [configuring gitolite's advanced features -- the `.gitolite.rc` file](rc.html)
       * [variables that should not be touched at all](rc.html#_variables_that_should_not_be_touched_at_all)
       * [most often used/changed variables](rc.html#_most_often_used_changed_variables)
       * [variables with an efficiency/performance impact](rc.html#_variables_with_an_efficiency_performance_impact)
-      * [variables with a security impact](rc.html#rcsecurity) (rcsecurity)
+      * [variables with a security impact](rc.html#rcsecurity)
       * [less used/changed variables](rc.html#_less_used_changed_variables)
       * [rarely changed variables](rc.html#_rarely_changed_variables)
       * [constants that aren't!](rc.html#_constants_that_aren_t_)
@@ -225,7 +225,7 @@
 
 ### hook-propagation
 
-  * [hook propagation in gitolite](hook_prop.html) (hook_prop)
+  * [hook propagation in gitolite](hook_prop.html)
       * [hooks used by gitolite](hook_prop.html#_hooks_used_by_gitolite)
       * [**where** do I (the admin) put the hooks?](hook_prop.html#_where_do_I_the_admin_put_the_hooks_)
           * [the `GL_PACKAGE_HOOKS` directory](hook_prop.html#_the_GL_PACKAGE_HOOKS_directory)
@@ -240,7 +240,7 @@
 
 ### http-backend
 
-  * [how to setup gitolite to use smart http mode](http.html) (http)
+  * [how to setup gitolite to use smart http mode](http.html)
       * [WARNINGS, plus stuff I need help with](http.html#_WARNINGS_plus_stuff_I_need_help_with)
       * [additional requirements](http.html#_additional_requirements)
       * [detailed instructions](http.html#_detailed_instructions)
@@ -256,11 +256,11 @@
 
 ### index
 
-  * [Hosting git repositories](index.html) (index)
-      * [quick install](index.html#qi) (qi)
-      * [what should you read?](index.html#rtfm) (rtfm)
-          * [what do the other docs contain](other_docs.html) (other_docs)
-      * [what is gitolite?](index.html#gl_what) (gl_what)
+  * [Hosting git repositories](index.html)
+      * [quick install](index.html#qi)
+      * [what should you read?](index.html#rtfm)
+          * [what do the other docs contain](other_docs.html)
+      * [what is gitolite?](index.html#gl_what)
       * [why is gitolite needed?](_need.html)
       * [why did I write it?](index.html#_why_did_I_write_it_)
           * [some more features](_morefeatures.html)
@@ -273,26 +273,26 @@
 
 ### install
 
-  * [gitolite installation](install.html) (install)
+  * [gitolite installation](install.html)
       * [installing and upgrading gitolite](install.html#_installing_and_upgrading_gitolite)
-          * [package method](rpmdeb.html) (rpmdeb)
-          * [non-root method](nonroot.html) (nonroot)
-              * [upgrading from from-client method to non-root method](upgrfromclient.html) (upgrfromclient)
-          * [root method](root.html) (root)
-          * [upgrading](install.html#upgrade) (upgrade)
-      * [if you run into trouble...](install.html#insttrouble) (insttrouble)
+          * [package method](rpmdeb.html)
+          * [non-root method](nonroot.html)
+              * [upgrading from from-client method to non-root method](upgrfromclient.html)
+          * [root method](root.html)
+          * [upgrading](install.html#upgrade)
+      * [if you run into trouble...](install.html#insttrouble)
           * [common install problems](install.html#_common_install_problems)
-          * [naming conventions used](install.html#instnameconv) (instnameconv)
-          * [helpful background information](instbg.html) (instbg)
-          * [requirements](instrequire.html) (instrequire)
+          * [naming conventions used](install.html#instnameconv)
+          * [helpful background information](instbg.html)
+          * [requirements](instrequire.html)
               * [client/workstation](instrequire.html#_client_workstation)
               * [server](instrequire.html#_server)
               * [technical skills](instrequire.html#_technical_skills)
           * [getting the gitolite software](_getgl.html)
               * [getting a tar file from a clone](_getgl.html#_getting_a_tar_file_from_a_clone)
       * [appendixes](install.html#_instappendices)
-          * [appendix a: PATH issues for gl-setup](install.html#instpath) (instpath)
-          * [appendix b: cleaning out a botched install](install.html#clean) (clean)
+          * [appendix a: PATH issues for gl-setup](install.html#instpath)
+          * [appendix b: cleaning out a botched install](install.html#clean)
           * [appendix c: uninstalling gitolite completely](_uninstall.html)
 
 ----
@@ -301,7 +301,7 @@
 
 ### migrate
 
-  * [migrating from gitosis to gitolite](migr.html) (migr)
+  * [migrating from gitosis to gitolite](migr.html)
 
 ----
 
@@ -309,30 +309,30 @@
 
 ### mirroring
 
-  * [mirroring gitolite servers](mirroring.html) (mirroring)
+  * [mirroring gitolite servers](mirroring.html)
       * [why](mirroring.html#_mirrwhy)
       * [RULE NUMBER ONE!](mirroring.html#_RULE_NUMBER_ONE_)
       * [concepts and terminology](mirroring.html#_concepts_and_terminology)
       * [setting up mirroring](mirroring.html#_setting_up_mirroring)
-          * [IMPORTANT cautions](mirrcautions.html) (mirrcautions)
-          * [setup and usage](mirrsetup.html) (mirrsetup)
+          * [IMPORTANT cautions](mirrcautions.html)
+          * [setup and usage](mirrsetup.html)
               * [server level setup](mirrsetup.html#_server_level_setup)
               * [repository level setup](mirrsetup.html#_repository_level_setup)
-          * [commands to (re-)sync mirrors](mirrsync.html) (mirrsync)
-      * [details](mirroring.html#ad/m-dtls) (ad/m-dtls)
-          * [the `conf/gitolite.conf` file](mirrconf.html) (mirrconf)
-          * [redirecting pushes](mirrredirect.html) (mirrredirect)
+          * [commands to (re-)sync mirrors](mirrsync.html)
+      * [details](mirroring.html#ad/m-dtls)
+          * [the `conf/gitolite.conf` file](mirrconf.html)
+          * [redirecting pushes](mirrredirect.html)
       * [example setups](mirroring.html#_example_setups)
-          * [non-autonomous](mirrnonauto.html) (mirrnonauto)
-          * [non-autonomous with local repos](mirrnonautolocal.html) (mirrnonautolocal)
-          * [semi-autonomous](mirrsemiauto.html) (mirrsemiauto)
-          * [autonomous](mirrauto.html) (mirrauto)
-      * [discussion](mirrdisc.html) (mirrdisc)
+          * [non-autonomous](mirrnonauto.html)
+          * [non-autonomous with local repos](mirrnonautolocal.html)
+          * [semi-autonomous](mirrsemiauto.html)
+          * [autonomous](mirrauto.html)
+      * [discussion](mirrdisc.html)
           * [problems with the old mirroring model](mirrdisc.html#_problems_with_the_old_mirroring_model)
           * [the new mirroring model](mirrdisc.html#_the_new_mirroring_model)
       * [appendices](mirroring.html#_appendices)
-          * [appendix A: example cronjob based mirroring](mirrcron.html) (mirrcron)
-          * [appendix B: efficiency versus paranoia](mirrparanoia.html) (mirrparanoia)
+          * [appendix A: example cronjob based mirroring](mirrcron.html)
+          * [appendix B: efficiency versus paranoia](mirrparanoia.html)
 
 ----
 
@@ -340,7 +340,7 @@
 
 ### mob-branches
 
-  * [mob branches in gitolite](mob.html) (mob)
+  * [mob branches in gitolite](mob.html)
 
 ----
 
@@ -348,7 +348,7 @@
 
 ### nagp
 
-  * [...not a gitolite problem!](nagp.html) (nagp)
+  * [...not a gitolite problem!](nagp.html)
       * [ssh](nagp.html#_ssh)
       * [git](nagp.html#_git)
       * [windows](nagp.html#_windows)
@@ -363,7 +363,7 @@
 
 ### packaging
 
-  * [packaging gitolite](packaging.html) (packaging)
+  * [packaging gitolite](packaging.html)
 
 ----
 
@@ -371,7 +371,7 @@
 
 ### progit-article
 
-  * [(master copy of progit chapter on gitolite)](progit.html) (progit)
+  * [(master copy of progit chapter on gitolite)](progit.html)
       * [Gitolite ##](progit.html#_Gitolite_)
           * [Installing ###](progit.html#_Installing_)
           * [Customising the Install ###](progit.html#_Customising_the_Install_)
@@ -388,12 +388,12 @@
 
 ### report-output
 
-  * [output of the "info" and "expand" commands](info_expand.html) (info_expand)
-      * [the "info" command](info_expand.html#info) (info)
+  * [output of the "info" and "expand" commands](info_expand.html)
+      * [the "info" command](info_expand.html#info)
           * [interpreting the output](info_expand.html#_interpreting_the_output)
-          * [using patterns to limit output](info_expand.html#limitoutput) (limitoutput)
-          * [side note: openssh 5.6](info_expand.html#openssh5.6) (openssh5.6)
-      * [the "expand" command](info_expand.html#expand) (expand)
+          * [using patterns to limit output](info_expand.html#limitoutput)
+          * [side note: openssh 5.6](info_expand.html#openssh5.6)
+      * [the "expand" command](info_expand.html#expand)
 
 ----
 
@@ -401,7 +401,7 @@
 
 ### ssh-troubleshooting
 
-  * [ssh troubleshooting](sts.html) (sts)
+  * [ssh troubleshooting](sts.html)
       * [IMPORTANT -- READ THIS FIRST](sts.html#_IMPORTANT_READ_THIS_FIRST)
           * [caveats](sts.html#_caveats)
           * [naming conventions used](sts.html#_naming_conventions_used)
@@ -420,7 +420,7 @@
       * [appendix 2: which key is which -- running sshkeys-lint](sts.html#_appendix_2_which_key_is_which_running_sshkeys_lint)
           * [typical cause(s)](sts.html#_typical_cause_s_)
       * [appendix 3: ssh client may not be offering the right key](sts.html#_appendix_3_ssh_client_may_not_be_offering_the_right_key)
-      * [appendix 4: host aliases](sshhostaliases.html) (sshhostaliases)
+      * [appendix 4: host aliases](sshhostaliases.html)
       * [appendix 5: why bypassing gitolite causes a problem](sts.html#_appendix_5_why_bypassing_gitolite_causes_a_problem)
 
 ----
@@ -429,33 +429,33 @@
 
 ### tips-notes
 
-  * [assorted tips and notes](tips.html) (tips)
+  * [assorted tips and notes](tips.html)
       * [common errors and mistakes](tips.html#_common_errors_and_mistakes)
       * [other errors, warnings, notes...](tips.html#_other_errors_warnings_notes_)
           * [cloning an empty repo](tips.html#_cloning_an_empty_repo)
           * [`@all` syntax for repos](tips.html#_all_syntax_for_repos)
       * [features](tips.html#_features)
           * [syntax and normal usage](tips.html#_syntax_and_normal_usage)
-              * [one user, many keys](tips.html#multikey) (multikey)
-                  * [old style multi keys](oldmultikeys.html) (oldmultikeys)
+              * [one user, many keys](tips.html#multikey)
+                  * [old style multi keys](oldmultikeys.html)
           * [security, access control, and auditing](_tipssec.html)
-              * [two levels of access rights checking](_tipssec.html#2levels) (2levels)
+              * [two levels of access rights checking](_tipssec.html#2levels)
               * [better logging](_tipssec.html#_better_logging)
               * [delegating parts of the config file](_tipssec.html#_delegating_parts_of_the_config_file)
           * [convenience features](_tnconv.html)
               * [what repos do I have access to?](_tnconv.html#_what_repos_do_I_have_access_to_)
               * [support for git installed outside default PATH](_tnconv.html#_support_for_git_installed_outside_default_PATH)
-              * ["personal" branches](_tnconv.html#pers) (pers)
+              * ["personal" branches](_tnconv.html#pers)
               * [custom hooks and custom git config](_tnconv.html#_custom_hooks_and_custom_git_config)
               * [bypassing gitolite](_tnconv.html#_bypassing_gitolite)
-              * [gl-admin-push: bypassing gitolite for the gitolite-admin repo](adminpush.html) (adminpush)
-              * [disabling write access to take backups](_tnconv.html#disable) (disable)
+              * [gl-admin-push: bypassing gitolite for the gitolite-admin repo](adminpush.html)
+              * [disabling write access to take backups](_tnconv.html#disable)
           * [INconvenience features](tips.html#_INconvenience_features)
-              * [deleting a repo](tips.html#repodel) (repodel)
+              * [deleting a repo](tips.html#repodel)
               * [renaming a repo](tips.html#_renaming_a_repo)
           * [helping with gitweb](tips.html#_helping_with_gitweb)
-              * [easier to link gitweb authorisation with gitolite](tips.html#gitwebauth) (gitwebauth)
-              * [umask setting](tips.html#umask) (umask)
+              * [easier to link gitweb authorisation with gitolite](tips.html#gitwebauth)
+              * [umask setting](tips.html#umask)
           * [advanced features](tips.html#_advanced_features)
           * [odds and ends](tips.html#_odds_and_ends)
               * ["poking" the admin repo to force a compile](tips.html#_poking_the_admin_repo_to_force_a_compile)
@@ -466,14 +466,14 @@
 
 ### user
 
-  * [what users (not admins) need to know about gitolite](user.html) (user)
+  * [what users (not admins) need to know about gitolite](user.html)
       * [accessing gitolite](user.html#_accessing_gitolite)
       * [always available commands](user.html#_always_available_commands)
       * [digression: two kinds of repos](user.html#_digression_two_kinds_of_repos)
       * [commands only available with "wildrepos" on](user.html#_commands_only_available_with_wildrepos_on)
           * [listing repos you created](user.html#_listing_repos_you_created)
           * [set/get additional permissions for repos you created](user.html#_set_get_additional_permissions_for_repos_you_created)
-          * [adding a description to repos you created](user.html#setdesc) (setdesc)
+          * [adding a description to repos you created](user.html#setdesc)
       * ["site-local" commands](user.html#_site_local_commands)
 
 ----
@@ -500,7 +500,7 @@
 
 ### who-uses-it
 
-  * [who uses gitolite](who.html) (who)
+  * [who uses gitolite](who.html)
 
 ----
 
@@ -508,19 +508,19 @@
 
 ### wildcard-repositories
 
-  * [repositories named with wildcards](wild.html) (wild)
+  * [repositories named with wildcards](wild.html)
       * [quick introduction](wild.html#_quick_introduction)
       * [rc file setting required](wild.html#_rc_file_setting_required)
       * [examples of wildcard repos](wild.html#_examples_of_wildcard_repos)
           * [wildcard repos with creator name in them](wild.html#_wildcard_repos_with_creator_name_in_them)
           * [wildcard repos without creator name in them](wild.html#_wildcard_repos_without_creator_name_in_them)
-      * [valid regexes and how they are used](wildregex.html) (wildregex)
+      * [valid regexes and how they are used](wildregex.html)
           * [side-note: valid regexes](wildregex.html#_side_note_valid_regexes)
           * [side-note: line-anchored regexes](wildregex.html#_side_note_line_anchored_regexes)
               * [contrast with refexes](wildregex.html#_contrast_with_refexes)
-      * [handing out rights to wildcard-matched repos](setperms.html) (setperms)
+      * [handing out rights to wildcard-matched repos](setperms.html)
           * [(admin) adding other roles than READERS and WRITERS](setperms.html#_admin_adding_other_roles_than_READERS_and_WRITERS)
-              * [**IMPORTANT WARNING ABOUT THIS FEATURE**](setperms.html#rolenamewarn) (rolenamewarn)
+              * [**IMPORTANT WARNING ABOUT THIS FEATURE**](setperms.html#rolenamewarn)
       * [setting a gitweb description for a wildcard-matched repo](wild.html#_setting_a_gitweb_description_for_a_wildcard_matched_repo)
       * [reporting](wild.html#_reporting)
       * [deleting a wild repo](wild.html#_deleting_a_wild_repo)
@@ -532,7 +532,7 @@
 
 ### gerrit
 
-  * [comparing gerrit and gitolite](gerrit.html) (gerrit)
+  * [comparing gerrit and gitolite](gerrit.html)
 
 ----
 
@@ -549,7 +549,7 @@
 
 ### mirroring-complex-example
 
-  * [semi-autonomous mirroring setup example](mirr_complex_example.html) (mirr_complex_example)
+  * [semi-autonomous mirroring setup example](mirr_complex_example.html)
       * [overview of problem](mirr_complex_example.html#_overview_of_problem)
       * [overview of setup](mirr_complex_example.html#_overview_of_setup)
           * [gitolite feature recap](mirr_complex_example.html#_gitolite_feature_recap)
@@ -571,7 +571,7 @@
 
 ### monkeysphere
 
-  * [(contributed doc: integrating gitolite with monkeysphere)](monkeysphere.html) (monkeysphere)
+  * [(contributed doc: integrating gitolite with monkeysphere)](monkeysphere.html)
 
 ----
 
@@ -579,7 +579,7 @@
 
 ### putty
 
-  * [putty and msysgit](contrib_putty.html) (contrib_putty)
+  * [putty and msysgit](contrib_putty.html)
       * [msysgit setup](contrib_putty.html#_msysgit_setup)
       * [Going back to OpenSSH](contrib_putty.html#_Going_back_to_OpenSSH)
       * [Putty keys](contrib_putty.html#_Putty_keys)
@@ -601,7 +601,7 @@
 
 ### hub
 
-  * [the 'hub' ADC](hub.html) (hub)
+  * [the 'hub' ADC](hub.html)
       * [a home grown 'hub' for git repos](hub.html#_a_home_grown_hub_for_git_repos)
       * [general syntax](hub.html#_general_syntax)
           * [Bob's commands](hub.html#_Bob_s_commands)
@@ -616,7 +616,7 @@
 
 ### README-adc
 
-  * [brief descriptions of the shipped ADCs (admin-defined commands)](shipped_ADCs.html) (shipped_ADCs)
+  * [brief descriptions of the shipped ADCs (admin-defined commands)](shipped_ADCs.html)
 
 ----
 
@@ -624,7 +624,7 @@
 
 ### repo-deletion
 
-  * [deleting repos safely](wild_repodel.html) (wild_repodel)
+  * [deleting repos safely](wild_repodel.html)
 
 ----
 
@@ -632,7 +632,7 @@
 
 ### sskm
 
-  * [changing keys -- self service key management](sskm.html) (sskm)
+  * [changing keys -- self service key management](sskm.html)
       * [Important!](sskm.html#_Important_)
           * [Key fingerprints](sskm.html#_Key_fingerprints)
           * [Active keys](sskm.html#_Active_keys)
@@ -655,7 +655,7 @@
 
 ### password-access
 
-  * [password access to gitolite](password_access.html) (password_access)
+  * [password access to gitolite](password_access.html)
       * [problems](password_access.html#_problems)
       * [solution](password_access.html#_solution)
       * [some hints, notes and caveats](password_access.html#_some_hints_notes_and_caveats)
@@ -668,7 +668,7 @@
 
 ### README-ldap
 
-  * [ldap helper programs](ldap_helpers.html) (ldap_helpers)
+  * [ldap helper programs](ldap_helpers.html)
 
 ----