From 35738e87105e1a11ced6a6b497146bbd189d4fb2 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junio@hera.kernel.org>
Date: Mon, 7 Jan 2008 07:55:46 +0000
Subject: [PATCH] Autogenerated HTML docs for v1.5.4-rc2-60-gb2e62

---
 RelNotes-1.5.4.txt                    |  15 +-
 blame-options.txt                     |   2 +-
 cmds-ancillaryinterrogators.txt       |  28 +--
 cmds-ancillarymanipulators.txt        |  24 +--
 cmds-foreignscminterface.txt          |  18 +-
 cmds-mainporcelain.txt                |  72 ++++----
 cmds-plumbinginterrogators.txt        |  36 ++--
 cmds-plumbingmanipulators.txt         |  34 ++--
 cmds-purehelpers.txt                  |  20 +--
 cmds-synchelpers.txt                  |  14 +-
 cmds-synchingrepositories.txt         |   8 +-
 config.txt                            | 129 +++++++-------
 core-tutorial.html                    |   2 +-
 cvs-migration.html                    |   2 +-
 cvs-migration.txt                     |  10 +-
 diff-options.txt                      |   4 +-
 diffcore.html                         |   2 +-
 everyday.html                         |   2 +-
 everyday.txt                          |  48 ++---
 fetch-options.txt                     |   2 +-
 git-add.html                          |   2 +-
 git-add.txt                           |  16 +-
 git-am.html                           |   2 +-
 git-am.txt                            |  16 +-
 git-annotate.html                     |   2 +-
 git-annotate.txt                      |   4 +-
 git-apply.html                        |   2 +-
 git-apply.txt                         |  12 +-
 git-archimport.html                   |   2 +-
 git-archimport.txt                    |   2 +-
 git-archive.html                      |   2 +-
 git-archive.txt                       |   2 +-
 git-bisect.html                       |   2 +-
 git-bisect.txt                        |   2 +-
 git-blame.html                        |   2 +-
 git-blame.txt                         |   8 +-
 git-branch.html                       |   2 +-
 git-branch.txt                        |  12 +-
 git-bundle.html                       |   2 +-
 git-bundle.txt                        |  10 +-
 git-cat-file.html                     |   2 +-
 git-cat-file.txt                      |   4 +-
 git-check-attr.html                   |   2 +-
 git-check-attr.txt                    |   4 +-
 git-check-ref-format.html             |   2 +-
 git-check-ref-format.txt              |   6 +-
 git-checkout-index.html               |   2 +-
 git-checkout-index.txt                |   2 +-
 git-checkout.html                     |   2 +-
 git-checkout.txt                      |   4 +-
 git-cherry-pick.html                  |   2 +-
 git-cherry-pick.txt                   |   4 +-
 git-cherry.html                       |   2 +-
 git-cherry.txt                        |   2 +-
 git-citool.html                       |   2 +-
 git-citool.txt                        |   6 +-
 git-clean.html                        |   2 +-
 git-clean.txt                         |   4 +-
 git-clone.html                        |   2 +-
 git-clone.txt                         |   2 +-
 git-commit-tree.html                  |   2 +-
 git-commit-tree.txt                   |   6 +-
 git-commit.html                       |   2 +-
 git-commit.txt                        |  30 ++--
 git-config.html                       |   5 +-
 git-config.txt                        |   2 +-
 git-count-objects.html                |   2 +-
 git-count-objects.txt                 |   2 +-
 git-cvsexportcommit.html              |   2 +-
 git-cvsexportcommit.txt               |   2 +-
 git-cvsimport.html                    |   2 +-
 git-cvsimport.txt                     |   4 +-
 git-cvsserver.html                    |   2 +-
 git-cvsserver.txt                     |   4 +-
 git-daemon.html                       |   2 +-
 git-daemon.txt                        |   2 +-
 git-describe.html                     |   2 +-
 git-describe.txt                      |   2 +-
 git-diff-files.html                   |   2 +-
 git-diff-files.txt                    |   2 +-
 git-diff-index.html                   |   2 +-
 git-diff-index.txt                    |   2 +-
 git-diff-tree.html                    |   2 +-
 git-diff-tree.txt                     |   2 +-
 git-diff.html                         |   2 +-
 git-diff.txt                          |   8 +-
 git-fast-export.html                  |   2 +-
 git-fast-export.txt                   |  12 +-
 git-fast-import.html                  |   2 +-
 git-fast-import.txt                   |  18 +-
 git-fetch-pack.html                   |   2 +-
 git-fetch-pack.txt                    |   4 +-
 git-fetch.html                        |   2 +-
 git-fetch.txt                         |   4 +-
 git-filter-branch.html                |   2 +-
 git-filter-branch.txt                 |  16 +-
 git-fmt-merge-msg.html                |   2 +-
 git-fmt-merge-msg.txt                 |   4 +-
 git-for-each-ref.html                 |   2 +-
 git-format-patch.html                 |   2 +-
 git-format-patch.txt                  |   8 +-
 git-fsck-objects.html                 |   2 +-
 git-fsck-objects.txt                  |   2 +-
 git-fsck.html                         |   2 +-
 git-fsck.txt                          |   2 +-
 git-gc.html                           |   2 +-
 git-gc.txt                            |  14 +-
 git-get-tar-commit-id.html            |   2 +-
 git-get-tar-commit-id.txt             |   4 +-
 git-grep.html                         |   2 +-
 git-grep.txt                          |   2 +-
 git-gui.html                          |   2 +-
 git-gui.txt                           |   4 +-
 git-hash-object.html                  |   2 +-
 git-hash-object.txt                   |   2 +-
 git-help.html                         |   2 +-
 git-help.txt                          |   6 +-
 git-http-fetch.html                   |   2 +-
 git-http-fetch.txt                    |   2 +-
 git-http-push.html                    |   2 +-
 git-http-push.txt                     |   2 +-
 git-imap-send.html                    |   2 +-
 git-imap-send.txt                     |   2 +-
 git-index-pack.html                   |   4 +-
 git-index-pack.txt                    |  10 +-
 git-init-db.html                      |   2 +-
 git-init-db.txt                       |   2 +-
 git-init.html                         |   2 +-
 git-init.txt                          |   2 +-
 git-instaweb.html                     |   2 +-
 git-instaweb.txt                      |   2 +-
 git-log.html                          |   2 +-
 git-log.txt                           |  10 +-
 git-lost-found.html                   |   2 +-
 git-lost-found.txt                    |   4 +-
 git-ls-files.html                     |   2 +-
 git-ls-files.txt                      |   8 +-
 git-ls-remote.html                    |   2 +-
 git-ls-remote.txt                     |   4 +-
 git-ls-tree.html                      |   2 +-
 git-ls-tree.txt                       |   2 +-
 git-mailinfo.html                     |   2 +-
 git-mailinfo.txt                      |   4 +-
 git-mailsplit.html                    |   2 +-
 git-mailsplit.txt                     |   2 +-
 git-merge-base.html                   |   2 +-
 git-merge-base.txt                    |   2 +-
 git-merge-file.html                   |   2 +-
 git-merge-file.txt                    |   4 +-
 git-merge-index.html                  |   2 +-
 git-merge-index.txt                   |   2 +-
 git-merge-one-file.html               |   2 +-
 git-merge-one-file.txt                |   2 +-
 git-merge-tree.html                   |   2 +-
 git-merge-tree.txt                    |   2 +-
 git-merge.html                        |   2 +-
 git-merge.txt                         |   8 +-
 git-mergetool.html                    |   2 +-
 git-mergetool.txt                     |   4 +-
 git-mktag.html                        |   2 +-
 git-mktag.txt                         |   2 +-
 git-mktree.html                       |   2 +-
 git-mktree.txt                        |   2 +-
 git-mv.html                           |   2 +-
 git-mv.txt                            |   2 +-
 git-name-rev.html                     |   4 +-
 git-name-rev.txt                      |   4 +-
 git-pack-objects.html                 |   2 +-
 git-pack-objects.txt                  |  10 +-
 git-pack-redundant.html               |   2 +-
 git-pack-redundant.txt                |   8 +-
 git-pack-refs.html                    |   2 +-
 git-pack-refs.txt                     |   2 +-
 git-parse-remote.html                 |   2 +-
 git-parse-remote.txt                  |   2 +-
 git-patch-id.html                     |   2 +-
 git-patch-id.txt                      |   2 +-
 git-peek-remote.html                  |   2 +-
 git-peek-remote.txt                   |   2 +-
 git-prune-packed.html                 |   2 +-
 git-prune-packed.txt                  |   6 +-
 git-prune.html                        |   2 +-
 git-prune.txt                         |   2 +-
 git-pull.html                         |   2 +-
 git-pull.txt                          |  10 +-
 git-push.html                         |   2 +-
 git-push.txt                          |   4 +-
 git-quiltimport.html                  |   2 +-
 git-quiltimport.txt                   |   2 +-
 git-read-tree.html                    |   2 +-
 git-read-tree.txt                     |   8 +-
 git-rebase.html                       |   2 +-
 git-rebase.txt                        |  10 +-
 git-receive-pack.html                 |   2 +-
 git-receive-pack.txt                  |   4 +-
 git-reflog.html                       |   2 +-
 git-reflog.txt                        |   8 +-
 git-relink.html                       |   2 +-
 git-relink.txt                        |   2 +-
 git-remote.html                       |   2 +-
 git-remote.txt                        |  12 +-
 git-repack.html                       |   2 +-
 git-repack.txt                        |  14 +-
 git-repo-config.html                  |   2 +-
 git-repo-config.txt                   |   2 +-
 git-request-pull.html                 |   2 +-
 git-request-pull.txt                  |   2 +-
 git-rerere.html                       |   2 +-
 git-rerere.txt                        |   4 +-
 git-reset.html                        |   2 +-
 git-reset.txt                         |   8 +-
 git-rev-list.html                     |   2 +-
 git-rev-list.txt                      |  20 +--
 git-rev-parse.html                    |  15 +-
 git-rev-parse.txt                     |   9 +-
 git-revert.html                       |   2 +-
 git-revert.txt                        |   4 +-
 git-rm.html                           |   2 +-
 git-rm.txt                            |   4 +-
 git-send-email.html                   |   2 +-
 git-send-email.txt                    |   2 +-
 git-send-pack.html                    |   2 +-
 git-send-pack.txt                     |   6 +-
 git-sh-setup.html                     |   2 +-
 git-sh-setup.txt                      |   2 +-
 git-shell.html                        |   2 +-
 git-shell.txt                         |   2 +-
 git-shortlog.html                     |   2 +-
 git-shortlog.txt                      |   2 +-
 git-show-branch.html                  |   2 +-
 git-show-branch.txt                   |   2 +-
 git-show-index.html                   |   2 +-
 git-show-index.txt                    |   2 +-
 git-show-ref.html                     |   2 +-
 git-show-ref.txt                      |   6 +-
 git-show.html                         |   2 +-
 git-show.txt                          |   8 +-
 git-stash.html                        |   2 +-
 git-stash.txt                         |  10 +-
 git-status.html                       |   2 +-
 git-status.txt                        |   6 +-
 git-stripspace.html                   |   2 +-
 git-stripspace.txt                    |   2 +-
 git-submodule.html                    |   2 +-
 git-submodule.txt                     |   6 +-
 git-svn.html                          |   2 +-
 git-svn.txt                           |  12 +-
 git-symbolic-ref.html                 |   2 +-
 git-symbolic-ref.txt                  |   2 +-
 git-tag.html                          |   2 +-
 git-tag.txt                           |   2 +-
 git-tar-tree.html                     |   2 +-
 git-tar-tree.txt                      |   2 +-
 git-tools.html                        |   2 +-
 git-unpack-file.html                  |   2 +-
 git-unpack-file.txt                   |   2 +-
 git-unpack-objects.html               |   2 +-
 git-unpack-objects.txt                |   2 +-
 git-update-index.html                 |   2 +-
 git-update-index.txt                  |  12 +-
 git-update-ref.html                   |   2 +-
 git-update-ref.txt                    |   2 +-
 git-update-server-info.html           |   2 +-
 git-update-server-info.txt            |   2 +-
 git-upload-archive.html               |   2 +-
 git-upload-archive.txt                |   2 +-
 git-upload-pack.html                  |   2 +-
 git-upload-pack.txt                   |   2 +-
 git-var.html                          |   2 +-
 git-var.txt                           |   8 +-
 git-verify-pack.html                  |   2 +-
 git-verify-pack.txt                   |   2 +-
 git-verify-tag.html                   |   2 +-
 git-verify-tag.txt                    |   2 +-
 git-whatchanged.html                  |   2 +-
 git-whatchanged.txt                   |   2 +-
 git-write-tree.html                   |   2 +-
 git-write-tree.txt                    |   2 +-
 git.html                              |   2 +-
 git.txt                               |  20 +--
 gitattributes.html                    |   2 +-
 gitattributes.txt                     |  10 +-
 gitcli.html                           |   2 +-
 gitcli.txt                            |   2 +-
 gitignore.html                        |   2 +-
 gitignore.txt                         |   6 +-
 gitk.html                             |   2 +-
 gitk.txt                              |   6 +-
 gitmodules.html                       |   2 +-
 gitmodules.txt                        |   6 +-
 glossary.html                         |   2 +-
 glossary.txt                          |  18 +-
 hooks.html                            |   2 +-
 howto-index.html                      |   2 +-
 howto/revert-branch-rebase.html       |   2 +-
 repository-layout.html                |   2 +-
 repository-layout.txt                 |  10 +-
 technical/api-allocation-growing.html |   2 +-
 technical/api-builtin.html            |   2 +-
 technical/api-decorate.html           |   2 +-
 technical/api-diff.html               |   2 +-
 technical/api-directory-listing.html  |   2 +-
 technical/api-gitattributes.html      |   2 +-
 technical/api-grep.html               |   2 +-
 technical/api-hash.html               |   2 +-
 technical/api-in-core-index.html      |   2 +-
 technical/api-index.html              |   2 +-
 technical/api-lockfile.html           |   2 +-
 technical/api-object-access.html      |   2 +-
 technical/api-parse-options.html      |   2 +-
 technical/api-path-list.html          |   2 +-
 technical/api-quote.html              |   2 +-
 technical/api-revision-walking.html   |   2 +-
 technical/api-run-command.html        |   2 +-
 technical/api-setup.html              |   2 +-
 technical/api-strbuf.html             |   2 +-
 technical/api-tree-walking.html       |   2 +-
 technical/api-xdiff-interface.html    |   2 +-
 tutorial-2.html                       |   2 +-
 tutorial-2.txt                        |   2 +-
 tutorial.html                         |   2 +-
 tutorial.txt                          |  24 +--
 urls.txt                              |   2 +-
 user-manual.txt                       | 246 +++++++++++++-------------
 324 files changed, 931 insertions(+), 898 deletions(-)

diff --git a/RelNotes-1.5.4.txt b/RelNotes-1.5.4.txt
index c6953ea51..c05de3d1d 100644
--- a/RelNotes-1.5.4.txt
+++ b/RelNotes-1.5.4.txt
@@ -212,7 +212,10 @@ Updates since v1.5.3
  * "git add -p" is a short-hand to go directly to the selective patch
    subcommand in the interactive command loop and to exit when done.
 
- * "git add -i" UI has been colorized.
+ * "git add -i" UI has been colorized.  The interactive prompt
+   and menu can be colored by setting color.interactive
+   configuration.  The diff output (including the hunk picker)
+   are colored with color.diff configuration.
 
  * "git commit --allow-empty" allows you to create a single-parent
    commit that records the same tree as its parent, overriding the usual
@@ -231,6 +234,11 @@ Updates since v1.5.3
    a UI mistake.  Use "git stash save random-text", or "git stash"
    (without extra args) for that.
 
+ * "git stash clear extra-text" does not clear the whole stash
+   anymore.  It is tempting to expect "git stash clear stash@{2}"
+   to drop only a single named stash entry, and it is rude to
+   discard everything when that is asked (but not provided).
+
  * "git prune --expire <time>" can exempt young loose objects from
    getting pruned.
 
@@ -345,8 +353,11 @@ series.
  * "git config" did not work correctly on platforms that define
    REG_NOMATCH to an even number.
 
+ * Recent versions of AsciiDoc 8 has a change to break our
+   documentation; a workaround has been implemented.
+
 --
 exec >/var/tmp/1
-O=v1.5.4-rc2-37-ge0cd252
+O=v1.5.4-rc2-59-g2370781
 echo O=`git describe refs/heads/master`
 git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint
diff --git a/blame-options.txt b/blame-options.txt
index 17379f057..ea1007bfb 100644
--- a/blame-options.txt
+++ b/blame-options.txt
@@ -39,7 +39,7 @@ of lines before or after the line given by <start>.
 	Show raw timestamp (Default: off).
 
 -S <revs-file>::
-	Use revs from revs-file instead of calling gitlink:git-rev-list[1].
+	Use revs from revs-file instead of calling linkgit:git-rev-list[1].
 
 -p, --porcelain::
 	Show in a format designed for machine consumption.
diff --git a/cmds-ancillaryinterrogators.txt b/cmds-ancillaryinterrogators.txt
index cefbea6ca..c44e1ce98 100644
--- a/cmds-ancillaryinterrogators.txt
+++ b/cmds-ancillaryinterrogators.txt
@@ -1,42 +1,42 @@
-gitlink:git-annotate[1]::
+linkgit:git-annotate[1]::
 	Annotate file lines with commit info.
 
-gitlink:git-blame[1]::
+linkgit:git-blame[1]::
 	Show what revision and author last modified each line of a file.
 
-gitlink:git-cherry[1]::
+linkgit:git-cherry[1]::
 	Find commits not merged upstream.
 
-gitlink:git-count-objects[1]::
+linkgit:git-count-objects[1]::
 	Count unpacked number of objects and their disk consumption.
 
-gitlink:git-fsck[1]::
+linkgit:git-fsck[1]::
 	Verifies the connectivity and validity of the objects in the database.
 
-gitlink:git-get-tar-commit-id[1]::
+linkgit:git-get-tar-commit-id[1]::
 	Extract commit ID from an archive created using git-archive.
 
-gitlink:git-help[1]::
+linkgit:git-help[1]::
 	display help information about git.
 
-gitlink:git-instaweb[1]::
+linkgit:git-instaweb[1]::
 	Instantly browse your working repository in gitweb.
 
-gitlink:git-merge-tree[1]::
+linkgit:git-merge-tree[1]::
 	Show three-way merge without touching index.
 
-gitlink:git-rerere[1]::
+linkgit:git-rerere[1]::
 	Reuse recorded resolution of conflicted merges.
 
-gitlink:git-rev-parse[1]::
+linkgit:git-rev-parse[1]::
 	Pick out and massage parameters.
 
-gitlink:git-show-branch[1]::
+linkgit:git-show-branch[1]::
 	Show branches and their commits.
 
-gitlink:git-verify-tag[1]::
+linkgit:git-verify-tag[1]::
 	Check the GPG signature of tags.
 
-gitlink:git-whatchanged[1]::
+linkgit:git-whatchanged[1]::
 	Show logs with difference each commit introduces.
 
diff --git a/cmds-ancillarymanipulators.txt b/cmds-ancillarymanipulators.txt
index b89998a03..c30ca41a9 100644
--- a/cmds-ancillarymanipulators.txt
+++ b/cmds-ancillarymanipulators.txt
@@ -1,36 +1,36 @@
-gitlink:git-config[1]::
+linkgit:git-config[1]::
 	Get and set repository or global options.
 
-gitlink:git-fast-export[1]::
+linkgit:git-fast-export[1]::
 	Git data exporter.
 
-gitlink:git-fast-import[1]::
+linkgit:git-fast-import[1]::
 	Backend for fast Git data importers.
 
-gitlink:git-filter-branch[1]::
+linkgit:git-filter-branch[1]::
 	Rewrite branches.
 
-gitlink:git-lost-found[1]::
+linkgit:git-lost-found[1]::
 	(deprecated) Recover lost refs that luckily have not yet been pruned.
 
-gitlink:git-mergetool[1]::
+linkgit:git-mergetool[1]::
 	Run merge conflict resolution tools to resolve merge conflicts.
 
-gitlink:git-pack-refs[1]::
+linkgit:git-pack-refs[1]::
 	Pack heads and tags for efficient repository access.
 
-gitlink:git-prune[1]::
+linkgit:git-prune[1]::
 	Prune all unreachable objects from the object database.
 
-gitlink:git-reflog[1]::
+linkgit:git-reflog[1]::
 	Manage reflog information.
 
-gitlink:git-relink[1]::
+linkgit:git-relink[1]::
 	Hardlink common objects in local repositories.
 
-gitlink:git-remote[1]::
+linkgit:git-remote[1]::
 	manage set of tracked repositories.
 
-gitlink:git-repack[1]::
+linkgit:git-repack[1]::
 	Pack unpacked objects in a repository.
 
diff --git a/cmds-foreignscminterface.txt b/cmds-foreignscminterface.txt
index f6bde74d2..48d7772d4 100644
--- a/cmds-foreignscminterface.txt
+++ b/cmds-foreignscminterface.txt
@@ -1,27 +1,27 @@
-gitlink:git-archimport[1]::
+linkgit:git-archimport[1]::
 	Import an Arch repository into git.
 
-gitlink:git-cvsexportcommit[1]::
+linkgit:git-cvsexportcommit[1]::
 	Export a single commit to a CVS checkout.
 
-gitlink:git-cvsimport[1]::
+linkgit:git-cvsimport[1]::
 	Salvage your data out of another SCM people love to hate.
 
-gitlink:git-cvsserver[1]::
+linkgit:git-cvsserver[1]::
 	A CVS server emulator for git.
 
-gitlink:git-imap-send[1]::
+linkgit:git-imap-send[1]::
 	Dump a mailbox from stdin into an imap folder.
 
-gitlink:git-quiltimport[1]::
+linkgit:git-quiltimport[1]::
 	Applies a quilt patchset onto the current branch.
 
-gitlink:git-request-pull[1]::
+linkgit:git-request-pull[1]::
 	Generates a summary of pending changes.
 
-gitlink:git-send-email[1]::
+linkgit:git-send-email[1]::
 	Send a collection of patches as emails.
 
-gitlink:git-svn[1]::
+linkgit:git-svn[1]::
 	Bidirectional operation between a single Subversion branch and git.
 
diff --git a/cmds-mainporcelain.txt b/cmds-mainporcelain.txt
index 619a8adc3..a98377c5b 100644
--- a/cmds-mainporcelain.txt
+++ b/cmds-mainporcelain.txt
@@ -1,108 +1,108 @@
-gitlink:git-add[1]::
+linkgit:git-add[1]::
 	Add file contents to the index.
 
-gitlink:git-am[1]::
+linkgit:git-am[1]::
 	Apply a series of patches from a mailbox.
 
-gitlink:git-archive[1]::
+linkgit:git-archive[1]::
 	Create an archive of files from a named tree.
 
-gitlink:git-bisect[1]::
+linkgit:git-bisect[1]::
 	Find the change that introduced a bug by binary search.
 
-gitlink:git-branch[1]::
+linkgit:git-branch[1]::
 	List, create, or delete branches.
 
-gitlink:git-bundle[1]::
+linkgit:git-bundle[1]::
 	Move objects and refs by archive.
 
-gitlink:git-checkout[1]::
+linkgit:git-checkout[1]::
 	Checkout and switch to a branch.
 
-gitlink:git-cherry-pick[1]::
+linkgit:git-cherry-pick[1]::
 	Apply the change introduced by an existing commit.
 
-gitlink:git-citool[1]::
+linkgit:git-citool[1]::
 	Graphical alternative to git-commit.
 
-gitlink:git-clean[1]::
+linkgit:git-clean[1]::
 	Remove untracked files from the working tree.
 
-gitlink:git-clone[1]::
+linkgit:git-clone[1]::
 	Clone a repository into a new directory.
 
-gitlink:git-commit[1]::
+linkgit:git-commit[1]::
 	Record changes to the repository.
 
-gitlink:git-describe[1]::
+linkgit:git-describe[1]::
 	Show the most recent tag that is reachable from a commit.
 
-gitlink:git-diff[1]::
+linkgit:git-diff[1]::
 	Show changes between commits, commit and working tree, etc.
 
-gitlink:git-fetch[1]::
+linkgit:git-fetch[1]::
 	Download objects and refs from another repository.
 
-gitlink:git-format-patch[1]::
+linkgit:git-format-patch[1]::
 	Prepare patches for e-mail submission.
 
-gitlink:git-gc[1]::
+linkgit:git-gc[1]::
 	Cleanup unnecessary files and optimize the local repository.
 
-gitlink:git-grep[1]::
+linkgit:git-grep[1]::
 	Print lines matching a pattern.
 
-gitlink:git-gui[1]::
+linkgit:git-gui[1]::
 	A portable graphical interface to Git.
 
-gitlink:git-init[1]::
+linkgit:git-init[1]::
 	Create an empty git repository or reinitialize an existing one.
 
-gitlink:git-log[1]::
+linkgit:git-log[1]::
 	Show commit logs.
 
-gitlink:git-merge[1]::
+linkgit:git-merge[1]::
 	Join two or more development histories together.
 
-gitlink:git-mv[1]::
+linkgit:git-mv[1]::
 	Move or rename a file, a directory, or a symlink.
 
-gitlink:git-pull[1]::
+linkgit:git-pull[1]::
 	Fetch from and merge with another repository or a local branch.
 
-gitlink:git-push[1]::
+linkgit:git-push[1]::
 	Update remote refs along with associated objects.
 
-gitlink:git-rebase[1]::
+linkgit:git-rebase[1]::
 	Forward-port local commits to the updated upstream head.
 
-gitlink:git-reset[1]::
+linkgit:git-reset[1]::
 	Reset current HEAD to the specified state.
 
-gitlink:git-revert[1]::
+linkgit:git-revert[1]::
 	Revert an existing commit.
 
-gitlink:git-rm[1]::
+linkgit:git-rm[1]::
 	Remove files from the working tree and from the index.
 
-gitlink:git-shortlog[1]::
+linkgit:git-shortlog[1]::
 	Summarize 'git log' output.
 
-gitlink:git-show[1]::
+linkgit:git-show[1]::
 	Show various types of objects.
 
-gitlink:git-stash[1]::
+linkgit:git-stash[1]::
 	Stash the changes in a dirty working directory away.
 
-gitlink:git-status[1]::
+linkgit:git-status[1]::
 	Show the working tree status.
 
-gitlink:git-submodule[1]::
+linkgit:git-submodule[1]::
 	Initialize, update or inspect submodules.
 
-gitlink:git-tag[1]::
+linkgit:git-tag[1]::
 	Create, list, delete or verify a tag object signed with GPG.
 
-gitlink:gitk[1]::
+linkgit:gitk[1]::
 	The git repository browser.
 
diff --git a/cmds-plumbinginterrogators.txt b/cmds-plumbinginterrogators.txt
index 6ff1aef87..f443ba7a7 100644
--- a/cmds-plumbinginterrogators.txt
+++ b/cmds-plumbinginterrogators.txt
@@ -1,54 +1,54 @@
-gitlink:git-cat-file[1]::
+linkgit:git-cat-file[1]::
 	Provide content or type/size information for repository objects.
 
-gitlink:git-diff-files[1]::
+linkgit:git-diff-files[1]::
 	Compares files in the working tree and the index.
 
-gitlink:git-diff-index[1]::
+linkgit:git-diff-index[1]::
 	Compares content and mode of blobs between the index and repository.
 
-gitlink:git-diff-tree[1]::
+linkgit:git-diff-tree[1]::
 	Compares the content and mode of blobs found via two tree objects.
 
-gitlink:git-for-each-ref[1]::
+linkgit:git-for-each-ref[1]::
 	Output information on each ref.
 
-gitlink:git-ls-files[1]::
+linkgit:git-ls-files[1]::
 	Show information about files in the index and the working tree.
 
-gitlink:git-ls-remote[1]::
+linkgit:git-ls-remote[1]::
 	List references in a remote repository.
 
-gitlink:git-ls-tree[1]::
+linkgit:git-ls-tree[1]::
 	List the contents of a tree object.
 
-gitlink:git-merge-base[1]::
+linkgit:git-merge-base[1]::
 	Find as good common ancestors as possible for a merge.
 
-gitlink:git-name-rev[1]::
+linkgit:git-name-rev[1]::
 	Find symbolic names for given revs.
 
-gitlink:git-pack-redundant[1]::
+linkgit:git-pack-redundant[1]::
 	Find redundant pack files.
 
-gitlink:git-rev-list[1]::
+linkgit:git-rev-list[1]::
 	Lists commit objects in reverse chronological order.
 
-gitlink:git-show-index[1]::
+linkgit:git-show-index[1]::
 	Show packed archive index.
 
-gitlink:git-show-ref[1]::
+linkgit:git-show-ref[1]::
 	List references in a local repository.
 
-gitlink:git-tar-tree[1]::
+linkgit:git-tar-tree[1]::
 	(deprecated) Create a tar archive of the files in the named tree object.
 
-gitlink:git-unpack-file[1]::
+linkgit:git-unpack-file[1]::
 	Creates a temporary file with a blob's contents.
 
-gitlink:git-var[1]::
+linkgit:git-var[1]::
 	Show a git logical variable.
 
-gitlink:git-verify-pack[1]::
+linkgit:git-verify-pack[1]::
 	Validate packed git archive files.
 
diff --git a/cmds-plumbingmanipulators.txt b/cmds-plumbingmanipulators.txt
index a7eba19c4..683dcb317 100644
--- a/cmds-plumbingmanipulators.txt
+++ b/cmds-plumbingmanipulators.txt
@@ -1,51 +1,51 @@
-gitlink:git-apply[1]::
+linkgit:git-apply[1]::
 	Apply a patch on a git index file and a working tree.
 
-gitlink:git-checkout-index[1]::
+linkgit:git-checkout-index[1]::
 	Copy files from the index to the working tree.
 
-gitlink:git-commit-tree[1]::
+linkgit:git-commit-tree[1]::
 	Create a new commit object.
 
-gitlink:git-hash-object[1]::
+linkgit:git-hash-object[1]::
 	Compute object ID and optionally creates a blob from a file.
 
-gitlink:git-index-pack[1]::
+linkgit:git-index-pack[1]::
 	Build pack index file for an existing packed archive.
 
-gitlink:git-merge-file[1]::
+linkgit:git-merge-file[1]::
 	Run a three-way file merge.
 
-gitlink:git-merge-index[1]::
+linkgit:git-merge-index[1]::
 	Run a merge for files needing merging.
 
-gitlink:git-mktag[1]::
+linkgit:git-mktag[1]::
 	Creates a tag object.
 
-gitlink:git-mktree[1]::
+linkgit:git-mktree[1]::
 	Build a tree-object from ls-tree formatted text.
 
-gitlink:git-pack-objects[1]::
+linkgit:git-pack-objects[1]::
 	Create a packed archive of objects.
 
-gitlink:git-prune-packed[1]::
+linkgit:git-prune-packed[1]::
 	Remove extra objects that are already in pack files.
 
-gitlink:git-read-tree[1]::
+linkgit:git-read-tree[1]::
 	Reads tree information into the index.
 
-gitlink:git-symbolic-ref[1]::
+linkgit:git-symbolic-ref[1]::
 	Read and modify symbolic refs.
 
-gitlink:git-unpack-objects[1]::
+linkgit:git-unpack-objects[1]::
 	Unpack objects from a packed archive.
 
-gitlink:git-update-index[1]::
+linkgit:git-update-index[1]::
 	Register file contents in the working tree to the index.
 
-gitlink:git-update-ref[1]::
+linkgit:git-update-ref[1]::
 	Update the object name stored in a ref safely.
 
-gitlink:git-write-tree[1]::
+linkgit:git-write-tree[1]::
 	Create a tree object from the current index.
 
diff --git a/cmds-purehelpers.txt b/cmds-purehelpers.txt
index d54a84c58..5900d4927 100644
--- a/cmds-purehelpers.txt
+++ b/cmds-purehelpers.txt
@@ -1,30 +1,30 @@
-gitlink:git-check-attr[1]::
+linkgit:git-check-attr[1]::
 	Display gitattributes information..
 
-gitlink:git-check-ref-format[1]::
+linkgit:git-check-ref-format[1]::
 	Make sure ref name is well formed.
 
-gitlink:git-fmt-merge-msg[1]::
+linkgit:git-fmt-merge-msg[1]::
 	Produce a merge commit message.
 
-gitlink:git-mailinfo[1]::
+linkgit:git-mailinfo[1]::
 	Extracts patch and authorship from a single e-mail message.
 
-gitlink:git-mailsplit[1]::
+linkgit:git-mailsplit[1]::
 	Simple UNIX mbox splitter program.
 
-gitlink:git-merge-one-file[1]::
+linkgit:git-merge-one-file[1]::
 	The standard helper program to use with git-merge-index.
 
-gitlink:git-patch-id[1]::
+linkgit:git-patch-id[1]::
 	Compute unique ID for a patch.
 
-gitlink:git-peek-remote[1]::
+linkgit:git-peek-remote[1]::
 	(deprecated) List the references in a remote repository.
 
-gitlink:git-sh-setup[1]::
+linkgit:git-sh-setup[1]::
 	Common git shell script setup code.
 
-gitlink:git-stripspace[1]::
+linkgit:git-stripspace[1]::
 	Filter out empty lines.
 
