diff --git a/contrib/emacs/README-emacs.mkd b/contrib/emacs/README-emacs.mkd
index 154565b..9d5d8cd 100644
--- a/contrib/emacs/README-emacs.mkd
+++ b/contrib/emacs/README-emacs.mkd
@@ -1,4 +1,4 @@
-# F=_emacsmode Emacs major mode for gitolite.conf
+# F=emacsmode_ Emacs major mode for gitolite.conf
 
 [Emacs][] major mode for `gitolite.conf` can be found here:
 
diff --git a/contrib/gitolite-tools.mkd b/contrib/gitolite-tools.mkd
index 680b6de..e004592 100644
--- a/contrib/gitolite-tools.mkd
+++ b/contrib/gitolite-tools.mkd
@@ -1,4 +1,4 @@
-# F=_gitolite_tools gitolite-tools
+# F=gitolite_tools_ gitolite-tools
 
 gitolite-tools is a collection of external git commands to work with
 gitolite server and repositories:
diff --git a/contrib/mirroring-complex-example.mkd b/contrib/mirroring-complex-example.mkd
index f5b70ec..2c28716 100644
--- a/contrib/mirroring-complex-example.mkd
+++ b/contrib/mirroring-complex-example.mkd
@@ -94,7 +94,7 @@ A typical sequence with that script is:
 You can then treat the detailed steps described below as extra information or
 "background reading" ;-)
 
-## F=_mirrexsteps step by step
+## F=mirrexsteps_ step by step
 
 If the script is not cutting it for you and want to vary the technique for
 some reason, or you simply want to gain a better understanding of what is
@@ -254,7 +254,7 @@ require.
     hostname in the slaves list for the admin repo (this is in the main
     gitolite.conf file)
 
-## F=_mirrappA appendix A: delegation helper files
+## F=mirrappA_ appendix A: delegation helper files
 
 These two files were briefly mentioned in the delegation setup.
 
diff --git a/contrib/vim/README-vim.mkd b/contrib/vim/README-vim.mkd
index 340d1fe..e92304e 100644
--- a/contrib/vim/README-vim.mkd
+++ b/contrib/vim/README-vim.mkd
@@ -1,4 +1,4 @@
-# F=_vimsyntax Vim Syntax Highlight
+# F=vimsyntax_ Vim Syntax Highlight
 
 [Vim][] Syntax highlight for `gitolite.conf` can be found from:
 
diff --git a/doc/big-config.mkd b/doc/big-config.mkd
index bbdc441..2aaa61a 100644
--- a/doc/big-config.mkd
+++ b/doc/big-config.mkd
@@ -35,7 +35,7 @@ Without the 'big config' setting, gitolite internally translates this to:
 
 and then generates the actual config rules once for each user-repo-ref
 combination (there are 8 combinations above); the compiled config file looks
-somewhat like [this][bigno__].
+somewhat like [this][bigno_].
 
 Of course, the output is the same whether you used groups (like `@wbr` and
 `@devs` in the example above) or listed the repos directly on the 'repo'
@@ -57,7 +57,7 @@ happens.
 ### access rules for groups
 
 If you used group names in the 'repo' lines (as in `repo @wbr`), then the
-compiled config looks like [this][bigyes__].
+compiled config looks like [this][bigyes_].
 
 That's a lot smaller, and allows orders of magintude more repos and groups to
 be supported.
@@ -208,7 +208,7 @@ the commit message for details]
 Gitolite now allows usergroup information to be stored outside its own config
 file.  We'll see "why" first, then the "how".
 
-### #_ldapwhy why
+### #ldapwhy_ why
 
 Large sites often have LDAP servers that already contain user and group
 information, including group membership details.  Such sites may prefer that
@@ -232,7 +232,7 @@ However, if the corporate LDAP server already tags these people correctly, and
 if there is some way of getting that information out **at run time**, that
 would be cool.
 
-### #_ldaphow how
+### #ldaphow_ how
 
 All you need is a script that, given a username, queries your LDAP or similar
 server, and returns a space-separated list of all the groups she is a member
@@ -287,7 +287,7 @@ composite set of rules that 'alice' accessing 'lynx' is subject to.
 
 ## config listings
 
