diff --git a/doc/3-faq-tips-etc.mkd b/doc/3-faq-tips-etc.mkd
index 784f58b..684086a 100644
--- a/doc/3-faq-tips-etc.mkd
+++ b/doc/3-faq-tips-etc.mkd
@@ -156,12 +156,18 @@ plain "git archive", because the Makefile adds a file called
     make master.tar
     # or maybe "make pu.tar"
 
-<a name="diff"></a>
+<a name="features"></a>
 
 ## features
 
+Apart from the big ones listed in the top level README, and subjective ones
+like "better config file format", gitolite has evolved to have many useful
+fearures than the original goal of "gitosis + branch-level access control".
+
 ### syntax and normal usage
 
+<a name="simpler_syntax"></a>
+
 #### simpler syntax
 
 The basic syntax is simpler and cleaner but it goes beyond that: **you can
@@ -205,6 +211,8 @@ do not worry that this causes some duplication or inefficiency.  It doesn't
 
 See the "specify gitweb/daemon access" section below for one more example.
 
+<a name="multikeys"></a>
+
 #### one user, many keys
 
 I have a laptop and a desktop I need to access the server from.  I have
@@ -250,6 +258,8 @@ corresponding derived usernames (which is what goes into the
 
 ### security, access control, and auditing
 
+<a name="two_levels"></a>
+
 #### two levels of access rights checking
 
 Gitolite has two levels of access checks.  The **first check** is what I will
@@ -285,12 +295,6 @@ any of the refexes match, the push succeeds.  If none of them match, it fails.
 Gitolite also allows "exclude" or "deny" rules.  See later in this document
 for details.
 
-Apart from the big ones listed in the top level README, and subjective ones
-like "better config file format", gitolite has evolved to have many useful
-fearures than the original goal of "gitosis + branch-level access control".
-
-<a name="simpler_syntax"></a>
-
 #### better logging
 
 If you have been too liberal with the permission to rewind, it has built-in
@@ -317,8 +321,6 @@ The other parts of the log line are the name of the repo, the refname being
 updated, the user updating it, and the refex pattern (from the config file)
 that matched, in case you need to debug the config file itself.
 
-<a name="multikeys"></a>
-
 #### "exclude" (or "deny") rules
 
 Here is an illustrative explanation of "deny" rules.  However, please be sure
@@ -384,10 +386,10 @@ access control for their own pieces.  See
 [doc/5-delegation.mkd](http://github.com/sitaramc/gitolite/blob/pu/doc/5-delegation.mkd)
 for details.
 
-<a name="gwd"></a>
-
 ### convenience features
 
+<a name="myrights"></a>
+
 #### what repos do I have access to?
 
 Sometimes there are too many repos, maybe even named similarly, or with the
@@ -451,8 +453,6 @@ attempting to run git stuff.
 
 Very easy, very simple, and completely transparent to the users :-)
 
-<a name="myrights"></a>
-
 #### "personal" branches
 
 "personal" branches are great for corporate environments, where
@@ -513,6 +513,8 @@ You can specify hooks that you want to propagate to all repos, as well as
 per-repo "gitconfig" settings.  Please see `doc/2-admin.mkd` and
 `conf/example.conf` for details.
 
+<a name="gitweb"></a>
+
 ### helping with gitweb
 
 Although gitweb is a completely separate program, gitolite can do quite a