diff --git a/cmds-synchelpers.txt b/cmds-synchelpers.txt
index e04554ace..c608f5015 100644
--- a/cmds-synchelpers.txt
+++ b/cmds-synchelpers.txt
@@ -1,21 +1,21 @@
-gitlink:git-http-fetch[1]::
+linkgit:git-http-fetch[1]::
 	Download from a remote git repository via HTTP.
 
-gitlink:git-http-push[1]::
+linkgit:git-http-push[1]::
 	Push objects over HTTP/DAV to another repository.
 
-gitlink:git-parse-remote[1]::
+linkgit:git-parse-remote[1]::
 	Routines to help parsing remote repository access parameters.
 
-gitlink:git-receive-pack[1]::
+linkgit:git-receive-pack[1]::
 	Receive what is pushed into the repository.
 
-gitlink:git-shell[1]::
+linkgit:git-shell[1]::
 	Restricted login shell for GIT-only SSH access.
 
-gitlink:git-upload-archive[1]::
+linkgit:git-upload-archive[1]::
 	Send archive back to git-archive.
 
-gitlink:git-upload-pack[1]::
+linkgit:git-upload-pack[1]::
 	Send objects packed back to git-fetch-pack.
 
diff --git a/cmds-synchingrepositories.txt b/cmds-synchingrepositories.txt
index ce00328bb..71db3edff 100644
--- a/cmds-synchingrepositories.txt
+++ b/cmds-synchingrepositories.txt
@@ -1,12 +1,12 @@
-gitlink:git-daemon[1]::
+linkgit:git-daemon[1]::
 	A really simple server for git repositories.
 
-gitlink:git-fetch-pack[1]::
+linkgit:git-fetch-pack[1]::
 	Receive missing objects from another repository.
 
-gitlink:git-send-pack[1]::
+linkgit:git-send-pack[1]::
 	Push objects over git protocol to another repository.
 
-gitlink:git-update-server-info[1]::
+linkgit:git-update-server-info[1]::
 	Update auxiliary info file to help dumb servers.
 
diff --git a/config.txt b/config.txt
index e1eaee997..1a90e6bf2 100644
--- a/config.txt
+++ b/config.txt
@@ -115,7 +115,7 @@ porcelain configuration variables in the respective porcelain documentation.
 core.fileMode::
 	If false, the executable bit differences between the index and
 	the working copy are ignored; useful on broken filesystems like FAT.
-	See gitlink:git-update-index[1]. True by default.
+	See linkgit:git-update-index[1]. True by default.
 
 core.quotepath::
 	The commands that output paths (e.g. `ls-files`,
@@ -141,8 +141,8 @@ core.autocrlf::
 
 core.symlinks::
 	If false, symbolic links are checked out as small plain files that
-	contain the link text. gitlink:git-update-index[1] and
-	gitlink:git-add[1] will not change the recorded type to regular
+	contain the link text. linkgit:git-update-index[1] and
+	linkgit:git-add[1] will not change the recorded type to regular
 	file. Useful on filesystems like FAT that do not support
 	symbolic links. True by default.
 
@@ -163,7 +163,7 @@ core.ignoreStat::
 	The working copy files are assumed to stay unchanged until you
 	mark them otherwise manually - Git will not detect the file changes
 	by lstat() calls. This is useful on systems where those are very
-	slow, such as Microsoft Windows.  See gitlink:git-update-index[1].
+	slow, such as Microsoft Windows.  See linkgit:git-update-index[1].
 	False by default.
 
 core.preferSymlinkRefs::
@@ -176,10 +176,10 @@ core.bare::
 	If true this repository is assumed to be 'bare' and has no
 	working directory associated with it.  If this is the case a
 	number of commands that require a working directory will be
-	disabled, such as gitlink:git-add[1] or gitlink:git-merge[1].
+	disabled, such as linkgit:git-add[1] or linkgit:git-merge[1].
 +
-This setting is automatically guessed by gitlink:git-clone[1] or
-gitlink:git-init[1] when the repository was created.  By default a
+This setting is automatically guessed by linkgit:git-clone[1] or
+linkgit:git-init[1] when the repository was created.  By default a
 repository that ends in "/.git" is assumed to be not bare (bare =
 false), while all other repositories are assumed to be bare (bare
 = true).
@@ -216,7 +216,7 @@ core.sharedRepository::
 	group-writable). When 'all' (or 'world' or 'everybody'), the
 	repository will be readable by all users, additionally to being
 	group-shareable. When 'umask' (or 'false'), git will use permissions
-	reported by umask(2). See gitlink:git-init[1]. False by default.
+	reported by umask(2). See linkgit:git-init[1]. False by default.
 
 core.warnAmbiguousRefs::
 	If true, git will warn you if the ref name you passed it is ambiguous
@@ -281,7 +281,7 @@ core.excludesfile::
 	In addition to '.gitignore' (per-directory) and
 	'.git/info/exclude', git looks into this file for patterns
 	of files which are not meant to be tracked.  See
-	gitlink:gitignore[5].
+	linkgit:gitignore[5].
 
 core.editor::
 	Commands such as `commit` and `tag` that lets you edit
@@ -310,7 +310,7 @@ core.whitespace::
   space characters as an error (not enabled by default).
 
 alias.*::
-	Command aliases for the gitlink:git[1] command wrapper - e.g.
+	Command aliases for the linkgit:git[1] command wrapper - e.g.
 	after defining "alias.last = cat-file commit HEAD", the invocation
 	"git last" is equivalent to "git cat-file commit HEAD". To avoid
 	confusion and troubles with script usage, aliases that
@@ -326,11 +326,11 @@ it will be treated as a shell command.  For example, defining
 
 apply.whitespace::
 	Tells `git-apply` how to handle whitespaces, in the same way
-	as the '--whitespace' option. See gitlink:git-apply[1].
+	as the '--whitespace' option. See linkgit:git-apply[1].
 
 branch.autosetupmerge::
 	Tells `git-branch` and `git-checkout` to setup new branches
-	so that gitlink:git-pull[1] will appropriately merge from that
+	so that linkgit:git-pull[1] will appropriately merge from that
 	remote branch.  Note that even if this option is not set,
 	this behavior can be chosen per-branch using the `--track`
 	and `--no-track` options.  This option defaults to false.
@@ -356,7 +356,7 @@ branch.<name>.merge::
 
 branch.<name>.mergeoptions::
 	Sets default options for merging into branch <name>. The syntax and
-	supported options are equal to that of gitlink:git-merge[1], but
+	supported options are equal to that of linkgit:git-merge[1], but
 	option values containing whitespace characters are currently not
 	supported.
 
@@ -364,7 +364,7 @@ branch.<name>.rebase::
 	When true, rebase the branch <name> on top of the fetched branch,
 	instead of merging the default branch from the default remote.
 	*NOTE*: this is a possibly dangerous operation; do *not* use
-	it unless you understand the implications (see gitlink:git-rebase[1]
+	it unless you understand the implications (see linkgit:git-rebase[1]
 	for details).
 
 clean.requireForce::
@@ -373,7 +373,7 @@ clean.requireForce::
 
 color.branch::
 	A boolean to enable/disable color in the output of
-	gitlink:git-branch[1]. May be set to `always`,
+	linkgit:git-branch[1]. May be set to `always`,
 	`false` (or `never`) or `auto` (or `true`), in which case colors are used
 	only when the output is to a terminal. Defaults to false.
 
@@ -406,7 +406,8 @@ color.diff.<slot>::
 	in color.branch.<slot>.
 
 color.interactive::
-	When set to `always`, always use colors in `git add --interactive`.
+	When set to `always`, always use colors for interactive prompts
+	and displays (such as those used by "git add --interactive").
 	When false (or `never`), never.  When set to `true` or `auto`, use
 	colors only when the output is to the terminal. Defaults to false.
 
@@ -423,7 +424,7 @@ color.pager::
 
 color.status::
 	A boolean to enable/disable color in the output of
-	gitlink:git-status[1]. May be set to `always`,
+	linkgit:git-status[1]. May be set to `always`,
 	`false` (or `never`) or `auto` (or `true`), in which case colors are used
 	only when the output is to a terminal. Defaults to false.
 
@@ -453,7 +454,7 @@ diff.external::
 	performed using the internal diff machinery, but using the
 	given command.  Note: if you want to use an external diff
 	program only on a subset of your files, you might want to
-	use gitlink:gitattributes[5] instead.
+	use linkgit:gitattributes[5] instead.
 
 diff.renameLimit::
 	The number of files to consider when performing the copy/rename
@@ -478,11 +479,11 @@ format.numbered::
 	A boolean which can enable sequence numbers in patch subjects.
 	Setting this option to "auto" will enable it only if there is
 	more than one patch.  See --numbered option in
-	gitlink:git-format-patch[1].
+	linkgit:git-format-patch[1].
 
 format.headers::
 	Additional email headers to include in a patch to be submitted
-	by mail.  See gitlink:git-format-patch[1].
+	by mail.  See linkgit:git-format-patch[1].
 
 format.suffix::
 	The default for format-patch is to output files with the suffix
@@ -530,27 +531,27 @@ gc.reflogexpireunreachable::
 gc.rerereresolved::
 	Records of conflicted merge you resolved earlier are
 	kept for this many days when `git rerere gc` is run.
-	The default is 60 days.  See gitlink:git-rerere[1].
+	The default is 60 days.  See linkgit:git-rerere[1].
 
 gc.rerereunresolved::
 	Records of conflicted merge you have not resolved are
 	kept for this many days when `git rerere gc` is run.
-	The default is 15 days.  See gitlink:git-rerere[1].
+	The default is 15 days.  See linkgit:git-rerere[1].
 
 rerere.enabled::
 	Activate recording of resolved conflicts, so that identical
 	conflict hunks can be resolved automatically, should they
-	be encountered again.  gitlink:git-rerere[1] command is by
+	be encountered again.  linkgit:git-rerere[1] command is by
 	default enabled, but can be disabled by setting this option to
 	false.
 
 gitcvs.enabled::
 	Whether the CVS server interface is enabled for this repository.
-	See gitlink:git-cvsserver[1].
+	See linkgit:git-cvsserver[1].
 
 gitcvs.logfile::
 	Path to a log file where the CVS server interface well... logs
-	various stuff. See gitlink:git-cvsserver[1].
+	various stuff. See linkgit:git-cvsserver[1].
 
 gitcvs.allbinary::
 	If true, all files are sent to the client in mode '-kb'. This
@@ -563,7 +564,7 @@ gitcvs.dbname::
 	derived from the git repository. The exact meaning depends on the
 	used database driver, for SQLite (which is the default driver) this
 	is a filename. Supports variable substitution (see
-	gitlink:git-cvsserver[1] for details). May not contain semicolons (`;`).
+	linkgit:git-cvsserver[1] for details). May not contain semicolons (`;`).
 	Default: '%Ggitcvs.%m.sqlite'
 
 gitcvs.dbdriver::
@@ -572,13 +573,13 @@ gitcvs.dbdriver::
 	with 'DBD::SQLite', reported to work with 'DBD::Pg', and
 	reported *not* to work with 'DBD::mysql'. Experimental feature.
 	May not contain double colons (`:`). Default: 'SQLite'.
-	See gitlink:git-cvsserver[1].
+	See linkgit:git-cvsserver[1].
 
 gitcvs.dbuser, gitcvs.dbpass::
 	Database user and password. Only useful if setting 'gitcvs.dbdriver',
 	since SQLite has no concept of database users and/or passwords.
 	'gitcvs.dbuser' supports variable substitution (see
-	gitlink:git-cvsserver[1] for details).
+	linkgit:git-cvsserver[1] for details).
 
 All gitcvs variables except for 'gitcvs.allbinary' can also be
 specified as 'gitcvs.<access_method>.<varname>' (where 'access_method'
@@ -587,7 +588,7 @@ access method.
 
 http.proxy::
 	Override the HTTP proxy, normally configured using the 'http_proxy'
-	environment variable (see gitlink:curl[1]).  This can be overridden
+	environment variable (see linkgit:curl[1]).  This can be overridden
 	on a per-remote basis; see remote.<name>.proxy
 
 http.sslVerify::
@@ -636,7 +637,7 @@ i18n.commitEncoding::
 	does not care per se, but this information is necessary e.g. when
 	importing commits from emails or in the gitk graphical history
 	browser (and possibly at other places in the future or in other
-	porcelains). See e.g. gitlink:git-mailinfo[1]. Defaults to 'utf-8'.
+	porcelains). See e.g. linkgit:git-mailinfo[1]. Defaults to 'utf-8'.
 
 i18n.logOutputEncoding::
 	Character encoding the commit messages are converted to when
@@ -645,7 +646,7 @@ i18n.logOutputEncoding::
 log.showroot::
 	If true, the initial commit will be shown as a big creation event.
 	This is equivalent to a diff against an empty tree.
-	Tools like gitlink:git-log[1] or gitlink:git-whatchanged[1], which
+	Tools like linkgit:git-log[1] or linkgit:git-whatchanged[1], which
 	normally hide the root commit will now show it. True by default.
 
 merge.summary::
@@ -654,7 +655,7 @@ merge.summary::
 
 merge.tool::
 	Controls which merge resolution program is used by
-	gitlink:git-mergetool[1].  Valid values are: "kdiff3", "tkdiff",
+	linkgit:git-mergetool[1].  Valid values are: "kdiff3", "tkdiff",
 	"meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and "opendiff".
 
 merge.verbosity::
@@ -667,31 +668,31 @@ merge.verbosity::
 
 merge.<driver>.name::
 	Defines a human readable name for a custom low-level
-	merge driver.  See gitlink:gitattributes[5] for details.
+	merge driver.  See linkgit:gitattributes[5] for details.
 
 merge.<driver>.driver::
 	Defines the command that implements a custom low-level
-	merge driver.  See gitlink:gitattributes[5] for details.
+	merge driver.  See linkgit:gitattributes[5] for details.
 
 merge.<driver>.recursive::
 	Names a low-level merge driver to be used when
 	performing an internal merge between common ancestors.
-	See gitlink:gitattributes[5] for details.
+	See linkgit:gitattributes[5] for details.
 
 mergetool.<tool>.path::
 	Override the path for the given tool.  This is useful in case
 	your tool is not in the PATH.
 
 pack.window::
-	The size of the window used by gitlink:git-pack-objects[1] when no
+	The size of the window used by linkgit:git-pack-objects[1] when no
 	window size is given on the command line. Defaults to 10.
 
 pack.depth::
-	The maximum delta depth used by gitlink:git-pack-objects[1] when no
+	The maximum delta depth used by linkgit:git-pack-objects[1] when no
 	maximum depth is given on the command line. Defaults to 50.
 
 pack.windowMemory::
-	The window memory size limit used by gitlink:git-pack-objects[1]
+	The window memory size limit used by linkgit:git-pack-objects[1]
 	when no limit is given on the command line.  The value can be
 	suffixed with "k", "m", or "g".  Defaults to 0, meaning no
 	limit.
@@ -707,16 +708,16 @@ pack.compression::
 
 pack.deltaCacheSize::
 	The maximum memory in bytes used for caching deltas in
-	gitlink:git-pack-objects[1].
+	linkgit:git-pack-objects[1].
 	A value of 0 means no limit. Defaults to 0.
 
 pack.deltaCacheLimit::
 	The maximum size of a delta, that is cached in
-	gitlink:git-pack-objects[1]. Defaults to 1000.
+	linkgit:git-pack-objects[1]. Defaults to 1000.
 
 pack.threads::
 	Specifies the number of threads to spawn when searching for best
-	delta matches.  This requires that gitlink:git-pack-objects[1]
+	delta matches.  This requires that linkgit:git-pack-objects[1]
 	be compiled with pthreads otherwise this option is ignored with a
 	warning. This is meant to reduce packing time on multiprocessor
 	machines. The required amount of memory for the delta search window
@@ -739,8 +740,8 @@ pull.twohead::
 	The default merge strategy to use when pulling a single branch.
 
 remote.<name>.url::
-	The URL of a remote repository.  See gitlink:git-fetch[1] or
-	gitlink:git-push[1].
+	The URL of a remote repository.  See linkgit:git-fetch[1] or
+	linkgit:git-push[1].
 
 remote.<name>.proxy::
 	For remotes that require curl (http, https and ftp), the URL to
@@ -748,24 +749,24 @@ remote.<name>.proxy::
 	disable proxying for that remote.
 
 remote.<name>.fetch::
-	The default set of "refspec" for gitlink:git-fetch[1]. See
-	gitlink:git-fetch[1].
+	The default set of "refspec" for linkgit:git-fetch[1]. See
+	linkgit:git-fetch[1].
 
 remote.<name>.push::
-	The default set of "refspec" for gitlink:git-push[1]. See
-	gitlink:git-push[1].
+	The default set of "refspec" for linkgit:git-push[1]. See
+	linkgit:git-push[1].
 
 remote.<name>.skipDefaultUpdate::
 	If true, this remote will be skipped by default when updating
-	using the update subcommand of gitlink:git-remote[1].
+	using the update subcommand of linkgit:git-remote[1].
 
 remote.<name>.receivepack::
 	The default program to execute on the remote side when pushing.  See
-	option \--exec of gitlink:git-push[1].
+	option \--exec of linkgit:git-push[1].
 
 remote.<name>.uploadpack::
 	The default program to execute on the remote side when fetching.  See
-	option \--exec of gitlink:git-fetch-pack[1].
+	option \--exec of linkgit:git-fetch-pack[1].
 
 remote.<name>.tagopt::
 	Setting this value to --no-tags disables automatic tag following when fetching
@@ -773,22 +774,22 @@ remote.<name>.tagopt::
 
 remotes.<group>::
 	The list of remotes which are fetched by "git remote update
-	<group>".  See gitlink:git-remote[1].
+	<group>".  See linkgit:git-remote[1].
 
 repack.usedeltabaseoffset::
-	Allow gitlink:git-repack[1] to create packs that uses
+	Allow linkgit:git-repack[1] to create packs that uses
 	delta-base offset.  Defaults to false.
 
 show.difftree::
-	The default gitlink:git-diff-tree[1] arguments to be used
-	for gitlink:git-show[1].
+	The default linkgit:git-diff-tree[1] arguments to be used
+	for linkgit:git-show[1].
 
 showbranch.default::
-	The default set of branches for gitlink:git-show-branch[1].
-	See gitlink:git-show-branch[1].
+	The default set of branches for linkgit:git-show-branch[1].
+	See linkgit:git-show-branch[1].
 
 status.relativePaths::
-	By default, gitlink:git-status[1] shows paths relative to the
+	By default, linkgit:git-status[1] shows paths relative to the
 	current directory. Setting this variable to `false` shows paths
 	relative to the repository root (this was the default for git
 	prior to v1.5.4).
@@ -798,32 +799,32 @@ tar.umask::
 	tar archive entries.  The default is 0002, which turns off the
 	world write bit.  The special value "user" indicates that the
 	archiving user's umask will be used instead.  See umask(2) and
-	gitlink:git-archive[1].
+	linkgit:git-archive[1].
 
 user.email::
 	Your email address to be recorded in any newly created commits.
 	Can be overridden by the 'GIT_AUTHOR_EMAIL', 'GIT_COMMITTER_EMAIL', and
-	'EMAIL' environment variables.  See gitlink:git-commit-tree[1].
+	'EMAIL' environment variables.  See linkgit:git-commit-tree[1].
 
 user.name::
 	Your full name to be recorded in any newly created commits.
 	Can be overridden by the 'GIT_AUTHOR_NAME' and 'GIT_COMMITTER_NAME'
-	environment variables.  See gitlink:git-commit-tree[1].
+	environment variables.  See linkgit:git-commit-tree[1].
 
 user.signingkey::
-	If gitlink:git-tag[1] is not selecting the key you want it to
+	If linkgit:git-tag[1] is not selecting the key you want it to
 	automatically when creating a signed tag, you can override the
 	default selection with this variable.  This option is passed
 	unchanged to gpg's --local-user parameter, so you may specify a key
 	using any method that gpg supports.
 
 whatchanged.difftree::
-	The default gitlink:git-diff-tree[1] arguments to be used
-	for gitlink:git-whatchanged[1].
+	The default linkgit:git-diff-tree[1] arguments to be used
+	for linkgit:git-whatchanged[1].
 
 imap::
 	The configuration variables in the 'imap' section are described
-	in gitlink:git-imap-send[1].
+	in linkgit:git-imap-send[1].
 
 receive.unpackLimit::
 	If the number of objects received in a push is below this
diff --git a/core-tutorial.html b/core-tutorial.html
index dfba7619b..6d40af2d8 100644
--- a/core-tutorial.html
+++ b/core-tutorial.html
@@ -1967,7 +1967,7 @@ to follow, not easier.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:12:00 UTC
+Last updated 07-Jan-2008 07:51:07 UTC
 </div>
 </div>
 </body>
diff --git a/cvs-migration.html b/cvs-migration.html
index c59877c47..ed06578d3 100644
--- a/cvs-migration.html
+++ b/cvs-migration.html
@@ -416,7 +416,7 @@ repositories without the need for a central maintainer.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:12:01 UTC
+Last updated 07-Jan-2008 07:51:08 UTC
 </div>
 </div>
 </body>
diff --git a/cvs-migration.txt b/cvs-migration.txt
index 3b6b49416..ea9890022 100644
--- a/cvs-migration.txt
+++ b/cvs-migration.txt
@@ -36,12 +36,12 @@ them first before running git pull.
 ================================
 The `pull` command knows where to get updates from because of certain
 configuration variables that were set by the first `git clone`
-command; see `git config -l` and the gitlink:git-config[1] man
+command; see `git config -l` and the linkgit:git-config[1] man
 page for details.
 ================================
 
 You can update the shared repository with your changes by first committing
-your changes, and then using the gitlink:git-push[1] command:
+your changes, and then using the linkgit:git-push[1] command:
 
 ------------------------------------------------
 $ git push origin master
@@ -88,7 +88,7 @@ Next, give every team member read/write access to this repository.  One
 easy way to do this is to give all the team members ssh access to the
 machine where the repository is hosted.  If you don't want to give them a
 full shell on the machine, there is a restricted shell which only allows
-users to do git pushes and pulls; see gitlink:git-shell[1].
+users to do git pushes and pulls; see linkgit:git-shell[1].
 
 Put all the committers in the same group, and make the repository
 writable by that group:
@@ -106,7 +106,7 @@ Importing a CVS archive
 First, install version 2.1 or higher of cvsps from
 link:http://www.cobite.com/cvsps/[http://www.cobite.com/cvsps/] and make
 sure it is in your path.  Then cd to a checked out CVS working directory
-of the project you are interested in and run gitlink:git-cvsimport[1]:
+of the project you are interested in and run linkgit:git-cvsimport[1]:
 
 -------------------------------------------
 $ git cvsimport -C <destination> <module>
@@ -146,7 +146,7 @@ Providing CVS Access to a git Repository
 ----------------------------------------
 
 It is also possible to provide true CVS access to a git repository, so
-that developers can still use CVS; see gitlink:git-cvsserver[1] for
+that developers can still use CVS; see linkgit:git-cvsserver[1] for
 details.
 
 Alternative Development Models
diff --git a/diff-options.txt b/diff-options.txt
index 1a78635fb..8d35cbd60 100644
--- a/diff-options.txt
+++ b/diff-options.txt
@@ -205,8 +205,8 @@ endif::git-format-patch[]
 
 --ext-diff::
 	Allow an external diff helper to be executed. If you set an
-	external diff driver with gitlink:gitattributes[5], you need
-	to use this option with gitlink:git-log[1] and friends.
+	external diff driver with linkgit:gitattributes[5], you need
+	to use this option with linkgit:git-log[1] and friends.
 
 --no-ext-diff::
 	Disallow external diff drivers.
diff --git a/diffcore.html b/diffcore.html
index 4870e1318..11a9724d0 100644
--- a/diffcore.html
+++ b/diffcore.html
@@ -541,7 +541,7 @@ t</tt></pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:12:01 UTC
+Last updated 07-Jan-2008 07:51:10 UTC
 </div>
 </div>
 </body>
diff --git a/everyday.html b/everyday.html
index 3b922a7dd..e6b957373 100644
--- a/everyday.html
+++ b/everyday.html
@@ -1052,7 +1052,7 @@ upload to public HTTP server hosted by your ISP.
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 21-Dec-2007 17:57:00 UTC
+Last updated 07-Jan-2008 07:51:12 UTC
 </div>
 </div>
 </body>
diff --git a/everyday.txt b/everyday.txt
index f1993e293..fdbd15a18 100644
--- a/everyday.txt
+++ b/everyday.txt
@@ -25,12 +25,12 @@ Basic Repository[[Basic Repository]]
 
 Everybody uses these commands to maintain git repositories.
 
-  * gitlink:git-init[1] or gitlink:git-clone[1] to create a
+  * linkgit:git-init[1] or linkgit:git-clone[1] to create a
     new repository.
 
-  * gitlink:git-fsck[1] to check the repository for errors.
+  * linkgit:git-fsck[1] to check the repository for errors.
 
-  * gitlink:git-gc[1] to do common housekeeping tasks such as
+  * linkgit:git-gc[1] to do common housekeeping tasks such as
     repack and prune.
 
 Examples
@@ -69,28 +69,28 @@ A standalone individual developer does not exchange patches with
 other people, and works alone in a single repository, using the
 following commands.
 
-  * gitlink:git-show-branch[1] to see where you are.
+  * linkgit:git-show-branch[1] to see where you are.
 
-  * gitlink:git-log[1] to see what happened.
+  * linkgit:git-log[1] to see what happened.
 
-  * gitlink:git-checkout[1] and gitlink:git-branch[1] to switch
+  * linkgit:git-checkout[1] and linkgit:git-branch[1] to switch
     branches.
 
-  * gitlink:git-add[1] to manage the index file.
+  * linkgit:git-add[1] to manage the index file.
 
-  * gitlink:git-diff[1] and gitlink:git-status[1] to see what
+  * linkgit:git-diff[1] and linkgit:git-status[1] to see what
     you are in the middle of doing.
 
-  * gitlink:git-commit[1] to advance the current branch.
+  * linkgit:git-commit[1] to advance the current branch.
 
-  * gitlink:git-reset[1] and gitlink:git-checkout[1] (with
+  * linkgit:git-reset[1] and linkgit:git-checkout[1] (with
     pathname parameters) to undo changes.
 
-  * gitlink:git-merge[1] to merge between local branches.
+  * linkgit:git-merge[1] to merge between local branches.
 
-  * gitlink:git-rebase[1] to maintain topic branches.
+  * linkgit:git-rebase[1] to maintain topic branches.
 
-  * gitlink:git-tag[1] to mark known point.
+  * linkgit:git-tag[1] to mark known point.
 
 Examples
 ~~~~~~~~
@@ -156,16 +156,16 @@ A developer working as a participant in a group project needs to
 learn how to communicate with others, and uses these commands in
 addition to the ones needed by a standalone developer.
 
-  * gitlink:git-clone[1] from the upstream to prime your local
+  * linkgit:git-clone[1] from the upstream to prime your local
     repository.
 
-  * gitlink:git-pull[1] and gitlink:git-fetch[1] from "origin"
+  * linkgit:git-pull[1] and linkgit:git-fetch[1] from "origin"
     to keep up-to-date with the upstream.
 
-  * gitlink:git-push[1] to shared repository, if you adopt CVS
+  * linkgit:git-push[1] to shared repository, if you adopt CVS
     style shared repository workflow.
 
-  * gitlink:git-format-patch[1] to prepare e-mail submission, if
+  * linkgit:git-format-patch[1] to prepare e-mail submission, if
     you adopt Linux kernel-style public forum workflow.
 
 Examples
@@ -258,17 +258,17 @@ project receives changes made by others, reviews and integrates
 them and publishes the result for others to use, using these
 commands in addition to the ones needed by participants.
 
-  * gitlink:git-am[1] to apply patches e-mailed in from your
+  * linkgit:git-am[1] to apply patches e-mailed in from your
     contributors.
 
-  * gitlink:git-pull[1] to merge from your trusted lieutenants.
+  * linkgit:git-pull[1] to merge from your trusted lieutenants.
 
-  * gitlink:git-format-patch[1] to prepare and send suggested
+  * linkgit:git-format-patch[1] to prepare and send suggested
     alternative to contributors.
 
-  * gitlink:git-revert[1] to undo botched commits.
+  * linkgit:git-revert[1] to undo botched commits.
 
-  * gitlink:git-push[1] to publish the bleeding edge.
+  * linkgit:git-push[1] to publish the bleeding edge.
 
 
 Examples
@@ -343,10 +343,10 @@ Repository Administration[[Repository Administration]]
 A repository administrator uses the following tools to set up
 and maintain access to the repository by developers.
 
-  * gitlink:git-daemon[1] to allow anonymous download from
+  * linkgit:git-daemon[1] to allow anonymous download from
     repository.
 
-  * gitlink:git-shell[1] can be used as a 'restricted login shell'
+  * linkgit:git-shell[1] can be used as a 'restricted login shell'
     for shared central repository users.
 
 link:howto/update-hook-example.txt[update hook howto] has a good
diff --git a/fetch-options.txt b/fetch-options.txt
index da034223f..61e48ccf0 100644
--- a/fetch-options.txt
+++ b/fetch-options.txt
@@ -50,5 +50,5 @@
 
 \--depth=<depth>::
 	Deepen the history of a 'shallow' repository created by
-	`git clone` with `--depth=<depth>` option (see gitlink:git-clone[1])
+	`git clone` with `--depth=<depth>` option (see linkgit:git-clone[1])
 	by the specified number of commits.
diff --git a/git-add.html b/git-add.html
index aa881f6d1..9aea63bc4 100644
--- a/git-add.html
+++ b/git-add.html
@@ -585,7 +585,7 @@ diff
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 11-Dec-2007 08:54:02 UTC
+Last updated 07-Jan-2008 07:50:00 UTC
 </div>
 </div>
 </body>
diff --git a/git-add.txt b/git-add.txt
index 721ca998c..9d2ac865d 100644
--- a/git-add.txt
+++ b/git-add.txt
@@ -37,7 +37,7 @@ directory recursion or filename globbing performed by Git (quote your
 globs before the shell) will be silently ignored.  The 'add' command can
 be used to add ignored files with the `-f` (force) option.
 
-Please see gitlink:git-commit[1] for alternative ways to add content to a
+Please see linkgit:git-commit[1] for alternative ways to add content to a
 commit.
 
 
@@ -231,12 +231,12 @@ diff::
 
 See Also
 --------
-gitlink:git-status[1]
-gitlink:git-rm[1]
-gitlink:git-reset[1]
-gitlink:git-mv[1]
-gitlink:git-commit[1]
-gitlink:git-update-index[1]
+linkgit:git-status[1]
+linkgit:git-rm[1]
+linkgit:git-reset[1]
+linkgit:git-mv[1]
+linkgit:git-commit[1]
+linkgit:git-update-index[1]
 
 Author
 ------
@@ -248,4 +248,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-am.html b/git-am.html
index 1d91bb487..70c6f87ce 100644
--- a/git-am.html
+++ b/git-am.html
@@ -509,7 +509,7 @@ names.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:20 UTC
+Last updated 07-Jan-2008 07:50:00 UTC
 </div>
 </div>
 </body>
diff --git a/git-am.txt b/git-am.txt
index e4a6b3a6f..2ffba2102 100644
--- a/git-am.txt
+++ b/git-am.txt
@@ -37,10 +37,10 @@ OPTIONS
 	area to store extracted patches.
 
 -k, --keep::
-	Pass `-k` flag to `git-mailinfo` (see gitlink:git-mailinfo[1]).
+	Pass `-k` flag to `git-mailinfo` (see linkgit:git-mailinfo[1]).
 
 -u, --utf8::
-	Pass `-u` flag to `git-mailinfo` (see gitlink:git-mailinfo[1]).
+	Pass `-u` flag to `git-mailinfo` (see linkgit:git-mailinfo[1]).
 	The proposed commit log message taken from the e-mail
 	is re-coded into UTF-8 encoding (configuration variable
 	`i18n.commitencoding` can be used to specify project's
@@ -51,7 +51,7 @@ default.   You could use `--no-utf8` to override this.
 
 --no-utf8::
 	Pass `-n` flag to `git-mailinfo` (see
-	gitlink:git-mailinfo[1]).
+	linkgit:git-mailinfo[1]).
 
 -3, --3way::
 	When the patch does not apply cleanly, fall back on
@@ -61,15 +61,15 @@ default.   You could use `--no-utf8` to override this.
 
 -b, --binary::
 	Pass `--allow-binary-replacement` flag to `git-apply`
-	(see gitlink:git-apply[1]).
+	(see linkgit:git-apply[1]).
 
 --whitespace=<option>::
-	This flag is passed to the `git-apply` (see gitlink:git-apply[1])
+	This flag is passed to the `git-apply` (see linkgit:git-apply[1])
 	program that applies
 	the patch.
 
 -C<n>, -p<n>::
-	These flags are passed to the `git-apply` (see gitlink:git-apply[1])
+	These flags are passed to the `git-apply` (see linkgit:git-apply[1])
 	program that applies
 	the patch.
 
@@ -144,7 +144,7 @@ names.
 
 SEE ALSO
 --------
-gitlink:git-apply[1].
+linkgit:git-apply[1].
 
 
 Author
@@ -157,4 +157,4 @@ Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.o
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-annotate.html b/git-annotate.html
index 82ade0348..9ba942214 100644
--- a/git-annotate.html
+++ b/git-annotate.html
@@ -454,7 +454,7 @@ commit.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:20 UTC
+Last updated 07-Jan-2008 07:50:01 UTC
 </div>
 </div>
 </body>
diff --git a/git-annotate.txt b/git-annotate.txt
index 02dc4740d..45a6a7251 100644
--- a/git-annotate.txt
+++ b/git-annotate.txt
@@ -20,7 +20,7 @@ include::blame-options.txt[]
 
 SEE ALSO
 --------
-gitlink:git-blame[1]
+linkgit:git-blame[1]
 
 AUTHOR
 ------
@@ -28,4 +28,4 @@ Written by Ryan Anderson <ryan@michonline.com>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-apply.html b/git-apply.html
index b6d6d7fcd..fb3f752ab 100644
--- a/git-apply.html
+++ b/git-apply.html
@@ -604,7 +604,7 @@ subdirectory is checked and (if possible) updated.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 12-Dec-2007 21:33:07 UTC
+Last updated 07-Jan-2008 07:50:01 UTC
 </div>
 </div>
 </body>
diff --git a/git-apply.txt b/git-apply.txt
index 9ec38f92b..2dec2ec1c 100644
--- a/git-apply.txt
+++ b/git-apply.txt
@@ -77,7 +77,7 @@ the information is read from the current index instead.
 	Apply the patch in reverse.
 
 --reject::
-	For atomicity, gitlink:git-apply[1] by default fails the whole patch and
+	For atomicity, linkgit:git-apply[1] by default fails the whole patch and
 	does not touch the working tree when some of the hunks
 	do not apply.  This option makes it apply
 	the parts of the patch that are applicable, and leave the
@@ -101,7 +101,7 @@ the information is read from the current index instead.
 	ever ignored.
 
 --unidiff-zero::
-	By default, gitlink:git-apply[1] expects that the patch being
+	By default, linkgit:git-apply[1] expects that the patch being
 	applied is a unified diff with at least one line of context.
 	This provides good safety measures, but breaks down when
 	applying a diff generated with --unified=0. To bypass these
@@ -112,7 +112,7 @@ discouraged.
 
 --apply::
 	If you use any of the options marked "Turns off
-	'apply'" above, gitlink:git-apply[1] reads and outputs the
+	'apply'" above, linkgit:git-apply[1] reads and outputs the
 	information you asked without actually applying the
 	patch.  Give this flag after those flags to also apply
 	the patch.
@@ -145,7 +145,7 @@ discouraged.
 	considered whitespace errors.
 +
 By default, the command outputs warning messages but applies the patch.
-When gitlink:git-apply[1] is used for statistics and not applying a
+When linkgit:git-apply[1] is used for statistics and not applying a
 patch, it defaults to `nowarn`.
 +
 You can use different `<action>` to control this
@@ -183,7 +183,7 @@ apply.whitespace::
 
 Submodules
 ----------
-If the patch contains any changes to submodules then gitlink:git-apply[1]
+If the patch contains any changes to submodules then linkgit:git-apply[1]
 treats these changes as follows.
 
 If --index is specified (explicitly or implicitly), then the submodule
@@ -206,4 +206,4 @@ Documentation by Junio C Hamano
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-archimport.html b/git-archimport.html
index cb85d21da..38715ef62 100644
--- a/git-archimport.html
+++ b/git-archimport.html
@@ -422,7 +422,7 @@ patches that have been traded out-of-sequence between the branches.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:21 UTC
+Last updated 07-Jan-2008 07:50:01 UTC
 </div>
 </div>
 </body>
diff --git a/git-archimport.txt b/git-archimport.txt
index 7091b8d61..bd20fd820 100644
--- a/git-archimport.txt
+++ b/git-archimport.txt
@@ -117,4 +117,4 @@ Documentation by Junio C Hamano, Martin Langhoff and the git-list <git@vger.kern
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-archive.html b/git-archive.html
index 87f46f83d..3843276ac 100644
--- a/git-archive.html
+++ b/git-archive.html
@@ -469,7 +469,7 @@ git archive --format=zip --prefix=git-docs/ HEAD:Documentation/ &gt; git-1.4.0-d
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:21 UTC
+Last updated 07-Jan-2008 07:50:01 UTC
 </div>
 </div>
 </body>
diff --git a/git-archive.txt b/git-archive.txt
index 7cd652655..d3eaa16af 100644
--- a/git-archive.txt
+++ b/git-archive.txt
@@ -118,4 +118,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-bisect.html b/git-bisect.html
index cc4baf790..5df54707e 100644
--- a/git-bisect.html
+++ b/git-bisect.html
@@ -453,7 +453,7 @@ know the outcome.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 09-Dec-2007 10:19:06 UTC
+Last updated 07-Jan-2008 07:50:02 UTC
 </div>
 </div>
 </body>
diff --git a/git-bisect.txt b/git-bisect.txt
index 8b9d61a8a..96585ae8d 100644
--- a/git-bisect.txt
+++ b/git-bisect.txt
@@ -227,4 +227,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-blame.html b/git-blame.html
index 141de8bc2..99ad263b4 100644
--- a/git-blame.html
+++ b/git-blame.html
@@ -686,7 +686,7 @@ commit commentary), a blame viewer won't ever care.</td>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:22 UTC
+Last updated 07-Jan-2008 07:50:02 UTC
 </div>
 </div>
 </body>