-### F=bigno__ compiled config with big-config disabled
+### F=bigno_ compiled config with big-config disabled
 
     %repos = (
       'firefox' => {
@@ -362,7 +362,7 @@ composite set of rules that 'alice' accessing 'lynx' is subject to.
 
 Phew!
 
-### F=bigyes__ compiled config with big-config enabled
+### F=bigyes_ compiled config with big-config enabled
 
     %repos = (
       '@wbr' => {
diff --git a/doc/gitolite.conf.mkd b/doc/gitolite.conf.mkd
index dee3a08..8060d10 100644
--- a/doc/gitolite.conf.mkd
+++ b/doc/gitolite.conf.mkd
@@ -404,7 +404,7 @@ one of `-`, `R`, `RW`, `RW+`, `RWC`, `RW+C`, `RWD`, `RW+D`, `RWCD`, or
 the standalone `C`, which is not really a "ref" level permission and can be
 found in doc/wildcard-repositories.mkd.]
 
-## F=confother__ other tips
+## F=confother_ other tips
 
 ### personal branches
 
diff --git a/doc/index.mkd b/doc/index.mkd
index d92673f..39f7484 100644
--- a/doc/index.mkd
+++ b/doc/index.mkd
@@ -95,7 +95,7 @@ summary":
     httpd if you prefer (this may require root access).
   * several other neat features, too many to list here
 
-## F=need__ why is gitolite needed?
+## F=need_ why is gitolite needed?
 
 Gitolite is separate from git, and needs to be installed and configured.  So...
 why do we bother?
@@ -153,7 +153,7 @@ deleting a branch (which is really just an extreme form of rewind).  I needed
 something in between allowing anyone to do it (the default) and disabling it
 completely (`receive.denyNonFastForwards` or `receive.denyDeletes`).
 
-### F=morefeatures__ some more features
+### F=morefeatures_ some more features
 
 Here're some more features.
 
diff --git a/doc/install.mkd b/doc/install.mkd
index 009b437..e34c8f9 100644
--- a/doc/install.mkd
+++ b/doc/install.mkd
@@ -275,7 +275,7 @@ don't know ssh it'll be a nightmare to support you.
   * regular expressions are a big part of gitolite in many places but
     familiarity is not necessary to do basic access control.
 
-### F=getgl__ getting the gitolite software
+### F=getgl_ getting the gitolite software
 
 You can get the latest version of gitolite from github or google code using
 the 'git clone' command:
@@ -301,7 +301,7 @@ Please use the make command as shown, not a plain "git archive", because the
 Makefile adds a file called `.GITOLITE-VERSION` that will help you identify
 which version you are using.
 
-## #_instappendices appendixes
+## #instappendices_ appendixes
 
 The following sections have some miscellaneous information that does not
 cleanly to fit anywhere else.
@@ -351,7 +351,7 @@ here's how to clean the slate.
         delete `/var/gitolite/conf` and `/var/gitolite/hooks` or
         `$HOME/share/gitolite/conf` and `$HOME/share/gitolite/hooks`
 
-### F=uninstall__ appendix c: uninstalling gitolite completely
+### F=uninstall_ appendix c: uninstalling gitolite completely
 
 (There's some duplication between this and the previous section).
 
diff --git a/doc/mirroring.mkd b/doc/mirroring.mkd
index 3c95618..bdde153 100644
--- a/doc/mirroring.mkd
+++ b/doc/mirroring.mkd
@@ -11,7 +11,7 @@ Mirroring a repo is simple in git; you just need code like this in a
 For a lot of people, though, mirroring is more than just 'backup', and their
 needs are complex enough that setup is hard.
 
-## #_mirrwhy why
+## #mirrwhy_ why
 
 Gitolite's mirroring used to be very rigid -- one master, any number of
 slaves, but the slaves are identical copies of the master. No variations
diff --git a/doc/tips-notes.mkd b/doc/tips-notes.mkd
index 164fc5c..b4cda6e 100644
--- a/doc/tips-notes.mkd
+++ b/doc/tips-notes.mkd
@@ -92,7 +92,7 @@ and the corresponding derived usernames:
         sitaramc@gmail.com@laptop.pub           sitaramc@gmail.com
         sitaramc@gmail.com@desktop.pub          sitaramc@gmail.com
 
-### F=tipssec__ security, access control, and auditing
+### F=tipssec_ security, access control, and auditing
 
 #### #2levels two levels of access rights checking
 
@@ -160,7 +160,7 @@ that matched, in case you need to debug the config file itself.
 You can now split up the config file and delegate the authority to specify
 access control for their own pieces.  See [delegation][deleg] for details.
 
-### F=tnconv__ convenience features
+### F=tnconv_ convenience features
 
 #### what repos do I have access to?
 
diff --git a/doc/wildcard-repositories.mkd b/doc/wildcard-repositories.mkd
index 0e44fd4..5006993 100644
--- a/doc/wildcard-repositories.mkd
+++ b/doc/wildcard-repositories.mkd
@@ -237,7 +237,7 @@ to install/setup "adc"s (admin defined commands).  See
 Enjoy, and please use with care.  This is pretty powerful stuff.  As they say:
 if you break it, you get to keep both pieces :)
 
-## F=wildhow__ how it actually works
+## F=wildhow_ how it actually works
 
 This section tells you what is happening inside gitolite so you can understand
 this feature better.  Let's use the config example at the beginning of this
diff --git a/t/README-t.mkd b/t/README-t.mkd
index 0213aa1..594b0e2 100644
--- a/t/README-t.mkd
+++ b/t/README-t.mkd
@@ -1,4 +1,4 @@
-# F=_t notes on the testing setup
+# F=t_ notes on the testing setup
 
 **WARNING: PLEASE use a dedicated user for doing this**.  Various files and
 directories get overwritten and it's much simpler this way.