diff --git a/git-blame.txt b/git-blame.txt
index 66f120370..14163b65f 100644
--- a/git-blame.txt
+++ b/git-blame.txt
@@ -21,7 +21,7 @@ last modified the line. Optionally, start annotating from the given revision.
 Also it can limit the range of lines annotated.
 
 This report doesn't tell you anything about lines which have been deleted or
-replaced; you need to use a tool such as gitlink:git-diff[1] or the "pickaxe"
+replaced; you need to use a tool such as linkgit:git-diff[1] or the "pickaxe"
 interface briefly mentioned in the following paragraph.
 
 Apart from supporting file annotation, git also supports searching the
@@ -41,7 +41,7 @@ OPTIONS
 include::blame-options.txt[]
 
 -c::
-	Use the same output mode as gitlink:git-annotate[1] (Default: off).
+	Use the same output mode as linkgit:git-annotate[1] (Default: off).
 
 --score-debug::
 	Include debugging information related to the movement of
@@ -184,7 +184,7 @@ commit commentary), a blame viewer won't ever care.
 
 SEE ALSO
 --------
-gitlink:git-annotate[1]
+linkgit:git-annotate[1]
 
 AUTHOR
 ------
@@ -192,4 +192,4 @@ Written by Junio C Hamano <junkio@cox.net>
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-branch.html b/git-branch.html
index c4d26dfb7..d8d405cfd 100644
--- a/git-branch.html
+++ b/git-branch.html
@@ -565,7 +565,7 @@ a branch and check it out with a single command.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 02-Dec-2007 18:56:08 UTC
+Last updated 07-Jan-2008 07:50:03 UTC
 </div>
 </div>
 </body>
diff --git a/git-branch.txt b/git-branch.txt
index d3f21c797..f920c04cc 100644
--- a/git-branch.txt
+++ b/git-branch.txt
@@ -35,7 +35,7 @@ working tree to it; use "git checkout <newbranch>" to switch to the
 new branch.
 
 When a local branch is started off a remote branch, git can setup the
-branch so that gitlink:git-pull[1] will appropriately merge from that
+branch so that linkgit:git-pull[1] will appropriately merge from that
 remote branch.  If this behavior is desired, it is possible to make it
 the default using the global `branch.autosetupmerge` configuration
 flag.  Otherwise, it can be chosen per-branch using the `--track`
@@ -53,8 +53,8 @@ has a reflog then the reflog will also be deleted.
 
 Use -r together with -d to delete remote-tracking branches. Note, that it
 only makes sense to delete remote-tracking branches if they no longer exist
-in remote repository or if gitlink:git-fetch[1] was configured not to fetch
-them again. See also 'prune' subcommand of gitlink:git-remote[1] for way to
+in remote repository or if linkgit:git-fetch[1] was configured not to fetch
+them again. See also 'prune' subcommand of linkgit:git-remote[1] for way to
 clean up all obsolete remote-tracking branches.
 
 
@@ -122,7 +122,7 @@ OPTIONS
 <branchname>::
 	The name of the branch to create or delete.
 	The new branch name must pass all checks defined by
-	gitlink:git-check-ref-format[1].  Some of these checks
+	linkgit:git-check-ref-format[1].  Some of these checks
 	may restrict the characters allowed in a branch name.
 
 <start-point>::
@@ -164,7 +164,7 @@ $ git branch -D test                                    <2>
 +
 <1> Delete remote-tracking branches "todo", "html", "man". Next 'fetch' or
 'pull' will create them again unless you configure them not to. See
-gitlink:git-fetch[1].
+linkgit:git-fetch[1].
 <2> Delete "test" branch even if the "master" branch (or whichever branch is
 currently checked out) does not have all commits from test branch.
 
@@ -187,4 +187,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-bundle.html b/git-bundle.html
index eb66f40d4..d01f649df 100644
--- a/git-bundle.html
+++ b/git-bundle.html
@@ -433,7 +433,7 @@ network.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:22 UTC
+Last updated 07-Jan-2008 07:50:03 UTC
 </div>
 </div>
 </body>
diff --git a/git-bundle.txt b/git-bundle.txt
index 0cc6511bd..72f080a97 100644
--- a/git-bundle.txt
+++ b/git-bundle.txt
@@ -23,7 +23,7 @@ be directly connected so the interactive git protocols (git, ssh,
 rsync, http) cannot be used.  This command provides support for
 git-fetch and git-pull to operate by packaging objects and references
 in an archive at the originating machine, then importing those into
-another repository using gitlink:git-fetch[1] and gitlink:git-pull[1]
+another repository using linkgit:git-fetch[1] and linkgit:git-pull[1]
 after moving the archive by some means (i.e., by sneakernet).  As no
 direct connection between repositories exists, the user must specify a
 basis for the bundle that is held by the destination repository: the
@@ -51,12 +51,12 @@ list-heads <file>::
        printed out.
 
 unbundle <file>::
-       Passes the objects in the bundle to gitlink:git-index-pack[1]
+       Passes the objects in the bundle to linkgit:git-index-pack[1]
        for storage in the repository, then prints the names of all
        defined references. If a reflist is given, only references
        matching those in the given list are printed. This command is
        really plumbing, intended to be called only by
-       gitlink:git-fetch[1].
+       linkgit:git-fetch[1].
 
 [git-rev-list-args...]::
        A list of arguments, acceptable to git-rev-parse and
@@ -73,7 +73,7 @@ unbundle <file>::
        available. This is principally of use to git-fetch, which
        expects to receive only those references asked for and not
        necessarily everything in the pack (in this case, git-bundle is
-       acting like gitlink:git-fetch-pack[1]).
+       acting like linkgit:git-fetch-pack[1]).
 
 SPECIFYING REFERENCES
 ---------------------
@@ -145,4 +145,4 @@ Written by Mark Levedahl <mdl123@verizon.net>
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-cat-file.html b/git-cat-file.html
index 4a033d952..681b21c71 100644
--- a/git-cat-file.html
+++ b/git-cat-file.html
@@ -366,7 +366,7 @@ be returned.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:23 UTC
+Last updated 07-Jan-2008 07:50:04 UTC
 </div>
 </div>
 </body>
diff --git a/git-cat-file.txt b/git-cat-file.txt
index afa095c79..df42cb10f 100644
--- a/git-cat-file.txt
+++ b/git-cat-file.txt
@@ -21,7 +21,7 @@ OPTIONS
 <object>::
 	The name of the object to show.
 	For a more complete list of ways to spell object names, see
-	"SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1].
+	"SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
 
 -t::
 	Instead of the content, show the object type identified by
@@ -70,4 +70,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-check-attr.html b/git-check-attr.html
index 1a3c0331b..4fc0f1513 100644
--- a/git-check-attr.html
+++ b/git-check-attr.html
@@ -312,7 +312,7 @@ git-check-attr(1) Manual Page
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 23-Dec-2007 08:15:26 UTC
+Last updated 07-Jan-2008 07:50:04 UTC
 </div>
 </div>
 </body>
diff --git a/git-check-attr.txt b/git-check-attr.txt
index 47cb1bdfa..290f10f16 100644
--- a/git-check-attr.txt
+++ b/git-check-attr.txt
@@ -25,7 +25,7 @@ OPTIONS
 
 SEE ALSO
 --------
-gitlink:gitattributes[5].
+linkgit:gitattributes[5].
 
 
 Author
@@ -38,4 +38,4 @@ Documentation by James Bowes.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-check-ref-format.html b/git-check-ref-format.html
index f0a27facc..9c14aaafd 100644
--- a/git-check-ref-format.html
+++ b/git-check-ref-format.html
@@ -343,7 +343,7 @@ colon <tt>:</tt> is used as in <tt>srcref:dstref</tt> to mean "use srcref's
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:23 UTC
+Last updated 07-Jan-2008 07:50:05 UTC
 </div>
 </div>
 </body>
diff --git a/git-check-ref-format.txt b/git-check-ref-format.txt
index 13a5f4304..a67688042 100644
--- a/git-check-ref-format.txt
+++ b/git-check-ref-format.txt
@@ -35,7 +35,7 @@ imposes the following rules on how refs are named:
 These rules makes it easy for shell script based tools to parse
 refnames, pathname expansion by the shell when a refname is used
 unquoted (by mistake), and also avoids ambiguities in certain
-refname expressions (see gitlink:git-rev-parse[1]).  Namely:
+refname expressions (see linkgit:git-rev-parse[1]).  Namely:
 
 . double-dot `..` are often used as in `ref1..ref2`, and in some
   context this notation means `{caret}ref1 ref2` (i.e. not in
@@ -47,9 +47,9 @@ refname expressions (see gitlink:git-rev-parse[1]).  Namely:
 . colon `:` is used as in `srcref:dstref` to mean "use srcref\'s
   value and store it in dstref" in fetch and push operations.
   It may also be used to select a specific object such as with
-  gitlink:git-cat-file[1] "git-cat-file blob v1.3.3:refs.c".
+  linkgit:git-cat-file[1] "git-cat-file blob v1.3.3:refs.c".
 
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-checkout-index.html b/git-checkout-index.html
index f47b12949..3432d6bd7 100644
--- a/git-checkout-index.html
+++ b/git-checkout-index.html
@@ -511,7 +511,7 @@ Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:23 UTC
+Last updated 07-Jan-2008 07:50:04 UTC
 </div>
 </div>
 </body>
diff --git a/git-checkout-index.txt b/git-checkout-index.txt
index b1a8ce110..cbbb0b509 100644
--- a/git-checkout-index.txt
+++ b/git-checkout-index.txt
@@ -181,4 +181,4 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-checkout.html b/git-checkout.html
index 1956a5a02..06b86e1c8 100644
--- a/git-checkout.html
+++ b/git-checkout.html
@@ -540,7 +540,7 @@ $ git add frotz</tt></pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:23 UTC
+Last updated 07-Jan-2008 07:50:05 UTC
 </div>
 </div>
 </body>
diff --git a/git-checkout.txt b/git-checkout.txt
index 2e58481ed..584359ff3 100644
--- a/git-checkout.txt
+++ b/git-checkout.txt
@@ -44,7 +44,7 @@ OPTIONS
 -b::
 	Create a new branch named <new_branch> and start it at
 	<branch>.  The new branch name must pass all checks defined
-	by gitlink:git-check-ref-format[1].  Some of these checks
+	by linkgit:git-check-ref-format[1].  Some of these checks
 	may restrict the characters allowed in a branch name.
 
 --track::
@@ -216,4 +216,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-cherry-pick.html b/git-cherry-pick.html
index 482aa2eca..a2a407f4f 100644
--- a/git-cherry-pick.html
+++ b/git-cherry-pick.html
@@ -375,7 +375,7 @@ effect to your working tree in a row.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:24 UTC
+Last updated 07-Jan-2008 07:50:06 UTC
 </div>
 </div>
 </body>
diff --git a/git-cherry-pick.txt b/git-cherry-pick.txt
index 937c4a792..3bcc12c13 100644
--- a/git-cherry-pick.txt
+++ b/git-cherry-pick.txt
@@ -20,7 +20,7 @@ OPTIONS
 <commit>::
 	Commit to cherry-pick.
 	For a more complete list of ways to spell commits, see
-	"SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1].
+	"SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
 
 -e|--edit::
 	With this option, `git-cherry-pick` will let you edit the commit
@@ -75,4 +75,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-cherry.html b/git-cherry.html
index a73e9eaa9..0d35243a5 100644
--- a/git-cherry.html
+++ b/git-cherry.html
@@ -356,7 +356,7 @@ than pushing or pulling commits directly.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:24 UTC
+Last updated 07-Jan-2008 07:50:06 UTC
 </div>
 </div>
 </body>
diff --git a/git-cherry.txt b/git-cherry.txt
index e6943822c..b0468aa74 100644
--- a/git-cherry.txt
+++ b/git-cherry.txt
@@ -66,4 +66,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-citool.html b/git-citool.html
index e7335dbe2..2aa572c3f 100644
--- a/git-citool.html
+++ b/git-citool.html
@@ -297,7 +297,7 @@ See <a href="git-gui.html">git-gui(1)</a> for more details.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:24 UTC
+Last updated 07-Jan-2008 07:50:06 UTC
 </div>
 </div>
 </body>
diff --git a/git-citool.txt b/git-citool.txt
index 5217ab223..aca1d75e5 100644
--- a/git-citool.txt
+++ b/git-citool.txt
@@ -14,10 +14,10 @@ DESCRIPTION
 A Tcl/Tk based graphical interface to review modified files, stage
 them into the index, enter a commit message and record the new
 commit onto the current branch.  This interface is an alternative
-to the less interactive gitlink:git-commit[1] program.
+to the less interactive linkgit:git-commit[1] program.
 
 git-citool is actually a standard alias for 'git gui citool'.
-See gitlink:git-gui[1] for more details.
+See linkgit:git-gui[1] for more details.
 
 Author
 ------
@@ -29,4 +29,4 @@ Documentation by Shawn O. Pearce <spearce@spearce.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-clean.html b/git-clean.html
index 7ea7f6230..aa14d2d8a 100644
--- a/git-clean.html
+++ b/git-clean.html
@@ -353,7 +353,7 @@ affected are further limited to those that match them.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:24 UTC
+Last updated 07-Jan-2008 07:50:06 UTC
 </div>
 </div>
 </body>
diff --git a/git-clean.txt b/git-clean.txt
index e3252d59d..5e9da036b 100644
--- a/git-clean.txt
+++ b/git-clean.txt
@@ -39,7 +39,7 @@ OPTIONS
 -x::
 	Don't use the ignore rules.  This allows removing all untracked
 	files, including build products.  This can be used (possibly in
-	conjunction with gitlink:git-reset[1]) to create a pristine
+	conjunction with linkgit:git-reset[1]) to create a pristine
 	working directory to test a clean build.
 
 -X::
@@ -54,4 +54,4 @@ Written by Pavel Roskin <proski@gnu.org>
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-clone.html b/git-clone.html
index fc507d658..efa8fc2a3 100644
--- a/git-clone.html
+++ b/git-clone.html
@@ -640,7 +640,7 @@ Create a repository on the kernel.org machine that borrows from Linus
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 17-Nov-2007 20:50:31 UTC
+Last updated 07-Jan-2008 07:50:07 UTC
 </div>
 </div>
 </body>
diff --git a/git-clone.txt b/git-clone.txt
index c90bcece2..fdccbd4cb 100644
--- a/git-clone.txt
+++ b/git-clone.txt
@@ -191,4 +191,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-commit-tree.html b/git-commit-tree.html
index 3d5adcafb..0491306fd 100644
--- a/git-commit-tree.html
+++ b/git-commit-tree.html
@@ -477,7 +477,7 @@ reversible operation.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 05-Jan-2008 10:31:57 UTC
+Last updated 07-Jan-2008 07:50:07 UTC
 </div>
 </div>
 </body>
diff --git a/git-commit-tree.txt b/git-commit-tree.txt
index a2537e179..170803a6d 100644
--- a/git-commit-tree.txt
+++ b/git-commit-tree.txt
@@ -13,7 +13,7 @@ SYNOPSIS
 DESCRIPTION
 -----------
 This is usually not what an end user wants to run directly.  See
-gitlink:git-commit[1] instead.
+linkgit:git-commit[1] instead.
 
 Creates a new commit object based on the provided tree object and
 emits the new commit object id on stdout. If no parent is given then
@@ -90,7 +90,7 @@ include::i18n.txt[]
 
 See Also
 --------
-gitlink:git-write-tree[1]
+linkgit:git-write-tree[1]
 
 
 Author
@@ -103,4 +103,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-commit.html b/git-commit.html
index 601a162e3..9842b70d2 100644
--- a/git-commit.html
+++ b/git-commit.html
@@ -730,7 +730,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 05-Jan-2008 10:31:57 UTC
+Last updated 07-Jan-2008 07:50:07 UTC
 </div>
 </div>
 </body>
diff --git a/git-commit.txt b/git-commit.txt
index 96383b654..c3725b2ed 100644
--- a/git-commit.txt
+++ b/git-commit.txt
@@ -20,11 +20,11 @@ commit along with a log message describing the changes you have made.
 
 The content to be added can be specified in several ways:
 
-1. by using gitlink:git-add[1] to incrementally "add" changes to the
+1. by using linkgit:git-add[1] to incrementally "add" changes to the
    index before using the 'commit' command (Note: even modified
    files must be "added");
 
-2. by using gitlink:git-rm[1] to remove files from the working tree
+2. by using linkgit:git-rm[1] to remove files from the working tree
    and the index, again before using the 'commit' command;
 
 3. by listing files as arguments to the 'commit' command, in which
@@ -41,13 +41,13 @@ The content to be added can be specified in several ways:
    by one which files should be part of the commit, before finalizing the
    operation.  Currently, this is done by invoking `git-add --interactive`.
 
-The gitlink:git-status[1] command can be used to obtain a
+The linkgit:git-status[1] command can be used to obtain a
 summary of what is included by any of the above for the next
 commit by giving the same set of parameters you would give to
 this command.
 
 If you make a commit and then found a mistake immediately after
-that, you can recover from it with gitlink:git-reset[1].
+that, you can recover from it with linkgit:git-reset[1].
 
 
 OPTIONS
@@ -170,7 +170,7 @@ EXAMPLES
 --------
 When recording your own work, the contents of modified files in
 your working tree are temporarily stored to a staging area
-called the "index" with gitlink:git-add[1].  A file can be
+called the "index" with linkgit:git-add[1].  A file can be
 reverted back, only in the index but not in the working tree,
 to that of the last commit with `git-reset HEAD -- <file>`,
 which effectively reverts `git-add` and prevents the changes to
@@ -229,13 +229,13 @@ $ git commit
 this second commit would record the changes to `hello.c` and
 `hello.h` as expected.
 
-After a merge (initiated by either gitlink:git-merge[1] or
-gitlink:git-pull[1]) stops because of conflicts, cleanly merged
+After a merge (initiated by either linkgit:git-merge[1] or
+linkgit:git-pull[1]) stops because of conflicts, cleanly merged
 paths are already staged to be committed for you, and paths that
 conflicted are left in unmerged state.  You would have to first
-check which paths are conflicting with gitlink:git-status[1]
+check which paths are conflicting with linkgit:git-status[1]
 and after fixing them manually in your working tree, you would
-stage the result as usual with gitlink:git-add[1]:
+stage the result as usual with linkgit:git-add[1]:
 
 ------------
 $ git status | grep unmerged
@@ -287,11 +287,11 @@ information.
 
 SEE ALSO
 --------
-gitlink:git-add[1],
-gitlink:git-rm[1],
-gitlink:git-mv[1],
-gitlink:git-merge[1],
-gitlink:git-commit-tree[1]
+linkgit:git-add[1],
+linkgit:git-rm[1],
+linkgit:git-mv[1],
+linkgit:git-merge[1],
+linkgit:git-commit-tree[1]
 
 Author
 ------
@@ -301,4 +301,4 @@ Junio C Hamano <junkio@cox.net>
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-config.html b/git-config.html
index 1bb101d7a..72b8323fc 100644
--- a/git-config.html
+++ b/git-config.html
@@ -1275,7 +1275,8 @@ color.interactive
 </dt>
 <dd>
 <p>
-        When set to <tt>always</tt>, always use colors in <tt>git add --interactive</tt>.
+        When set to <tt>always</tt>, always use colors for interactive prompts
+        and displays (such as those used by "git add --interactive").
         When false (or <tt>never</tt>), never.  When set to <tt>true</tt> or <tt>auto</tt>, use
         colors only when the output is to the terminal. Defaults to false.
 </p>
@@ -2126,7 +2127,7 @@ transfer.unpackLimit
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 02-Jan-2008 10:50:22 UTC
+Last updated 07-Jan-2008 07:50:08 UTC
 </div>
 </div>
 </body>
diff --git a/git-config.txt b/git-config.txt
index 98509b4f4..e4d0e4752 100644
--- a/git-config.txt
+++ b/git-config.txt
@@ -332,4 +332,4 @@ Documentation by Johannes Schindelin, Petr Baudis and the git-list <git@vger.ker
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-count-objects.html b/git-count-objects.html
index b464c9d2f..4dab67d36 100644
--- a/git-count-objects.html
+++ b/git-count-objects.html
@@ -309,7 +309,7 @@ them, to help you decide when it is a good time to repack.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:26 UTC
+Last updated 07-Jan-2008 07:50:09 UTC
 </div>
 </div>
 </body>
diff --git a/git-count-objects.txt b/git-count-objects.txt
index 81614111a..7fb08e934 100644
--- a/git-count-objects.txt
+++ b/git-count-objects.txt
@@ -34,4 +34,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-cvsexportcommit.html b/git-cvsexportcommit.html
index 3a53da000..bdef20e79 100644
--- a/git-cvsexportcommit.html
+++ b/git-cvsexportcommit.html
@@ -432,7 +432,7 @@ $ git-cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git-cvsexportcommit
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 15-Nov-2007 00:12:54 UTC
+Last updated 07-Jan-2008 07:50:09 UTC
 </div>
 </div>
 </body>
diff --git a/git-cvsexportcommit.txt b/git-cvsexportcommit.txt
index 3f9d2295d..9a47b4c39 100644
--- a/git-cvsexportcommit.txt
+++ b/git-cvsexportcommit.txt
@@ -106,4 +106,4 @@ Documentation by Martin Langhoff <martin@catalyst.net.nz> and others.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-cvsimport.html b/git-cvsimport.html
index f0fbb5778..5fb6a086d 100644
--- a/git-cvsimport.html
+++ b/git-cvsimport.html
@@ -526,7 +526,7 @@ various participants of the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:26 UTC
+Last updated 07-Jan-2008 07:50:10 UTC
 </div>
 </div>
 </body>
diff --git a/git-cvsimport.txt b/git-cvsimport.txt
index fdd7ec7ed..dbce50369 100644
--- a/git-cvsimport.txt
+++ b/git-cvsimport.txt
@@ -142,7 +142,7 @@ file each time git-cvsimport is run.
 +
 It is not recommended to use this feature if you intend to
 export changes back to CVS again later with
-gitlink:git-cvsexportcommit[1].
+linkgit:git-cvsexportcommit[1].
 
 -h::
 	Print a short usage message and exit.
@@ -166,4 +166,4 @@ Documentation by Matthias Urlichs <smurf@smurf.noris.de>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-cvsserver.html b/git-cvsserver.html
index 0832ebf3a..4e2da4bce 100644
--- a/git-cvsserver.html
+++ b/git-cvsserver.html
@@ -691,7 +691,7 @@ Martin Langhoff &lt;martin@catalyst.net.nz&gt;
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:27 UTC
+Last updated 07-Jan-2008 07:50:10 UTC
 </div>
 </div>
 </body>
diff --git a/git-cvsserver.txt b/git-cvsserver.txt
index 258a62f7e..d75e40134 100644
--- a/git-cvsserver.txt
+++ b/git-cvsserver.txt
@@ -28,7 +28,7 @@ OPTIONS
 -------
 
 All these options obviously only make sense if enforced by the server side.
-They have been implemented to resemble the gitlink:git-daemon[1] options as
+They have been implemented to resemble the linkgit:git-daemon[1] options as
 closely as possible.
 
 --base-path <path>::
@@ -319,4 +319,4 @@ Documentation by Martyn Smith <martyn@catalyst.net.nz>, Martin Langhoff <martin@
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-daemon.html b/git-daemon.html
index 0df3b32ec..0e983efbc 100644
--- a/git-daemon.html
+++ b/git-daemon.html
@@ -676,7 +676,7 @@ selectively enable/disable services per repository
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 18-Dec-2007 06:59:36 UTC
+Last updated 07-Jan-2008 07:50:11 UTC
 </div>
 </div>
 </body>
diff --git a/git-daemon.txt b/git-daemon.txt
index f1e48dd02..fd83bc783 100644
--- a/git-daemon.txt
+++ b/git-daemon.txt
@@ -272,4 +272,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-describe.html b/git-describe.html
index df05e6c39..54716684f 100644
--- a/git-describe.html
+++ b/git-describe.html
@@ -428,7 +428,7 @@ updated by Shawn Pearce &lt;spearce@spearce.org&gt;.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:27 UTC
+Last updated 07-Jan-2008 07:50:12 UTC
 </div>
 </div>
 </body>
diff --git a/git-describe.txt b/git-describe.txt
index ac23e28f2..0742152b8 100644
--- a/git-describe.txt
+++ b/git-describe.txt
@@ -123,4 +123,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-diff-files.html b/git-diff-files.html
index 1a415825e..585729d69 100644
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -1261,7 +1261,7 @@ the pathname, but if that is <tt>NUL</tt>, the record will show two paths.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 21-Dec-2007 17:56:56 UTC
+Last updated 07-Jan-2008 07:50:13 UTC
 </div>
 </div>
 </body>
diff --git a/git-diff-files.txt b/git-diff-files.txt
index d8a0a8602..6d2ea16a2 100644
--- a/git-diff-files.txt
+++ b/git-diff-files.txt
@@ -57,4 +57,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-diff-index.html b/git-diff-index.html
index c09641c4d..c3338948c 100644
--- a/git-diff-index.html
+++ b/git-diff-index.html
@@ -1343,7 +1343,7 @@ always have the special all-zero sha1.</td>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 21-Dec-2007 17:56:56 UTC
+Last updated 07-Jan-2008 07:50:13 UTC
 </div>
 </div>
 </body>
diff --git a/git-diff-index.txt b/git-diff-index.txt
index 7bd262cef..e86777859 100644
--- a/git-diff-index.txt
+++ b/git-diff-index.txt
@@ -129,4 +129,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-diff-tree.html b/git-diff-tree.html
index b36b00ea1..09afd553a 100644
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -1731,7 +1731,7 @@ the pathname, but if that is <tt>NUL</tt>, the record will show two paths.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 21-Dec-2007 17:56:57 UTC
+Last updated 07-Jan-2008 07:50:15 UTC
 </div>
 </div>
 </body>
diff --git a/git-diff-tree.txt b/git-diff-tree.txt
index 6b3f74efe..58d02c6a2 100644
--- a/git-diff-tree.txt
+++ b/git-diff-tree.txt
@@ -165,4 +165,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-diff.html b/git-diff.html
index a100b957d..9f1a12849 100644
--- a/git-diff.html
+++ b/git-diff.html
@@ -1458,7 +1458,7 @@ Output diff in reverse.
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 21-Dec-2007 17:56:58 UTC
+Last updated 07-Jan-2008 07:50:15 UTC
 </div>
 </div>
 </body>
diff --git a/git-diff.txt b/git-diff.txt
index 2808a5ec4..57c28628b 100644
--- a/git-diff.txt
+++ b/git-diff.txt
@@ -21,7 +21,7 @@ tree and the index file, or the index file and the working tree.
 	the index (staging area for the next commit).  In other
 	words, the differences are what you _could_ tell git to
 	further add to the index but you still haven't.  You can
-	stage these changes by using gitlink:git-add[1].
+	stage these changes by using linkgit:git-add[1].
 +
 If exactly two paths are given, and at least one is untracked,
 compare the two files / directories. This behavior can be
@@ -67,11 +67,11 @@ for the last two forms that use ".." notations, can be any
 <tree-ish>.
 
 For a more complete list of ways to spell <commit>, see
-"SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1].
+"SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
 However, "diff" is about comparing two _endpoints_, not ranges,
 and the range notations ("<commit>..<commit>" and
 "<commit>\...<commit>") do not mean a range as defined in the
-"SPECIFYING RANGES" section in gitlink:git-rev-parse[1].
+"SPECIFYING RANGES" section in linkgit:git-rev-parse[1].
 
 OPTIONS
 -------
@@ -168,4 +168,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-fast-export.html b/git-fast-export.html
index 13811f2cb..6ab6271ab 100644
--- a/git-fast-export.html
+++ b/git-fast-export.html
@@ -351,7 +351,7 @@ a tag referencing a tree instead of a commit.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Dec-2007 08:28:19 UTC
+Last updated 07-Jan-2008 07:50:17 UTC
 </div>
 </div>
 </body>
diff --git a/git-fast-export.txt b/git-fast-export.txt
index fd3d57146..6dac475a0 100644
--- a/git-fast-export.txt
+++ b/git-fast-export.txt
@@ -13,18 +13,18 @@ SYNOPSIS
 DESCRIPTION
 -----------
 This program dumps the given revisions in a form suitable to be piped
-into gitlink:git-fast-import[1].
+into linkgit:git-fast-import[1].
 
 You can use it as a human readable bundle replacement (see
-gitlink:git-bundle[1]), or as a kind of an interactive
-gitlink:git-filter-branch[1].
+linkgit:git-bundle[1]), or as a kind of an interactive
+linkgit:git-filter-branch[1].
 
 
 OPTIONS
 -------
 --progress=<n>::
 	Insert 'progress' statements every <n> objects, to be shown by
-	gitlink:git-fast-import[1] during import.
+	linkgit:git-fast-import[1] during import.
 
 --signed-tags=(verbatim|warn|strip|abort)::
 	Specify how to handle signed tags.  Since any transformation
@@ -65,7 +65,7 @@ referenced by that revision range contains the string
 Limitations
 -----------
 
-Since gitlink:git-fast-import[1] cannot tag trees, you will not be
+Since linkgit:git-fast-import[1] cannot tag trees, you will not be
 able to export the linux-2.6.git repository completely, as it contains
 a tag referencing a tree instead of a commit.
 
@@ -80,4 +80,4 @@ Documentation by Johannes E. Schindelin <johannes.schindelin@gmx.de>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-fast-import.html b/git-fast-import.html
index 462a0da15..e664f8f3b 100644
--- a/git-fast-import.html
+++ b/git-fast-import.html
@@ -1309,7 +1309,7 @@ memory footprint (less than 2.7 MiB per active branch).</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:30 UTC
+Last updated 07-Jan-2008 07:50:18 UTC
 </div>
 </div>
 </body>
diff --git a/git-fast-import.txt b/git-fast-import.txt
index d5119678b..bd625abab 100644
--- a/git-fast-import.txt
+++ b/git-fast-import.txt
@@ -24,7 +24,7 @@ updated branch and tag refs, fully updating the current repository
 with the newly imported data.
 
 The fast-import backend itself can import into an empty repository (one that
-has already been initialized by gitlink:git-init[1]) or incrementally
+has already been initialized by linkgit:git-init[1]) or incrementally
 update an existing populated repository.  Whether or not incremental
 imports are supported from a particular foreign source depends on
 the frontend program in use.
@@ -82,7 +82,7 @@ OPTIONS
 	This information may be useful after importing projects
 	whose total object set exceeds the 4 GiB packfile limit,
 	as these commits can be used as edge points during calls
-	to gitlink:git-pack-objects[1].
+	to linkgit:git-pack-objects[1].
 
 --quiet::
 	Disable all non-fatal output, making fast-import silent when it
@@ -220,7 +220,7 @@ variation in formatting will cause fast-import to reject the value.
 +
 An example value is ``Tue Feb 6 11:22:18 2007 -0500''.  The Git
 parser is accurate, but a little on the lenient side.  It is the
-same parser used by gitlink:git-am[1] when applying patches
+same parser used by linkgit:git-am[1] when applying patches
 received from email.
 +
 Some malformed strings may be accepted as valid dates.  In some of
@@ -256,7 +256,7 @@ timezone.
 This particular format is supplied as its short to implement and
 may be useful to a process that wants to create a new commit
 right now, without needing to use a working directory or
-gitlink:git-update-index[1].
+linkgit:git-update-index[1].
 +
 If separate `author` and `committer` commands are used in a `commit`
 the timestamps may not match, as the system clock will be polled
@@ -411,7 +411,7 @@ Marks must be declared (via `mark`) before they can be used.
 * A complete 40 byte or abbreviated commit SHA-1 in hex.
 
 * Any valid Git SHA-1 expression that resolves to a commit.  See
-  ``SPECIFYING REVISIONS'' in gitlink:git-rev-parse[1] for details.
+  ``SPECIFYING REVISIONS'' in linkgit:git-rev-parse[1] for details.
 
 The special case of restarting an incremental import from the
 current branch value should be written as:
@@ -649,7 +649,7 @@ recommended, as the frontend does not (easily) have access to the
 complete set of bytes which normally goes into such a signature.
 If signing is required, create lightweight tags from within fast-import with
 `reset`, then create the annotated versions of those tags offline
-with the standard gitlink:git-tag[1] process.
+with the standard linkgit:git-tag[1] process.
 
 `reset`
 ~~~~~~~
@@ -863,7 +863,7 @@ is not `refs/heads/TAG_FIXUP`).
 
 When committing fixups, consider using `merge` to connect the
 commit(s) which are supplying file revisions to the fixup branch.
-Doing so will allow tools such as gitlink:git-blame[1] to track
+Doing so will allow tools such as linkgit:git-blame[1] to track
 through the real commit history and properly annotate the source
 files.
 
@@ -892,7 +892,7 @@ Repacking Historical Data
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 If you are repacking very old imported data (e.g. older than the
 last year), consider expending some extra CPU time and supplying
-\--window=50 (or higher) when you run gitlink:git-repack[1].
+\--window=50 (or higher) when you run linkgit:git-repack[1].
 This will take longer, but will also produce a smaller packfile.
 You only need to expend the effort once, and everyone using your
 project will benefit from the smaller repository.
@@ -1027,4 +1027,4 @@ Documentation by Shawn O. Pearce <spearce@spearce.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-fetch-pack.html b/git-fetch-pack.html
index 83a3b4f0a..31df016d2 100644
--- a/git-fetch-pack.html
+++ b/git-fetch-pack.html
@@ -420,7 +420,7 @@ have a common ancestor commit.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:30 UTC
+Last updated 07-Jan-2008 07:50:18 UTC
 </div>
 </div>
 </body>
diff --git a/git-fetch-pack.txt b/git-fetch-pack.txt
index a99a5b321..2b8ffe532 100644
--- a/git-fetch-pack.txt
+++ b/git-fetch-pack.txt
@@ -12,7 +12,7 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
-Usually you would want to use gitlink:git-fetch[1] which is a
+Usually you would want to use linkgit:git-fetch[1] which is a
 higher level wrapper of this command instead.
 
 Invokes 'git-upload-pack' on a potentially remote repository,
@@ -93,4 +93,4 @@ Documentation by Junio C Hamano.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-fetch.html b/git-fetch.html
index 98e5c092b..1ec17f23b 100644
--- a/git-fetch.html
+++ b/git-fetch.html
@@ -664,7 +664,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 17-Nov-2007 20:50:31 UTC
+Last updated 07-Jan-2008 07:50:19 UTC
 </div>
 </div>
 </body>
diff --git a/git-fetch.txt b/git-fetch.txt
index 900347359..d982f961f 100644
--- a/git-fetch.txt
+++ b/git-fetch.txt
@@ -39,7 +39,7 @@ include::urls-remotes.txt[]
 
 SEE ALSO
 --------
-gitlink:git-pull[1]
+linkgit:git-pull[1]
 
 
 Author
@@ -53,4 +53,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-filter-branch.html b/git-filter-branch.html
index 27971fb71..c021eacfe 100644
--- a/git-filter-branch.html
+++ b/git-filter-branch.html
@@ -593,7 +593,7 @@ and the git list &lt;git@vger.kernel.org&gt;</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:31 UTC
+Last updated 07-Jan-2008 07:50:20 UTC
 </div>
 </div>
 </body>
diff --git a/git-filter-branch.txt b/git-filter-branch.txt
index 895d75031..e22dfa580 100644
--- a/git-filter-branch.txt
+++ b/git-filter-branch.txt
@@ -72,7 +72,7 @@ OPTIONS
 	This is the filter for modifying the environment in which
 	the commit will be performed.  Specifically, you might want
 	to rewrite the author/committer name/email/time environment
-	variables (see gitlink:git-commit[1] for details).  Do not forget
+	variables (see linkgit:git-commit[1] for details).  Do not forget
 	to re-export the variables.
 
 --tree-filter <command>::
@@ -86,13 +86,13 @@ OPTIONS
 --index-filter <command>::
 	This is the filter for rewriting the index.  It is similar to the
 	tree filter but does not check out the tree, which makes it much
-	faster.  For hairy cases, see gitlink:git-update-index[1].
+	faster.  For hairy cases, see linkgit:git-update-index[1].
 
 --parent-filter <command>::
 	This is the filter for rewriting the commit's parent list.
 	It will receive the parent string on stdin and shall output
 	the new parent string on stdout.  The parent string is in
-	a format accepted by gitlink:git-commit-tree[1]: empty for
+	a format accepted by linkgit:git-commit-tree[1]: empty for
 	the initial commit, "-p parent" for a normal commit and
 	"-p parent1 -p parent2 -p parent3 ..." for a merge commit.
 
@@ -105,7 +105,7 @@ OPTIONS
 --commit-filter <command>::
 	This is the filter for performing the commit.
 	If this filter is specified, it will be called instead of the
-	gitlink:git-commit-tree[1] command, with arguments of the form
+	linkgit:git-commit-tree[1] command, with arguments of the form
 	"<TREE_ID> [-p <PARENT_COMMIT_ID>]..." and the log message on
 	stdin.  The commit id is expected on stdout.
 +
@@ -116,7 +116,7 @@ have all of them as parents.
 You can use the 'map' convenience function in this filter, and other
 convenience functions, too.  For example, calling 'skip_commit "$@"'
 will leave out the current commit (but not its changes! If you want
-that, use gitlink:git-rebase[1] instead).
+that, use linkgit:git-rebase[1] instead).
 
 --tag-name-filter <command>::
 	This is the filter for rewriting tag names. When passed,
@@ -159,7 +159,7 @@ definition impossible to preserve signatures at any rate.)
 
 <rev-list-options>::
 	When options are given after the new branch name, they will
-	be passed to gitlink:git-rev-list[1].  Only commits in the resulting
+	be passed to linkgit:git-rev-list[1].  Only commits in the resulting
 	output will be filtered, although the filtered commits can still
 	reference parents which are outside of that set.
 
@@ -249,7 +249,7 @@ will print.
 *NOTE* the changes introduced by the commits, and which are not reverted
 by subsequent commits, will still be in the rewritten branch. If you want
 to throw out _changes_ together with the commits, you should use the
-interactive mode of gitlink:git-rebase[1].
+interactive mode of linkgit:git-rebase[1].
 
 
 Consider this history:
@@ -295,4 +295,4 @@ Documentation by Petr Baudis and the git list.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-fmt-merge-msg.html b/git-fmt-merge-msg.html
index 545dbcab8..464b532a4 100644
--- a/git-fmt-merge-msg.html
+++ b/git-fmt-merge-msg.html
@@ -349,7 +349,7 @@ merge.summary
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:31 UTC
+Last updated 07-Jan-2008 07:50:21 UTC
 </div>
 </div>
 </body>
diff --git a/git-fmt-merge-msg.txt b/git-fmt-merge-msg.txt
index 7088ed409..8615ae353 100644
--- a/git-fmt-merge-msg.txt
+++ b/git-fmt-merge-msg.txt
@@ -46,7 +46,7 @@ merge.summary::
 
 SEE ALSO
 --------
-gitlink:git-merge[1]
+linkgit:git-merge[1]
 
 
 Author
@@ -59,4 +59,4 @@ Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.o
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-for-each-ref.html b/git-for-each-ref.html
index 4d3da00b0..e6a61a4ae 100644
--- a/git-for-each-ref.html
+++ b/git-for-each-ref.html
@@ -495,7 +495,7 @@ eval "$eval"</tt></pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:31 UTC
+Last updated 07-Jan-2008 07:50:21 UTC
 </div>
 </div>
 </body>
diff --git a/git-format-patch.html b/git-format-patch.html
index 8ee736768..cf1875e27 100644
--- a/git-format-patch.html
+++ b/git-format-patch.html
@@ -1017,7 +1017,7 @@ git-format-patch -3
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 21-Dec-2007 17:56:59 UTC
+Last updated 07-Jan-2008 07:50:21 UTC
 </div>
 </div>
 </body>
diff --git a/git-format-patch.txt b/git-format-patch.txt
index 6fb942985..651efe6ca 100644
--- a/git-format-patch.txt
+++ b/git-format-patch.txt
@@ -25,7 +25,7 @@ DESCRIPTION
 Prepare each commit with its patch in
 one file per commit, formatted to resemble UNIX mailbox format.
 The output of this command is convenient for e-mail submission or
-for use with gitlink:git-am[1].
+for use with linkgit:git-am[1].
 
 There are two ways to specify which commits to operate on.
 
@@ -34,7 +34,7 @@ There are two ways to specify which commits to operate on.
    that leads to the <since> to be output.
 
 2. Generic <revision range> expression (see "SPECIFYING
-   REVISIONS" section in gitlink:git-rev-parse[1]) means the
+   REVISIONS" section in linkgit:git-rev-parse[1]) means the
    commits in the specified range.
 
 A single commit, when interpreted as a <revision range>
@@ -192,7 +192,7 @@ git-format-patch -3::
 
 See Also
 --------
-gitlink:git-am[1], gitlink:git-send-email[1]
+linkgit:git-am[1], linkgit:git-send-email[1]
 
 
 Author
@@ -205,4 +205,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-fsck-objects.html b/git-fsck-objects.html
index 5154db95c..06359a12e 100644
--- a/git-fsck-objects.html
+++ b/git-fsck-objects.html
@@ -281,7 +281,7 @@ documentation of that command.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:32 UTC
+Last updated 07-Jan-2008 07:50:22 UTC
 </div>
 </div>
 </body>
diff --git a/git-fsck-objects.txt b/git-fsck-objects.txt
index f21061ecf..6e9f71764 100644
--- a/git-fsck-objects.txt
+++ b/git-fsck-objects.txt
@@ -13,5 +13,5 @@ SYNOPSIS
 DESCRIPTION
 -----------
 
-This is a synonym for gitlink:git-fsck[1].  Please refer to the
+This is a synonym for linkgit:git-fsck[1].  Please refer to the
 documentation of that command.
diff --git a/git-fsck.html b/git-fsck.html
index d225772a4..452e24184 100644
--- a/git-fsck.html
+++ b/git-fsck.html
@@ -521,7 +521,7 @@ GIT_ALTERNATE_OBJECT_DIRECTORIES
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:32 UTC
+Last updated 07-Jan-2008 07:50:22 UTC
 </div>
 </div>
 </body>
diff --git a/git-fsck.txt b/git-fsck.txt
index 45c0bee50..f16cb9861 100644
--- a/git-fsck.txt
+++ b/git-fsck.txt
@@ -150,4 +150,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-gc.html b/git-gc.html
index 579b394fe..597e26d59 100644
--- a/git-gc.html
+++ b/git-gc.html
@@ -390,7 +390,7 @@ more details.  This defaults to 10.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:32 UTC
+Last updated 07-Jan-2008 07:50:23 UTC
 </div>
 </div>
 </body>
diff --git a/git-gc.txt b/git-gc.txt
index 872056ea0..c4354bb6a 100644
--- a/git-gc.txt
+++ b/git-gc.txt
@@ -15,7 +15,7 @@ DESCRIPTION
 Runs a number of housekeeping tasks within the current repository,
 such as compressing file revisions (to reduce disk space and increase
 performance) and removing unreachable objects which may have been
-created from prior invocations of gitlink:git-add[1].
+created from prior invocations of linkgit:git-add[1].
 
 Users are encouraged to run this task on a regular basis within
 each repository to maintain good disk space utilization and good
@@ -98,15 +98,15 @@ The optional configuration variable 'gc.aggressiveWindow' controls how
 much time is spent optimizing the delta compression of the objects in
 the repository when the --aggressive option is specified.  The larger
 the value, the more time is spent optimizing the delta compression.  See
-the documentation for the --window' option in gitlink:git-repack[1] for
+the documentation for the --window' option in linkgit:git-repack[1] for
 more details.  This defaults to 10.
 
 See Also
 --------
-gitlink:git-prune[1]
-gitlink:git-reflog[1]
-gitlink:git-repack[1]
-gitlink:git-rerere[1]
+linkgit:git-prune[1]
+linkgit:git-reflog[1]
+linkgit:git-repack[1]
+linkgit:git-rerere[1]
 
 Author
 ------
@@ -114,4 +114,4 @@ Written by Shawn O. Pearce <spearce@spearce.org>
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-get-tar-commit-id.html b/git-get-tar-commit-id.html
index 21a580ae1..52a5a97ab 100644
--- a/git-get-tar-commit-id.html
+++ b/git-get-tar-commit-id.html
@@ -298,7 +298,7 @@ a tree ID instead of a commit ID or tag.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 20-Nov-2007 04:52:56 UTC
+Last updated 07-Jan-2008 07:50:23 UTC
 </div>
 </div>
 </body>
diff --git a/git-get-tar-commit-id.txt b/git-get-tar-commit-id.txt
index 60d1c52f4..dea41490c 100644
--- a/git-get-tar-commit-id.txt
+++ b/git-get-tar-commit-id.txt
@@ -14,7 +14,7 @@ SYNOPSIS
 DESCRIPTION
 -----------
 Acts as a filter, extracting the commit ID stored in archives created by
-gitlink:git-archive[1].  It reads only the first 1024 bytes of input, thus its
+linkgit:git-archive[1].  It reads only the first 1024 bytes of input, thus its
 runtime is not influenced by the size of <tarfile> very much.
 
 If no commit ID is found, git-get-tar-commit-id quietly exists with a
@@ -33,4 +33,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-grep.html b/git-grep.html
index 9f2bcd449..d96f52d1a 100644
--- a/git-grep.html
+++ b/git-grep.html
@@ -528,7 +528,7 @@ revamped by Junio C Hamano.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:33 UTC
+Last updated 07-Jan-2008 07:50:23 UTC
 </div>
 </div>
 </body>
diff --git a/git-grep.txt b/git-grep.txt
index 97faaa1d3..f3cb24f25 100644
--- a/git-grep.txt
+++ b/git-grep.txt
@@ -143,4 +143,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-gui.html b/git-gui.html
index 6d7345b4f..ad66605d4 100644
--- a/git-gui.html
+++ b/git-gui.html
@@ -433,7 +433,7 @@ of end users.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:33 UTC
+Last updated 07-Jan-2008 07:50:24 UTC
 </div>
 </div>
 </body>
diff --git a/git-gui.txt b/git-gui.txt
index 13252a1aa..6d6cd5d87 100644
--- a/git-gui.txt
+++ b/git-gui.txt
@@ -16,7 +16,7 @@ on allowing users to make changes to their repository by making
 new commits, amending existing ones, creating branches, performing
 local merges, and fetching/pushing to remote repositories.
 
-Unlike gitlink:gitk[1], git-gui focuses on commit generation
+Unlike linkgit:gitk[1], git-gui focuses on commit generation
 and single file annotation, and does not show project history.
 It does however supply menu actions to start a gitk session from
 within git-gui.
@@ -112,4 +112,4 @@ Documentation by Shawn O. Pearce <spearce@spearce.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-hash-object.html b/git-hash-object.html
index a78e28fc6..1281beefb 100644
--- a/git-hash-object.html
+++ b/git-hash-object.html
@@ -327,7 +327,7 @@ specified, it defaults to "blob".</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:33 UTC
+Last updated 07-Jan-2008 07:50:24 UTC
 </div>
 </div>
 </body>
diff --git a/git-hash-object.txt b/git-hash-object.txt
index 616f196d8..33030c022 100644
--- a/git-hash-object.txt
+++ b/git-hash-object.txt
@@ -42,4 +42,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-help.html b/git-help.html
index 655608088..d10f7a2c8 100644
--- a/git-help.html
+++ b/git-help.html
@@ -394,7 +394,7 @@ little. Maintenance is done by the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 19-Dec-2007 07:33:00 UTC
+Last updated 07-Jan-2008 07:50:25 UTC
 </div>
 </div>
 </body>
diff --git a/git-help.txt b/git-help.txt
index a8ffcbe78..09904c75c 100644
--- a/git-help.txt
+++ b/git-help.txt
@@ -85,7 +85,7 @@ $ git config --global web.browser firefox
 ------------------------------------------------
 
 as they are probably more user specific than repository specific.
-See gitlink:git-config[1] for more information about this.
+See linkgit:git-config[1] for more information about this.
 
 Author
 ------
@@ -94,10 +94,10 @@ Written by Junio C Hamano <gitster@pobox.com> and the git-list
 
 Documentation
 -------------
-Initial documentation was part of the gitlink:git[7] man page.
+Initial documentation was part of the linkgit:git[7] man page.
 Christian Couder <chriscool@tuxfamily.org> extracted and rewrote it a
 little. Maintenance is done by the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-http-fetch.html b/git-http-fetch.html
index a513a01ca..a7691a70c 100644
--- a/git-http-fetch.html
+++ b/git-http-fetch.html
@@ -369,7 +369,7 @@ commit-id
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:33 UTC
+Last updated 07-Jan-2008 07:50:25 UTC
 </div>
 </div>
 </body>
diff --git a/git-http-fetch.txt b/git-http-fetch.txt
index 389c6edfb..b784a9d07 100644
--- a/git-http-fetch.txt
+++ b/git-http-fetch.txt
@@ -53,4 +53,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-http-push.html b/git-http-push.html
index 0f21b55b3..ea3e9b3ca 100644
--- a/git-http-push.html
+++ b/git-http-push.html
@@ -420,7 +420,7 @@ to disable the fast-forward check only on that ref.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:33 UTC
+Last updated 07-Jan-2008 07:50:25 UTC
 </div>
 </div>
 </body>
diff --git a/git-http-push.txt b/git-http-push.txt
index 3a69b719b..cca77f10d 100644
--- a/git-http-push.txt
+++ b/git-http-push.txt
@@ -98,4 +98,4 @@ Documentation by Nick Hengeveld
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-imap-send.html b/git-imap-send.html
index 592d8e888..362b818f5 100644
--- a/git-imap-send.html
+++ b/git-imap-send.html
@@ -320,7 +320,7 @@ configuration file (shown with examples):</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:34 UTC
+Last updated 07-Jan-2008 07:50:26 UTC
 </div>
 </div>
 </body>
diff --git a/git-imap-send.txt b/git-imap-send.txt
index eca9e9cce..522b73c12 100644
--- a/git-imap-send.txt
+++ b/git-imap-send.txt
@@ -59,4 +59,4 @@ Documentation by Mike McCormack
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-index-pack.html b/git-index-pack.html
index f013f7bea..28ba3ae79 100644
--- a/git-index-pack.html
+++ b/git-index-pack.html
@@ -320,7 +320,7 @@ objects/pack/ directory of a git repository.</p>
         a default name determined from the pack content.  If
         &lt;pack-file&gt; is not specified consider using --keep to
         prevent a race condition between this process and
-        <a href=":git-repack.html">:git-repack(1)</a>.
+        <a href="git-repack.html">git-repack(1)</a>.
 </p>
 </dd>
 <dt>
@@ -398,7 +398,7 @@ mentioned above.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:34 UTC
+Last updated 07-Jan-2008 07:50:26 UTC
 </div>
 </div>
 </body>
diff --git a/git-index-pack.txt b/git-index-pack.txt
index bf5c2bddf..72b5d0011 100644
--- a/git-index-pack.txt
+++ b/git-index-pack.txt
@@ -43,10 +43,10 @@ OPTIONS
 	a default name determined from the pack content.  If
 	<pack-file> is not specified consider using --keep to
 	prevent a race condition between this process and
-	gitlink::git-repack[1].
+	linkgit:git-repack[1].
 
 --fix-thin::
-	It is possible for gitlink:git-pack-objects[1] to build
+	It is possible for linkgit:git-pack-objects[1] to build
 	"thin" pack, which records objects in deltified form based on
 	objects not included in the pack to reduce network traffic.
 	Those objects are expected to be present on the receiving end
@@ -59,7 +59,7 @@ OPTIONS
 	Before moving the index into its final destination
 	create an empty .keep file for the associated pack file.
 	This option is usually necessary with --stdin to prevent a
-	simultaneous gitlink:git-repack[1] process from deleting
+	simultaneous linkgit:git-repack[1] process from deleting
 	the newly constructed pack and index before refs can be
 	updated to use objects contained in the pack.
 
@@ -83,7 +83,7 @@ Once the index has been created, the list of object names is sorted
 and the SHA1 hash of that list is printed to stdout. If --stdin was
 also used then this is prefixed by either "pack\t", or "keep\t" if a
 new .keep file was successfully created. This is useful to remove a
-.keep file used as a lock to prevent the race with gitlink:git-repack[1]
+.keep file used as a lock to prevent the race with linkgit:git-repack[1]
 mentioned above.
 
 
@@ -97,4 +97,4 @@ Documentation by Sergey Vlasov
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-init-db.html b/git-init-db.html
index 16f19534e..76d55c461 100644
--- a/git-init-db.html
+++ b/git-init-db.html
@@ -281,7 +281,7 @@ documentation of that command.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:34 UTC
+Last updated 07-Jan-2008 07:50:26 UTC
 </div>
 </div>
 </body>
diff --git a/git-init-db.txt b/git-init-db.txt
index d4e01cb32..439cabb73 100644
--- a/git-init-db.txt
+++ b/git-init-db.txt
@@ -14,5 +14,5 @@ SYNOPSIS
 DESCRIPTION
 -----------
 
-This is a synonym for gitlink:git-init[1].  Please refer to the
+This is a synonym for linkgit:git-init[1].  Please refer to the
 documentation of that command.
diff --git a/git-init.html b/git-init.html
index ff906e18c..f75994ee9 100644
--- a/git-init.html
+++ b/git-init.html
@@ -403,7 +403,7 @@ add all existing file to the index
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 19-Dec-2007 07:33:00 UTC
+Last updated 07-Jan-2008 07:50:27 UTC
 </div>
 </div>
 </body>
diff --git a/git-init.txt b/git-init.txt
index e51351dd5..62914da97 100644
--- a/git-init.txt
+++ b/git-init.txt
@@ -111,4 +111,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-instaweb.html b/git-instaweb.html
index 9531a109a..cdcb2c08d 100644
--- a/git-instaweb.html
+++ b/git-instaweb.html
@@ -392,7 +392,7 @@ repository.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 13-Dec-2007 02:42:55 UTC
+Last updated 07-Jan-2008 07:50:27 UTC
 </div>
 </div>
 </body>
diff --git a/git-instaweb.txt b/git-instaweb.txt
index d2ce7790e..841e8fac7 100644
--- a/git-instaweb.txt
+++ b/git-instaweb.txt
@@ -84,4 +84,4 @@ Documentation by Eric Wong <normalperson@yhbt.net>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-log.html b/git-log.html
index 1c32e39e9..228f483e5 100644
--- a/git-log.html
+++ b/git-log.html
@@ -1477,7 +1477,7 @@ reversible operation.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 05-Jan-2008 10:31:57 UTC
+Last updated 07-Jan-2008 07:50:27 UTC
 </div>
 </div>
 </body>
diff --git a/git-log.txt b/git-log.txt
index d71e51ad4..5985f4739 100644
--- a/git-log.txt
+++ b/git-log.txt
@@ -14,9 +14,9 @@ DESCRIPTION
 -----------
 Shows the commit logs.
 
-The command takes options applicable to the gitlink:git-rev-list[1]
+The command takes options applicable to the linkgit:git-rev-list[1]
 command to control what is shown and how, and options applicable to
-the gitlink:git-diff-tree[1] commands to control how the changes
+the linkgit:git-diff-tree[1] commands to control how the changes
 each commit introduces are shown.
 
 This manual page describes only the most frequently used options.
@@ -39,7 +39,7 @@ include::diff-options.txt[]
 	`HEAD`, i.e. the tip of the current branch.
 	For a more complete list of ways to spell <since>
 	and <until>, see "SPECIFYING REVISIONS" section in
-	gitlink:git-rev-parse[1].
+	linkgit:git-rev-parse[1].
 
 --first-parent::
 	Follow only the first parent commit upon seeing a merge
@@ -54,7 +54,7 @@ include::diff-options.txt[]
 	Show commits as they were recorded in the reflog. The log contains
 	a record about how the tip of a reference was changed.
 	Cannot be combined with --reverse.
-	See also gitlink:git-reflog[1].
+	See also linkgit:git-reflog[1].
 
 --decorate::
 	Print out the ref names of any commits that are shown.
@@ -129,4 +129,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-lost-found.html b/git-lost-found.html
index 5adde3f84..9b08249f4 100644
--- a/git-lost-found.html
+++ b/git-lost-found.html
@@ -340,7 +340,7 @@ $ git rev-parse not-lost-anymore
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:35 UTC
+Last updated 07-Jan-2008 07:50:28 UTC
 </div>
 </div>
 </body>
diff --git a/git-lost-found.txt b/git-lost-found.txt
index 7f808fcd7..b1c797f10 100644
--- a/git-lost-found.txt
+++ b/git-lost-found.txt
@@ -12,7 +12,7 @@ SYNOPSIS
 DESCRIPTION
 -----------
 
-*NOTE*: this command is deprecated.  Use gitlink:git-fsck[1] with
+*NOTE*: this command is deprecated.  Use linkgit:git-fsck[1] with
 the option '--lost-found' instead.
 
 Finds dangling commits and tags from the object database, and
@@ -78,4 +78,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-ls-files.html b/git-ls-files.html
index 9103ec33a..eeb3b79a0 100644
--- a/git-ls-files.html
+++ b/git-ls-files.html
@@ -626,7 +626,7 @@ pattern file appears in.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 23-Dec-2007 08:15:26 UTC
+Last updated 07-Jan-2008 07:50:29 UTC
 </div>
 </div>
 </body>
diff --git a/git-ls-files.txt b/git-ls-files.txt
index d0c3aa21d..da9ebf405 100644
--- a/git-ls-files.txt
+++ b/git-ls-files.txt
@@ -106,7 +106,7 @@ OPTIONS
 -v::
 	Similar to `-t`, but use lowercase letters for files
 	that are marked as 'assume unchanged' (see
-	gitlink:git-update-index[1]).
+	linkgit:git-update-index[1]).
 
 --full-name::
 	When run from a subdirectory, the command usually
@@ -152,7 +152,7 @@ Exclude Patterns
 
 'git-ls-files' can use a list of "exclude patterns" when
 traversing the directory tree and finding files to show when the
-flags --others or --ignored are specified.  gitlink:gitignore[5]
+flags --others or --ignored are specified.  linkgit:gitignore[5]
 specifies the format of exclude patterns.
 
 These exclude patterns come from these places, in order:
@@ -179,7 +179,7 @@ pattern file appears in.
 
 See Also
 --------
-gitlink:git-read-tree[1], gitlink:gitignore[5]
+linkgit:git-read-tree[1], linkgit:gitignore[5]
 
 
 Author
@@ -192,4 +192,4 @@ Documentation by David Greaves, Junio C Hamano, Josh Triplett, and the git-list
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-ls-remote.html b/git-ls-remote.html
index cb38a90a4..5a68bb281 100644
--- a/git-ls-remote.html
+++ b/git-ls-remote.html
@@ -361,7 +361,7 @@ c5db5456ae3b0873fc659c19fafdde22313cc441        refs/tags/v0.99.2
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 18-Dec-2007 06:59:37 UTC
+Last updated 07-Jan-2008 07:50:29 UTC
 </div>
 </div>
 </body>
diff --git a/git-ls-remote.txt b/git-ls-remote.txt
index 445bedaa9..c5ba0aad1 100644
--- a/git-ls-remote.txt
+++ b/git-ls-remote.txt
@@ -27,7 +27,7 @@ OPTIONS
 	displayed.
 
 -u <exec>, --upload-pack=<exec>::
-	Specify the full path of gitlink:git-upload-pack[1] on the remote
+	Specify the full path of linkgit:git-upload-pack[1] on the remote
 	host. This allows listing references from repositories accessed via
 	SSH and where the SSH daemon does not use the PATH configured by the
 	user.
@@ -69,4 +69,4 @@ Written by Junio C Hamano <junkio@cox.net>
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-ls-tree.html b/git-ls-tree.html
index 9b778a5ad..a19f7c89f 100644
--- a/git-ls-tree.html
+++ b/git-ls-tree.html
@@ -416,7 +416,7 @@ another major rewrite by Linus Torvalds &lt;torvalds@osdl.org&gt;</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:36 UTC
+Last updated 07-Jan-2008 07:50:30 UTC
 </div>
 </div>
 </body>
diff --git a/git-ls-tree.txt b/git-ls-tree.txt
index 7b7859967..360c0a1b9 100644
--- a/git-ls-tree.txt
+++ b/git-ls-tree.txt
@@ -91,4 +91,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-mailinfo.html b/git-mailinfo.html
index bf5eeb697..90f7234aa 100644
--- a/git-mailinfo.html
+++ b/git-mailinfo.html
@@ -357,7 +357,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:36 UTC
+Last updated 07-Jan-2008 07:50:30 UTC
 </div>
 </div>
 </body>
diff --git a/git-mailinfo.txt b/git-mailinfo.txt
index 64aa6a1ea..3846f0e6e 100644
--- a/git-mailinfo.txt
+++ b/git-mailinfo.txt
@@ -18,7 +18,7 @@ writes the commit log message in <msg> file, and the patches in
 <patch> file.  The author name, e-mail and e-mail subject are
 written out to the standard output to be used by git-am
 to create a commit.  It is usually not necessary to use this
-command directly.  See gitlink:git-am[1] instead.
+command directly.  See linkgit:git-am[1] instead.
 
 
 OPTIONS
@@ -66,4 +66,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-mailsplit.html b/git-mailsplit.html
index a5866d8b9..40cafa3ad 100644
--- a/git-mailsplit.html
+++ b/git-mailsplit.html
@@ -362,7 +362,7 @@ and Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:36 UTC
+Last updated 07-Jan-2008 07:50:30 UTC
 </div>
 </div>
 </body>
diff --git a/git-mailsplit.txt b/git-mailsplit.txt
index c4f4cabbd..8243f6911 100644
--- a/git-mailsplit.txt
+++ b/git-mailsplit.txt
@@ -55,4 +55,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-merge-base.html b/git-merge-base.html
index f1b89045e..6ba602d97 100644
--- a/git-merge-base.html
+++ b/git-merge-base.html
@@ -312,7 +312,7 @@ relied on to decide in any particular way.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:36 UTC
+Last updated 07-Jan-2008 07:50:31 UTC
 </div>
 </div>
 </body>
diff --git a/git-merge-base.txt b/git-merge-base.txt
index 6b71880ec..07f78b4ae 100644
--- a/git-merge-base.txt
+++ b/git-merge-base.txt
@@ -39,4 +39,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-merge-file.html b/git-merge-file.html
index a9af6464f..4626e7df3 100644
--- a/git-merge-file.html
+++ b/git-merge-file.html
@@ -377,7 +377,7 @@ with parts copied from the original documentation of RCS merge.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:36 UTC
+Last updated 07-Jan-2008 07:50:31 UTC
 </div>
 </div>
 </body>
diff --git a/git-merge-file.txt b/git-merge-file.txt
index 31882abb8..c513184ba 100644
--- a/git-merge-file.txt
+++ b/git-merge-file.txt
@@ -41,7 +41,7 @@ conflicts otherwise. If the merge was clean, the exit value is 0.
 
 git-merge-file is designed to be a minimal clone of RCS merge, that is, it
 implements all of RCS merge's functionality which is needed by
-gitlink:git[1].
+linkgit:git[1].
 
 
 OPTIONS
@@ -89,4 +89,4 @@ with parts copied from the original documentation of RCS merge.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-merge-index.html b/git-merge-index.html
index ca1597630..95c3d3de1 100644
--- a/git-merge-index.html
+++ b/git-merge-index.html
@@ -372,7 +372,7 @@ One-shot merge by Petr Baudis &lt;pasky@ucw.cz&gt;</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:36 UTC
+Last updated 07-Jan-2008 07:50:31 UTC
 </div>
 </div>
 </body>
diff --git a/git-merge-index.txt b/git-merge-index.txt
index b726ddfe1..5d816d0d8 100644
--- a/git-merge-index.txt
+++ b/git-merge-index.txt
@@ -84,4 +84,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-merge-one-file.html b/git-merge-one-file.html
index e71100b69..2bda0b361 100644
--- a/git-merge-one-file.html
+++ b/git-merge-one-file.html
@@ -294,7 +294,7 @@ Junio C Hamano &lt;junkio@cox.net&gt; and Petr Baudis &lt;pasky@suse.cz&gt;.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:37 UTC
+Last updated 07-Jan-2008 07:50:32 UTC
 </div>
 </div>
 </body>
diff --git a/git-merge-one-file.txt b/git-merge-one-file.txt
index f35d0e1b4..ee95df3bc 100644
--- a/git-merge-one-file.txt
+++ b/git-merge-one-file.txt
@@ -26,4 +26,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-merge-tree.html b/git-merge-tree.html
index 6ffa7fc9e..01a3aa0a8 100644
--- a/git-merge-tree.html
+++ b/git-merge-tree.html
@@ -300,7 +300,7 @@ entries that match &lt;branch1&gt; tree.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:37 UTC
+Last updated 07-Jan-2008 07:50:32 UTC
 </div>
 </div>
 </body>
diff --git a/git-merge-tree.txt b/git-merge-tree.txt
index 6892fdac3..4cc0964e7 100644
--- a/git-merge-tree.txt
+++ b/git-merge-tree.txt
@@ -33,4 +33,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-merge.html b/git-merge.html
index 209d0b33d..2f72cda7a 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -649,7 +649,7 @@ Resolve the conflicts.  <tt>git-diff</tt> would report only the
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 23-Dec-2007 08:15:27 UTC
+Last updated 07-Jan-2008 07:50:33 UTC
 </div>
 </div>
 </body>
diff --git a/git-merge.txt b/git-merge.txt
index 1521a9ee0..ed3a92404 100644
--- a/git-merge.txt
+++ b/git-merge.txt
@@ -42,7 +42,7 @@ include::merge-strategies.txt[]
 
 If you tried a merge which resulted in a complex conflicts and
 would want to start over, you can recover with
-gitlink:git-reset[1].
+linkgit:git-reset[1].
 
 CONFIGURATION
 -------------
@@ -163,8 +163,8 @@ After seeing a conflict, you can do two things:
 
 SEE ALSO
 --------
-gitlink:git-fmt-merge-msg[1], gitlink:git-pull[1],
-gitlink:gitattributes[5]
+linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1],
+linkgit:gitattributes[5]
 
 
 Author
@@ -178,4 +178,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-mergetool.html b/git-mergetool.html
index 82c0cfaf7..51db618f8 100644
--- a/git-mergetool.html
+++ b/git-mergetool.html
@@ -321,7 +321,7 @@ is available in PATH.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:37 UTC
+Last updated 07-Jan-2008 07:50:32 UTC
 </div>
 </div>
 </body>
diff --git a/git-mergetool.txt b/git-mergetool.txt
index a26c26016..50f106ec5 100644
--- a/git-mergetool.txt
+++ b/git-mergetool.txt
@@ -13,7 +13,7 @@ DESCRIPTION
 -----------
 
 Use 'git mergetool' to run one of several merge utilities to resolve
-merge conflicts.  It is typically run after gitlink:git-merge[1].
+merge conflicts.  It is typically run after linkgit:git-merge[1].
 
 If one or more <file> parameters are given, the merge tool program will
 be run to resolve differences on each file.  If no <file> names are
@@ -48,4 +48,4 @@ Documentation by Theodore Y Ts'o.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-mktag.html b/git-mktag.html
index 21667c451..e2d293471 100644
--- a/git-mktag.html
+++ b/git-mktag.html
@@ -310,7 +310,7 @@ care about, but that can be verified with gpg.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:38 UTC
+Last updated 07-Jan-2008 07:50:33 UTC
 </div>
 </div>
 </body>
diff --git a/git-mktag.txt b/git-mktag.txt
index ea7a75234..82db9f5d8 100644
--- a/git-mktag.txt
+++ b/git-mktag.txt
@@ -43,4 +43,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-mktree.html b/git-mktree.html
index 168d3f476..202e23450 100644
--- a/git-mktree.html
+++ b/git-mktree.html
@@ -307,7 +307,7 @@ built is written to the standard output.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:38 UTC
+Last updated 07-Jan-2008 07:50:34 UTC
 </div>
 </div>
 </body>
diff --git a/git-mktree.txt b/git-mktree.txt
index 638abc7d0..f312036ab 100644
--- a/git-mktree.txt
+++ b/git-mktree.txt
@@ -31,4 +31,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-mv.html b/git-mv.html
index d27cfa80d..3c6993be0 100644
--- a/git-mv.html
+++ b/git-mv.html
@@ -337,7 +337,7 @@ Move functionality added by Josef Weidendorfer &lt;Josef.Weidendorfer@gmx.de&gt;
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:39 UTC
+Last updated 07-Jan-2008 07:50:34 UTC
 </div>
 </div>
 </body>
diff --git a/git-mv.txt b/git-mv.txt
index 3b8ca76df..bff3fbe74 100644
--- a/git-mv.txt
+++ b/git-mv.txt
@@ -50,4 +50,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-name-rev.html b/git-name-rev.html
index 38daaf49f..c9212413f 100644
--- a/git-name-rev.html
+++ b/git-name-rev.html
@@ -325,7 +325,7 @@ format parsable by git-rev-parse.</p>
         Instead of printing both the SHA-1 and the name, print only
         the name.  If given with --tags the usual tag prefix of
         "tags/" is also omitted from the name, matching the output
-        of <a href=":git-describe.html">:git-describe(1)</a> more closely.  This option
+        of <a href="git-describe.html">git-describe(1)</a> more closely.  This option
         cannot be combined with --stdin.
 </p>
 </dd>
@@ -364,7 +364,7 @@ not the context.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:40 UTC
+Last updated 07-Jan-2008 07:50:34 UTC
 </div>
 </div>
 </body>
diff --git a/git-name-rev.txt b/git-name-rev.txt
index 306e1a495..efcabdc27 100644
--- a/git-name-rev.txt
+++ b/git-name-rev.txt
@@ -38,7 +38,7 @@ OPTIONS
 	Instead of printing both the SHA-1 and the name, print only
 	the name.  If given with --tags the usual tag prefix of
 	"tags/" is also omitted from the name, matching the output
-	of gitlink::git-describe[1] more closely.  This option
+	of linkgit:git-describe[1] more closely.  This option
 	cannot be combined with --stdin.
 
 EXAMPLE
@@ -75,4 +75,4 @@ Documentation by Johannes Schindelin.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-pack-objects.html b/git-pack-objects.html
index f7d3334bb..b2f730954 100644
--- a/git-pack-objects.html
+++ b/git-pack-objects.html
@@ -563,7 +563,7 @@ base-name
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:40 UTC
+Last updated 07-Jan-2008 07:50:35 UTC
 </div>
 </div>
 </body>
diff --git a/git-pack-objects.txt b/git-pack-objects.txt
index 5237ab0c0..74cc7c1cb 100644
--- a/git-pack-objects.txt
+++ b/git-pack-objects.txt
@@ -58,7 +58,7 @@ base-name::
 --revs::
 	Read the revision arguments from the standard input, instead of
 	individual object names.  The revision arguments are processed
-	the same way as gitlink:git-rev-list[1] with `--objects` flag
+	the same way as linkgit:git-rev-list[1] with `--objects` flag
 	uses its `commit` arguments to build the list of objects it
 	outputs.  The objects on the resulting list are packed.
 
@@ -193,10 +193,10 @@ Documentation by Junio C Hamano
 
 See Also
 --------
-gitlink:git-rev-list[1]
-gitlink:git-repack[1]
-gitlink:git-prune-packed[1]
+linkgit:git-rev-list[1]
+linkgit:git-repack[1]
+linkgit:git-prune-packed[1]
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-pack-redundant.html b/git-pack-redundant.html
index 3cb7d5221..f60f36455 100644
--- a/git-pack-redundant.html
+++ b/git-pack-redundant.html
@@ -335,7 +335,7 @@ objects.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:40 UTC
+Last updated 07-Jan-2008 07:50:34 UTC
 </div>
 </div>
 </body>
diff --git a/git-pack-redundant.txt b/git-pack-redundant.txt
index f2ceebac4..af4aa4a2e 100644
--- a/git-pack-redundant.txt
+++ b/git-pack-redundant.txt
@@ -48,10 +48,10 @@ Documentation by Lukas Sandström <lukass@etek.chalmers.se>
 
 See Also
 --------
-gitlink:git-pack-objects[1]
-gitlink:git-repack[1]
-gitlink:git-prune-packed[1]
+linkgit:git-pack-objects[1]
+linkgit:git-repack[1]
+linkgit:git-prune-packed[1]
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-pack-refs.html b/git-pack-refs.html
index 6f325b23f..7b68535bb 100644
--- a/git-pack-refs.html
+++ b/git-pack-refs.html
@@ -336,7 +336,7 @@ hierarchy after packing them.  This option tells it not to.
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:40 UTC
+Last updated 07-Jan-2008 07:50:35 UTC
 </div>
 </div>
 </body>
diff --git a/git-pack-refs.txt b/git-pack-refs.txt
index a20fc7de4..e4ff93471 100644
--- a/git-pack-refs.txt
+++ b/git-pack-refs.txt
@@ -63,4 +63,4 @@ Written by Linus Torvalds <torvalds@osdl.org>
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-parse-remote.html b/git-parse-remote.html
index fcbe82adb..9f9857434 100644
--- a/git-parse-remote.html
+++ b/git-parse-remote.html
@@ -326,7 +326,7 @@ get_remote_refs_for_push
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:40 UTC
+Last updated 07-Jan-2008 07:50:35 UTC
 </div>
 </div>
 </body>
diff --git a/git-parse-remote.txt b/git-parse-remote.txt
index 11b1f4d2e..deb8b2f01 100644
--- a/git-parse-remote.txt
+++ b/git-parse-remote.txt
@@ -47,4 +47,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-patch-id.html b/git-patch-id.html
index 080497c60..9200c231c 100644
--- a/git-patch-id.html
+++ b/git-patch-id.html
@@ -314,7 +314,7 @@ This can be used to make a mapping from patch ID to commit ID.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:41 UTC
+Last updated 07-Jan-2008 07:50:36 UTC
 </div>
 </div>
 </body>
diff --git a/git-patch-id.txt b/git-patch-id.txt
index ad528a922..894852a78 100644
--- a/git-patch-id.txt
+++ b/git-patch-id.txt
@@ -39,4 +39,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-peek-remote.html b/git-peek-remote.html
index 669b971e6..ec101996f 100644
--- a/git-peek-remote.html
+++ b/git-peek-remote.html
@@ -332,7 +332,7 @@ git-peek-remote(1) Manual Page
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 18-Dec-2007 06:59:38 UTC
+Last updated 07-Jan-2008 07:50:36 UTC
 </div>
 </div>
 </body>
diff --git a/git-peek-remote.txt b/git-peek-remote.txt
index 09b005b10..000171007 100644
--- a/git-peek-remote.txt
+++ b/git-peek-remote.txt
@@ -47,4 +47,4 @@ Documentation by Junio C Hamano.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-prune-packed.html b/git-prune-packed.html
index c6a5084bf..61065e6a8 100644
--- a/git-prune-packed.html
+++ b/git-prune-packed.html
@@ -325,7 +325,7 @@ disk storage, etc.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:41 UTC
+Last updated 07-Jan-2008 07:50:36 UTC
 </div>
 </div>
 </body>
diff --git a/git-prune-packed.txt b/git-prune-packed.txt
index 9f85f3833..93ee82ae5 100644
--- a/git-prune-packed.txt
+++ b/git-prune-packed.txt
@@ -44,9 +44,9 @@ Documentation by Ryan Anderson <ryan@michonline.com>
 
 See Also
 --------
-gitlink:git-pack-objects[1]
-gitlink:git-repack[1]
+linkgit:git-pack-objects[1]
+linkgit:git-repack[1]
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-prune.html b/git-prune.html
index e4f66ba61..49b51b4c6 100644
--- a/git-prune.html
+++ b/git-prune.html
@@ -348,7 +348,7 @@ borrows from your repository via its
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 03-Dec-2007 09:57:29 UTC
+Last updated 07-Jan-2008 07:50:36 UTC
 </div>
 </div>
 </body>
diff --git a/git-prune.txt b/git-prune.txt
index 9835bdb87..f151cff5d 100644
--- a/git-prune.txt
+++ b/git-prune.txt
@@ -60,4 +60,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-pull.html b/git-pull.html
index 685e7d7f8..f7e08c187 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -966,7 +966,7 @@ Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 03-Dec-2007 09:57:29 UTC
+Last updated 07-Jan-2008 07:50:37 UTC
 </div>
 </div>
 </body>
diff --git a/git-pull.txt b/git-pull.txt
index d4d26afea..77fdaf146 100644
--- a/git-pull.txt
+++ b/git-pull.txt
@@ -38,7 +38,7 @@ include::merge-strategies.txt[]
 	*NOTE:* This is a potentially _dangerous_ mode of operation.
 	It rewrites history, which does not bode well when you
 	published that history already.  Do *not* use this option
-	unless you have read gitlink:git-rebase[1] carefully.
+	unless you have read linkgit:git-rebase[1] carefully.
 
 \--no-rebase::
 	Override earlier \--rebase.
@@ -106,7 +106,7 @@ git pull, git pull origin::
 	current branch.  Normally the branch merged in is
 	the HEAD of the remote repository, but the choice is
 	determined by the branch.<name>.remote and
-	branch.<name>.merge options; see gitlink:git-config[1]
+	branch.<name>.merge options; see linkgit:git-config[1]
 	for details.
 
 git pull origin next::
@@ -153,12 +153,12 @@ The final command then merges the newly fetched `tmp` into master.
 
 If you tried a pull which resulted in a complex conflicts and
 would want to start over, you can recover with
-gitlink:git-reset[1].
+linkgit:git-reset[1].
 
 
 SEE ALSO
 --------
-gitlink:git-fetch[1], gitlink:git-merge[1], gitlink:git-config[1]
+linkgit:git-fetch[1], linkgit:git-merge[1], linkgit:git-config[1]
 
 
 Author
@@ -174,4 +174,4 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-push.html b/git-push.html
index 6746b0757..a2f60173b 100644
--- a/git-push.html
+++ b/git-push.html
@@ -634,7 +634,7 @@ by Linus Torvalds &lt;torvalds@osdl.org&gt;</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 25-Nov-2007 04:55:50 UTC
+Last updated 07-Jan-2008 07:50:37 UTC
 </div>
 </div>
 </body>
diff --git a/git-push.txt b/git-push.txt
index b8003c63c..5f2494495 100644
--- a/git-push.txt
+++ b/git-push.txt
@@ -20,7 +20,7 @@ necessary to complete the given refs.
 
 You can make interesting things happen to a repository
 every time you push into it, by setting up 'hooks' there.  See
-documentation for gitlink:git-receive-pack[1].
+documentation for linkgit:git-receive-pack[1].
 
 
 OPTIONS
@@ -145,4 +145,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-quiltimport.html b/git-quiltimport.html
index c089aec77..1bddc1510 100644
--- a/git-quiltimport.html
+++ b/git-quiltimport.html
@@ -339,7 +339,7 @@ variable.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:42 UTC
+Last updated 07-Jan-2008 07:50:38 UTC
 </div>
 </div>
 </body>
diff --git a/git-quiltimport.txt b/git-quiltimport.txt
index 1c3ef4c59..0fc2b56c1 100644
--- a/git-quiltimport.txt
+++ b/git-quiltimport.txt
@@ -57,4 +57,4 @@ Documentation by Eric Biederman <ebiederm@lnxi.com>
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-read-tree.html b/git-read-tree.html
index 409c5b568..1b74cc7de 100644
--- a/git-read-tree.html
+++ b/git-read-tree.html
@@ -711,7 +711,7 @@ have finished your work-in-progress), attempt the merge again.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:43 UTC
+Last updated 07-Jan-2008 07:50:38 UTC
 </div>
 </div>
 </body>
diff --git a/git-read-tree.txt b/git-read-tree.txt
index 74c5478ba..8421d1fd7 100644
--- a/git-read-tree.txt
+++ b/git-read-tree.txt
@@ -15,7 +15,7 @@ DESCRIPTION
 -----------
 Reads the tree information given by <tree-ish> into the index,
 but does not actually *update* any of the files it "caches". (see:
-gitlink:git-checkout-index[1])
+linkgit:git-checkout-index[1])
 
 Optionally, it can merge a tree into the index, perform a
 fast-forward (i.e. 2-way) merge, or a 3-way merge, with the `-m`
@@ -347,8 +347,8 @@ have finished your work-in-progress), attempt the merge again.
 
 See Also
 --------
-gitlink:git-write-tree[1]; gitlink:git-ls-files[1];
-gitlink:gitignore[5]
+linkgit:git-write-tree[1]; linkgit:git-ls-files[1];
+linkgit:gitignore[5]
 
 
 Author
@@ -361,4 +361,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-rebase.html b/git-rebase.html
index 9ce2fcdaf..d0cc962e9 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -831,7 +831,7 @@ Johannes E. Schindelin &lt;johannes.schindelin@gmx.de&gt;</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:43 UTC
+Last updated 07-Jan-2008 07:50:39 UTC
 </div>
 </div>
 </body>
diff --git a/git-rebase.txt b/git-rebase.txt
index e4326d332..c11c6453e 100644
--- a/git-rebase.txt
+++ b/git-rebase.txt
@@ -235,7 +235,7 @@ OPTIONS
 
 --whitespace=<nowarn|warn|error|error-all|strip>::
 	This flag is passed to the `git-apply` program
-	(see gitlink:git-apply[1]) that applies the patch.
+	(see linkgit:git-apply[1]) that applies the patch.
 
 -i, \--interactive::
 	Make a list of the commits which are about to be rebased.  Let the
@@ -374,8 +374,8 @@ add other commits.  This can be used to split a commit into two:
   However, the working tree stays the same.
 
 - Now add the changes to the index that you want to have in the first
-  commit.  You can use gitlink:git-add[1] (possibly interactively) and/or
-  gitlink:git-gui[1] to do that.
+  commit.  You can use linkgit:git-add[1] (possibly interactively) and/or
+  linkgit:git-gui[1] to do that.
 
 - Commit the now-current index with whatever commit message is appropriate
   now.
@@ -386,7 +386,7 @@ add other commits.  This can be used to split a commit into two:
 
 If you are not absolutely sure that the intermediate revisions are
 consistent (they compile, pass the testsuite, etc.) you should use
-gitlink:git-stash[1] to stash away the not-yet-committed changes
+linkgit:git-stash[1] to stash away the not-yet-committed changes
 after each commit, test, and amend the commit if fixes are necessary.
 
 
@@ -401,4 +401,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-receive-pack.html b/git-receive-pack.html
index e5f89e6e4..5f645eb46 100644
--- a/git-receive-pack.html
+++ b/git-receive-pack.html
@@ -430,7 +430,7 @@ exec git-update-server-info</tt></pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:44 UTC
+Last updated 07-Jan-2008 07:50:39 UTC
 </div>
 </div>
 </body>
diff --git a/git-receive-pack.txt b/git-receive-pack.txt
index 2633d94c5..4111434bb 100644
--- a/git-receive-pack.txt
+++ b/git-receive-pack.txt
@@ -149,7 +149,7 @@ if the repository is packed and is served via a dumb transport.
 
 SEE ALSO
 --------
-gitlink:git-send-pack[1]
+linkgit:git-send-pack[1]
 
 
 Author
@@ -162,4 +162,4 @@ Documentation by Junio C Hamano.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-reflog.html b/git-reflog.html
index 6b5fc99c4..5564b5ba4 100644
--- a/git-reflog.html
+++ b/git-reflog.html
@@ -375,7 +375,7 @@ them.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 21-Nov-2007 08:54:17 UTC
+Last updated 07-Jan-2008 07:50:40 UTC
 </div>
 </div>
 </body>
diff --git a/git-reflog.txt b/git-reflog.txt
index 25003c386..f9bba36c2 100644
--- a/git-reflog.txt
+++ b/git-reflog.txt
@@ -28,19 +28,19 @@ The subcommand "expire" is used to prune older reflog entries.
 Entries older than `expire` time, or entries older than
 `expire-unreachable` time and are not reachable from the current
 tip, are removed from the reflog.  This is typically not used
-directly by the end users -- instead, see gitlink:git-gc[1].
+directly by the end users -- instead, see linkgit:git-gc[1].
 
 The subcommand "show" (which is also the default, in the absence of any
 subcommands) will take all the normal log options, and show the log of
 the reference provided in the command-line (or `HEAD`, by default).
 The reflog will cover all recent actions (HEAD reflog records branch switching
 as well).  It is an alias for 'git log -g --abbrev-commit --pretty=oneline';
-see gitlink:git-log[1].
+see linkgit:git-log[1].
 
 The reflog is useful in various git commands, to specify the old value
 of a reference. For example, `HEAD@\{2\}` means "where HEAD used to be
 two moves ago", `master@\{one.week.ago\}` means "where master used to
-point to one week ago", and so on. See gitlink:git-rev-parse[1] for
+point to one week ago", and so on. See linkgit:git-rev-parse[1] for
 more details.
 
 
@@ -88,4 +88,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-relink.html b/git-relink.html
index f1fc86dfb..11673d125 100644
--- a/git-relink.html
+++ b/git-relink.html
@@ -315,7 +315,7 @@ if they are hardlinked, and replace one with a hardlink to the other if not.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:44 UTC
+Last updated 07-Jan-2008 07:50:41 UTC
 </div>
 </div>
 </body>
diff --git a/git-relink.txt b/git-relink.txt
index fe631bb3d..ccbda9fba 100644
--- a/git-relink.txt
+++ b/git-relink.txt
@@ -33,4 +33,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-remote.html b/git-remote.html
index f41e90cea..f03fc6f31 100644
--- a/git-remote.html
+++ b/git-remote.html
@@ -428,7 +428,7 @@ $ git merge origin</tt></pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 20-Nov-2007 04:52:56 UTC
+Last updated 07-Jan-2008 07:50:41 UTC
 </div>
 </div>
 </body>
diff --git a/git-remote.txt b/git-remote.txt
index 4b263c249..10f6fa58b 100644
--- a/git-remote.txt
+++ b/git-remote.txt
@@ -81,7 +81,7 @@ remotes.<group>.  If a named group is not specified on the command line,
 the configuration parameter remotes.default will get used; if
 remotes.default is not defined, all remotes which do not have the
 configuration parameter remote.<name>.skipDefaultUpdate set to true will
-be updated.  (See gitlink:git-config[1]).
+be updated.  (See linkgit:git-config[1]).
 
 
 DISCUSSION
@@ -89,7 +89,7 @@ DISCUSSION
 
 The remote configuration is achieved using the `remote.origin.url` and
 `remote.origin.fetch` configuration variables.  (See
-gitlink:git-config[1]).
+linkgit:git-config[1]).
 
 Examples
 --------
@@ -128,9 +128,9 @@ $ git merge origin
 
 See Also
 --------
-gitlink:git-fetch[1]
-gitlink:git-branch[1]
-gitlink:git-config[1]
+linkgit:git-fetch[1]
+linkgit:git-branch[1]
+linkgit:git-config[1]
 
 Author
 ------
@@ -144,4 +144,4 @@ Documentation by J. Bruce Fields and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-repack.html b/git-repack.html
index a2729a219..7280681ff 100644
--- a/git-repack.html
+++ b/git-repack.html
@@ -423,7 +423,7 @@ that way can try to use older git with it).</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:45 UTC
+Last updated 07-Jan-2008 07:50:41 UTC
 </div>
 </div>
 </body>
diff --git a/git-repack.txt b/git-repack.txt
index 12e2079a7..3d957492f 100644
--- a/git-repack.txt
+++ b/git-repack.txt
@@ -40,19 +40,19 @@ OPTIONS
 -d::
 	After packing, if the newly created packs make some
 	existing packs redundant, remove the redundant packs.
-	Also runs gitlink:git-prune-packed[1].
+	Also runs linkgit:git-prune-packed[1].
 
 -l::
         Pass the `--local` option to `git pack-objects`, see
-        gitlink:git-pack-objects[1].
+	linkgit:git-pack-objects[1].
 
 -f::
         Pass the `--no-reuse-delta` option to `git pack-objects`, see
-        gitlink:git-pack-objects[1].
+	linkgit:git-pack-objects[1].
 
 -q::
         Pass the `-q` option to `git pack-objects`, see
-        gitlink:git-pack-objects[1].
+	linkgit:git-pack-objects[1].
 
 -n::
         Do not update the server information with
@@ -109,9 +109,9 @@ Documentation by Ryan Anderson <ryan@michonline.com>
 
 See Also
 --------
-gitlink:git-pack-objects[1]
-gitlink:git-prune-packed[1]
+linkgit:git-pack-objects[1]
+linkgit:git-prune-packed[1]
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-repo-config.html b/git-repo-config.html
index 80d9751b2..29255ede8 100644
--- a/git-repo-config.html
+++ b/git-repo-config.html
@@ -281,7 +281,7 @@ documentation of that command.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:45 UTC
+Last updated 07-Jan-2008 07:50:42 UTC
 </div>
 </div>
 </body>
diff --git a/git-repo-config.txt b/git-repo-config.txt
index 2deba3176..2ca39946b 100644
--- a/git-repo-config.txt
+++ b/git-repo-config.txt
@@ -14,5 +14,5 @@ SYNOPSIS
 DESCRIPTION
 -----------
 
-This is a synonym for gitlink:git-config[1].  Please refer to the
+This is a synonym for linkgit:git-config[1].  Please refer to the
 documentation of that command.
diff --git a/git-request-pull.html b/git-request-pull.html
index 6334f995c..f6b71a970 100644
--- a/git-request-pull.html
+++ b/git-request-pull.html
@@ -322,7 +322,7 @@ the given URL in the generated summary.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:45 UTC
+Last updated 07-Jan-2008 07:50:42 UTC
 </div>
 </div>
 </body>
diff --git a/git-request-pull.txt b/git-request-pull.txt
index 087eeb7cc..270df9b18 100644
--- a/git-request-pull.txt
+++ b/git-request-pull.txt
@@ -36,4 +36,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-rerere.html b/git-rerere.html
index 08efed8f8..80f498aa8 100644
--- a/git-rerere.html
+++ b/git-rerere.html
@@ -472,7 +472,7 @@ conflict.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 05-Dec-2007 10:59:13 UTC
+Last updated 07-Jan-2008 07:50:42 UTC
 </div>
 </div>
 </body>
diff --git a/git-rerere.txt b/git-rerere.txt
index 8ce492c8f..3793267da 100644
--- a/git-rerere.txt
+++ b/git-rerere.txt
@@ -33,7 +33,7 @@ its working state.
 'clear'::
 
 This resets the metadata used by rerere if a merge resolution is to be
-is aborted.  Calling gitlink:git-am[1] --skip or gitlink:git-rebase[1]
+is aborted.  Calling linkgit:git-am[1] --skip or linkgit:git-rebase[1]
 [--skip|--abort] will automatically invoke this command.
 
 'diff'::
@@ -204,4 +204,4 @@ Written by Junio C Hamano <junkio@cox.net>
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-reset.html b/git-reset.html
index 3be0caf00..41a8ce6b0 100644
--- a/git-reset.html
+++ b/git-reset.html
@@ -575,7 +575,7 @@ At this point the index file still has all the WIP changes you
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 05-Jan-2008 10:31:57 UTC
+Last updated 07-Jan-2008 07:50:43 UTC
 </div>
 </div>
 </body>
diff --git a/git-reset.txt b/git-reset.txt
index 69722d14d..a4e0a779d 100644
--- a/git-reset.txt
+++ b/git-reset.txt
@@ -21,7 +21,7 @@ commit (or set of commits) and want to redo that part without showing
 the undo in the history.
 
 If you want to undo a commit other than the latest on a branch,
-gitlink:git-revert[1] is your friend.
+linkgit:git-revert[1] is your friend.
 
 The second form with 'paths' is used to revert selected paths in
 the index from a given commit, without moving HEAD.
@@ -37,7 +37,7 @@ OPTIONS
 --soft::
 	Does not touch the index file nor the working tree at all, but
 	requires them to be in a good order. This leaves all your changed
-	files "Added but not yet committed", as gitlink:git-status[1] would
+	files "Added but not yet committed", as linkgit:git-status[1] would
 	put it.
 
 --hard::
@@ -71,7 +71,7 @@ message, or both.  Leaves working tree as it was before "reset".
 commit by starting with its log message.  If you do not need to
 edit the message further, you can give -C option instead.
 +
-See also the --amend option to gitlink:git-commit[1].
+See also the --amend option to linkgit:git-commit[1].
 
 Undo commits permanently::
 +
@@ -186,4 +186,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-rev-list.html b/git-rev-list.html
index 5bda7fbbd..aba16b190 100644
--- a/git-rev-list.html
+++ b/git-rev-list.html
@@ -1190,7 +1190,7 @@ and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 27-Dec-2007 03:28:37 UTC
+Last updated 07-Jan-2008 07:50:44 UTC
 </div>
 </div>
 </body>
diff --git a/git-rev-list.txt b/git-rev-list.txt
index 438dae02e..db42cd8a9 100644
--- a/git-rev-list.txt
+++ b/git-rev-list.txt
@@ -79,11 +79,11 @@ between the two operands.  The following two commands are equivalent:
 	$ git-rev-list A...B
 -----------------------------------------------------------------------
 
-gitlink:git-rev-list[1] is a very essential git program, since it
+linkgit:git-rev-list[1] is a very essential git program, since it
 provides the ability to build and traverse commit ancestry graphs. For
 this reason, it has a lot of different options that enables it to be
-used by commands as different as gitlink:git-bisect[1] and
-gitlink:git-repack[1].
+used by commands as different as linkgit:git-bisect[1] and
+linkgit:git-repack[1].
 
 OPTIONS
 -------
@@ -91,9 +91,9 @@ OPTIONS
 Commit Formatting
 ~~~~~~~~~~~~~~~~~
 
-Using these options, gitlink:git-rev-list[1] will act similar to the
-more specialized family of commit log tools: gitlink:git-log[1],
-gitlink:git-show[1], and gitlink:git-whatchanged[1]
+Using these options, linkgit:git-rev-list[1] will act similar to the
+more specialized family of commit log tools: linkgit:git-log[1],
+linkgit:git-show[1], and linkgit:git-whatchanged[1]
 
 include::pretty-options.txt[]
 
@@ -167,8 +167,8 @@ Diff Formatting
 ~~~~~~~~~~~~~~~
 
 Below are listed options that control the formatting of diff output.
-Some of them are specific to gitlink:git-rev-list[1], however other diff
-options may be given. See gitlink:git-diff-files[1] for more options.
+Some of them are specific to linkgit:git-rev-list[1], however other diff
+options may be given. See linkgit:git-diff-files[1] for more options.
 
 -c::
 
@@ -428,7 +428,7 @@ These options are mostly targeted for packing of git repositories.
 
 	Similar to '--objects', but also print the IDs of excluded
 	commits prefixed with a "-" character.  This is used by
-	gitlink:git-pack-objects[1] to build "thin" pack, which records
+	linkgit:git-pack-objects[1] to build "thin" pack, which records
 	objects in deltified form based on objects contained in these
 	excluded commits to reduce network traffic.
 
@@ -460,4 +460,4 @@ and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-rev-parse.html b/git-rev-parse.html
index f5087c902..67594b99f 100644
--- a/git-rev-parse.html
+++ b/git-rev-parse.html
@@ -389,6 +389,19 @@ distinguish between them.</p>
 </p>
 </dd>
 <dt>
+--symbolic-full-name
+</dt>
+<dd>
+<p>
+        This is similar to --symbolic, but it omits input that
+        are not refs (i.e. branch or tag names; or more
+        explicitly disambiguating "heads/master" form, when you
+        want to name the "master" branch when there is an
+        unfortunately named tag "master"), and show them as full
+        refnames (e.g. "refs/heads/master").
+</p>
+</dd>
+<dt>
 --all
 </dt>
 <dd>
@@ -821,7 +834,7 @@ Junio C Hamano &lt;junkio@cox.net&gt; and Pierre Habouzit &lt;madcoder@debian.or
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 19-Nov-2007 05:02:45 UTC
+Last updated 07-Jan-2008 07:50:44 UTC
 </div>
 </div>
 </body>
diff --git a/git-rev-parse.txt b/git-rev-parse.txt
index 329fce0aa..5d9c36985 100644
--- a/git-rev-parse.txt
+++ b/git-rev-parse.txt
@@ -70,6 +70,13 @@ OPTIONS
 	possible '{caret}' prefix); this option makes them output in a
 	form as close to the original input as possible.
 
+--symbolic-full-name::
+	This is similar to \--symbolic, but it omits input that
+	are not refs (i.e. branch or tag names; or more
+	explicitly disambiguating "heads/master" form, when you
+	want to name the "master" branch when there is an
+	unfortunately named tag "master"), and show them as full
+	refnames (e.g. "refs/heads/master").
 
 --all::
 	Show all refs found in `$GIT_DIR/refs`.
@@ -371,4 +378,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-revert.html b/git-revert.html
index a6a4bcfcc..adc071d32 100644
--- a/git-revert.html
+++ b/git-revert.html
@@ -357,7 +357,7 @@ effect to your working tree in a row.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:46 UTC
+Last updated 07-Jan-2008 07:50:43 UTC
 </div>
 </div>
 </body>
diff --git a/git-revert.txt b/git-revert.txt
index 3457c4078..494fc7f84 100644
--- a/git-revert.txt
+++ b/git-revert.txt
@@ -20,7 +20,7 @@ OPTIONS
 <commit>::
 	Commit to revert.
 	For a more complete list of ways to spell commit names, see
-	"SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1].
+	"SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
 
 -e|--edit::
 	With this option, `git-revert` will let you edit the commit
@@ -62,4 +62,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-rm.html b/git-rm.html
index e4e3e885b..aaff2a603 100644
--- a/git-rm.html
+++ b/git-rm.html
@@ -415,7 +415,7 @@ git-rm -f git-*.sh
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:47 UTC
+Last updated 07-Jan-2008 07:50:46 UTC
 </div>
 </div>
 </body>
diff --git a/git-rm.txt b/git-rm.txt
index 48c1d97f9..dc36c662a 100644
--- a/git-rm.txt
+++ b/git-rm.txt
@@ -83,7 +83,7 @@ git-rm -f git-*.sh::
 
 See Also
 --------
-gitlink:git-add[1]
+linkgit:git-add[1]
 
 Author
 ------
@@ -95,4 +95,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-send-email.html b/git-send-email.html
index 3523fbd8f..6803e9be9 100644
--- a/git-send-email.html
+++ b/git-send-email.html
@@ -616,7 +616,7 @@ send_lots_of_email.pl by Greg Kroah-Hartman.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 19-Dec-2007 07:33:02 UTC
+Last updated 07-Jan-2008 07:50:46 UTC
 </div>
 </div>
 </body>
diff --git a/git-send-email.txt b/git-send-email.txt
index f0bd2851d..4b8ec8a20 100644
--- a/git-send-email.txt
+++ b/git-send-email.txt
@@ -196,4 +196,4 @@ Documentation by Ryan Anderson
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-send-pack.html b/git-send-pack.html
index 2cdff5a0e..42d073107 100644
--- a/git-send-pack.html
+++ b/git-send-pack.html
@@ -453,7 +453,7 @@ to disable the fast-forward check only on that ref.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 05-Dec-2007 10:59:14 UTC
+Last updated 07-Jan-2008 07:50:47 UTC
 </div>
 </div>
 </body>
diff --git a/git-send-pack.txt b/git-send-pack.txt
index a2d9cb61b..777515b12 100644
--- a/git-send-pack.txt
+++ b/git-send-pack.txt
@@ -12,7 +12,7 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
-Usually you would want to use gitlink:git-push[1] which is a
+Usually you would want to use linkgit:git-push[1] which is a
 higher level wrapper of this command instead.
 
 Invokes 'git-receive-pack' on a possibly remote repository, and
@@ -86,7 +86,7 @@ and the destination side (after the colon).  The ref to be
 pushed is determined by finding a match that matches the source
 side, and where it is pushed is determined by using the
 destination side. The rules used to match a ref are the same
-rules used by gitlink:git-rev-parse[1] to resolve a symbolic ref
+rules used by linkgit:git-rev-parse[1] to resolve a symbolic ref
 name.
 
  - It is an error if <src> does not match exactly one of the
@@ -125,4 +125,4 @@ Documentation by Junio C Hamano.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-sh-setup.html b/git-sh-setup.html
index d376239aa..2a1517c78 100644
--- a/git-sh-setup.html
+++ b/git-sh-setup.html
@@ -383,7 +383,7 @@ get_author_ident_from_commit
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 31-Dec-2007 09:44:03 UTC
+Last updated 07-Jan-2008 07:50:50 UTC
 </div>
 </div>
 </body>
diff --git a/git-sh-setup.txt b/git-sh-setup.txt
index 505b4c98e..16b8b7514 100644
--- a/git-sh-setup.txt
+++ b/git-sh-setup.txt
@@ -77,4 +77,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-shell.html b/git-shell.html
index afe2342c1..4450c934b 100644
--- a/git-shell.html
+++ b/git-shell.html
@@ -298,7 +298,7 @@ are permitted to be called, with a single required argument.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:48 UTC
+Last updated 07-Jan-2008 07:50:47 UTC
 </div>
 </div>
 </body>
diff --git a/git-shell.txt b/git-shell.txt
index 48f2d57b7..bc031e0cc 100644
--- a/git-shell.txt
+++ b/git-shell.txt
@@ -31,4 +31,4 @@ Documentation by Petr Baudis and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-shortlog.html b/git-shortlog.html
index 96cd49eab..8c5f1b886 100644
--- a/git-shortlog.html
+++ b/git-shortlog.html
@@ -348,7 +348,7 @@ Eve Jones &lt;eve@laptop.(none)&gt;</tt></pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 24-Dec-2007 19:31:23 UTC
+Last updated 07-Jan-2008 07:50:47 UTC
 </div>
 </div>
 </body>
diff --git a/git-shortlog.txt b/git-shortlog.txt
index 36510a845..c7752575d 100644
--- a/git-shortlog.txt
+++ b/git-shortlog.txt
@@ -59,4 +59,4 @@ Documentation by Junio C Hamano.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-show-branch.html b/git-show-branch.html
index cd7b9f06e..f65f89f24 100644
--- a/git-show-branch.html
+++ b/git-show-branch.html
@@ -521,7 +521,7 @@ topologically related with each other.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:49 UTC
+Last updated 07-Jan-2008 07:50:47 UTC
 </div>
 </div>
 </body>
diff --git a/git-show-branch.txt b/git-show-branch.txt
index ba5313d51..0bb8250b2 100644
--- a/git-show-branch.txt
+++ b/git-show-branch.txt
@@ -190,4 +190,4 @@ Documentation by Junio C Hamano.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-show-index.html b/git-show-index.html
index 766a3b440..ff0c11584 100644
--- a/git-show-index.html
+++ b/git-show-index.html
@@ -296,7 +296,7 @@ offset and SHA1 of each object.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:49 UTC
+Last updated 07-Jan-2008 07:50:48 UTC
 </div>
 </div>
 </body>
diff --git a/git-show-index.txt b/git-show-index.txt
index 764d99356..535a88464 100644
--- a/git-show-index.txt
+++ b/git-show-index.txt
@@ -31,4 +31,4 @@ Documentation by Junio C Hamano
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-show-ref.html b/git-show-ref.html
index 6100f6ce7..900a49371 100644
--- a/git-show-ref.html
+++ b/git-show-ref.html
@@ -460,7 +460,7 @@ Man page by Jonas Fonseca &lt;fonseca@diku.dk&gt;.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 18-Dec-2007 06:59:38 UTC
+Last updated 07-Jan-2008 07:50:49 UTC
 </div>
 </div>
 </body>
diff --git a/git-show-ref.txt b/git-show-ref.txt
index 7893a5088..ce0e643fb 100644
--- a/git-show-ref.txt
+++ b/git-show-ref.txt
@@ -130,7 +130,7 @@ When using the '--verify' flag, the command requires an exact path:
 
 will only match the exact branch called "master".
 
-If nothing matches, gitlink:git-show-ref[1] will return an error code of 1,
+If nothing matches, linkgit:git-show-ref[1] will return an error code of 1,
 and in the case of verification, it will show an error message.
 
 For scripting, you can ask it to be quiet with the "--quiet" flag, which
@@ -160,7 +160,7 @@ to get a listing of all tags together with what they dereference.
 
 SEE ALSO
 --------
-gitlink:git-ls-remote[1]
+linkgit:git-ls-remote[1]
 
 AUTHORS
 -------
@@ -169,4 +169,4 @@ Man page by Jonas Fonseca <fonseca@diku.dk>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-show.html b/git-show.html
index 0c1afc56f..f2a1a2fba 100644
--- a/git-show.html
+++ b/git-show.html
@@ -762,7 +762,7 @@ Johannes Schindelin &lt;Johannes.Schindelin@gmx.de&gt;.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 05-Jan-2008 10:31:58 UTC
+Last updated 07-Jan-2008 07:50:48 UTC
 </div>
 </div>
 </body>
diff --git a/git-show.txt b/git-show.txt
index a42e12115..dccf0e20e 100644
--- a/git-show.txt
+++ b/git-show.txt
@@ -20,12 +20,12 @@ presents the merge commit in a special format as produced by
 
 For tags, it shows the tag message and the referenced objects.
 
-For trees, it shows the names (equivalent to gitlink:git-ls-tree[1]
+For trees, it shows the names (equivalent to linkgit:git-ls-tree[1]
 with \--name-only).
 
 For plain blobs, it shows the plain contents.
 
-The command takes options applicable to the gitlink:git-diff-tree[1] command to
+The command takes options applicable to the linkgit:git-diff-tree[1] command to
 control how the changes the commit introduces are shown.
 
 This manual page describes only the most frequently used options.
@@ -36,7 +36,7 @@ OPTIONS
 <object>::
 	The name of the object to show.
 	For a more complete list of ways to spell object names, see
-	"SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1].
+	"SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
 
 include::pretty-options.txt[]
 
@@ -83,4 +83,4 @@ This manual page is a stub. You can help the git documentation by expanding it.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-stash.html b/git-stash.html
index 38a6a9ef3..faf400bb3 100644
--- a/git-stash.html
+++ b/git-stash.html
@@ -460,7 +460,7 @@ $ git stash apply
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:51 UTC
+Last updated 07-Jan-2008 07:50:50 UTC
 </div>
 </div>
 </body>
diff --git a/git-stash.txt b/git-stash.txt
index c0147b99a..9889806a5 100644
--- a/git-stash.txt
+++ b/git-stash.txt
@@ -156,10 +156,10 @@ $ git stash apply
 
 SEE ALSO
 --------
-gitlink:git-checkout[1],
-gitlink:git-commit[1],
-gitlink:git-reflog[1],
-gitlink:git-reset[1]
+linkgit:git-checkout[1],
+linkgit:git-commit[1],
+linkgit:git-reflog[1],
+linkgit:git-reset[1]
 
 AUTHOR
 ------
@@ -167,4 +167,4 @@ Written by Nanako Shiraishi <nanako3@bluebottle.com>
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-status.html b/git-status.html
index 691fdc994..108063614 100644
--- a/git-status.html
+++ b/git-status.html
@@ -328,7 +328,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 10-Dec-2007 10:07:20 UTC
+Last updated 07-Jan-2008 07:50:51 UTC
 </div>
 </div>
 </body>
diff --git a/git-status.txt b/git-status.txt
index 5c5a480ec..3ea269aa7 100644
--- a/git-status.txt
+++ b/git-status.txt
@@ -15,7 +15,7 @@ DESCRIPTION
 Displays paths that have differences between the index file and the
 current HEAD commit, paths that have differences between the working
 tree and the index file, and paths in the working tree that are not
-tracked by git (and are not ignored by gitlink:gitignore[5]). The first
+tracked by git (and are not ignored by linkgit:gitignore[5]). The first
 are what you _would_ commit by running `git commit`; the second and
 third are what you _could_ commit by running `git add` before running
 `git commit`.
@@ -54,7 +54,7 @@ directory.
 
 See Also
 --------
-gitlink:gitignore[5]
+linkgit:gitignore[5]
 
 Author
 ------
@@ -67,4 +67,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-stripspace.html b/git-stripspace.html
index 7d61683ec..a177b738c 100644
--- a/git-stripspace.html
+++ b/git-stripspace.html
@@ -313,7 +313,7 @@ git-stripspace(1) Manual Page
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:53 UTC
+Last updated 07-Jan-2008 07:50:51 UTC
 </div>
 </div>
 </body>
diff --git a/git-stripspace.txt b/git-stripspace.txt
index f80526ba7..fc5687502 100644
--- a/git-stripspace.txt
+++ b/git-stripspace.txt
@@ -32,4 +32,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-submodule.html b/git-submodule.html
index df1b5f42f..e8efc9ce2 100644
--- a/git-submodule.html
+++ b/git-submodule.html
@@ -389,7 +389,7 @@ for details.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 31-Dec-2007 09:44:03 UTC
+Last updated 07-Jan-2008 07:50:51 UTC
 </div>
 </div>
 </body>
diff --git a/git-submodule.txt b/git-submodule.txt
index 7d9a9fe5c..cffc6d48f 100644
--- a/git-submodule.txt
+++ b/git-submodule.txt
@@ -28,7 +28,7 @@ add::
 status::
 	Show the status of the submodules. This will print the SHA-1 of the
 	currently checked out commit for each submodule, along with the
-	submodule path and the output of gitlink:git-describe[1] for the
+	submodule path and the output of linkgit:git-describe[1] for the
 	SHA-1. Each SHA-1 will be prefixed with `-` if the submodule is not
 	initialized and `+` if the currently checked out submodule commit
 	does not match the SHA-1 found in the index of the containing
@@ -68,7 +68,7 @@ FILES
 When initializing submodules, a .gitmodules file in the top-level directory
 of the containing repository is used to find the url of each submodule.
 This file should be formatted in the same way as `$GIT_DIR/config`. The key
-to each submodule url is "submodule.$name.url".  See gitlink:gitmodules[5]
+to each submodule url is "submodule.$name.url".  See linkgit:gitmodules[5]
 for details.
 
 
@@ -78,4 +78,4 @@ Written by Lars Hjemli <hjemli@gmail.com>
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-svn.html b/git-svn.html
index 77b7b51a0..cf054d7d2 100644
--- a/git-svn.html
+++ b/git-svn.html
@@ -1071,7 +1071,7 @@ should be manually entered with a text-editor or using
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 23-Nov-2007 08:43:06 UTC
+Last updated 07-Jan-2008 07:50:52 UTC
 </div>
 </div>
 </body>
diff --git a/git-svn.txt b/git-svn.txt
index 918a9928b..e1a1d46a9 100644
--- a/git-svn.txt
+++ b/git-svn.txt
@@ -12,7 +12,7 @@ SYNOPSIS
 DESCRIPTION
 -----------
 git-svn is a simple conduit for changesets between Subversion and git.
-It is not to be confused with gitlink:git-svnimport[1], which is
+It is not to be confused with linkgit:git-svnimport[1], which is
 read-only.
 
 git-svn was originally designed for an individual developer who wants a
@@ -208,7 +208,7 @@ OPTIONS
 --shared[={false|true|umask|group|all|world|everybody}]::
 --template=<template_directory>::
 	Only used with the 'init' command.
-	These are passed directly to gitlink:git-init[1].
+	These are passed directly to linkgit:git-init[1].
 
 -r <ARG>::
 --revision <ARG>::
@@ -261,7 +261,7 @@ config key: svn.edit
 Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands.
 
 They are both passed directly to git-diff-tree see
-gitlink:git-diff-tree[1] for more information.
+linkgit:git-diff-tree[1] for more information.
 
 [verse]
 config key: svn.l
@@ -299,7 +299,7 @@ with many revisions.
 to fetch before repacking.  This defaults to repacking every
 1000 commits fetched if no argument is specified.
 
---repack-flags are passed directly to gitlink:git-repack[1].
+--repack-flags are passed directly to linkgit:git-repack[1].
 
 [verse]
 config key: svn.repack
@@ -561,11 +561,11 @@ however the remote wildcard may be anywhere as long as it's own
 independent path component (surrounded by '/' or EOL).   This
 type of configuration is not automatically created by 'init' and
 should be manually entered with a text-editor or using
-gitlink:git-config[1]
+linkgit:git-config[1]
 
 SEE ALSO
 --------
-gitlink:git-rebase[1]
+linkgit:git-rebase[1]
 
 Author
 ------
diff --git a/git-symbolic-ref.html b/git-symbolic-ref.html
index fdd842dce..d9d1ebb33 100644
--- a/git-symbolic-ref.html
+++ b/git-symbolic-ref.html
@@ -336,7 +336,7 @@ name is not a symbolic ref, or 128 if another error occurs.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:53 UTC
+Last updated 07-Jan-2008 07:50:52 UTC
 </div>
 </div>
 </body>
diff --git a/git-symbolic-ref.txt b/git-symbolic-ref.txt
index 694cabab2..a5b40f3e8 100644
--- a/git-symbolic-ref.txt
+++ b/git-symbolic-ref.txt
@@ -58,4 +58,4 @@ Written by Junio C Hamano <junkio@cox.net>
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-tag.html b/git-tag.html
index 1b54a2142..573477415 100644
--- a/git-tag.html
+++ b/git-tag.html
@@ -546,7 +546,7 @@ Junio C Hamano &lt;junkio@cox.net&gt; and Chris Wright &lt;chrisw@osdl.org&gt;.<
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 02-Dec-2007 18:56:08 UTC
+Last updated 07-Jan-2008 07:50:53 UTC
 </div>
 </div>
 </body>
diff --git a/git-tag.txt b/git-tag.txt
index 784ec6d4c..b62a3d1c5 100644
--- a/git-tag.txt
+++ b/git-tag.txt
@@ -248,4 +248,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-tar-tree.html b/git-tar-tree.html
index ad00baf00..f84c748c0 100644
--- a/git-tar-tree.html
+++ b/git-tar-tree.html
@@ -399,7 +399,7 @@ git tar-tree HEAD:Documentation/ git-docs &gt; git-1.4.0-docs.tar
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:54 UTC
+Last updated 07-Jan-2008 07:50:54 UTC
 </div>
 </div>
 </body>
diff --git a/git-tar-tree.txt b/git-tar-tree.txt
index 434607bfb..65c68176e 100644
--- a/git-tar-tree.txt
+++ b/git-tar-tree.txt
@@ -86,4 +86,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-tools.html b/git-tools.html
index 044ad0212..025caecf1 100644
--- a/git-tools.html
+++ b/git-tools.html
@@ -438,7 +438,7 @@ comprehensive list.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:12:05 UTC
+Last updated 07-Jan-2008 07:51:14 UTC
 </div>
 </div>
 </body>
diff --git a/git-unpack-file.html b/git-unpack-file.html
index a9afa78db..801d67438 100644
--- a/git-unpack-file.html
+++ b/git-unpack-file.html
@@ -307,7 +307,7 @@ returns the name of the temporary file in the following format:
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:55 UTC
+Last updated 07-Jan-2008 07:50:54 UTC
 </div>
 </div>
 </body>
diff --git a/git-unpack-file.txt b/git-unpack-file.txt
index 20bb6a780..1864d13ed 100644
--- a/git-unpack-file.txt
+++ b/git-unpack-file.txt
@@ -32,4 +32,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-unpack-objects.html b/git-unpack-objects.html
index 9c20aa0d2..eee01c711 100644
--- a/git-unpack-objects.html
+++ b/git-unpack-objects.html
@@ -333,7 +333,7 @@ new packs and replace existing ones.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:55 UTC
+Last updated 07-Jan-2008 07:50:55 UTC
 </div>
 </div>
 </body>
diff --git a/git-unpack-objects.txt b/git-unpack-objects.txt
index d529a43f5..b79be3fd4 100644
--- a/git-unpack-objects.txt
+++ b/git-unpack-objects.txt
@@ -51,4 +51,4 @@ Documentation by Junio C Hamano
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-update-index.html b/git-update-index.html
index 205e200b1..2038b4900 100644
--- a/git-update-index.html
+++ b/git-update-index.html
@@ -721,7 +721,7 @@ from symbolic link to regular file.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:55 UTC
+Last updated 07-Jan-2008 07:50:55 UTC
 </div>
 </div>
 </body>
diff --git a/git-update-index.txt b/git-update-index.txt
index 0a1953803..66be18ef3 100644
--- a/git-update-index.txt
+++ b/git-update-index.txt
@@ -27,7 +27,7 @@ Modifies the index or directory cache. Each file mentioned is updated
 into the index and any 'unmerged' or 'needs updating' state is
 cleared.
 
-See also gitlink:git-add[1] for a more user-friendly way to do some of
+See also linkgit:git-add[1] for a more user-friendly way to do some of
 the most common operations on the index.
 
 The way "git-update-index" handles files it is told about can be modified
@@ -292,14 +292,14 @@ Configuration
 
 The command honors `core.filemode` configuration variable.  If
 your repository is on an filesystem whose executable bits are
-unreliable, this should be set to 'false' (see gitlink:git-config[1]).
+unreliable, this should be set to 'false' (see linkgit:git-config[1]).
 This causes the command to ignore differences in file modes recorded
 in the index and the file mode on the filesystem if they differ only on
 executable bit.   On such an unfortunate filesystem, you may
 need to use `git-update-index --chmod=`.
 
 Quite similarly, if `core.symlinks` configuration variable is set
-to 'false' (see gitlink:git-config[1]), symbolic links are checked out
+to 'false' (see linkgit:git-config[1]), symbolic links are checked out
 as plain files, and this command does not modify a recorded file mode
 from symbolic link to regular file.
 
@@ -309,8 +309,8 @@ The command looks at `core.ignorestat` configuration variable.  See
 
 See Also
 --------
-gitlink:git-config[1],
-gitlink:git-add[1]
+linkgit:git-config[1],
+linkgit:git-add[1]
 
 
 Author
@@ -323,4 +323,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-update-ref.html b/git-update-ref.html
index a0b558c4c..24fec5640 100644
--- a/git-update-ref.html
+++ b/git-update-ref.html
@@ -360,7 +360,7 @@ or does not have committer information available.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:55 UTC
+Last updated 07-Jan-2008 07:50:56 UTC
 </div>
 </div>
 </body>
diff --git a/git-update-ref.txt b/git-update-ref.txt
index f22261659..4dc475992 100644
--- a/git-update-ref.txt
+++ b/git-update-ref.txt
@@ -90,4 +90,4 @@ Written by Linus Torvalds <torvalds@osdl.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-update-server-info.html b/git-update-server-info.html
index 1f9658b46..a0fb9b0c4 100644
--- a/git-update-server-info.html
+++ b/git-update-server-info.html
@@ -332,7 +332,7 @@ info/refs file unless <tt>--force</tt> flag is given.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:56 UTC
+Last updated 07-Jan-2008 07:50:57 UTC
 </div>
 </div>
 </body>
diff --git a/git-update-server-info.txt b/git-update-server-info.txt
index e7e82a31e..1cf89fd79 100644
--- a/git-update-server-info.txt
+++ b/git-update-server-info.txt
@@ -54,4 +54,4 @@ Documentation by Junio C Hamano.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-upload-archive.html b/git-upload-archive.html
index a49ca1745..dec0371dd 100644
--- a/git-upload-archive.html
+++ b/git-upload-archive.html
@@ -309,7 +309,7 @@ is meant to be used to get an archive from a remote repository.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:56 UTC
+Last updated 07-Jan-2008 07:50:57 UTC
 </div>
 </div>
 </body>
diff --git a/git-upload-archive.txt b/git-upload-archive.txt
index 403871d7c..c1ef1440b 100644
--- a/git-upload-archive.txt
+++ b/git-upload-archive.txt
@@ -34,4 +34,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-upload-pack.html b/git-upload-pack.html
index 2353f8b21..57909731a 100644
--- a/git-upload-pack.html
+++ b/git-upload-pack.html
@@ -326,7 +326,7 @@ repository.  For push operations, see <em>git-send-pack</em>.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:56 UTC
+Last updated 07-Jan-2008 07:50:57 UTC
 </div>
 </div>
 </body>
diff --git a/git-upload-pack.txt b/git-upload-pack.txt
index fd6519299..2330d1381 100644
--- a/git-upload-pack.txt
+++ b/git-upload-pack.txt
@@ -43,4 +43,4 @@ Documentation by Junio C Hamano.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-var.html b/git-var.html
index 478086bfa..45f13fd38 100644
--- a/git-var.html
+++ b/git-var.html
@@ -372,7 +372,7 @@ Your sysadmin must hate you!
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:56 UTC
+Last updated 07-Jan-2008 07:50:57 UTC
 </div>
 </div>
 </body>
diff --git a/git-var.txt b/git-var.txt
index 813942368..298028390 100644
--- a/git-var.txt
+++ b/git-var.txt
@@ -47,9 +47,9 @@ Your sysadmin must hate you!::
 
 See Also
 --------
-gitlink:git-commit-tree[1]
-gitlink:git-tag[1]
-gitlink:git-config[1]
+linkgit:git-commit-tree[1]
+linkgit:git-tag[1]
+linkgit:git-config[1]
 
 Author
 ------
@@ -61,4 +61,4 @@ Documentation by Eric Biederman and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-verify-pack.html b/git-verify-pack.html
index fbec55638..5a792458b 100644
--- a/git-verify-pack.html
+++ b/git-verify-pack.html
@@ -338,7 +338,7 @@ corresponding pack file.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:56 UTC
+Last updated 07-Jan-2008 07:50:58 UTC
 </div>
 </div>
 </body>
diff --git a/git-verify-pack.txt b/git-verify-pack.txt
index f4c540f39..db019a2b8 100644
--- a/git-verify-pack.txt
+++ b/git-verify-pack.txt
@@ -50,4 +50,4 @@ Documentation by Junio C Hamano
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-verify-tag.html b/git-verify-tag.html
index ebb9a6955..9df190b8b 100644
--- a/git-verify-tag.html
+++ b/git-verify-tag.html
@@ -305,7 +305,7 @@ git-verify-tag(1) Manual Page
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:57 UTC
+Last updated 07-Jan-2008 07:50:58 UTC
 </div>
 </div>
 </body>
diff --git a/git-verify-tag.txt b/git-verify-tag.txt
index ac7fb1915..7e9c1ed15 100644
--- a/git-verify-tag.txt
+++ b/git-verify-tag.txt
@@ -28,4 +28,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-whatchanged.html b/git-whatchanged.html
index 9aad4b398..58e3ee6d0 100644
--- a/git-whatchanged.html
+++ b/git-whatchanged.html
@@ -384,7 +384,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:57 UTC
+Last updated 07-Jan-2008 07:50:58 UTC
 </div>
 </div>
 </body>
diff --git a/git-whatchanged.txt b/git-whatchanged.txt
index 607df48f0..54947b676 100644
--- a/git-whatchanged.txt
+++ b/git-whatchanged.txt
@@ -77,4 +77,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git-write-tree.html b/git-write-tree.html
index a85be4f38..6a5f5769f 100644
--- a/git-write-tree.html
+++ b/git-write-tree.html
@@ -323,7 +323,7 @@ now, you need to have done a <tt>git-update-index</tt> phase before you did the
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:57 UTC
+Last updated 07-Jan-2008 07:50:59 UTC
 </div>
 </div>
 </body>
diff --git a/git-write-tree.txt b/git-write-tree.txt
index cb8d6aade..461c813f5 100644
--- a/git-write-tree.txt
+++ b/git-write-tree.txt
@@ -46,4 +46,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/git.html b/git.html
index fd7588560..2a15b19cc 100644
--- a/git.html
+++ b/git.html
@@ -1938,7 +1938,7 @@ contributors on the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 19-Dec-2007 07:33:03 UTC
+Last updated 07-Jan-2008 07:51:01 UTC
 </div>
 </div>
 </body>
diff --git a/git.txt b/git.txt
index 37235b993..1828df209 100644
--- a/git.txt
+++ b/git.txt
@@ -28,7 +28,7 @@ link:user-manual.html[Git User's Manual] for a more in-depth
 introduction.
 
 The COMMAND is either a name of a Git command (see below) or an alias
-as defined in the configuration file (see gitlink:git-config[1]).
+as defined in the configuration file (see linkgit:git-config[1]).
 
 Formatted and hyperlinked version of the latest git
 documentation can be viewed at
@@ -106,7 +106,7 @@ OPTIONS
 	option will bring up the manual page for that command.
 +
 Other options are available to control how the manual page is
-displayed. See gitlink:git-help[1] for more information,
+displayed. See linkgit:git-help[1] for more information,
 because 'git --help ...' is converted internally into 'git
 help ...'.
 
@@ -198,8 +198,8 @@ Low-level commands (plumbing)
 Although git includes its
 own porcelain layer, its low-level commands are sufficient to support
 development of alternative porcelains.  Developers of such porcelains
-might start by reading about gitlink:git-update-index[1] and
-gitlink:git-read-tree[1].
+might start by reading about linkgit:git-update-index[1] and
+linkgit:git-read-tree[1].
 
 The interface (input, output, set of options and the semantics)
 to these low-level commands are meant to be a lot more stable
@@ -331,7 +331,7 @@ HEAD::
 	(i.e. the contents of `$GIT_DIR/refs/heads/<head>`).
 
 For a more complete list of ways to spell object names, see
-"SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1].
+"SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
 
 
 File/Directory Structure
@@ -399,7 +399,7 @@ git Commits
 'GIT_COMMITTER_EMAIL'::
 'GIT_COMMITTER_DATE'::
 'EMAIL'::
-	see gitlink:git-commit-tree[1]
+	see linkgit:git-commit-tree[1]
 
 git Diffs
 ~~~~~~~~~
@@ -439,7 +439,7 @@ other
 'GIT_MERGE_VERBOSITY'::
 	A number controlling the amount of output shown by
 	the recursive merge strategy.  Overrides merge.verbosity.
-	See gitlink:git-merge[1]
+	See linkgit:git-merge[1]
 
 'GIT_PAGER'::
 	This environment variable overrides `$PAGER`. If it is set
@@ -447,8 +447,8 @@ other
 	a pager.
 
 'GIT_SSH'::
-	If this environment variable is set then gitlink:git-fetch[1]
-	and gitlink:git-push[1] will use this command instead
+	If this environment variable is set then linkgit:git-fetch[1]
+	and linkgit:git-push[1] will use this command instead
 	of `ssh` when they need to connect to a remote system.
 	The 'GIT_SSH' command will be given exactly two arguments:
 	the 'username@host' (or just 'host') from the URL and the
@@ -554,4 +554,4 @@ contributors on the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/gitattributes.html b/gitattributes.html
index b53e571a7..57ba80387 100644
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -787,7 +787,7 @@ commit hash.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 23-Dec-2007 08:15:27 UTC
+Last updated 07-Jan-2008 07:50:59 UTC
 </div>
 </div>
 </body>
diff --git a/gitattributes.txt b/gitattributes.txt
index cc9c7c52c..35a29fd60 100644
--- a/gitattributes.txt
+++ b/gitattributes.txt
@@ -238,7 +238,7 @@ When git needs to show you a diff for the path with `diff`
 attribute set to `jcdiff`, it calls the command you specified
 with the above configuration, i.e. `j-c-diff`, with 7
 parameters, just like `GIT_EXTERNAL_DIFF` program is called.
-See gitlink:git[7] for details.
+See linkgit:git[7] for details.
 
 
 Defining a custom hunk-header
@@ -400,7 +400,7 @@ Checking whitespace errors
 
 The `core.whitespace` configuration variable allows you to define what
 `diff` and `apply` should consider whitespace errors for all paths in
-the project (See gitlink:git-config[1]).  This attribute gives you finer
+the project (See linkgit:git-config[1]).  This attribute gives you finer
 control per path.
 
 Set::
@@ -481,9 +481,9 @@ Creating an archive
 If the attribute `export-subst` is set for a file then git will expand
 several placeholders when adding this file to an archive.  The
 expansion depends on the availability of a commit ID, i.e. if
-gitlink:git-archive[1] has been given a tree instead of a commit or a
+linkgit:git-archive[1] has been given a tree instead of a commit or a
 tag then no replacement will be done.  The placeholders are the same
-as those for the option `--pretty=format:` of gitlink:git-log[1],
+as those for the option `--pretty=format:` of linkgit:git-log[1],
 except that they need to be wrapped like this: `$Format:PLACEHOLDERS$`
 in the file.  E.g. the string `$Format:%H$` will be replaced by the
 commit hash.
@@ -491,4 +491,4 @@ commit hash.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/gitcli.html b/gitcli.html
index 0a6bad1c1..fc221691f 100644
--- a/gitcli.html
+++ b/gitcli.html
@@ -388,7 +388,7 @@ $ git describe --abbrev 10 HEAD  # NOT WHAT YOU MEANT</tt></pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 23-Dec-2007 08:15:28 UTC
+Last updated 07-Jan-2008 07:51:00 UTC
 </div>
 </div>
 </body>
diff --git a/gitcli.txt b/gitcli.txt
index b7dcf9ca1..a4703cd7c 100644
--- a/gitcli.txt
+++ b/gitcli.txt
@@ -110,4 +110,4 @@ Documentation by Pierre Habouzit.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/gitignore.html b/gitignore.html
index 88a646fa7..199f8c66a 100644
--- a/gitignore.html
+++ b/gitignore.html
@@ -412,7 +412,7 @@ Frank Lichtenheld, and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:58 UTC
+Last updated 07-Jan-2008 07:51:00 UTC
 </div>
 </div>
 </body>
diff --git a/gitignore.txt b/gitignore.txt
index e8b8581f5..08373f52b 100644
--- a/gitignore.txt
+++ b/gitignore.txt
@@ -39,10 +39,10 @@ precedence, the last matching pattern decides the outcome):
    variable 'core.excludesfile'.
 
 The underlying git plumbing tools, such as
-gitlink:git-ls-files[1] and gitlink:git-read-tree[1], read
+linkgit:git-ls-files[1] and linkgit:git-read-tree[1], read
 `gitignore` patterns specified by command-line options, or from
 files specified by command-line options.  Higher-level git
-tools, such as gitlink:git-status[1] and gitlink:git-add[1],
+tools, such as linkgit:git-status[1] and linkgit:git-add[1],
 use patterns from the sources specified above.
 
 Patterns have the following format:
@@ -119,4 +119,4 @@ Frank Lichtenheld, and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/gitk.html b/gitk.html
index e495fb860..e3d0e3285 100644
--- a/gitk.html
+++ b/gitk.html
@@ -425,7 +425,7 @@ gitk --max-count=100 --all -- Makefile
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:57 UTC
+Last updated 07-Jan-2008 07:50:59 UTC
 </div>
 </div>
 </body>
diff --git a/gitk.txt b/gitk.txt
index 8dbfb0d5a..29edafced 100644
--- a/gitk.txt
+++ b/gitk.txt
@@ -22,7 +22,7 @@ git repository.
 OPTIONS
 -------
 To control which revisions to shown, the command takes options applicable to
-the gitlink:git-rev-list[1] command. This manual page describes only the most
+the linkgit:git-rev-list[1] command. This manual page describes only the most
 frequently used options.
 
 -n <number>, --max-count=<number>::
@@ -48,7 +48,7 @@ frequently used options.
 	the form "'<from>'..'<to>'" to show all revisions between '<from>' and
 	back to '<to>'. Note, more advanced revision selection can be applied.
 	For a more complete list of ways to spell object names, see
-	"SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1].
+	"SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
 
 <path>::
 
@@ -98,4 +98,4 @@ Documentation by Junio C Hamano, Jonas Fonseca, and the git-list
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/gitmodules.html b/gitmodules.html
index 594ae1e85..9dae35366 100644
--- a/gitmodules.html
+++ b/gitmodules.html
@@ -337,7 +337,7 @@ submodules an url is specified which can be used for cloning the submodules.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:58 UTC
+Last updated 07-Jan-2008 07:51:01 UTC
 </div>
 </div>
 </body>
diff --git a/gitmodules.txt b/gitmodules.txt
index 035294e20..cc95b69f2 100644
--- a/gitmodules.txt
+++ b/gitmodules.txt
@@ -15,7 +15,7 @@ DESCRIPTION
 
 The `.gitmodules` file, located in the top-level directory of a git
 working tree, is a text file with a syntax matching the requirements
-of gitlink:git-config[1].
+of linkgit:git-config[1].
 
 The file contains one subsection per submodule, and the subsection value
 is the name of the submodule. Each submodule section also contains the
@@ -51,7 +51,7 @@ submodules an url is specified which can be used for cloning the submodules.
 
 SEE ALSO
 --------
-gitlink:git-submodule[1] gitlink:git-config[1]
+linkgit:git-submodule[1] linkgit:git-config[1]
 
 DOCUMENTATION
 -------------
@@ -59,4 +59,4 @@ Documentation by Lars Hjemli <hjemli@gmail.com>
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
diff --git a/glossary.html b/glossary.html
index ba782a9b0..9bece8da0 100644
--- a/glossary.html
+++ b/glossary.html
@@ -1079,7 +1079,7 @@ This commit is referred to as a "merge commit", or sometimes just a
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 12-Dec-2007 21:33:10 UTC
+Last updated 07-Jan-2008 07:51:14 UTC
 </div>
 </div>
 </body>
diff --git a/glossary.txt b/glossary.txt
index 65f55e4ce..ab4caf4e2 100644
--- a/glossary.txt
+++ b/glossary.txt
@@ -140,7 +140,7 @@ to point at the new commit.
 	branch's <<def_head_ref,head ref>> from a remote
 	<<def_repository,repository>>, to find out which objects are
 	missing from the local <<def_object_database,object database>>,
-	and to get them, too.  See also gitlink:git-fetch[1].
+	and to get them, too.  See also linkgit:git-fetch[1].
 
 [[def_file_system]]file system::
 	Linus Torvalds originally designed git to be a user space file system,
@@ -164,7 +164,7 @@ to point at the new commit.
 	A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a
 	<<def_branch,branch>>.  Heads are stored in
 	`$GIT_DIR/refs/heads/`, except when using packed refs. (See
-	gitlink:git-pack-refs[1].)
+	linkgit:git-pack-refs[1].)
 
 [[def_HEAD]]HEAD::
 	The current <<def_branch,branch>>.  In more detail: Your <<def_working_tree,
@@ -282,7 +282,7 @@ This commit is referred to as a "merge commit", or sometimes just a
 	routines that help select changes that add or delete a given text
 	string. With the `--pickaxe-all` option, it can be used to view the full
 	<<def_changeset,changeset>> that introduced or removed, say, a
-	particular line of text. See gitlink:git-diff[1].
+	particular line of text. See linkgit:git-diff[1].
 
 [[def_plumbing]]plumbing::
 	Cute name for <<def_core_git,core git>>.
@@ -295,7 +295,7 @@ This commit is referred to as a "merge commit", or sometimes just a
 
 [[def_pull]]pull::
 	Pulling a <<def_branch,branch>> means to <<def_fetch,fetch>> it and
-	<<def_merge,merge>> it.  See also gitlink:git-pull[1].
+	<<def_merge,merge>> it.  See also linkgit:git-pull[1].
 
 [[def_push]]push::
 	Pushing a <<def_branch,branch>> means to get the branch's
@@ -333,7 +333,7 @@ This commit is referred to as a "merge commit", or sometimes just a
 	A reflog shows the local "history" of a ref.  In other words,
 	it can tell you what the 3rd last revision in _this_ repository
 	was, and what was the current state in _this_ repository,
-	yesterday 9:14pm.  See gitlink:git-reflog[1] for details.
+	yesterday 9:14pm.  See linkgit:git-reflog[1] for details.
 
 [[def_refspec]]refspec::
 	A "refspec" is used by <<def_fetch,fetch>> and
@@ -346,7 +346,7 @@ This commit is referred to as a "merge commit", or sometimes just a
 	it as my origin branch head". And `git push
 	$URL refs/heads/master:refs/heads/to-upstream` means "publish my
 	master branch head as to-upstream branch at $URL". See also
-	gitlink:git-push[1].
+	linkgit:git-push[1].
 
 [[def_repository]]repository::
 	A collection of <<def_ref,refs>> together with an
@@ -383,15 +383,15 @@ This commit is referred to as a "merge commit", or sometimes just a
 	object>>). This is sometimes useful when you are interested only in the
 	recent history of a project even though the real history recorded in the
 	upstream is much larger. A shallow repository
-	is created by giving the `--depth` option to gitlink:git-clone[1], and
-	its history can be later deepened with gitlink:git-fetch[1].
+	is created by giving the `--depth` option to linkgit:git-clone[1], and
+	its history can be later deepened with linkgit:git-fetch[1].
 
 [[def_symref]]symref::
 	Symbolic reference: instead of containing the <<def_SHA1,SHA1>>
 	id itself, it is of the format 'ref: refs/some/thing' and when
 	referenced, it recursively dereferences to this reference.
 	'<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic
-	references are manipulated with the gitlink:git-symbolic-ref[1]
+	references are manipulated with the linkgit:git-symbolic-ref[1]
 	command.
 
 [[def_tag]]tag::
diff --git a/hooks.html b/hooks.html
index 674c151f0..7a4086d98 100644
--- a/hooks.html
+++ b/hooks.html
@@ -479,7 +479,7 @@ for the user.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:12:04 UTC
+Last updated 07-Jan-2008 07:51:12 UTC
 </div>
 </div>
 </body>
diff --git a/howto-index.html b/howto-index.html
index 84227193e..7d73162cb 100644
--- a/howto-index.html
+++ b/howto-index.html
@@ -361,7 +361,7 @@ into which branch and who can make a tag.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 23-Nov-2007 08:43:05 UTC
+Last updated 07-Jan-2008 07:51:11 UTC
 </div>
 </div>
 </body>
diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index e343314bc..8242dcbcf 100644
--- a/howto/revert-branch-rebase.html
+++ b/howto/revert-branch-rebase.html
@@ -434,7 +434,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:12:06 UTC
+Last updated 07-Jan-2008 07:51:15 UTC
 </div>
 </div>
 </body>
diff --git a/repository-layout.html b/repository-layout.html
index 3ea1abbe3..07eba6e4d 100644
--- a/repository-layout.html
+++ b/repository-layout.html
@@ -582,7 +582,7 @@ shallow
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:12:03 UTC
+Last updated 07-Jan-2008 07:51:11 UTC
 </div>
 </div>
 </body>
diff --git a/repository-layout.txt b/repository-layout.txt
index 4c92e375f..693913009 100644
--- a/repository-layout.txt
+++ b/repository-layout.txt
@@ -19,7 +19,7 @@ trees this way, for example.  A repository with this kind of
 incomplete object store is not suitable to be published to the
 outside world but sometimes useful for private repository.
 . You also could have an incomplete but locally usable repository
-by cloning shallowly.  See gitlink:git-clone[1].
+by cloning shallowly.  See linkgit:git-clone[1].
 . You can be using `objects/info/alternates` mechanism, or
 `$GIT_ALTERNATE_OBJECT_DIRECTORIES` mechanism to 'borrow'
 objects from other object stores.  A repository with this kind
@@ -89,7 +89,7 @@ refs/remotes/`name`::
 packed-refs::
 	records the same information as refs/heads/, refs/tags/,
 	and friends record in a more efficient way.  See
-	gitlink:git-pack-refs[1].
+	linkgit:git-pack-refs[1].
 
 HEAD::
 	A symref (see glossary) to the `refs/heads/` namespace
@@ -106,7 +106,7 @@ HEAD::
 HEAD can also record a specific commit directly, instead of
 being a symref to point at the current branch.  Such a state
 is often called 'detached HEAD', and almost all commands work
-identically as normal.  See gitlink:git-checkout[1] for
+identically as normal.  See linkgit:git-checkout[1] for
 details.
 
 branches::
@@ -155,7 +155,7 @@ info/exclude::
 	exclude pattern list. `.gitignore` is the per-directory
 	ignore file.  `git status`, `git add`, `git rm` and `git
 	clean` look at it but the core git commands do not look
-	at it.  See also: gitlink:gitignore[5].
+	at it.  See also: linkgit:gitignore[5].
 
 remotes::
 	Stores shorthands to be used to give URL and default
@@ -176,4 +176,4 @@ logs/refs/tags/`name`::
 shallow::
 	This is similar to `info/grafts` but is internally used
 	and maintained by shallow clone mechanism.  See `--depth`
-	option to gitlink:git-clone[1] and gitlink:git-fetch[1].
+	option to linkgit:git-clone[1] and linkgit:git-fetch[1].
diff --git a/technical/api-allocation-growing.html b/technical/api-allocation-growing.html
index b147af9f2..3c8b4b111 100644
--- a/technical/api-allocation-growing.html
+++ b/technical/api-allocation-growing.html
@@ -306,7 +306,7 @@ ary[nr++] = value you like;</tt></pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 15-Dec-2007 08:39:57 UTC
+Last updated 07-Jan-2008 07:51:17 UTC
 </div>
 </div>
 </body>
diff --git a/technical/api-builtin.html b/technical/api-builtin.html
index 4bedd40dc..8e14f7c94 100644
--- a/technical/api-builtin.html
+++ b/technical/api-builtin.html
@@ -359,7 +359,7 @@ command.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 15-Dec-2007 08:39:58 UTC
+Last updated 07-Jan-2008 07:51:18 UTC
 </div>
 </div>
 </body>
diff --git a/technical/api-decorate.html b/technical/api-decorate.html
index aba2a48c9..2343d6a8c 100644
--- a/technical/api-decorate.html
+++ b/technical/api-decorate.html
@@ -269,7 +269,7 @@ div.exampleblock-content {
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 15-Dec-2007 08:39:58 UTC
+Last updated 07-Jan-2008 07:51:19 UTC
 </div>
 </div>
 </body>
diff --git a/technical/api-diff.html b/technical/api-diff.html
index f0d67027a..99b9cd886 100644
--- a/technical/api-diff.html
+++ b/technical/api-diff.html
@@ -582,7 +582,7 @@ RECURSIVE, TREE_IN_RECURSIVE
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 15-Dec-2007 08:39:58 UTC
+Last updated 07-Jan-2008 07:51:22 UTC
 </div>
 </div>
 </body>
diff --git a/technical/api-directory-listing.html b/technical/api-directory-listing.html
index 80de35a95..4f6c1be82 100644
--- a/technical/api-directory-listing.html
+++ b/technical/api-directory-listing.html
@@ -393,7 +393,7 @@ Use <tt>dir.entries[]</tt>.
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 15-Dec-2007 08:39:59 UTC
+Last updated 07-Jan-2008 07:51:23 UTC
 </div>
 </div>
 </body>
diff --git a/technical/api-gitattributes.html b/technical/api-gitattributes.html
index d453853f9..0bd036307 100644
--- a/technical/api-gitattributes.html
+++ b/technical/api-gitattributes.html
@@ -417,7 +417,7 @@ Act on <tt>.value</tt> member of the result, left in <tt>check[]</tt>:
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 15-Dec-2007 08:39:59 UTC
+Last updated 07-Jan-2008 07:51:24 UTC
 </div>
 </div>
 </body>
diff --git a/technical/api-grep.html b/technical/api-grep.html
index 533f095b4..0e465a607 100644
--- a/technical/api-grep.html
+++ b/technical/api-grep.html
@@ -276,7 +276,7 @@ grep_buffer()
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 15-Dec-2007 08:39:59 UTC
+Last updated 07-Jan-2008 07:51:25 UTC
 </div>
 </div>
 </body>
diff --git a/technical/api-hash.html b/technical/api-hash.html
index ec52689ac..8a352c327 100644
--- a/technical/api-hash.html
+++ b/technical/api-hash.html
@@ -269,7 +269,7 @@ div.exampleblock-content {
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 15-Dec-2007 08:39:59 UTC
+Last updated 07-Jan-2008 07:51:26 UTC
 </div>
 </div>
 </body>
diff --git a/technical/api-in-core-index.html b/technical/api-in-core-index.html
index 7770538c6..ab55da712 100644
--- a/technical/api-in-core-index.html
+++ b/technical/api-in-core-index.html
@@ -337,7 +337,7 @@ cache_tree_update()
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 15-Dec-2007 08:39:59 UTC
+Last updated 07-Jan-2008 07:51:26 UTC
 </div>
 </div>
 </body>
diff --git a/technical/api-index.html b/technical/api-index.html
index e9cf63d20..173a1e2d9 100644
--- a/technical/api-index.html
+++ b/technical/api-index.html
@@ -372,7 +372,7 @@ documents them.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 15-Dec-2007 08:40:02 UTC
+Last updated 07-Jan-2008 07:51:30 UTC
 </div>
 </div>
 </body>
diff --git a/technical/api-lockfile.html b/technical/api-lockfile.html
index 2a0bc1a15..4cf84abba 100644
--- a/technical/api-lockfile.html
+++ b/technical/api-lockfile.html
@@ -292,7 +292,7 @@ rollback_rock_file()
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 15-Dec-2007 08:40:00 UTC
+Last updated 07-Jan-2008 07:51:27 UTC
 </div>
 </div>
 </body>
diff --git a/technical/api-object-access.html b/technical/api-object-access.html
index 207ae6fd7..ba39fa886 100644
--- a/technical/api-object-access.html
+++ b/technical/api-object-access.html
@@ -311,7 +311,7 @@ Use of object flags
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 15-Dec-2007 08:40:00 UTC
+Last updated 07-Jan-2008 07:51:28 UTC
 </div>
 </div>
 </body>
diff --git a/technical/api-parse-options.html b/technical/api-parse-options.html
index 70ca90aaf..75c363c17 100644
--- a/technical/api-parse-options.html
+++ b/technical/api-parse-options.html
@@ -269,7 +269,7 @@ div.exampleblock-content {
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 15-Dec-2007 08:40:00 UTC
+Last updated 07-Jan-2008 07:51:28 UTC
 </div>
 </div>
 </body>
diff --git a/technical/api-path-list.html b/technical/api-path-list.html
index 9c865e4f2..4434fbd99 100644
--- a/technical/api-path-list.html
+++ b/technical/api-path-list.html
@@ -281,7 +281,7 @@ the calling sequence.
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 15-Dec-2007 08:40:00 UTC
+Last updated 07-Jan-2008 07:51:29 UTC
 </div>
 </div>
 </body>
diff --git a/technical/api-quote.html b/technical/api-quote.html
index 104ff5a17..6ea2650da 100644
--- a/technical/api-quote.html
+++ b/technical/api-quote.html
@@ -286,7 +286,7 @@ quoting for foreign languages
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 15-Dec-2007 08:40:00 UTC
+Last updated 07-Jan-2008 07:51:29 UTC
 </div>
 </div>
 </body>
diff --git a/technical/api-revision-walking.html b/technical/api-revision-walking.html
index db126508e..b824c3e70 100644
--- a/technical/api-revision-walking.html
+++ b/technical/api-revision-walking.html
@@ -281,7 +281,7 @@ calling sequence: init_revisions(), setup_revsions(), get_revision();
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 15-Dec-2007 08:40:01 UTC
+Last updated 07-Jan-2008 07:51:29 UTC
 </div>
 </div>
 </body>
diff --git a/technical/api-run-command.html b/technical/api-run-command.html
index 00b10fb4b..1f192a9ed 100644
--- a/technical/api-run-command.html
+++ b/technical/api-run-command.html
@@ -286,7 +286,7 @@ Exit status;
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 15-Dec-2007 08:40:01 UTC
+Last updated 07-Jan-2008 07:51:29 UTC
 </div>
 </div>
 </body>
diff --git a/technical/api-setup.html b/technical/api-setup.html
index 38b50838f..37f08718c 100644
--- a/technical/api-setup.html
+++ b/technical/api-setup.html
@@ -301,7 +301,7 @@ get_pathspec()
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 15-Dec-2007 08:40:01 UTC
+Last updated 07-Jan-2008 07:51:29 UTC
 </div>
 </div>
 </body>
diff --git a/technical/api-strbuf.html b/technical/api-strbuf.html
index e75fba926..a66298a57 100644
--- a/technical/api-strbuf.html
+++ b/technical/api-strbuf.html
@@ -269,7 +269,7 @@ div.exampleblock-content {
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 15-Dec-2007 08:40:01 UTC
+Last updated 07-Jan-2008 07:51:30 UTC
 </div>
 </div>
 </body>
diff --git a/technical/api-tree-walking.html b/technical/api-tree-walking.html
index e541585bc..4cc721047 100644
--- a/technical/api-tree-walking.html
+++ b/technical/api-tree-walking.html
@@ -296,7 +296,7 @@ get_tree_entry
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 15-Dec-2007 08:40:01 UTC
+Last updated 07-Jan-2008 07:51:30 UTC
 </div>
 </div>
 </body>
diff --git a/technical/api-xdiff-interface.html b/technical/api-xdiff-interface.html
index 63aced77e..dda82e5a4 100644
--- a/technical/api-xdiff-interface.html
+++ b/technical/api-xdiff-interface.html
@@ -270,7 +270,7 @@ xdiff_emit_consume_fn.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 15-Dec-2007 08:40:01 UTC
+Last updated 07-Jan-2008 07:51:30 UTC
 </div>
 </div>
 </body>
diff --git a/tutorial-2.html b/tutorial-2.html
index 03bcf5080..9e92ce6fe 100644
--- a/tutorial-2.html
+++ b/tutorial-2.html
@@ -647,7 +647,7 @@ example, creating a new commit.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:12:00 UTC
+Last updated 07-Jan-2008 07:51:03 UTC
 </div>
 </div>
 </body>
diff --git a/tutorial-2.txt b/tutorial-2.txt
index 5c39a165f..7fac47de8 100644
--- a/tutorial-2.txt
+++ b/tutorial-2.txt
@@ -172,7 +172,7 @@ merge, with the parent references pointing to the heads of the merged
 branches.
 
 Besides blobs, trees, and commits, the only remaining type of object
-is a "tag", which we won't discuss here; refer to gitlink:git-tag[1]
+is a "tag", which we won't discuss here; refer to linkgit:git-tag[1]
 for details.
 
 So now we know how git uses the object database to represent a
diff --git a/tutorial.html b/tutorial.html
index 32c594906..538a7a5f6 100644
--- a/tutorial.html
+++ b/tutorial.html
@@ -786,7 +786,7 @@ digressions that may be interesting at this point are:</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 14-Nov-2007 12:11:59 UTC
+Last updated 07-Jan-2008 07:51:01 UTC
 </div>
 </div>
 </body>
diff --git a/tutorial.txt b/tutorial.txt
index fff1068c5..e2bbda53f 100644
--- a/tutorial.txt
+++ b/tutorial.txt
@@ -47,7 +47,7 @@ You've now initialized the working directory--you may notice a new
 directory created, named ".git".
 
 Next, tell git to take a snapshot of the contents of all files under the
-current directory (note the '.'), with gitlink:git-add[1]:
+current directory (note the '.'), with linkgit:git-add[1]:
 
 ------------------------------------------------
 $ git add .
@@ -55,7 +55,7 @@ $ git add .
 
 This snapshot is now stored in a temporary staging area which git calls
 the "index".  You can permanently store the contents of the index in the
-repository with gitlink:git-commit[1]:
+repository with linkgit:git-commit[1]:
 
 ------------------------------------------------
 $ git commit
@@ -74,15 +74,15 @@ $ git add file1 file2 file3
 ------------------------------------------------
 
 You are now ready to commit.  You can see what is about to be committed
-using gitlink:git-diff[1] with the --cached option:
+using linkgit:git-diff[1] with the --cached option:
 
 ------------------------------------------------
 $ git diff --cached
 ------------------------------------------------
 
-(Without --cached, gitlink:git-diff[1] will show you any changes that
+(Without --cached, linkgit:git-diff[1] will show you any changes that
 you've made but not yet added to the index.)  You can also get a brief
-summary of the situation with gitlink:git-status[1]:
+summary of the situation with linkgit:git-status[1]:
 
 ------------------------------------------------
 $ git status
@@ -358,7 +358,7 @@ $ git config --get remote.origin.url
 -------------------------------------
 
 (The complete configuration created by git-clone is visible using
-"git config -l", and the gitlink:git-config[1] man page
+"git config -l", and the linkgit:git-config[1] man page
 explains the meaning of each option.)
 
 Git also keeps a pristine copy of Alice's master branch under the
@@ -377,10 +377,10 @@ $ git clone alice.org:/home/alice/project myrepo
 -------------------------------------
 
 Alternatively, git has a native protocol, or can use rsync or http;
-see gitlink:git-pull[1] for details.
+see linkgit:git-pull[1] for details.
 
 Git can also be used in a CVS-like mode, with a central repository
-that various users push changes to; see gitlink:git-push[1] and
+that various users push changes to; see linkgit:git-push[1] and
 link:cvs-migration.html[git for CVS users].
 
 Exploring history
@@ -442,7 +442,7 @@ $ git-tag v2.5 1b2e1d63ff
 you can refer to 1b2e1d63ff by the name "v2.5".  If you intend to
 share this name with other people (for example, to identify a release
 version), you should create a "tag" object, and perhaps sign it; see
-gitlink:git-tag[1] for details.
+linkgit:git-tag[1] for details.
 
 Any git command that needs to know a commit can take any of these
 names.  For example:
@@ -461,7 +461,7 @@ this branch.  If this branch is the only branch containing those
 commits, they will be lost.  Also, don't use "git reset" on a
 publicly-visible branch that other developers pull from, as it will
 force needless merges on other developers to clean up the history.
-If you need to undo changes that you have pushed, use gitlink:git-revert[1]
+If you need to undo changes that you have pushed, use linkgit:git-revert[1]
 instead.
 
 The git grep command can search for strings in any version of your
@@ -567,12 +567,12 @@ need to make the most of git.
 If you don't want to continue with that right away, a few other
 digressions that may be interesting at this point are:
 
-  * gitlink:git-format-patch[1], gitlink:git-am[1]: These convert
+  * linkgit:git-format-patch[1], linkgit:git-am[1]: These convert
     series of git commits into emailed patches, and vice versa,
     useful for projects such as the linux kernel which rely heavily
     on emailed patches.
 
-  * gitlink:git-bisect[1]: When there is a regression in your
+  * linkgit:git-bisect[1]: When there is a regression in your
     project, one way to track down the bug is by searching through
     the history to find the exact commit that's to blame.  Git bisect
     can help you perform a binary search for that commit.  It is
diff --git a/urls.txt b/urls.txt
index 4f667382e..81ac17f32 100644
--- a/urls.txt
+++ b/urls.txt
@@ -38,7 +38,7 @@ To sync with a local directory, you can use:
 
 ifndef::git-clone[]
 They are mostly equivalent, except when cloning.  See
-gitlink:git-clone[1] for details.
+linkgit:git-clone[1] for details.
 endif::git-clone[]
 
 ifdef::git-clone[]
diff --git a/user-manual.txt b/user-manual.txt
index 3f552e9d8..40b0de087 100644
--- a/user-manual.txt
+++ b/user-manual.txt
@@ -42,7 +42,7 @@ How to get a git repository
 It will be useful to have a git repository to experiment with as you
 read this manual.
 
-The best way to get one is by using the gitlink:git-clone[1] command to
+The best way to get one is by using the linkgit:git-clone[1] command to
 download a copy of an existing repository.  If you don't already have a
 project in mind, here are some interesting examples:
 
@@ -79,7 +79,7 @@ merge and diverge.
 
 A single git repository can track development on multiple branches.  It
 does this by keeping a list of <<def_head,heads>> which reference the
-latest commit on each branch; the gitlink:git-branch[1] command shows
+latest commit on each branch; the linkgit:git-branch[1] command shows
 you the list of branch heads:
 
 ------------------------------------------------
@@ -93,7 +93,7 @@ the project referred to by that branch head.
 
 Most projects also use <<def_tag,tags>>.  Tags, like heads, are
 references into the project's history, and can be listed using the
-gitlink:git-tag[1] command:
+linkgit:git-tag[1] command:
 
 ------------------------------------------------
 $ git tag -l
@@ -113,14 +113,14 @@ Tags are expected to always point at the same version of a project,
 while heads are expected to advance as development progresses.
 
 Create a new branch head pointing to one of these versions and check it
-out using gitlink:git-checkout[1]:
+out using linkgit:git-checkout[1]:
 
 ------------------------------------------------
 $ git checkout -b new v2.6.13
 ------------------------------------------------
 
 The working directory then reflects the contents that the project had
-when it was tagged v2.6.13, and gitlink:git-branch[1] shows two
+when it was tagged v2.6.13, and linkgit:git-branch[1] shows two
 branches, with an asterisk marking the currently checked-out branch:
 
 ------------------------------------------------
@@ -146,7 +146,7 @@ Understanding History: Commits
 ------------------------------
 
 Every change in the history of a project is represented by a commit.
-The gitlink:git-show[1] command shows the most recent commit on the
+The linkgit:git-show[1] command shows the most recent commit on the
 current branch:
 
 ------------------------------------------------
@@ -208,7 +208,7 @@ representing a merge can therefore have more than one parent, with
 each parent representing the most recent commit on one of the lines
 of development leading to that point.
 
-The best way to see how this works is using the gitlink:gitk[1]
+The best way to see how this works is using the linkgit:gitk[1]
 command; running gitk now on a git repository and looking for merge
 commits will help understand how the git organizes history.
 
@@ -335,7 +335,7 @@ The "master" branch that was created at the time you cloned is a copy
 of the HEAD in the repository that you cloned from.  That repository
 may also have had other branches, though, and your local repository
 keeps branches which track each of those remote branches, which you
-can view using the "-r" option to gitlink:git-branch[1]:
+can view using the "-r" option to linkgit:git-branch[1]:
 
 ------------------------------------------------
 $ git branch -r
@@ -378,7 +378,7 @@ exists a tag and a branch with the same name.
 (Newly created refs are actually stored in the .git/refs directory,
 under the path given by their name.  However, for efficiency reasons
 they may also be packed together in a single file; see
-gitlink:git-pack-refs[1]).
+linkgit:git-pack-refs[1]).
 
 As another useful shortcut, the "HEAD" of a repository can be referred
 to just using the name of that repository.  So, for example, "origin"
@@ -387,7 +387,7 @@ is usually a shortcut for the HEAD branch in the repository "origin".
 For the complete list of paths which git checks for references, and
 the order it uses to decide which to choose when there are multiple
 references with the same shorthand name, see the "SPECIFYING
-REVISIONS" section of gitlink:git-rev-parse[1].
+REVISIONS" section of linkgit:git-rev-parse[1].
 
 [[Updating-a-repository-with-git-fetch]]
 Updating a repository with git fetch
@@ -407,7 +407,7 @@ Fetching branches from other repositories
 -----------------------------------------
 
 You can also track branches from repositories other than the one you
-cloned from, using gitlink:git-remote[1]:
+cloned from, using linkgit:git-remote[1]:
 
 -------------------------------------------------
 $ git remote add linux-nfs git://linux-nfs.org/pub/nfs-2.6.git
@@ -443,7 +443,7 @@ $ cat .git/config
 This is what causes git to track the remote's branches; you may modify
 or delete these configuration options by editing .git/config with a
 text editor.  (See the "CONFIGURATION FILE" section of
-gitlink:git-config[1] for details.)
+linkgit:git-config[1] for details.)
 
 [[exploring-git-history]]
 Exploring git history
@@ -468,7 +468,7 @@ Suppose version 2.6.18 of your project worked, but the version at
 "master" crashes.  Sometimes the best way to find the cause of such a
 regression is to perform a brute-force search through the project's
 history to find the particular commit that caused the problem.  The
-gitlink:git-bisect[1] command can help you do this:
+linkgit:git-bisect[1] command can help you do this:
 
 -------------------------------------------------
 $ git bisect start
@@ -497,7 +497,7 @@ half each time.
 
 After about 13 tests (in this case), it will output the commit id of
 the guilty commit.  You can then examine the commit with
-gitlink:git-show[1], find out who wrote it, and mail them your bug
+linkgit:git-show[1], find out who wrote it, and mail them your bug
 report with the commit id.  Finally, run
 
 -------------------------------------------------
@@ -543,7 +543,7 @@ We have seen several ways of naming commits already:
 	- HEAD: refers to the head of the current branch
 
 There are many more; see the "SPECIFYING REVISIONS" section of the
-gitlink:git-rev-parse[1] man page for the complete list of ways to
+linkgit:git-rev-parse[1] man page for the complete list of ways to
 name revisions.  Some examples:
 
 -------------------------------------------------
@@ -584,7 +584,7 @@ When we discuss merges we'll also see the special name MERGE_HEAD,
 which refers to the other branch that we're merging in to the current
 branch.
 
-The gitlink:git-rev-parse[1] command is a low-level command that is
+The linkgit:git-rev-parse[1] command is a low-level command that is
 occasionally useful for translating some name for a commit to the object
 name for that commit:
 
@@ -608,14 +608,14 @@ You can use stable-1 to refer to the commit 1b2e1d63ff.
 
 This creates a "lightweight" tag.  If you would also like to include a
 comment with the tag, and possibly sign it cryptographically, then you
-should create a tag object instead; see the gitlink:git-tag[1] man page
+should create a tag object instead; see the linkgit:git-tag[1] man page
 for details.
 
 [[browsing-revisions]]
 Browsing revisions
 ------------------
 
-The gitlink:git-log[1] command can show lists of commits.  On its
+The linkgit:git-log[1] command can show lists of commits.  On its
 own, it shows all commits reachable from the parent commit; but you
 can also make more specific requests:
 
@@ -645,7 +645,7 @@ You can also ask git log to show patches:
 $ git log -p
 -------------------------------------------------
 
-See the "--pretty" option in the gitlink:git-log[1] man page for more
+See the "--pretty" option in the linkgit:git-log[1] man page for more
 display options.
 
 Note that git log starts with the most recent commit and works
@@ -658,7 +658,7 @@ Generating diffs
 ----------------
 
 You can generate diffs between any two versions using
-gitlink:git-diff[1]:
+linkgit:git-diff[1]:
 
 -------------------------------------------------
 $ git diff master..test
@@ -673,7 +673,7 @@ $ git diff master...test
 -------------------------------------------------
 
 Sometimes what you want instead is a set of patches; for this you can
-use gitlink:git-format-patch[1]:
+use linkgit:git-format-patch[1]:
 
 -------------------------------------------------
 $ git format-patch master..test
@@ -714,7 +714,7 @@ $ git log --pretty=oneline origin..mybranch | wc -l
 -------------------------------------------------
 
 Alternatively, you may often see this sort of thing done with the
-lower-level command gitlink:git-rev-list[1], which just lists the SHA1's
+lower-level command linkgit:git-rev-list[1], which just lists the SHA1's
 of all the given commits:
 
 -------------------------------------------------
@@ -772,7 +772,7 @@ You could just visually inspect the commits since e05db0fd:
 $ gitk e05db0fd..
 -------------------------------------------------
 
-Or you can use gitlink:git-name-rev[1], which will give the commit a
+Or you can use linkgit:git-name-rev[1], which will give the commit a
 name based on any tag it finds pointing to one of the commit's
 descendants:
 
@@ -781,7 +781,7 @@ $ git name-rev --tags e05db0fd
 e05db0fd tags/v1.5.0-rc1^0~23
 -------------------------------------------------
 
-The gitlink:git-describe[1] command does the opposite, naming the
+The linkgit:git-describe[1] command does the opposite, naming the
 revision using a tag on which the given commit is based:
 
 -------------------------------------------------
@@ -793,7 +793,7 @@ but that may sometimes help you guess which tags might come after the
 given commit.
 
 If you just want to verify whether a given tagged version contains a
-given commit, you could use gitlink:git-merge-base[1]:
+given commit, you could use linkgit:git-merge-base[1]:
 
 -------------------------------------------------
 $ git merge-base e05db0fd v1.5.0-rc1
@@ -814,7 +814,7 @@ $ git log v1.5.0-rc1..e05db0fd
 will produce empty output if and only if v1.5.0-rc1 includes e05db0fd,
 because it outputs only commits that are not reachable from v1.5.0-rc1.
 
-As yet another alternative, the gitlink:git-show-branch[1] command lists
+As yet another alternative, the linkgit:git-show-branch[1] command lists
 the commits reachable from its arguments with a display on the left-hand
 side that indicates which arguments that commit is reachable from.  So,
 you can run something like
@@ -847,7 +847,7 @@ Suppose you would like to see all the commits reachable from the branch
 head named "master" but not from any other head in your repository.
 
 We can list all the heads in this repository with
-gitlink:git-show-ref[1]:
+linkgit:git-show-ref[1]:
 
 -------------------------------------------------
 $ git show-ref --heads
@@ -884,14 +884,14 @@ commits reachable from some head but not from any tag in the repository:
 $ gitk $( git show-ref --heads ) --not  $( git show-ref --tags )
 -------------------------------------------------
 
-(See gitlink:git-rev-parse[1] for explanations of commit-selecting
+(See linkgit:git-rev-parse[1] for explanations of commit-selecting
 syntax such as `--not`.)
 
 [[making-a-release]]
 Creating a changelog and tarball for a software release
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The gitlink:git-archive[1] command can create a tar or zip archive from
+The linkgit:git-archive[1] command can create a tar or zip archive from
 any version of a project; for example:
 
 -------------------------------------------------
@@ -944,8 +944,8 @@ $  git log --raw --abbrev=40 --pretty=oneline |
 -------------------------------------------------
 
 Figuring out why this works is left as an exercise to the (advanced)
-student.  The gitlink:git-log[1], gitlink:git-diff-tree[1], and
-gitlink:git-hash-object[1] man pages may prove helpful.
+student.  The linkgit:git-log[1], linkgit:git-diff-tree[1], and
+linkgit:git-hash-object[1] man pages may prove helpful.
 
 [[Developing-with-git]]
 Developing with git
@@ -965,7 +965,7 @@ file named .gitconfig in your home directory:
 	email = you@yourdomain.example.com
 ------------------------------------------------
 
-(See the "CONFIGURATION FILE" section of gitlink:git-config[1] for
+(See the "CONFIGURATION FILE" section of linkgit:git-config[1] for
 details on the configuration file.)
 
 
@@ -1088,7 +1088,7 @@ $ git diff HEAD	    # difference between HEAD and working tree; what
 $ git status	    # a brief per-file summary of the above.
 -------------------------------------------------
 
-You can also use gitlink:git-gui[1] to create commits, view changes in
+You can also use linkgit:git-gui[1] to create commits, view changes in
 the index and the working tree files, and individually select diff hunks
 for inclusion in the index (by right-clicking on the diff hunk and
 choosing "Stage Hunk For Commit").
@@ -1131,7 +1131,7 @@ foo.txt
 *.[oa]
 -------------------------------------------------
 
-See gitlink:gitignore[5] for a detailed explanation of the syntax.  You can
+See linkgit:gitignore[5] for a detailed explanation of the syntax.  You can
 also place .gitignore files in other directories in your working tree, and they
 will apply to those directories and their subdirectories.  The `.gitignore`
 files can be added to your repository like any other files (just run `git add
@@ -1144,14 +1144,14 @@ If you wish the exclude patterns to affect only certain repositories
 them in a file in your repository named .git/info/exclude, or in any file
 specified by the `core.excludesfile` configuration variable.  Some git
 commands can also take exclude patterns directly on the command line.
-See gitlink:gitignore[5] for the details.
+See linkgit:gitignore[5] for the details.
 
 [[how-to-merge]]
 How to merge
 ------------
 
 You can rejoin two diverging branches of development using
-gitlink:git-merge[1]:
+linkgit:git-merge[1]:
 
 -------------------------------------------------
 $ git merge branchname
@@ -1188,7 +1188,7 @@ the working tree in a special state that gives you all the
 information you need to help resolve the merge.
 
 Files with conflicts are marked specially in the index, so until you
-resolve the problem and update the index, gitlink:git-commit[1] will
+resolve the problem and update the index, linkgit:git-commit[1] will
 fail:
 
 -------------------------------------------------
@@ -1196,7 +1196,7 @@ $ git commit
 file.txt: needs merge
 -------------------------------------------------
 
-Also, gitlink:git-status[1] will list those files as "unmerged", and the
+Also, linkgit:git-status[1] will list those files as "unmerged", and the
 files with conflicts will have conflict markers added, like this:
 
 -------------------------------------------------
@@ -1227,7 +1227,7 @@ Getting conflict-resolution help during a merge
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 All of the changes that git was able to merge automatically are
-already added to the index file, so gitlink:git-diff[1] shows only
+already added to the index file, so linkgit:git-diff[1] shows only
 the conflicts.  It uses an unusual syntax:
 
 -------------------------------------------------
@@ -1262,7 +1262,7 @@ $ git show :3:file.txt	# the version from MERGE_HEAD, but including any
 
 Since the stage 2 and stage 3 versions have already been updated with
 nonconflicting changes, the only remaining differences between them are
-the important ones; thus gitlink:git-diff[1] can use the information in
+the important ones; thus linkgit:git-diff[1] can use the information in
 the index to show only those conflicts.
 
 The diff above shows the differences between the working-tree version of
@@ -1271,7 +1271,7 @@ each line by a single "+" or "-", it now uses two columns: the first
 column is used for differences between the first parent and the working
 directory copy, and the second for differences between the second parent
 and the working directory copy.  (See the "COMBINED DIFF FORMAT" section
-of gitlink:git-diff-files[1] for a details of the format.)
+of linkgit:git-diff-files[1] for a details of the format.)
 
 After resolving the conflict in the obvious way (but before updating the
 index), the diff will look like:
@@ -1304,7 +1304,7 @@ $ git diff -3 file.txt		# diff against stage 3
 $ git diff --theirs file.txt	# same as the above.
 -------------------------------------------------
 
-The gitlink:git-log[1] and gitk[1] commands also provide special help
+The linkgit:git-log[1] and gitk[1] commands also provide special help
 for merges:
 
 -------------------------------------------------
@@ -1315,7 +1315,7 @@ $ gitk --merge
 These will display all commits which exist only on HEAD or on
 MERGE_HEAD, and which touch an unmerged file.
 
-You may also use gitlink:git-mergetool[1], which lets you merge the
+You may also use linkgit:git-mergetool[1], which lets you merge the
 unmerged files using external tools such as emacs or kdiff3.
 
 Each time you resolve the conflicts in a file and update the index:
@@ -1394,7 +1394,7 @@ Fixing a mistake with a new commit
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Creating a new commit that reverts an earlier change is very easy;
-just pass the gitlink:git-revert[1] command a reference to the bad
+just pass the linkgit:git-revert[1] command a reference to the bad
 commit; for example, to revert the most recent commit:
 
 -------------------------------------------------
@@ -1437,7 +1437,7 @@ which will replace the old commit by a new commit incorporating your
 changes, giving you a chance to edit the old commit message first.
 
 Again, you should never do this to a commit that may already have
-been merged into another branch; use gitlink:git-revert[1] instead in
+been merged into another branch; use linkgit:git-revert[1] instead in
 that case.
 
 It is also possible to replace commits further back in the history, but
@@ -1450,7 +1450,7 @@ Checking out an old version of a file
 
 In the process of undoing a previous bad change, you may find it
 useful to check out an older version of a particular file using
-gitlink:git-checkout[1].  We've used git checkout before to switch
+linkgit:git-checkout[1].  We've used git checkout before to switch
 branches, but it has quite different behavior if it is given a path
 name: the command
 
@@ -1463,7 +1463,7 @@ also updates the index to match.  It does not change branches.
 
 If you just want to look at an old version of the file, without
 modifying the working directory, you can do that with
-gitlink:git-show[1]:
+linkgit:git-show[1]:
 
 -------------------------------------------------
 $ git show HEAD^:path/to/file
@@ -1477,7 +1477,7 @@ Temporarily setting aside work in progress
 
 While you are in the middle of working on something complicated, you
 find an unrelated but obvious and trivial bug.  You would like to fix it
-before continuing.  You can use gitlink:git-stash[1] to save the current
+before continuing.  You can use linkgit:git-stash[1] to save the current
 state of your work, and after fixing the bug (or, optionally after doing
 so on a different branch and then coming back), unstash the
 work-in-progress changes.
@@ -1511,7 +1511,7 @@ On large repositories, git depends on compression to keep the history
 information from taking up too much space on disk or in memory.
 
 This compression is not performed automatically.  Therefore you
-should occasionally run gitlink:git-gc[1]:
+should occasionally run linkgit:git-gc[1]:
 
 -------------------------------------------------
 $ git gc
@@ -1529,7 +1529,7 @@ Ensuring reliability
 Checking the repository for corruption
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The gitlink:git-fsck[1] command runs a number of self-consistency checks
+The linkgit:git-fsck[1] command runs a number of self-consistency checks
 on the repository, and reports on any problems.  This may take some
 time.  The most common warning by far is about "dangling" objects:
 
@@ -1549,8 +1549,8 @@ dangling tree b24c2473f1fd3d91352a624795be026d64c8841f
 Dangling objects are not a problem.  At worst they may take up a little
 extra disk space.  They can sometimes provide a last-resort method for
 recovering lost work--see <<dangling-objects>> for details.  However, if
-you wish, you can remove them with gitlink:git-prune[1] or the `--prune`
-option to gitlink:git-gc[1]:
+you wish, you can remove them with linkgit:git-prune[1] or the `--prune`
+option to linkgit:git-gc[1]:
 
 -------------------------------------------------
 $ git gc --prune
@@ -1560,7 +1560,7 @@ This may be time-consuming.  Unlike most other git operations (including
 git-gc when run without any options), it is not safe to prune while
 other git operations are in progress in the same repository.
 
-If gitlink:git-fsck[1] complains about sha1 mismatches or missing
+If linkgit:git-fsck[1] complains about sha1 mismatches or missing
 objects, you may have a much more serious problem; your best option is
 probably restoring from backups.  See
 <<recovering-from-repository-corruption>> for a detailed discussion.
@@ -1573,7 +1573,7 @@ Recovering lost changes
 Reflogs
 ^^^^^^^
 
-Say you modify a branch with `gitlink:git-reset[1] --hard`, and then
+Say you modify a branch with `linkgit:git-reset[1] --hard`, and then
 realize that the branch was the only reference you had to that point in
 history.
 
@@ -1608,9 +1608,9 @@ pointed to one week ago.  This allows you to see the history of what
 you've checked out.
 
 The reflogs are kept by default for 30 days, after which they may be
-pruned.  See gitlink:git-reflog[1] and gitlink:git-gc[1] to learn
+pruned.  See linkgit:git-reflog[1] and linkgit:git-gc[1] to learn
 how to control this pruning, and see the "SPECIFYING REVISIONS"
-section of gitlink:git-rev-parse[1] for details.
+section of linkgit:git-rev-parse[1] for details.
 
 Note that the reflog history is very different from normal git history.
 While normal history is shared by every repository that works on the
@@ -1675,7 +1675,7 @@ may wish to check the original repository for updates and merge them
 into your own work.
 
 We have already seen <<Updating-a-repository-with-git-fetch,how to
-keep remote tracking branches up to date>> with gitlink:git-fetch[1],
+keep remote tracking branches up to date>> with linkgit:git-fetch[1],
 and how to merge two branches.  So you can merge in changes from the
 original repository's master branch with:
 
@@ -1684,7 +1684,7 @@ $ git fetch
 $ git merge origin/master
 -------------------------------------------------
 
-However, the gitlink:git-pull[1] command provides a way to do this in
+However, the linkgit:git-pull[1] command provides a way to do this in
 one step:
 
 -------------------------------------------------
@@ -1702,8 +1702,8 @@ $ git pull
 More generally, a branch that is created from a remote branch will pull
 by default from that branch.  See the descriptions of the
 branch.<name>.remote and branch.<name>.merge options in
-gitlink:git-config[1], and the discussion of the `--track` option in
-gitlink:git-checkout[1], to learn how to control these defaults.
+linkgit:git-config[1], and the discussion of the `--track` option in
+linkgit:git-checkout[1], to learn how to control these defaults.
 
 In addition to saving you keystrokes, "git pull" also helps you by
 producing a default commit message documenting the branch and
@@ -1731,7 +1731,7 @@ Submitting patches to a project
 If you just have a few changes, the simplest way to submit them may
 just be to send them as patches in email:
 
-First, use gitlink:git-format-patch[1]; for example:
+First, use linkgit:git-format-patch[1]; for example:
 
 -------------------------------------------------
 $ git format-patch origin
@@ -1742,7 +1742,7 @@ for each patch in the current branch but not in origin/HEAD.
 
 You can then import these into your mail client and send them by
 hand.  However, if you have a lot to send at once, you may prefer to
-use the gitlink:git-send-email[1] script to automate the process.
+use the linkgit:git-send-email[1] script to automate the process.
 Consult the mailing list for your project first to determine how they
 prefer such patches be handled.
 
@@ -1750,7 +1750,7 @@ prefer such patches be handled.
 Importing patches to a project
 ------------------------------
 
-Git also provides a tool called gitlink:git-am[1] (am stands for
+Git also provides a tool called linkgit:git-am[1] (am stands for
 "apply mailbox"), for importing such an emailed series of patches.
 Just save all of the patch-containing messages, in order, into a
 single mailbox file, say "patches.mbox", then run
@@ -1785,7 +1785,7 @@ Public git repositories
 
 Another way to submit changes to a project is to tell the maintainer
 of that project to pull the changes from your repository using
-gitlink:git-pull[1].  In the section "<<getting-updates-with-git-pull,
+linkgit:git-pull[1].  In the section "<<getting-updates-with-git-pull,
 Getting updates with git pull>>" we described this as a way to get
 updates from the "main" repository, but it works just as well in the
 other direction.
@@ -1866,14 +1866,14 @@ at.  You can then skip to the section
 "<<pushing-changes-to-a-public-repository,Pushing changes to a public
 repository>>", below.
 
-Otherwise, all you need to do is start gitlink:git-daemon[1]; it will
+Otherwise, all you need to do is start linkgit:git-daemon[1]; it will
 listen on port 9418.  By default, it will allow access to any directory
 that looks like a git directory and contains the magic file
 git-daemon-export-ok.  Passing some directory paths as git-daemon
 arguments will further restrict the exports to those paths.
 
 You can also run git-daemon as an inetd service; see the
-gitlink:git-daemon[1] man page for details.  (See especially the
+linkgit:git-daemon[1] man page for details.  (See especially the
 examples section.)
 
 [[exporting-via-http]]
@@ -1895,7 +1895,7 @@ $ chmod a+x hooks/post-update
 -------------------------------------------------
 
 (For an explanation of the last two lines, see
-gitlink:git-update-server-info[1], and the documentation
+linkgit:git-update-server-info[1], and the documentation
 link:hooks.html[Hooks used by git].)
 
 Advertise the URL of proj.git.  Anybody else should then be able to
@@ -1920,7 +1920,7 @@ maintainers to fetch your latest changes, but they do not allow write
 access, which you will need to update the public repository with the
 latest changes created in your private repository.
 
-The simplest way to do this is using gitlink:git-push[1] and ssh; to
+The simplest way to do this is using linkgit:git-push[1] and ssh; to
 update the remote branch named "master" with the latest state of your
 branch named "master", run
 
@@ -1961,7 +1961,7 @@ $ git push public-repo master
 -------------------------------------------------
 
 See the explanations of the remote.<name>.url, branch.<name>.remote,
-and remote.<name>.push options in gitlink:git-config[1] for
+and remote.<name>.push options in linkgit:git-config[1] for
 details.
 
 [[forcing-push]]
@@ -2083,14 +2083,14 @@ $ cd work
 -------------------------------------------------
 
 Linus's tree will be stored in the remote branch named origin/master,
-and can be updated using gitlink:git-fetch[1]; you can track other
-public trees using gitlink:git-remote[1] to set up a "remote" and
-gitlink:git-fetch[1] to keep them up-to-date; see
+and can be updated using linkgit:git-fetch[1]; you can track other
+public trees using linkgit:git-remote[1] to set up a "remote" and
+linkgit:git-fetch[1] to keep them up-to-date; see
 <<repositories-and-branches>>.
 
 Now create the branches in which you are going to work; these start out
 at the current tip of origin/master branch, and should be set up (using
-the --track option to gitlink:git-branch[1]) to merge changes in from
+the --track option to linkgit:git-branch[1]) to merge changes in from
 Linus by default.
 
 -------------------------------------------------
@@ -2098,7 +2098,7 @@ $ git branch --track test origin/master
 $ git branch --track release origin/master
 -------------------------------------------------
 
-These can be easily kept up to date using gitlink:git-pull[1].
+These can be easily kept up to date using linkgit:git-pull[1].
 
 -------------------------------------------------
 $ git checkout test && git pull
@@ -2113,7 +2113,7 @@ doing this capriciously in the "release" branch, as these noisy commits
 will become part of the permanent history when you ask Linus to pull
 from the release branch.
 
-A few configuration variables (see gitlink:git-config[1]) can
+A few configuration variables (see linkgit:git-config[1]) can
 make it easy to push both branches to your public tree.  (See
 <<setting-up-a-public-repository>>.)
 
@@ -2127,7 +2127,7 @@ EOF
 -------------------------------------------------
 
 Then you can push both the test and release trees using
-gitlink:git-push[1]:
+linkgit:git-push[1]:
 
 -------------------------------------------------
 $ git push mytree
@@ -2440,7 +2440,7 @@ the result would create a new merge commit, like this:
 
 However, if you prefer to keep the history in mywork a simple series of
 commits without any merges, you may instead choose to use
-gitlink:git-rebase[1]:
+linkgit:git-rebase[1]:
 
 -------------------------------------------------
 $ git checkout mywork
@@ -2491,7 +2491,7 @@ $ git commit --amend
 which will replace the old commit by a new commit incorporating your
 changes, giving you a chance to edit the old commit message first.
 
-You can also use a combination of this and gitlink:git-rebase[1] to
+You can also use a combination of this and linkgit:git-rebase[1] to
 replace a commit further back in your history and recreate the
 intervening changes on top of it.  First, tag the problematic commit
 with
@@ -2529,7 +2529,7 @@ new commits having new object names.
 Reordering or selecting from a patch series
 -------------------------------------------
 
-Given one existing commit, the gitlink:git-cherry-pick[1] command
+Given one existing commit, the linkgit:git-cherry-pick[1] command
 allows you to apply the change introduced by that commit and create a
 new commit that records it.  So, for example, if "mywork" points to a
 series of patches on top of "origin", you might do something like:
@@ -2542,7 +2542,7 @@ $ gitk origin..mywork &
 and browse through the list of patches in the mywork branch using gitk,
 applying them (possibly in a different order) to mywork-new using
 cherry-pick, and possibly modifying them as you go using `commit --amend`.
-The gitlink:git-gui[1] command may also help as it allows you to
+The linkgit:git-gui[1] command may also help as it allows you to
 individually select diff hunks for inclusion in the index (by
 right-clicking on the diff hunk and choosing "Stage Hunk for Commit").
 
@@ -2555,7 +2555,7 @@ $ git reset --hard origin
 -------------------------------------------------
 
 Then modify, reorder, or eliminate patches as preferred before applying
-them again with gitlink:git-am[1].
+them again with linkgit:git-am[1].
 
 [[patch-series-tools]]
 Other tools
@@ -2618,7 +2618,7 @@ published branches should never be rewritten.
 Why bisecting merge commits can be harder than bisecting linear history
 -----------------------------------------------------------------------
 
-The gitlink:git-bisect[1] command correctly handles history that
+The linkgit:git-bisect[1] command correctly handles history that
 includes merge commits.  However, when the commit that it finds is a
 merge commit, the user may need to work harder than usual to figure out
 why that commit introduced a problem.
@@ -2651,7 +2651,7 @@ Nevertheless, the code at C is broken, because the callers added
 on the lower line of development have not been converted to the new
 semantics introduced on the upper line of development.  So if all
 you know is that D is bad, that Z is good, and that
-gitlink:git-bisect[1] identifies C as the culprit, how will you
+linkgit:git-bisect[1] identifies C as the culprit, how will you
 figure out that the problem is due to this change in semantics?
 
 When the result of a git-bisect is a non-merge commit, you should
@@ -2688,7 +2688,7 @@ Advanced branch management
 Fetching individual branches
 ----------------------------
 
-Instead of using gitlink:git-remote[1], you can also choose just
+Instead of using linkgit:git-remote[1], you can also choose just
 to update one branch at a time, and to store it locally under an
 arbitrary name:
 
@@ -2779,7 +2779,7 @@ Configuring remote branches
 We saw above that "origin" is just a shortcut to refer to the
 repository that you originally cloned from.  This information is
 stored in git configuration variables, which you can see using
-gitlink:git-config[1]:
+linkgit:git-config[1]:
 
 -------------------------------------------------
 $ git config -l
@@ -2832,9 +2832,9 @@ throwing away commits on mybranch.
 
 Also note that all of the above configuration can be performed by
 directly editing the file .git/config instead of using
-gitlink:git-config[1].
+linkgit:git-config[1].
 
-See gitlink:git-config[1] for more details on the configuration
+See linkgit:git-config[1] for more details on the configuration
 options mentioned above.
 
 
@@ -2900,7 +2900,7 @@ Commit Object
 
 The "commit" object links a physical state of a tree with a description
 of how we got there and why.  Use the --pretty=raw option to
-gitlink:git-show[1] or gitlink:git-log[1] to examine your favorite
+linkgit:git-show[1] or linkgit:git-log[1] to examine your favorite
 commit:
 
 ------------------------------------------------
@@ -2941,9 +2941,9 @@ of the tree referred to by this commit with the trees associated with
 its parents.  In particular, git does not attempt to record file renames
 explicitly, though it can identify cases where the existence of the same
 file data at changing paths suggests a rename.  (See, for example, the
--M option to gitlink:git-diff[1]).
+-M option to linkgit:git-diff[1]).
 
-A commit is usually created by gitlink:git-commit[1], which creates a
+A commit is usually created by linkgit:git-commit[1], which creates a
 commit whose parent is normally the current HEAD, and whose tree is
 taken from the content currently stored in the index.
 
@@ -2951,8 +2951,8 @@ taken from the content currently stored in the index.
 Tree Object
 ~~~~~~~~~~~
 
-The ever-versatile gitlink:git-show[1] command can also be used to
-examine tree objects, but gitlink:git-ls-tree[1] will give you more
+The ever-versatile linkgit:git-show[1] command can also be used to
+examine tree objects, but linkgit:git-ls-tree[1] will give you more
 details:
 
 ------------------------------------------------
@@ -2991,7 +2991,7 @@ attention to the executable bit.
 Blob Object
 ~~~~~~~~~~~
 
-You can use gitlink:git-show[1] to examine the contents of a blob; take,
+You can use linkgit:git-show[1] to examine the contents of a blob; take,
 for example, the blob in the entry for "COPYING" from the tree above:
 
 ------------------------------------------------
@@ -3013,7 +3013,7 @@ is totally independent of its location in the directory tree, and
 renaming a file does not change the object that file is associated with.
 
 Note that any tree or blob object can be examined using
-gitlink:git-show[1] with the <revision>:<path> syntax.  This can
+linkgit:git-show[1] with the <revision>:<path> syntax.  This can
 sometimes be useful for browsing the contents of a tree that is not
 currently checked out.
 
@@ -3053,7 +3053,7 @@ Tag Object
 
 A tag object contains an object, object type, tag name, the name of the
 person ("tagger") who created the tag, and a message, which may contain
-a signature, as can be seen using the gitlink:git-cat-file[1]:
+a signature, as can be seen using the linkgit:git-cat-file[1]:
 
 ------------------------------------------------
 $ git cat-file tag v1.5.0
@@ -3072,8 +3072,8 @@ nLE/L9aUXdWeTFPron96DLA=
 -----END PGP SIGNATURE-----
 ------------------------------------------------
 
-See the gitlink:git-tag[1] command to learn how to create and verify tag
-objects.  (Note that gitlink:git-tag[1] can also be used to create
+See the linkgit:git-tag[1] command to learn how to create and verify tag
+objects.  (Note that linkgit:git-tag[1] can also be used to create
 "lightweight tags", which are not tag objects at all, but just simple
 references whose names begin with "refs/tags/").
 
@@ -3135,14 +3135,14 @@ $ git count-objects
 Although the object files are gone, any commands that refer to those
 objects will work exactly as they did before.
 
-The gitlink:git-gc[1] command performs packing, pruning, and more for
+The linkgit:git-gc[1] command performs packing, pruning, and more for
 you, so is normally the only high-level command you need.
 
 [[dangling-objects]]
 Dangling objects
 ~~~~~~~~~~~~~~~~
 
-The gitlink:git-fsck[1] command will sometimes complain about dangling
+The linkgit:git-fsck[1] command will sometimes complain about dangling
 objects.  They are not a problem.
 
 The most common cause of dangling objects is that you've rebased a
@@ -3246,7 +3246,7 @@ which is sometimes a solvable problem.  (Recovering missing trees and
 especially commits is *much* harder).
 
 Before starting, verify that there is corruption, and figure out where
-it is with gitlink:git-fsck[1]; this may be time-consuming.
+it is with linkgit:git-fsck[1]; this may be time-consuming.
 
 Assume the output looks like this:
 
@@ -3264,7 +3264,7 @@ Now you know that blob 4b9458b3 is missing, and that the tree 2d9263c6
 points to it.  If you could find just one copy of that missing blob
 object, possibly in some other repository, you could move it into
 .git/objects/4b/9458b3... and be done.  Suppose you can't.  You can
-still examine the tree that pointed to it with gitlink:git-ls-tree[1],
+still examine the tree that pointed to it with linkgit:git-ls-tree[1],
 which might output something like:
 
 ------------------------------------------------
@@ -3282,7 +3282,7 @@ So now you know that the missing blob was the data for a file named
 say it's in "somedirectory".  If you're lucky the missing copy might be
 the same as the copy you have checked out in your working tree at
 "somedirectory/myfile"; you can test whether that's right with
-gitlink:git-hash-object[1]:
+linkgit:git-hash-object[1]:
 
 ------------------------------------------------
 $ git hash-object -w somedirectory/myfile
@@ -3352,7 +3352,7 @@ The index
 
 The index is a binary file (generally kept in .git/index) containing a
 sorted list of path names, each with permissions and the SHA1 of a blob
-object; gitlink:git-ls-files[1] can show you the contents of the index:
+object; linkgit:git-ls-files[1] can show you the contents of the index:
 
 -------------------------------------------------
 $ git ls-files --stage
@@ -3374,7 +3374,7 @@ properties:
 1. The index contains all the information necessary to generate a single
 (uniquely determined) tree object.
 +
-For example, running gitlink:git-commit[1] generates this tree object
+For example, running linkgit:git-commit[1] generates this tree object
 from the index, stores it in the object database, and uses it as the
 tree object associated with the new commit.
 
@@ -3395,7 +3395,7 @@ you can create a three-way merge between them.
 +
 We saw in <<conflict-resolution>> that during a merge the index can
 store multiple versions of a single file (called "stages").  The third
-column in the gitlink:git-ls-files[1] output above is the stage
+column in the linkgit:git-ls-files[1] output above is the stage
 number, and will take on values other than 0 for files with merge
 conflicts.
 
@@ -3444,7 +3444,7 @@ commit ID, so other developers who clone the containing project
 Partial checkouts of the superproject are possible: you can tell Git to
 clone none, some or all of the submodules.
 
-The gitlink:git-submodule[1] command is available since Git 1.5.3.  Users
+The linkgit:git-submodule[1] command is available since Git 1.5.3.  Users
 with Git 1.5.2 can look up the submodule commits in the repository and
 manually check them out; earlier versions won't recognize the submodules at
 all.
@@ -3492,7 +3492,7 @@ The `git submodule add` command does a couple of things:
 
 - It clones the submodule under the current directory and by default checks out
   the master branch.
-- It adds the submodule's clone path to the gitlink:gitmodules[5] file and
+- It adds the submodule's clone path to the linkgit:gitmodules[5] file and
   adds this file to the index, ready to be committed.
 - It adds the submodule's current commit ID to the index, ready to be
   committed.
@@ -3653,26 +3653,26 @@ understand its inner workings.
 Object access and manipulation
 ------------------------------
 
-The gitlink:git-cat-file[1] command can show the contents of any object,
-though the higher-level gitlink:git-show[1] is usually more useful.
+The linkgit:git-cat-file[1] command can show the contents of any object,
+though the higher-level linkgit:git-show[1] is usually more useful.
 
-The gitlink:git-commit-tree[1] command allows constructing commits with
+The linkgit:git-commit-tree[1] command allows constructing commits with
 arbitrary parents and trees.
 
-A tree can be created with gitlink:git-write-tree[1] and its data can be
-accessed by gitlink:git-ls-tree[1].  Two trees can be compared with
-gitlink:git-diff-tree[1].
+A tree can be created with linkgit:git-write-tree[1] and its data can be
+accessed by linkgit:git-ls-tree[1].  Two trees can be compared with
+linkgit:git-diff-tree[1].
 
-A tag is created with gitlink:git-mktag[1], and the signature can be
-verified by gitlink:git-verify-tag[1], though it is normally simpler to
-use gitlink:git-tag[1] for both.
+A tag is created with linkgit:git-mktag[1], and the signature can be
+verified by linkgit:git-verify-tag[1], though it is normally simpler to
+use linkgit:git-tag[1] for both.
 
 [[the-workflow]]
 The Workflow
 ------------
 
-High-level operations such as gitlink:git-commit[1],
-gitlink:git-checkout[1] and gitlink:git-reset[1] work by moving data
+High-level operations such as linkgit:git-commit[1],
+linkgit:git-checkout[1] and linkgit:git-reset[1] work by moving data
 between the working tree, the index, and the object database.  Git
 provides low-level operations which perform each of these steps
 individually.
@@ -3687,7 +3687,7 @@ combinations:
 working directory -> index
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The gitlink:git-update-index[1] command updates the index with
+The linkgit:git-update-index[1] command updates the index with
 information from the working directory.  You generally update the
 index information by just specifying the filename you want to update,
 like so:
@@ -3717,8 +3717,8 @@ stat information. It will 'not' update the object status itself, and
 it will only update the fields that are used to quickly test whether
 an object still matches its old backing store object.
 
-The previously introduced gitlink:git-add[1] is just a wrapper for
-gitlink:git-update-index[1].
+The previously introduced linkgit:git-add[1] is just a wrapper for
+linkgit:git-update-index[1].
 
 [[index-to-object-database]]
 index -> object database
@@ -3865,7 +3865,7 @@ Examining the data
 
 You can examine the data represented in the object database and the
 index with various helper tools. For every object, you can use
-gitlink:git-cat-file[1] to examine details about the
+linkgit:git-cat-file[1] to examine details about the
 object:
 
 -------------------------------------------------
@@ -4528,7 +4528,7 @@ Scan Documentation/ for other stuff left out; in particular:
 - howto's
 - some of technical/?
 - hooks
-- list of commands in gitlink:git[1]
+- list of commands in linkgit:git[1]
 
 Scan email archives for other stuff left out
 
-- 
2.26.2