From f7c042d91f834c0648b5ca3ebf1ef6d0cdc1e36d Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junio@hera.kernel.org>
Date: Fri, 6 Jun 2008 22:50:53 +0000
Subject: [PATCH] Autogenerated HTML docs for v1.5.6-rc1-21-g03300

---
 diff-options.txt                              |   2 +-
 git-add.html                                  |   6 +-
 git-add.txt                                   |   4 +-
 git-am.html                                   |   4 +-
 git-am.txt                                    |   2 +-
 git-annotate.html                             |   4 +-
 git-annotate.txt                              |   2 +-
 git-apply.html                                |   4 +-
 git-apply.txt                                 |   2 +-
 git-archimport.html                           |   4 +-
 git-archimport.txt                            |   2 +-
 git-archive.html                              |   4 +-
 git-archive.txt                               |   2 +-
 git-bisect.html                               |   4 +-
 git-bisect.txt                                |   2 +-
 git-blame.html                                |   4 +-
 git-blame.txt                                 |   2 +-
 git-branch.html                               |   4 +-
 git-branch.txt                                |   2 +-
 git-bundle.html                               |   4 +-
 git-bundle.txt                                |   2 +-
 git-cat-file.html                             |   4 +-
 git-cat-file.txt                              |   2 +-
 git-check-attr.html                           |   4 +-
 git-check-attr.txt                            |   2 +-
 git-check-ref-format.html                     |   4 +-
 git-check-ref-format.txt                      |   2 +-
 git-checkout-index.html                       |   4 +-
 git-checkout-index.txt                        |   2 +-
 git-checkout.html                             |   4 +-
 git-checkout.txt                              |   2 +-
 git-cherry-pick.html                          |   4 +-
 git-cherry-pick.txt                           |   2 +-
 git-cherry.html                               |   4 +-
 git-cherry.txt                                |   2 +-
 git-citool.html                               |   4 +-
 git-citool.txt                                |   2 +-
 git-clean.html                                |   4 +-
 git-clean.txt                                 |   2 +-
 git-clone.html                                |   4 +-
 git-clone.txt                                 |   2 +-
 git-commit-tree.html                          |   4 +-
 git-commit-tree.txt                           |   2 +-
 git-commit.html                               |   4 +-
 git-commit.txt                                |   2 +-
 git-config.html                               |   4 +-
 git-config.txt                                |   2 +-
 git-count-objects.html                        |   4 +-
 git-count-objects.txt                         |   2 +-
 git-cvsexportcommit.html                      |   4 +-
 git-cvsexportcommit.txt                       |   2 +-
 git-cvsimport.html                            |   4 +-
 git-cvsimport.txt                             |   2 +-
 git-cvsserver.html                            |   4 +-
 git-cvsserver.txt                             |   2 +-
 git-daemon.html                               |   4 +-
 git-daemon.txt                                |   2 +-
 git-describe.html                             |   4 +-
 git-describe.txt                              |   2 +-
 git-diff-files.html                           |   6 +-
 git-diff-files.txt                            |   2 +-
 git-diff-index.html                           |   6 +-
 git-diff-index.txt                            |   2 +-
 git-diff-tree.html                            |   6 +-
 git-diff-tree.txt                             |   2 +-
 git-diff.html                                 |   6 +-
 git-diff.txt                                  |   2 +-
 git-fast-export.html                          |   4 +-
 git-fast-export.txt                           |   2 +-
 git-fast-import.html                          |   4 +-
 git-fast-import.txt                           |   2 +-
 git-fetch-pack.html                           |   4 +-
 git-fetch-pack.txt                            |   2 +-
 git-fetch.html                                |   4 +-
 git-fetch.txt                                 |   2 +-
 git-filter-branch.html                        |   4 +-
 git-filter-branch.txt                         |   2 +-
 git-fmt-merge-msg.html                        |   4 +-
 git-fmt-merge-msg.txt                         |   2 +-
 git-for-each-ref.html                         |  19 +-
 git-for-each-ref.txt                          |  17 +-
 git-format-patch.html                         |   6 +-
 git-format-patch.txt                          |   2 +-
 git-fsck.html                                 |   4 +-
 git-fsck.txt                                  |   2 +-
 git-gc.html                                   |   4 +-
 git-gc.txt                                    |   2 +-
 git-get-tar-commit-id.html                    |   4 +-
 git-get-tar-commit-id.txt                     |   2 +-
 git-grep.html                                 |   4 +-
 git-grep.txt                                  |   2 +-
 git-gui.html                                  |   4 +-
 git-gui.txt                                   |   2 +-
 git-hash-object.html                          |   4 +-
 git-hash-object.txt                           |   2 +-
 git-help.html                                 |   6 +-
 git-help.txt                                  |   4 +-
 git-http-fetch.html                           |   4 +-
 git-http-fetch.txt                            |   2 +-
 git-http-push.html                            |   4 +-
 git-http-push.txt                             |   2 +-
 git-imap-send.html                            |   4 +-
 git-imap-send.txt                             |   2 +-
 git-index-pack.html                           |   4 +-
 git-index-pack.txt                            |   2 +-
 git-init.html                                 |   4 +-
 git-init.txt                                  |   2 +-
 git-instaweb.html                             |   4 +-
 git-instaweb.txt                              |   2 +-
 git-log.html                                  |   6 +-
 git-log.txt                                   |   2 +-
 git-lost-found.html                           |   4 +-
 git-lost-found.txt                            |   2 +-
 git-ls-files.html                             |   4 +-
 git-ls-files.txt                              |   2 +-
 git-ls-remote.html                            |   4 +-
 git-ls-remote.txt                             |   2 +-
 git-ls-tree.html                              |   4 +-
 git-ls-tree.txt                               |   2 +-
 git-mailinfo.html                             |   4 +-
 git-mailinfo.txt                              |   2 +-
 git-mailsplit.html                            |   4 +-
 git-mailsplit.txt                             |   2 +-
 git-merge-base.html                           |   4 +-
 git-merge-base.txt                            |   2 +-
 git-merge-file.html                           |   4 +-
 git-merge-file.txt                            |   2 +-
 git-merge-index.html                          |   4 +-
 git-merge-index.txt                           |   2 +-
 git-merge-one-file.html                       |   4 +-
 git-merge-one-file.txt                        |   2 +-
 git-merge-tree.html                           |   4 +-
 git-merge-tree.txt                            |   2 +-
 git-merge.html                                |   4 +-
 git-merge.txt                                 |   2 +-
 git-mergetool.html                            |   4 +-
 git-mergetool.txt                             |   2 +-
 git-mktag.html                                |   4 +-
 git-mktag.txt                                 |   2 +-
 git-mktree.html                               |   4 +-
 git-mktree.txt                                |   2 +-
 git-mv.html                                   |   4 +-
 git-mv.txt                                    |   2 +-
 git-name-rev.html                             |   4 +-
 git-name-rev.txt                              |   2 +-
 git-pack-objects.html                         |   4 +-
 git-pack-objects.txt                          |   2 +-
 git-pack-redundant.html                       |   4 +-
 git-pack-redundant.txt                        |   2 +-
 git-pack-refs.html                            |   4 +-
 git-pack-refs.txt                             |   2 +-
 git-parse-remote.html                         |   4 +-
 git-parse-remote.txt                          |   2 +-
 git-patch-id.html                             |   4 +-
 git-patch-id.txt                              |   2 +-
 git-peek-remote.html                          |   4 +-
 git-peek-remote.txt                           |   2 +-
 git-prune-packed.html                         |   4 +-
 git-prune-packed.txt                          |   2 +-
 git-prune.html                                |   4 +-
 git-prune.txt                                 |   2 +-
 git-pull.html                                 |   4 +-
 git-pull.txt                                  |   2 +-
 git-push.html                                 |   4 +-
 git-push.txt                                  |   2 +-
 git-quiltimport.html                          |   4 +-
 git-quiltimport.txt                           |   2 +-
 git-read-tree.html                            |   4 +-
 git-read-tree.txt                             |   2 +-
 git-rebase.html                               |   4 +-
 git-rebase.txt                                |   2 +-
 git-receive-pack.html                         |   4 +-
 git-receive-pack.txt                          |   2 +-
 git-reflog.html                               |   4 +-
 git-reflog.txt                                |   2 +-
 git-relink.html                               |   4 +-
 git-relink.txt                                |   2 +-
 git-remote.html                               |   4 +-
 git-remote.txt                                |   2 +-
 git-repack.html                               |   4 +-
 git-repack.txt                                |   2 +-
 git-request-pull.html                         |   4 +-
 git-request-pull.txt                          |   2 +-
 git-rerere.html                               |   4 +-
 git-rerere.txt                                |   2 +-
 git-reset.html                                |   4 +-
 git-reset.txt                                 |   2 +-
 git-rev-list.html                             |   4 +-
 git-rev-list.txt                              |   2 +-
 git-rev-parse.html                            |   4 +-
 git-rev-parse.txt                             |   2 +-
 git-revert.html                               |   4 +-
 git-revert.txt                                |   2 +-
 git-rm.html                                   |   4 +-
 git-rm.txt                                    |   2 +-
 git-send-email.html                           |   4 +-
 git-send-email.txt                            |   2 +-
 git-send-pack.html                            |   4 +-
 git-send-pack.txt                             |   2 +-
 git-sh-setup.html                             |   4 +-
 git-sh-setup.txt                              |   2 +-
 git-shell.html                                |   4 +-
 git-shell.txt                                 |   2 +-
 git-shortlog.html                             |   4 +-
 git-shortlog.txt                              |   2 +-
 git-show-branch.html                          |   4 +-
 git-show-branch.txt                           |   2 +-
 git-show-index.html                           |   4 +-
 git-show-index.txt                            |   2 +-
 git-show-ref.html                             |   4 +-
 git-show-ref.txt                              |   2 +-
 git-show.html                                 |   4 +-
 git-show.txt                                  |   2 +-
 git-stash.html                                |   4 +-
 git-stash.txt                                 |   2 +-
 git-status.html                               |   4 +-
 git-status.txt                                |   2 +-
 git-stripspace.html                           |   4 +-
 git-stripspace.txt                            |   2 +-
 git-submodule.html                            |   4 +-
 git-submodule.txt                             |   2 +-
 git-symbolic-ref.html                         |   4 +-
 git-symbolic-ref.txt                          |   2 +-
 git-tag.html                                  |   4 +-
 git-tag.txt                                   |   2 +-
 git-tar-tree.html                             |   4 +-
 git-tar-tree.txt                              |   2 +-
 git-unpack-file.html                          |   4 +-
 git-unpack-file.txt                           |   2 +-
 git-unpack-objects.html                       |   4 +-
 git-unpack-objects.txt                        |   2 +-
 git-update-index.html                         |   4 +-
 git-update-index.txt                          |   2 +-
 git-update-ref.html                           |   4 +-
 git-update-ref.txt                            |   2 +-
 git-update-server-info.html                   |   8 +-
 git-update-server-info.txt                    |   6 +-
 git-upload-archive.html                       |   4 +-
 git-upload-archive.txt                        |   2 +-
 git-upload-pack.html                          |   4 +-
 git-upload-pack.txt                           |   2 +-
 git-var.html                                  |   4 +-
 git-var.txt                                   |   2 +-
 git-verify-pack.html                          |   4 +-
 git-verify-pack.txt                           |   2 +-
 git-verify-tag.html                           |   4 +-
 git-verify-tag.txt                            |   2 +-
 git-web--browse.html                          |   4 +-
 git-web--browse.txt                           |   2 +-
 git-whatchanged.html                          |   4 +-
 git-whatchanged.txt                           |   2 +-
 git-write-tree.html                           |   4 +-
 git-write-tree.txt                            |   2 +-
 git.html                                      |  11 +-
 git.txt                                       |   7 +-
 gitattributes.html                            |   6 +-
 gitattributes.txt                             |   4 +-
 gitcli.html                                   |   4 +-
 gitcli.txt                                    |   2 +-
 gitcore-tutorial.html                         |   6 +-
 gitcore-tutorial.txt                          |   4 +-
 gitcvs-migration.html                         |   4 +-
 gitcvs-migration.txt                          |   2 +-
 gitdiffcore.html                              | 575 ++++++++++++++++
 diffcore.txt => gitdiffcore.txt               |  31 +-
 gitglossary.html                              |   4 +-
 gitglossary.txt                               |   2 +-
 githooks.html                                 |   4 +-
 githooks.txt                                  |   2 +-
 gitignore.html                                |   4 +-
 gitignore.txt                                 |   2 +-
 gitk.html                                     |   4 +-
 gitk.txt                                      |   2 +-
 gitmodules.html                               |   4 +-
 gitmodules.txt                                |   2 +-
 gitrepository-layout.html                     | 619 ++++++++++++++++++
 ...ory-layout.txt => gitrepository-layout.txt |  34 +-
 gittutorial-2.html                            |   4 +-
 gittutorial-2.txt                             |   2 +-
 gittutorial.html                              |   4 +-
 gittutorial.txt                               |   2 +-
 281 files changed, 1706 insertions(+), 461 deletions(-)
 create mode 100644 gitdiffcore.html
 rename diffcore.txt => gitdiffcore.txt (96%)
 create mode 100644 gitrepository-layout.html
 rename repository-layout.txt => gitrepository-layout.txt (92%)

diff --git a/diff-options.txt b/diff-options.txt
index 859d67990..572154834 100644
--- a/diff-options.txt
+++ b/diff-options.txt
@@ -241,4 +241,4 @@ endif::git-format-patch[]
 	Do not show any source or destination prefix.
 
 For more detailed explanation on these common options, see also
-link:diffcore.html[diffcore documentation].
+linkgit:gitdiffcore[7][diffcore documentation].
diff --git a/git-add.html b/git-add.html
index d1728720e..d4119d376 100644
--- a/git-add.html
+++ b/git-add.html
@@ -410,7 +410,7 @@ commit.</p>
 <p>The optional configuration variable <em>core.excludesfile</em> indicates a path to a
 file containing patterns of file names to exclude from git-add, similar to
 $GIT_DIR/info/exclude.  Patterns in the exclude file are used in addition to
-those in info/exclude.  See <a href="repository-layout.html">repository layout</a>.</p>
+those in info/exclude.  See <a href="gitrepository-layout.html">gitrepository-layout(5)</a>[repository layout].</p>
 </div>
 <h2>EXAMPLES</h2>
 <div class="sectionbody">
@@ -600,11 +600,11 @@ double-quote and control characters will still have problems.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:20:52 UTC
+Last updated 06-Jun-2008 22:45:04 UTC
 </div>
 </div>
 </body>
diff --git a/git-add.txt b/git-add.txt
index 1afd0c69e..88165da38 100644
--- a/git-add.txt
+++ b/git-add.txt
@@ -100,7 +100,7 @@ Configuration
 The optional configuration variable 'core.excludesfile' indicates a path to a
 file containing patterns of file names to exclude from git-add, similar to
 $GIT_DIR/info/exclude.  Patterns in the exclude file are used in addition to
-those in info/exclude.  See link:repository-layout.html[repository layout].
+those in info/exclude.  See linkgit:gitrepository-layout[5][repository layout].
 
 
 EXAMPLES
@@ -265,4 +265,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-am.html b/git-am.html
index c70f0b2c3..f8b767344 100644
--- a/git-am.html
+++ b/git-am.html
@@ -496,11 +496,11 @@ names.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:20:52 UTC
+Last updated 06-Jun-2008 22:45:04 UTC
 </div>
 </div>
 </body>
diff --git a/git-am.txt b/git-am.txt
index 2387a8d6c..7f6f5b472 100644
--- a/git-am.txt
+++ b/git-am.txt
@@ -153,4 +153,4 @@ Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.o
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-annotate.html b/git-annotate.html
index 7b554d86b..f35ac04ea 100644
--- a/git-annotate.html
+++ b/git-annotate.html
@@ -450,11 +450,11 @@ commit.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:20:53 UTC
+Last updated 06-Jun-2008 22:45:05 UTC
 </div>
 </div>
 </body>
diff --git a/git-annotate.txt b/git-annotate.txt
index 45a6a7251..da15379ae 100644
--- a/git-annotate.txt
+++ b/git-annotate.txt
@@ -28,4 +28,4 @@ Written by Ryan Anderson <ryan@michonline.com>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-apply.html b/git-apply.html
index c0ae67ca4..8bfc9f53f 100644
--- a/git-apply.html
+++ b/git-apply.html
@@ -600,11 +600,11 @@ subdirectory is checked and (if possible) updated.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:20:53 UTC
+Last updated 06-Jun-2008 22:45:06 UTC
 </div>
 </div>
 </body>
diff --git a/git-apply.txt b/git-apply.txt
index 2dec2ec1c..76277bd17 100644
--- a/git-apply.txt
+++ b/git-apply.txt
@@ -206,4 +206,4 @@ Documentation by Junio C Hamano
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-archimport.html b/git-archimport.html
index 281d39766..82cce9863 100644
--- a/git-archimport.html
+++ b/git-archimport.html
@@ -418,11 +418,11 @@ patches that have been traded out-of-sequence between the branches.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:20:54 UTC
+Last updated 06-Jun-2008 22:45:06 UTC
 </div>
 </div>
 </body>
diff --git a/git-archimport.txt b/git-archimport.txt
index bd20fd820..603117c79 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 linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-archive.html b/git-archive.html
index a7ec75916..35c751658 100644
--- a/git-archive.html
+++ b/git-archive.html
@@ -465,11 +465,11 @@ git archive --format=zip --prefix=git-docs/ HEAD:Documentation/ &gt; git-1.4.0-d
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:20:54 UTC
+Last updated 06-Jun-2008 22:45:07 UTC
 </div>
 </div>
 </body>
diff --git a/git-archive.txt b/git-archive.txt
index d3eaa16af..a3e36dbb0 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 linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-bisect.html b/git-bisect.html
index d1485498b..ecfd1282a 100644
--- a/git-bisect.html
+++ b/git-bisect.html
@@ -508,11 +508,11 @@ test processes and the scripts.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:20:54 UTC
+Last updated 06-Jun-2008 22:45:07 UTC
 </div>
 </div>
 </body>
diff --git a/git-bisect.txt b/git-bisect.txt
index 0b8b0ebba..37c7acbe9 100644
--- a/git-bisect.txt
+++ b/git-bisect.txt
@@ -283,4 +283,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-blame.html b/git-blame.html
index a3ba6e941..7e7e39a36 100644
--- a/git-blame.html
+++ b/git-blame.html
@@ -682,11 +682,11 @@ commit commentary), a blame viewer won't ever care.</td>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:20:55 UTC
+Last updated 06-Jun-2008 22:45:08 UTC
 </div>
 </div>
 </body>
diff --git a/git-blame.txt b/git-blame.txt
index 14163b65f..7900f33d4 100644
--- a/git-blame.txt
+++ b/git-blame.txt
@@ -192,4 +192,4 @@ Written by Junio C Hamano <junkio@cox.net>
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-branch.html b/git-branch.html
index 53f0526a1..55500d2b6 100644
--- a/git-branch.html
+++ b/git-branch.html
@@ -609,11 +609,11 @@ but different purposes:</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:20:55 UTC
+Last updated 06-Jun-2008 22:45:08 UTC
 </div>
 </div>
 </body>
diff --git a/git-branch.txt b/git-branch.txt
index c824d8874..a70fa76f3 100644
--- a/git-branch.txt
+++ b/git-branch.txt
@@ -209,4 +209,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-bundle.html b/git-bundle.html
index 9fab1759a..fed3d1755 100644
--- a/git-bundle.html
+++ b/git-bundle.html
@@ -480,11 +480,11 @@ network.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:20:56 UTC
+Last updated 06-Jun-2008 22:45:09 UTC
 </div>
 </div>
 </body>
diff --git a/git-bundle.txt b/git-bundle.txt
index 18330cdcd..f6a06129a 100644
--- a/git-bundle.txt
+++ b/git-bundle.txt
@@ -171,4 +171,4 @@ Written by Mark Levedahl <mdl123@verizon.net>
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-cat-file.html b/git-cat-file.html
index ff1ccc037..89dd3f4c2 100644
--- a/git-cat-file.html
+++ b/git-cat-file.html
@@ -402,11 +402,11 @@ for each object specified on stdin that does not exist in the repository:</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:20:56 UTC
+Last updated 06-Jun-2008 22:45:09 UTC
 </div>
 </div>
 </body>
diff --git a/git-cat-file.txt b/git-cat-file.txt
index f6c394c48..3f77dbd10 100644
--- a/git-cat-file.txt
+++ b/git-cat-file.txt
@@ -103,4 +103,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-check-attr.html b/git-check-attr.html
index 5fc817d9b..3955c9588 100644
--- a/git-check-attr.html
+++ b/git-check-attr.html
@@ -308,11 +308,11 @@ git-check-attr(1) Manual Page
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:20:56 UTC
+Last updated 06-Jun-2008 22:45:10 UTC
 </div>
 </div>
 </body>
diff --git a/git-check-attr.txt b/git-check-attr.txt
index 290f10f16..ef16b9398 100644
--- a/git-check-attr.txt
+++ b/git-check-attr.txt
@@ -38,4 +38,4 @@ Documentation by James Bowes.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-check-ref-format.html b/git-check-ref-format.html
index 464441899..5f53e1282 100644
--- a/git-check-ref-format.html
+++ b/git-check-ref-format.html
@@ -339,11 +339,11 @@ colon <tt>:</tt> is used as in <tt>srcref:dstref</tt> to mean "use srcref's
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:20:58 UTC
+Last updated 06-Jun-2008 22:45:11 UTC
 </div>
 </div>
 </body>
diff --git a/git-check-ref-format.txt b/git-check-ref-format.txt
index a67688042..c560c0aa6 100644
--- a/git-check-ref-format.txt
+++ b/git-check-ref-format.txt
@@ -52,4 +52,4 @@ refname expressions (see linkgit:git-rev-parse[1]).  Namely:
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-checkout-index.html b/git-checkout-index.html
index e1ebd1aa4..0be6d76e9 100644
--- a/git-checkout-index.html
+++ b/git-checkout-index.html
@@ -507,11 +507,11 @@ Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:20:57 UTC
+Last updated 06-Jun-2008 22:45:10 UTC
 </div>
 </div>
 </body>
diff --git a/git-checkout-index.txt b/git-checkout-index.txt
index cbbb0b509..a8cad9c21 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 linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-checkout.html b/git-checkout.html
index 01e323241..102bf2d60 100644
--- a/git-checkout.html
+++ b/git-checkout.html
@@ -535,11 +535,11 @@ $ git add frotz</tt></pre>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:20:57 UTC
+Last updated 06-Jun-2008 22:45:10 UTC
 </div>
 </div>
 </body>
diff --git a/git-checkout.txt b/git-checkout.txt
index a644173e1..a5bf9d6f8 100644
--- a/git-checkout.txt
+++ b/git-checkout.txt
@@ -215,4 +215,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-cherry-pick.html b/git-cherry-pick.html
index b87bf0ce2..06f2744d6 100644
--- a/git-cherry-pick.html
+++ b/git-cherry-pick.html
@@ -379,11 +379,11 @@ effect to your working tree in a row.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:20:58 UTC
+Last updated 06-Jun-2008 22:45:12 UTC
 </div>
 </div>
 </body>
diff --git a/git-cherry-pick.txt b/git-cherry-pick.txt
index ca048f46f..3762272b8 100644
--- a/git-cherry-pick.txt
+++ b/git-cherry-pick.txt
@@ -78,4 +78,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-cherry.html b/git-cherry.html
index 33e086021..a3b9464a4 100644
--- a/git-cherry.html
+++ b/git-cherry.html
@@ -358,11 +358,11 @@ than pushing or pulling commits directly.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:20:58 UTC
+Last updated 06-Jun-2008 22:45:12 UTC
 </div>
 </div>
 </body>
diff --git a/git-cherry.txt b/git-cherry.txt
index d8e0a5b84..ef7caf61e 100644
--- a/git-cherry.txt
+++ b/git-cherry.txt
@@ -72,4 +72,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-citool.html b/git-citool.html
index 8c0192f94..5d64e7a12 100644
--- a/git-citool.html
+++ b/git-citool.html
@@ -293,11 +293,11 @@ See <a href="git-gui.html">git-gui(1)</a> for more details.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:20:59 UTC
+Last updated 06-Jun-2008 22:45:12 UTC
 </div>
 </div>
 </body>
diff --git a/git-citool.txt b/git-citool.txt
index aca1d75e5..09108d0e6 100644
--- a/git-citool.txt
+++ b/git-citool.txt
@@ -29,4 +29,4 @@ Documentation by Shawn O. Pearce <spearce@spearce.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-clean.html b/git-clean.html
index 86e199c1e..b4dc63922 100644
--- a/git-clean.html
+++ b/git-clean.html
@@ -349,11 +349,11 @@ affected are further limited to those that match them.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:20:59 UTC
+Last updated 06-Jun-2008 22:45:13 UTC
 </div>
 </div>
 </body>
diff --git a/git-clean.txt b/git-clean.txt
index 5e9da036b..deebf3b31 100644
--- a/git-clean.txt
+++ b/git-clean.txt
@@ -54,4 +54,4 @@ Written by Pavel Roskin <proski@gnu.org>
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-clone.html b/git-clone.html
index 7d33af6df..6d902b1b6 100644
--- a/git-clone.html
+++ b/git-clone.html
@@ -664,11 +664,11 @@ Create a repository on the kernel.org machine that borrows from Linus
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:20:59 UTC
+Last updated 06-Jun-2008 22:45:13 UTC
 </div>
 </div>
 </body>
diff --git a/git-clone.txt b/git-clone.txt
index 9b564420c..7973e6af4 100644
--- a/git-clone.txt
+++ b/git-clone.txt
@@ -205,4 +205,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-commit-tree.html b/git-commit-tree.html
index 8ebd33f3c..62542e63e 100644
--- a/git-commit-tree.html
+++ b/git-commit-tree.html
@@ -473,11 +473,11 @@ reversible operation.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:00 UTC
+Last updated 06-Jun-2008 22:45:13 UTC
 </div>
 </div>
 </body>
diff --git a/git-commit-tree.txt b/git-commit-tree.txt
index 700840d41..728c2fae8 100644
--- a/git-commit-tree.txt
+++ b/git-commit-tree.txt
@@ -103,4 +103,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-commit.html b/git-commit.html
index b227c59f3..b3d7eab9c 100644
--- a/git-commit.html
+++ b/git-commit.html
@@ -742,11 +742,11 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:00 UTC
+Last updated 06-Jun-2008 22:45:15 UTC
 </div>
 </div>
 </body>
diff --git a/git-commit.txt b/git-commit.txt
index c3c9f5b90..02d4baab6 100644
--- a/git-commit.txt
+++ b/git-commit.txt
@@ -312,4 +312,4 @@ Junio C Hamano <junkio@cox.net>
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-config.html b/git-config.html
index a22b24283..099fd992a 100644
--- a/git-config.html
+++ b/git-config.html
@@ -2588,11 +2588,11 @@ web.browser
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:00 UTC
+Last updated 06-Jun-2008 22:45:15 UTC
 </div>
 </div>
 </body>
diff --git a/git-config.txt b/git-config.txt
index 5de5d051b..84b754f8d 100644
--- a/git-config.txt
+++ b/git-config.txt
@@ -334,4 +334,4 @@ Documentation by Johannes Schindelin, Petr Baudis and the git-list <git@vger.ker
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-count-objects.html b/git-count-objects.html
index 3375f9be0..52b620a92 100644
--- a/git-count-objects.html
+++ b/git-count-objects.html
@@ -305,11 +305,11 @@ them, to help you decide when it is a good time to repack.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:01 UTC
+Last updated 06-Jun-2008 22:45:17 UTC
 </div>
 </div>
 </body>
diff --git a/git-count-objects.txt b/git-count-objects.txt
index 7fb08e934..e1219b316 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 linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-cvsexportcommit.html b/git-cvsexportcommit.html
index 920af796b..b7906d2b4 100644
--- a/git-cvsexportcommit.html
+++ b/git-cvsexportcommit.html
@@ -452,11 +452,11 @@ $ git-cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git-cvsexportcommit
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:02 UTC
+Last updated 06-Jun-2008 22:45:17 UTC
 </div>
 </div>
 </body>
diff --git a/git-cvsexportcommit.txt b/git-cvsexportcommit.txt
index f75afaaad..5fa91e51a 100644
--- a/git-cvsexportcommit.txt
+++ b/git-cvsexportcommit.txt
@@ -117,4 +117,4 @@ Documentation by Martin Langhoff <martin@catalyst.net.nz> and others.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-cvsimport.html b/git-cvsimport.html
index 7eff155a8..72cff455c 100644
--- a/git-cvsimport.html
+++ b/git-cvsimport.html
@@ -524,11 +524,11 @@ various participants of the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:04 UTC
+Last updated 06-Jun-2008 22:45:18 UTC
 </div>
 </div>
 </body>
diff --git a/git-cvsimport.txt b/git-cvsimport.txt
index 58eefd42e..2f9b35f62 100644
--- a/git-cvsimport.txt
+++ b/git-cvsimport.txt
@@ -170,4 +170,4 @@ Documentation by Matthias Urlichs <smurf@smurf.noris.de>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-cvsserver.html b/git-cvsserver.html
index efd420436..b03879af0 100644
--- a/git-cvsserver.html
+++ b/git-cvsserver.html
@@ -722,11 +722,11 @@ Martin Langhoff &lt;martin@catalyst.net.nz&gt;
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:06 UTC
+Last updated 06-Jun-2008 22:45:18 UTC
 </div>
 </div>
 </body>
diff --git a/git-cvsserver.txt b/git-cvsserver.txt
index a33382ec2..b7721131d 100644
--- a/git-cvsserver.txt
+++ b/git-cvsserver.txt
@@ -352,4 +352,4 @@ Documentation by Martyn Smith <martyn@catalyst.net.nz>, Martin Langhoff <martin@
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-daemon.html b/git-daemon.html
index 4f03a7c32..6027cbbc1 100644
--- a/git-daemon.html
+++ b/git-daemon.html
@@ -672,11 +672,11 @@ selectively enable/disable services per repository
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:07 UTC
+Last updated 06-Jun-2008 22:45:19 UTC
 </div>
 </div>
 </body>
diff --git a/git-daemon.txt b/git-daemon.txt
index cf261dd40..3fb71d683 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 linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-describe.html b/git-describe.html
index e163c4de0..8e795af9d 100644
--- a/git-describe.html
+++ b/git-describe.html
@@ -458,11 +458,11 @@ updated by Shawn Pearce &lt;spearce@spearce.org&gt;.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:09 UTC
+Last updated 06-Jun-2008 22:45:19 UTC
 </div>
 </div>
 </body>
diff --git a/git-describe.txt b/git-describe.txt
index 69e1ab750..3f0b7b2f4 100644
--- a/git-describe.txt
+++ b/git-describe.txt
@@ -142,4 +142,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-diff-files.html b/git-diff-files.html
index 907a823f7..ae11843eb 100644
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -757,7 +757,7 @@ same as "git-diff-index" and "git-diff-tree".</p>
 </dd>
 </dl>
 <p>For more detailed explanation on these common options, see also
-<a href="diffcore.html">diffcore documentation</a>.</p>
+<a href="gitdiffcore.html">gitdiffcore(7)</a>[diffcore documentation].</p>
 <dl>
 <dt>
 -1 -2 -3 or --base --ours --theirs, and -0
@@ -1284,11 +1284,11 @@ the pathname, but if that is <tt>NUL</tt>, the record will show two paths.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:09 UTC
+Last updated 06-Jun-2008 22:45:19 UTC
 </div>
 </div>
 </body>
diff --git a/git-diff-files.txt b/git-diff-files.txt
index ca1bb6a8e..ed9bd75b7 100644
--- a/git-diff-files.txt
+++ b/git-diff-files.txt
@@ -54,4 +54,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-diff-index.html b/git-diff-index.html
index 10bd6ef40..560b2afc9 100644
--- a/git-diff-index.html
+++ b/git-diff-index.html
@@ -758,7 +758,7 @@ entries in the index are compared.</p>
 </dd>
 </dl>
 <p>For more detailed explanation on these common options, see also
-<a href="diffcore.html">diffcore documentation</a>.</p>
+<a href="gitdiffcore.html">gitdiffcore(7)</a>[diffcore documentation].</p>
 <dl>
 <dt>
 &lt;tree-ish&gt;
@@ -1374,11 +1374,11 @@ always have the special all-zero sha1.</td>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:12 UTC
+Last updated 06-Jun-2008 22:45:20 UTC
 </div>
 </div>
 </body>
diff --git a/git-diff-index.txt b/git-diff-index.txt
index e86777859..f6e844fe6 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 linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-diff-tree.html b/git-diff-tree.html
index ba2dd8fdd..bdf178888 100644
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -760,7 +760,7 @@ git-diff-tree(1) Manual Page
 </dd>
 </dl>
 <p>For more detailed explanation on these common options, see also
-<a href="diffcore.html">diffcore documentation</a>.</p>
+<a href="gitdiffcore.html">gitdiffcore(7)</a>[diffcore documentation].</p>
 <dl>
 <dt>
 &lt;tree-ish&gt;
@@ -1769,11 +1769,11 @@ the pathname, but if that is <tt>NUL</tt>, the record will show two paths.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:14 UTC
+Last updated 06-Jun-2008 22:45:21 UTC
 </div>
 </div>
 </body>
diff --git a/git-diff-tree.txt b/git-diff-tree.txt
index 58d02c6a2..56caeb2d2 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 linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-diff.html b/git-diff.html
index 009e73037..a2ebaff33 100644
--- a/git-diff.html
+++ b/git-diff.html
@@ -836,7 +836,7 @@ and the range notations ("&lt;commit&gt;..&lt;commit&gt;" and
 </dd>
 </dl>
 <p>For more detailed explanation on these common options, see also
-<a href="diffcore.html">diffcore documentation</a>.</p>
+<a href="gitdiffcore.html">gitdiffcore(7)</a>[diffcore documentation].</p>
 <dl>
 <dt>
 &lt;path&gt;&#8230;
@@ -1489,11 +1489,11 @@ Output diff in reverse.
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:16 UTC
+Last updated 06-Jun-2008 22:45:21 UTC
 </div>
 </div>
 </body>
diff --git a/git-diff.txt b/git-diff.txt
index 57c28628b..7acd42896 100644
--- a/git-diff.txt
+++ b/git-diff.txt
@@ -168,4 +168,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-fast-export.html b/git-fast-export.html
index 11b8e4304..6deea7529 100644
--- a/git-fast-export.html
+++ b/git-fast-export.html
@@ -347,11 +347,11 @@ a tag referencing a tree instead of a commit.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:20 UTC
+Last updated 06-Jun-2008 22:45:24 UTC
 </div>
 </div>
 </body>
diff --git a/git-fast-export.txt b/git-fast-export.txt
index 6dac475a0..332346cc5 100644
--- a/git-fast-export.txt
+++ b/git-fast-export.txt
@@ -80,4 +80,4 @@ Documentation by Johannes E. Schindelin <johannes.schindelin@gmx.de>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-fast-import.html b/git-fast-import.html
index 20f5fe48c..040be1511 100644
--- a/git-fast-import.html
+++ b/git-fast-import.html
@@ -1412,11 +1412,11 @@ memory footprint (less than 2.7 MiB per active branch).</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:22 UTC
+Last updated 06-Jun-2008 22:45:24 UTC
 </div>
 </div>
 </body>
diff --git a/git-fast-import.txt b/git-fast-import.txt
index c29a4f812..395c055f9 100644
--- a/git-fast-import.txt
+++ b/git-fast-import.txt
@@ -1119,4 +1119,4 @@ Documentation by Shawn O. Pearce <spearce@spearce.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-fetch-pack.html b/git-fetch-pack.html
index 227a932fe..a554f39e6 100644
--- a/git-fetch-pack.html
+++ b/git-fetch-pack.html
@@ -427,11 +427,11 @@ have a common ancestor commit.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:22 UTC
+Last updated 06-Jun-2008 22:45:25 UTC
 </div>
 </div>
 </body>
diff --git a/git-fetch-pack.txt b/git-fetch-pack.txt
index 57598eb05..6ee3dccc1 100644
--- a/git-fetch-pack.txt
+++ b/git-fetch-pack.txt
@@ -99,4 +99,4 @@ Documentation by Junio C Hamano.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-fetch.html b/git-fetch.html
index eaa393ca2..f247132d9 100644
--- a/git-fetch.html
+++ b/git-fetch.html
@@ -705,11 +705,11 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:24 UTC
+Last updated 06-Jun-2008 22:45:26 UTC
 </div>
 </div>
 </body>
diff --git a/git-fetch.txt b/git-fetch.txt
index d982f961f..489b2b17e 100644
--- a/git-fetch.txt
+++ b/git-fetch.txt
@@ -53,4 +53,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-filter-branch.html b/git-filter-branch.html
index e05190335..03827d273 100644
--- a/git-filter-branch.html
+++ b/git-filter-branch.html
@@ -610,11 +610,11 @@ and the git list &lt;git@vger.kernel.org&gt;</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 03-Jun-2008 07:59:37 UTC
+Last updated 06-Jun-2008 22:45:27 UTC
 </div>
 </div>
 </body>
diff --git a/git-filter-branch.txt b/git-filter-branch.txt
index 35cb1677f..44060687a 100644
--- a/git-filter-branch.txt
+++ b/git-filter-branch.txt
@@ -317,4 +317,4 @@ Documentation by Petr Baudis and the git list.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-fmt-merge-msg.html b/git-fmt-merge-msg.html
index c06a5011c..e37120c2f 100644
--- a/git-fmt-merge-msg.html
+++ b/git-fmt-merge-msg.html
@@ -363,11 +363,11 @@ merge.summary
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:28 UTC
+Last updated 06-Jun-2008 22:45:27 UTC
 </div>
 </div>
 </body>
diff --git a/git-fmt-merge-msg.txt b/git-fmt-merge-msg.txt
index 457cf4256..328cc542d 100644
--- a/git-fmt-merge-msg.txt
+++ b/git-fmt-merge-msg.txt
@@ -67,4 +67,4 @@ Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.o
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-for-each-ref.html b/git-for-each-ref.html
index 15fa7778a..4c538e144 100644
--- a/git-for-each-ref.html
+++ b/git-for-each-ref.html
@@ -273,9 +273,8 @@ git-for-each-ref(1) Manual Page
 <h2>SYNOPSIS</h2>
 <div class="sectionbody">
 <div class="verseblock">
-<div class="content"><em>git-for-each-ref</em> [--count=&lt;count&gt;]*
-                   [--shell|--perl|--python|--tcl]
-                   [--sort=&lt;key&gt;]* [--format=&lt;format&gt;] [&lt;pattern&gt;]</div></div>
+<div class="content"><em>git-for-each-ref</em> [--count=&lt;count&gt;] [--shell|--perl|--python|--tcl]
+                   [--sort=&lt;key&gt;]* [--format=&lt;format&gt;] [&lt;pattern&gt;&#8230;]</div></div>
 </div>
 <h2>DESCRIPTION</h2>
 <div class="sectionbody">
@@ -306,8 +305,9 @@ host language allowing their direct evaluation in that language.</p>
 <p>
         A field name to sort on.  Prefix <tt>-</tt> to sort in
         descending order of the value.  When unspecified,
-        <tt>refname</tt> is used.  More than one sort keys can be
-        given.
+        <tt>refname</tt> is used.  You may use the --sort=&lt;key&gt; option
+        multiple times, in which case the last key becomes the primary
+        key.
 </p>
 </dd>
 <dt>
@@ -332,9 +332,10 @@ host language allowing their direct evaluation in that language.</p>
 </dt>
 <dd>
 <p>
-        If given, the name of the ref is matched against this
-        using fnmatch(3).  Refs that do not match the pattern
-        are not shown.
+        If one or more patterns are given, only refs are shown that
+        match againt at least one pattern, either using fnmatch(3) or
+        literally, in the latter case matching completely or from the
+        beginning up to a slash.
 </p>
 </dd>
 <dt>
@@ -495,7 +496,7 @@ eval "$eval"</tt></pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:29 UTC
+Last updated 06-Jun-2008 22:45:28 UTC
 </div>
 </div>
 </body>
diff --git a/git-for-each-ref.txt b/git-for-each-ref.txt
index f1f90cca6..6325ff9a6 100644
--- a/git-for-each-ref.txt
+++ b/git-for-each-ref.txt
@@ -8,9 +8,8 @@ git-for-each-ref - Output information on each ref
 SYNOPSIS
 --------
 [verse]
-'git-for-each-ref' [--count=<count>]\*
-                   [--shell|--perl|--python|--tcl]
-                   [--sort=<key>]\* [--format=<format>] [<pattern>]
+'git-for-each-ref' [--count=<count>] [--shell|--perl|--python|--tcl]
+		   [--sort=<key>]\* [--format=<format>] [<pattern>...]
 
 DESCRIPTION
 -----------
@@ -32,8 +31,9 @@ OPTIONS
 <key>::
 	A field name to sort on.  Prefix `-` to sort in
 	descending order of the value.  When unspecified,
-	`refname` is used.  More than one sort keys can be
-	given.
+	`refname` is used.  You may use the --sort=<key> option
+	multiple times, in which case the last key becomes the primary
+	key.
 
 <format>::
 	A string that interpolates `%(fieldname)` from the
@@ -48,9 +48,10 @@ OPTIONS
 	`%09` to `\t` (TAB) and `%0a` to `\n` (LF).
 
 <pattern>::
-	If given, the name of the ref is matched against this
-	using fnmatch(3).  Refs that do not match the pattern
-	are not shown.
+	If one or more patterns are given, only refs are shown that
+	match againt at least one pattern, either using fnmatch(3) or
+	literally, in the latter case matching completely or from the
+	beginning up to a slash.
 
 --shell, --perl, --python, --tcl::
 	If given, strings that substitute `%(fieldname)`
diff --git a/git-format-patch.html b/git-format-patch.html
index b6249f514..371140074 100644
--- a/git-format-patch.html
+++ b/git-format-patch.html
@@ -806,7 +806,7 @@ reference.</p>
 </dd>
 </dl>
 <p>For more detailed explanation on these common options, see also
-<a href="diffcore.html">diffcore documentation</a>.</p>
+<a href="gitdiffcore.html">gitdiffcore(7)</a>[diffcore documentation].</p>
 <dl>
 <dt>
 -&lt;n&gt;
@@ -1084,11 +1084,11 @@ as e-mailable patches:
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:29 UTC
+Last updated 06-Jun-2008 22:45:28 UTC
 </div>
 </div>
 </body>
diff --git a/git-format-patch.txt b/git-format-patch.txt
index fefcd269c..cdee64206 100644
--- a/git-format-patch.txt
+++ b/git-format-patch.txt
@@ -238,4 +238,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-fsck.html b/git-fsck.html
index 52983e5d1..bdbf668a8 100644
--- a/git-fsck.html
+++ b/git-fsck.html
@@ -518,11 +518,11 @@ GIT_ALTERNATE_OBJECT_DIRECTORIES
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:32 UTC
+Last updated 06-Jun-2008 22:45:29 UTC
 </div>
 </div>
 </body>
diff --git a/git-fsck.txt b/git-fsck.txt
index 4cc26fb74..9846c859c 100644
--- a/git-fsck.txt
+++ b/git-fsck.txt
@@ -151,4 +151,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-gc.html b/git-gc.html
index a0d4b0ecc..11ed4c78d 100644
--- a/git-gc.html
+++ b/git-gc.html
@@ -399,11 +399,11 @@ remove those references.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:33 UTC
+Last updated 06-Jun-2008 22:45:29 UTC
 </div>
 </div>
 </body>
diff --git a/git-gc.txt b/git-gc.txt
index f4097007f..6ace615d8 100644
--- a/git-gc.txt
+++ b/git-gc.txt
@@ -132,4 +132,4 @@ Written by Shawn O. Pearce <spearce@spearce.org>
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-get-tar-commit-id.html b/git-get-tar-commit-id.html
index 307d79360..c71449010 100644
--- a/git-get-tar-commit-id.html
+++ b/git-get-tar-commit-id.html
@@ -294,11 +294,11 @@ a tree ID instead of a commit ID or tag.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:34 UTC
+Last updated 06-Jun-2008 22:45:29 UTC
 </div>
 </div>
 </body>
diff --git a/git-get-tar-commit-id.txt b/git-get-tar-commit-id.txt
index dea41490c..c13bf9869 100644
--- a/git-get-tar-commit-id.txt
+++ b/git-get-tar-commit-id.txt
@@ -33,4 +33,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-grep.html b/git-grep.html
index 2d84bd61d..a2f2f8770 100644
--- a/git-grep.html
+++ b/git-grep.html
@@ -526,11 +526,11 @@ revamped by Junio C Hamano.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:34 UTC
+Last updated 06-Jun-2008 22:45:30 UTC
 </div>
 </div>
 </body>
diff --git a/git-grep.txt b/git-grep.txt
index a97f0557f..13b9cf770 100644
--- a/git-grep.txt
+++ b/git-grep.txt
@@ -145,4 +145,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-gui.html b/git-gui.html
index ad74bfef5..de06a8efb 100644
--- a/git-gui.html
+++ b/git-gui.html
@@ -429,11 +429,11 @@ of end users.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:35 UTC
+Last updated 06-Jun-2008 22:45:30 UTC
 </div>
 </div>
 </body>
diff --git a/git-gui.txt b/git-gui.txt
index bd5fe67b3..105397f2b 100644
--- a/git-gui.txt
+++ b/git-gui.txt
@@ -112,4 +112,4 @@ Documentation by Shawn O. Pearce <spearce@spearce.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-hash-object.html b/git-hash-object.html
index 916e5b930..6e4752423 100644
--- a/git-hash-object.html
+++ b/git-hash-object.html
@@ -331,11 +331,11 @@ specified, it defaults to "blob".</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:35 UTC
+Last updated 06-Jun-2008 22:45:30 UTC
 </div>
 </div>
 </body>
diff --git a/git-hash-object.txt b/git-hash-object.txt
index 99a21434b..cf3dce8a4 100644
--- a/git-hash-object.txt
+++ b/git-hash-object.txt
@@ -45,4 +45,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-help.html b/git-help.html
index 4c7a662d0..8a35a97b6 100644
--- a/git-help.html
+++ b/git-help.html
@@ -451,17 +451,17 @@ See <a href="git-config.html">git-config(1)</a> for more information about this.
 </div>
 <h2>Documentation</h2>
 <div class="sectionbody">
-<p>Initial documentation was part of the <a href="git.html">git(7)</a> man page.
+<p>Initial documentation was part of the <a href="git.html">git(1)</a> man page.
 Christian Couder &lt;chriscool@tuxfamily.org&gt; extracted and rewrote it a
 little. Maintenance is done by the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:35 UTC
+Last updated 06-Jun-2008 22:45:31 UTC
 </div>
 </div>
 </body>
diff --git a/git-help.txt b/git-help.txt
index bfbba9e23..8994c6d43 100644
--- a/git-help.txt
+++ b/git-help.txt
@@ -172,10 +172,10 @@ Written by Junio C Hamano <gitster@pobox.com> and the git-list
 
 Documentation
 -------------
-Initial documentation was part of the linkgit:git[7] man page.
+Initial documentation was part of the linkgit:git[1] 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 linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-http-fetch.html b/git-http-fetch.html
index 0ac3368a1..1250a815a 100644
--- a/git-http-fetch.html
+++ b/git-http-fetch.html
@@ -365,11 +365,11 @@ commit-id
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:36 UTC
+Last updated 06-Jun-2008 22:45:31 UTC
 </div>
 </div>
 </body>
diff --git a/git-http-fetch.txt b/git-http-fetch.txt
index b784a9d07..70fb63529 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 linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-http-push.html b/git-http-push.html
index ab071427a..cd435d9fc 100644
--- a/git-http-push.html
+++ b/git-http-push.html
@@ -419,11 +419,11 @@ to disable the fast-forward check only on that ref.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:36 UTC
+Last updated 06-Jun-2008 22:45:31 UTC
 </div>
 </div>
 </body>
diff --git a/git-http-push.txt b/git-http-push.txt
index 0b8272234..143291d12 100644
--- a/git-http-push.txt
+++ b/git-http-push.txt
@@ -101,4 +101,4 @@ Documentation by Nick Hengeveld
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-imap-send.html b/git-imap-send.html
index 946d1d177..60f9b8603 100644
--- a/git-imap-send.html
+++ b/git-imap-send.html
@@ -316,11 +316,11 @@ configuration file (shown with examples):</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:36 UTC
+Last updated 06-Jun-2008 22:45:32 UTC
 </div>
 </div>
 </body>
diff --git a/git-imap-send.txt b/git-imap-send.txt
index 522b73c12..f4fdc2428 100644
--- a/git-imap-send.txt
+++ b/git-imap-send.txt
@@ -59,4 +59,4 @@ Documentation by Mike McCormack
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-index-pack.html b/git-index-pack.html
index 9658ffc63..413e5541a 100644
--- a/git-index-pack.html
+++ b/git-index-pack.html
@@ -402,11 +402,11 @@ mentioned above.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:36 UTC
+Last updated 06-Jun-2008 22:45:32 UTC
 </div>
 </div>
 </body>
diff --git a/git-index-pack.txt b/git-index-pack.txt
index a7825b614..6409363ae 100644
--- a/git-index-pack.txt
+++ b/git-index-pack.txt
@@ -100,4 +100,4 @@ Documentation by Sergey Vlasov
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-init.html b/git-init.html
index a2e23c928..5202de5b1 100644
--- a/git-init.html
+++ b/git-init.html
@@ -417,11 +417,11 @@ add all existing file to the index
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 02-Jun-2008 07:30:00 UTC
+Last updated 06-Jun-2008 22:45:32 UTC
 </div>
 </div>
 </body>
diff --git a/git-init.txt b/git-init.txt
index b48c31289..c48b615da 100644
--- a/git-init.txt
+++ b/git-init.txt
@@ -122,4 +122,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-instaweb.html b/git-instaweb.html
index 8a7730154..06fbe5d2f 100644
--- a/git-instaweb.html
+++ b/git-instaweb.html
@@ -391,11 +391,11 @@ repository.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:37 UTC
+Last updated 06-Jun-2008 22:45:32 UTC
 </div>
 </div>
 </body>
diff --git a/git-instaweb.txt b/git-instaweb.txt
index 51f1532ef..11e6a8177 100644
--- a/git-instaweb.txt
+++ b/git-instaweb.txt
@@ -86,4 +86,4 @@ Documentation by Eric Wong <normalperson@yhbt.net>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-log.html b/git-log.html
index 615c09acc..ab9ff5033 100644
--- a/git-log.html
+++ b/git-log.html
@@ -758,7 +758,7 @@ each commit introduces are shown.</p>
 </dd>
 </dl>
 <p>For more detailed explanation on these common options, see also
-<a href="diffcore.html">diffcore documentation</a>.</p>
+<a href="gitdiffcore.html">gitdiffcore(7)</a>[diffcore documentation].</p>
 <dl>
 <dt>
 -&lt;n&gt;
@@ -1909,11 +1909,11 @@ reversible operation.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Jun-2008 07:52:27 UTC
+Last updated 06-Jun-2008 22:45:33 UTC
 </div>
 </div>
 </body>
diff --git a/git-log.txt b/git-log.txt
index ebaee4b33..db61bc96c 100644
--- a/git-log.txt
+++ b/git-log.txt
@@ -112,4 +112,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-lost-found.html b/git-lost-found.html
index 09650af23..7de6abd16 100644
--- a/git-lost-found.html
+++ b/git-lost-found.html
@@ -336,11 +336,11 @@ $ git rev-parse not-lost-anymore
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:37 UTC
+Last updated 06-Jun-2008 22:45:33 UTC
 </div>
 </div>
 </body>
diff --git a/git-lost-found.txt b/git-lost-found.txt
index b1c797f10..4dc475e0d 100644
--- a/git-lost-found.txt
+++ b/git-lost-found.txt
@@ -78,4 +78,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-ls-files.html b/git-ls-files.html
index 6cbe9458c..411f10277 100644
--- a/git-ls-files.html
+++ b/git-ls-files.html
@@ -622,11 +622,11 @@ pattern file appears in.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:37 UTC
+Last updated 06-Jun-2008 22:45:34 UTC
 </div>
 </div>
 </body>
diff --git a/git-ls-files.txt b/git-ls-files.txt
index 4be45b001..1b0b21224 100644
--- a/git-ls-files.txt
+++ b/git-ls-files.txt
@@ -192,4 +192,4 @@ Documentation by David Greaves, Junio C Hamano, Josh Triplett, and the git-list
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-ls-remote.html b/git-ls-remote.html
index 4c0a4c4c1..033c53532 100644
--- a/git-ls-remote.html
+++ b/git-ls-remote.html
@@ -357,11 +357,11 @@ c5db5456ae3b0873fc659c19fafdde22313cc441        refs/tags/v0.99.2
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:38 UTC
+Last updated 06-Jun-2008 22:45:34 UTC
 </div>
 </div>
 </body>
diff --git a/git-ls-remote.txt b/git-ls-remote.txt
index c5ba0aad1..8ad7a94f9 100644
--- a/git-ls-remote.txt
+++ b/git-ls-remote.txt
@@ -69,4 +69,4 @@ Written by Junio C Hamano <junkio@cox.net>
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-ls-tree.html b/git-ls-tree.html
index 4972222e3..8bd04949d 100644
--- a/git-ls-tree.html
+++ b/git-ls-tree.html
@@ -412,11 +412,11 @@ another major rewrite by Linus Torvalds &lt;torvalds@osdl.org&gt;</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:38 UTC
+Last updated 06-Jun-2008 22:45:35 UTC
 </div>
 </div>
 </body>
diff --git a/git-ls-tree.txt b/git-ls-tree.txt
index 360c0a1b9..d9881fbbb 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 linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-mailinfo.html b/git-mailinfo.html
index 92e069316..c70db35ef 100644
--- a/git-mailinfo.html
+++ b/git-mailinfo.html
@@ -353,11 +353,11 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:38 UTC
+Last updated 06-Jun-2008 22:45:35 UTC
 </div>
 </div>
 </body>
diff --git a/git-mailinfo.txt b/git-mailinfo.txt
index 3846f0e6e..183dc1dd7 100644
--- a/git-mailinfo.txt
+++ b/git-mailinfo.txt
@@ -66,4 +66,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-mailsplit.html b/git-mailsplit.html
index 2922ebe00..a1a1f5c8f 100644
--- a/git-mailsplit.html
+++ b/git-mailsplit.html
@@ -358,11 +358,11 @@ and Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Jun-2008 23:09:01 UTC
+Last updated 06-Jun-2008 22:45:36 UTC
 </div>
 </div>
 </body>
diff --git a/git-mailsplit.txt b/git-mailsplit.txt
index 421e7782b..9a2aedd48 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 linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-merge-base.html b/git-merge-base.html
index f5a668e28..c68bcbaa8 100644
--- a/git-merge-base.html
+++ b/git-merge-base.html
@@ -308,11 +308,11 @@ relied on to decide in any particular way.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:39 UTC
+Last updated 06-Jun-2008 22:45:36 UTC
 </div>
 </div>
 </body>
diff --git a/git-merge-base.txt b/git-merge-base.txt
index 07f78b4ae..bbe851239 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 linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-merge-file.html b/git-merge-file.html
index ac9f27c35..487c33ae4 100644
--- a/git-merge-file.html
+++ b/git-merge-file.html
@@ -373,11 +373,11 @@ with parts copied from the original documentation of RCS merge.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:39 UTC
+Last updated 06-Jun-2008 22:45:36 UTC
 </div>
 </div>
 </body>
diff --git a/git-merge-file.txt b/git-merge-file.txt
index c513184ba..149f13105 100644
--- a/git-merge-file.txt
+++ b/git-merge-file.txt
@@ -89,4 +89,4 @@ with parts copied from the original documentation of RCS merge.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-merge-index.html b/git-merge-index.html
index 763413bae..6b289bf3a 100644
--- a/git-merge-index.html
+++ b/git-merge-index.html
@@ -368,11 +368,11 @@ One-shot merge by Petr Baudis &lt;pasky@ucw.cz&gt;</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:39 UTC
+Last updated 06-Jun-2008 22:45:36 UTC
 </div>
 </div>
 </body>
diff --git a/git-merge-index.txt b/git-merge-index.txt
index 19ee017ae..a0ead2bbf 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 linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-merge-one-file.html b/git-merge-one-file.html
index d22fa3c1d..4d0fb3931 100644
--- a/git-merge-one-file.html
+++ b/git-merge-one-file.html
@@ -290,11 +290,11 @@ Junio C Hamano &lt;junkio@cox.net&gt; and Petr Baudis &lt;pasky@suse.cz&gt;.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:39 UTC
+Last updated 06-Jun-2008 22:45:37 UTC
 </div>
 </div>
 </body>
diff --git a/git-merge-one-file.txt b/git-merge-one-file.txt
index ee95df3bc..5c9ce641e 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 linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-merge-tree.html b/git-merge-tree.html
index 209da2d6c..deb69177d 100644
--- a/git-merge-tree.html
+++ b/git-merge-tree.html
@@ -296,11 +296,11 @@ entries that match &lt;branch1&gt; tree.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:40 UTC
+Last updated 06-Jun-2008 22:45:37 UTC
 </div>
 </div>
 </body>
diff --git a/git-merge-tree.txt b/git-merge-tree.txt
index 4cc0964e7..b785e0f6e 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 linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-merge.html b/git-merge.html
index ba283a553..4512eee57 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -745,11 +745,11 @@ Resolve the conflicts.  <tt>git-diff</tt> would report only the
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:40 UTC
+Last updated 06-Jun-2008 22:45:38 UTC
 </div>
 </div>
 </body>
diff --git a/git-merge.txt b/git-merge.txt
index ef1f055c8..55bc36747 100644
--- a/git-merge.txt
+++ b/git-merge.txt
@@ -168,4 +168,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-mergetool.html b/git-mergetool.html
index e78a596fc..887da677b 100644
--- a/git-mergetool.html
+++ b/git-mergetool.html
@@ -336,11 +336,11 @@ success of the resolution after the custom tool has exited.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:39 UTC
+Last updated 06-Jun-2008 22:45:37 UTC
 </div>
 </div>
 </body>
diff --git a/git-mergetool.txt b/git-mergetool.txt
index 8ed44947e..83525609c 100644
--- a/git-mergetool.txt
+++ b/git-mergetool.txt
@@ -70,4 +70,4 @@ Documentation by Theodore Y Ts'o.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-mktag.html b/git-mktag.html
index 31bb98b71..31cd8bdb2 100644
--- a/git-mktag.html
+++ b/git-mktag.html
@@ -306,11 +306,11 @@ care about, but that can be verified with gpg.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:40 UTC
+Last updated 06-Jun-2008 22:45:38 UTC
 </div>
 </div>
 </body>
diff --git a/git-mktag.txt b/git-mktag.txt
index 82db9f5d8..232bc1a33 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 linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-mktree.html b/git-mktree.html
index fa985788d..e31d3e7f0 100644
--- a/git-mktree.html
+++ b/git-mktree.html
@@ -303,11 +303,11 @@ built is written to the standard output.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:40 UTC
+Last updated 06-Jun-2008 22:45:38 UTC
 </div>
 </div>
 </body>
diff --git a/git-mktree.txt b/git-mktree.txt
index f312036ab..1ddbf00af 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 linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-mv.html b/git-mv.html
index 74c706d74..8407840b5 100644
--- a/git-mv.html
+++ b/git-mv.html
@@ -333,11 +333,11 @@ Move functionality added by Josef Weidendorfer &lt;Josef.Weidendorfer@gmx.de&gt;
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:40 UTC
+Last updated 06-Jun-2008 22:45:39 UTC
 </div>
 </div>
 </body>
diff --git a/git-mv.txt b/git-mv.txt
index bff3fbe74..fb485de2c 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 linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-name-rev.html b/git-name-rev.html
index 8b4945eb8..73105ab98 100644
--- a/git-name-rev.html
+++ b/git-name-rev.html
@@ -360,11 +360,11 @@ not the context.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:41 UTC
+Last updated 06-Jun-2008 22:45:39 UTC
 </div>
 </div>
 </body>
diff --git a/git-name-rev.txt b/git-name-rev.txt
index efcabdc27..12784d737 100644
--- a/git-name-rev.txt
+++ b/git-name-rev.txt
@@ -75,4 +75,4 @@ Documentation by Johannes Schindelin.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-pack-objects.html b/git-pack-objects.html
index 6480c308c..a3d62da8b 100644
--- a/git-pack-objects.html
+++ b/git-pack-objects.html
@@ -573,11 +573,11 @@ base-name
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:41 UTC
+Last updated 06-Jun-2008 22:45:39 UTC
 </div>
 </div>
 </body>
diff --git a/git-pack-objects.txt b/git-pack-objects.txt
index 35d1856b5..d5a87effa 100644
--- a/git-pack-objects.txt
+++ b/git-pack-objects.txt
@@ -208,4 +208,4 @@ linkgit:git-prune-packed[1]
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-pack-redundant.html b/git-pack-redundant.html
index 65821cb57..000abe92b 100644
--- a/git-pack-redundant.html
+++ b/git-pack-redundant.html
@@ -331,11 +331,11 @@ objects.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:41 UTC
+Last updated 06-Jun-2008 22:45:39 UTC
 </div>
 </div>
 </body>
diff --git a/git-pack-redundant.txt b/git-pack-redundant.txt
index c7bc7b336..6737326f0 100644
--- a/git-pack-redundant.txt
+++ b/git-pack-redundant.txt
@@ -54,4 +54,4 @@ linkgit:git-prune-packed[1]
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-pack-refs.html b/git-pack-refs.html
index d45fa23a4..dc6628ebf 100644
--- a/git-pack-refs.html
+++ b/git-pack-refs.html
@@ -332,11 +332,11 @@ hierarchy after packing them.  This option tells it not to.
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:41 UTC
+Last updated 06-Jun-2008 22:45:40 UTC
 </div>
 </div>
 </body>
diff --git a/git-pack-refs.txt b/git-pack-refs.txt
index e4ff93471..fa4868137 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 linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-parse-remote.html b/git-parse-remote.html
index 5013c4846..13017a52e 100644
--- a/git-parse-remote.html
+++ b/git-parse-remote.html
@@ -322,11 +322,11 @@ get_remote_refs_for_push
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:41 UTC
+Last updated 06-Jun-2008 22:45:40 UTC
 </div>
 </div>
 </body>
diff --git a/git-parse-remote.txt b/git-parse-remote.txt
index deb8b2f01..951dbd6c8 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 linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-patch-id.html b/git-patch-id.html
index d93e52340..2dcc8da83 100644
--- a/git-patch-id.html
+++ b/git-patch-id.html
@@ -310,11 +310,11 @@ This can be used to make a mapping from patch ID to commit ID.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:42 UTC
+Last updated 06-Jun-2008 22:45:41 UTC
 </div>
 </div>
 </body>
diff --git a/git-patch-id.txt b/git-patch-id.txt
index 894852a78..bb8a07925 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 linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-peek-remote.html b/git-peek-remote.html
index 9eb82044f..1c3568a26 100644
--- a/git-peek-remote.html
+++ b/git-peek-remote.html
@@ -328,11 +328,11 @@ git-peek-remote(1) Manual Page
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:42 UTC
+Last updated 06-Jun-2008 22:45:41 UTC
 </div>
 </div>
 </body>
diff --git a/git-peek-remote.txt b/git-peek-remote.txt
index 000171007..56be1b611 100644
--- a/git-peek-remote.txt
+++ b/git-peek-remote.txt
@@ -47,4 +47,4 @@ Documentation by Junio C Hamano.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-prune-packed.html b/git-prune-packed.html
index cdddb8c10..6cc257392 100644
--- a/git-prune-packed.html
+++ b/git-prune-packed.html
@@ -321,11 +321,11 @@ disk storage, etc.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:42 UTC
+Last updated 06-Jun-2008 22:45:41 UTC
 </div>
 </div>
 </body>
diff --git a/git-prune-packed.txt b/git-prune-packed.txt
index 3219eb3dd..f330b8a5b 100644
--- a/git-prune-packed.txt
+++ b/git-prune-packed.txt
@@ -49,4 +49,4 @@ linkgit:git-repack[1]
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-prune.html b/git-prune.html
index 1c2cebdda..74874f5e8 100644
--- a/git-prune.html
+++ b/git-prune.html
@@ -369,11 +369,11 @@ git-fsck's --unreachable option.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:42 UTC
+Last updated 06-Jun-2008 22:45:42 UTC
 </div>
 </div>
 </body>
diff --git a/git-prune.txt b/git-prune.txt
index 82a03e376..7283d07a0 100644
--- a/git-prune.txt
+++ b/git-prune.txt
@@ -83,4 +83,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-pull.html b/git-pull.html
index 457e85f3f..1a366e100 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -1061,11 +1061,11 @@ Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:42 UTC
+Last updated 06-Jun-2008 22:45:42 UTC
 </div>
 </div>
 </body>
diff --git a/git-pull.txt b/git-pull.txt
index 66304f025..5c522ced9 100644
--- a/git-pull.txt
+++ b/git-pull.txt
@@ -203,4 +203,4 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-push.html b/git-push.html
index 31f820ba5..b0bf1c695 100644
--- a/git-push.html
+++ b/git-push.html
@@ -755,11 +755,11 @@ by Linus Torvalds &lt;torvalds@osdl.org&gt;</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:42 UTC
+Last updated 06-Jun-2008 22:45:43 UTC
 </div>
 </div>
 </body>
diff --git a/git-push.txt b/git-push.txt
index 0cc44d799..9d8c37971 100644
--- a/git-push.txt
+++ b/git-push.txt
@@ -200,4 +200,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-quiltimport.html b/git-quiltimport.html
index 46e1cd580..b6d545322 100644
--- a/git-quiltimport.html
+++ b/git-quiltimport.html
@@ -335,11 +335,11 @@ variable.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:43 UTC
+Last updated 06-Jun-2008 22:45:44 UTC
 </div>
 </div>
 </body>
diff --git a/git-quiltimport.txt b/git-quiltimport.txt
index 0fc2b56c1..d0bc182c7 100644
--- a/git-quiltimport.txt
+++ b/git-quiltimport.txt
@@ -57,4 +57,4 @@ Documentation by Eric Biederman <ebiederm@lnxi.com>
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-read-tree.html b/git-read-tree.html
index a95c8a63e..195725150 100644
--- a/git-read-tree.html
+++ b/git-read-tree.html
@@ -707,11 +707,11 @@ have finished your work-in-progress), attempt the merge again.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:43 UTC
+Last updated 06-Jun-2008 22:45:44 UTC
 </div>
 </div>
 </body>
diff --git a/git-read-tree.txt b/git-read-tree.txt
index 2e097a140..cbe68352b 100644
--- a/git-read-tree.txt
+++ b/git-read-tree.txt
@@ -361,4 +361,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-rebase.html b/git-rebase.html
index 37facd978..6a0c7237f 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -839,11 +839,11 @@ Johannes E. Schindelin &lt;johannes.schindelin@gmx.de&gt;</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:43 UTC
+Last updated 06-Jun-2008 22:45:44 UTC
 </div>
 </div>
 </body>
diff --git a/git-rebase.txt b/git-rebase.txt
index e0412e086..cc48beec7 100644
--- a/git-rebase.txt
+++ b/git-rebase.txt
@@ -401,4 +401,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-receive-pack.html b/git-receive-pack.html
index 5cc51620f..71b973051 100644
--- a/git-receive-pack.html
+++ b/git-receive-pack.html
@@ -426,11 +426,11 @@ exec git-update-server-info</tt></pre>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:44 UTC
+Last updated 06-Jun-2008 22:45:46 UTC
 </div>
 </div>
 </body>
diff --git a/git-receive-pack.txt b/git-receive-pack.txt
index 4111434bb..a70c7168f 100644
--- a/git-receive-pack.txt
+++ b/git-receive-pack.txt
@@ -162,4 +162,4 @@ Documentation by Junio C Hamano.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-reflog.html b/git-reflog.html
index eed8baf2b..51add9853 100644
--- a/git-reflog.html
+++ b/git-reflog.html
@@ -393,11 +393,11 @@ them.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:44 UTC
+Last updated 06-Jun-2008 22:45:47 UTC
 </div>
 </div>
 </body>
diff --git a/git-reflog.txt b/git-reflog.txt
index 047e3ce14..8492aeacf 100644
--- a/git-reflog.txt
+++ b/git-reflog.txt
@@ -102,4 +102,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-relink.html b/git-relink.html
index 4a393d1fe..033d94b2e 100644
--- a/git-relink.html
+++ b/git-relink.html
@@ -312,11 +312,11 @@ repository will be replaced with a hardlink to the master repository.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:44 UTC
+Last updated 06-Jun-2008 22:45:47 UTC
 </div>
 </div>
 </body>
diff --git a/git-relink.txt b/git-relink.txt
index 1b024ded3..f6dafd449 100644
--- a/git-relink.txt
+++ b/git-relink.txt
@@ -34,4 +34,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-remote.html b/git-remote.html
index 24df82c5e..0bfe6284e 100644
--- a/git-remote.html
+++ b/git-remote.html
@@ -426,11 +426,11 @@ $ git merge origin</tt></pre>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:44 UTC
+Last updated 06-Jun-2008 22:45:48 UTC
 </div>
 </div>
 </body>
diff --git a/git-remote.txt b/git-remote.txt
index 5c55290ee..e97dc0929 100644
--- a/git-remote.txt
+++ b/git-remote.txt
@@ -146,4 +146,4 @@ Documentation by J. Bruce Fields and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-repack.html b/git-repack.html
index dd84d371b..fdac98954 100644
--- a/git-repack.html
+++ b/git-repack.html
@@ -439,11 +439,11 @@ that way can try to use older git with it).</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:45 UTC
+Last updated 06-Jun-2008 22:45:49 UTC
 </div>
 </div>
 </body>
diff --git a/git-repack.txt b/git-repack.txt
index ef578f0f8..793dccaa9 100644
--- a/git-repack.txt
+++ b/git-repack.txt
@@ -129,4 +129,4 @@ linkgit:git-prune-packed[1]
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-request-pull.html b/git-request-pull.html
index 25a09726a..bf956af1a 100644
--- a/git-request-pull.html
+++ b/git-request-pull.html
@@ -318,11 +318,11 @@ the given URL in the generated summary.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:45 UTC
+Last updated 06-Jun-2008 22:45:49 UTC
 </div>
 </div>
 </body>
diff --git a/git-request-pull.txt b/git-request-pull.txt
index 9a14c04e3..c71d86985 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 linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-rerere.html b/git-rerere.html
index 48056ee16..9e7ef16a7 100644
--- a/git-rerere.html
+++ b/git-rerere.html
@@ -477,11 +477,11 @@ conflict.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:45 UTC
+Last updated 06-Jun-2008 22:45:50 UTC
 </div>
 </div>
 </body>
diff --git a/git-rerere.txt b/git-rerere.txt
index a53858e25..8030ec4d0 100644
--- a/git-rerere.txt
+++ b/git-rerere.txt
@@ -208,4 +208,4 @@ Written by Junio C Hamano <junkio@cox.net>
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-reset.html b/git-reset.html
index cdfb0e542..7c880ddbd 100644
--- a/git-reset.html
+++ b/git-reset.html
@@ -603,11 +603,11 @@ Adds the file to the index again.
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:45 UTC
+Last updated 06-Jun-2008 22:45:50 UTC
 </div>
 </div>
 </body>
diff --git a/git-reset.txt b/git-reset.txt
index fac59c972..12ea9b23c 100644
--- a/git-reset.txt
+++ b/git-reset.txt
@@ -203,4 +203,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-rev-list.html b/git-rev-list.html
index 3a0254dcc..719b0d053 100644
--- a/git-rev-list.html
+++ b/git-rev-list.html
@@ -1221,11 +1221,11 @@ and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Jun-2008 07:52:27 UTC
+Last updated 06-Jun-2008 22:45:52 UTC
 </div>
 </div>
 </body>
diff --git a/git-rev-list.txt b/git-rev-list.txt
index d80cdf550..c9b095032 100644
--- a/git-rev-list.txt
+++ b/git-rev-list.txt
@@ -109,4 +109,4 @@ and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-rev-parse.html b/git-rev-parse.html
index 01a73666a..579ca4ee7 100644
--- a/git-rev-parse.html
+++ b/git-rev-parse.html
@@ -897,11 +897,11 @@ Junio C Hamano &lt;junkio@cox.net&gt; and Pierre Habouzit &lt;madcoder@debian.or
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:46 UTC
+Last updated 06-Jun-2008 22:45:52 UTC
 </div>
 </div>
 </body>
diff --git a/git-rev-parse.txt b/git-rev-parse.txt
index 5641d9951..a0ef1fd55 100644
--- a/git-rev-parse.txt
+++ b/git-rev-parse.txt
@@ -417,4 +417,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-revert.html b/git-revert.html
index 15b472c7e..28f4be3f8 100644
--- a/git-revert.html
+++ b/git-revert.html
@@ -361,11 +361,11 @@ effect to your working tree in a row.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:46 UTC
+Last updated 06-Jun-2008 22:45:51 UTC
 </div>
 </div>
 </body>
diff --git a/git-revert.txt b/git-revert.txt
index 13ceabbcc..5e6adfcea 100644
--- a/git-revert.txt
+++ b/git-revert.txt
@@ -65,4 +65,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-rm.html b/git-rm.html
index fbc0d66c2..c955bc825 100644
--- a/git-rm.html
+++ b/git-rm.html
@@ -423,11 +423,11 @@ git-rm -f git-*.sh
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:47 UTC
+Last updated 06-Jun-2008 22:45:54 UTC
 </div>
 </div>
 </body>
diff --git a/git-rm.txt b/git-rm.txt
index 6481f4ae5..da3fe5913 100644
--- a/git-rm.txt
+++ b/git-rm.txt
@@ -107,4 +107,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-send-email.html b/git-send-email.html
index 0f0697220..6083c99e8 100644
--- a/git-send-email.html
+++ b/git-send-email.html
@@ -681,11 +681,11 @@ send_lots_of_email.pl by Greg Kroah-Hartman.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:47 UTC
+Last updated 06-Jun-2008 22:45:55 UTC
 </div>
 </div>
 </body>
diff --git a/git-send-email.txt b/git-send-email.txt
index 9d0a10c56..a29583796 100644
--- a/git-send-email.txt
+++ b/git-send-email.txt
@@ -241,4 +241,4 @@ Documentation by Ryan Anderson
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-send-pack.html b/git-send-pack.html
index 4347e83fe..893499f1a 100644
--- a/git-send-pack.html
+++ b/git-send-pack.html
@@ -449,11 +449,11 @@ to disable the fast-forward check only on that ref.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:47 UTC
+Last updated 06-Jun-2008 22:45:55 UTC
 </div>
 </div>
 </body>
diff --git a/git-send-pack.txt b/git-send-pack.txt
index 777515b12..850c351dc 100644
--- a/git-send-pack.txt
+++ b/git-send-pack.txt
@@ -125,4 +125,4 @@ Documentation by Junio C Hamano.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-sh-setup.html b/git-sh-setup.html
index 4e00a9f82..258f6ae36 100644
--- a/git-sh-setup.html
+++ b/git-sh-setup.html
@@ -379,11 +379,11 @@ get_author_ident_from_commit
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:49 UTC
+Last updated 06-Jun-2008 22:46:00 UTC
 </div>
 </div>
 </body>
diff --git a/git-sh-setup.txt b/git-sh-setup.txt
index 16b8b7514..c54317034 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 linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-shell.html b/git-shell.html
index 544b2bb89..ad71efd45 100644
--- a/git-shell.html
+++ b/git-shell.html
@@ -294,11 +294,11 @@ are permitted to be called, with a single required argument.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:47 UTC
+Last updated 06-Jun-2008 22:45:56 UTC
 </div>
 </div>
 </body>
diff --git a/git-shell.txt b/git-shell.txt
index bc031e0cc..bd09196ac 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 linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-shortlog.html b/git-shortlog.html
index fed86125a..0ef9065c0 100644
--- a/git-shortlog.html
+++ b/git-shortlog.html
@@ -355,11 +355,11 @@ Eve Jones &lt;eve@laptop.(none)&gt;</tt></pre>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:48 UTC
+Last updated 06-Jun-2008 22:45:57 UTC
 </div>
 </div>
 </body>
diff --git a/git-shortlog.txt b/git-shortlog.txt
index d7cb4c046..5079b568e 100644
--- a/git-shortlog.txt
+++ b/git-shortlog.txt
@@ -65,4 +65,4 @@ Documentation by Junio C Hamano.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-show-branch.html b/git-show-branch.html
index 3d9a009c6..05005e789 100644
--- a/git-show-branch.html
+++ b/git-show-branch.html
@@ -517,11 +517,11 @@ topologically related with each other.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:48 UTC
+Last updated 06-Jun-2008 22:45:57 UTC
 </div>
 </div>
 </body>
diff --git a/git-show-branch.txt b/git-show-branch.txt
index 0bb8250b2..32595ad54 100644
--- a/git-show-branch.txt
+++ b/git-show-branch.txt
@@ -190,4 +190,4 @@ Documentation by Junio C Hamano.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-show-index.html b/git-show-index.html
index 7793f5112..d6ac7d29a 100644
--- a/git-show-index.html
+++ b/git-show-index.html
@@ -292,11 +292,11 @@ offset and SHA1 of each object.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:48 UTC
+Last updated 06-Jun-2008 22:45:58 UTC
 </div>
 </div>
 </body>
diff --git a/git-show-index.txt b/git-show-index.txt
index 535a88464..891f0eff2 100644
--- a/git-show-index.txt
+++ b/git-show-index.txt
@@ -31,4 +31,4 @@ Documentation by Junio C Hamano
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-show-ref.html b/git-show-ref.html
index f6bb4b901..cb96173b1 100644
--- a/git-show-ref.html
+++ b/git-show-ref.html
@@ -456,11 +456,11 @@ Man page by Jonas Fonseca &lt;fonseca@diku.dk&gt;.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:48 UTC
+Last updated 06-Jun-2008 22:45:58 UTC
 </div>
 </div>
 </body>
diff --git a/git-show-ref.txt b/git-show-ref.txt
index ce0e643fb..a85332c36 100644
--- a/git-show-ref.txt
+++ b/git-show-ref.txt
@@ -169,4 +169,4 @@ Man page by Jonas Fonseca <fonseca@diku.dk>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-show.html b/git-show.html
index 6f2ccbb58..752730da5 100644
--- a/git-show.html
+++ b/git-show.html
@@ -764,11 +764,11 @@ Johannes Schindelin &lt;Johannes.Schindelin@gmx.de&gt;.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:48 UTC
+Last updated 06-Jun-2008 22:45:59 UTC
 </div>
 </div>
 </body>
diff --git a/git-show.txt b/git-show.txt
index 29ed0acc6..baaf2bc8f 100644
--- a/git-show.txt
+++ b/git-show.txt
@@ -81,4 +81,4 @@ Documentation by David Greaves, Petr Baudis and the git-list <git@vger.kernel.or
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-stash.html b/git-stash.html
index a58fedc90..2a4cd414c 100644
--- a/git-stash.html
+++ b/git-stash.html
@@ -478,11 +478,11 @@ $ git stash apply
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:49 UTC
+Last updated 06-Jun-2008 22:46:00 UTC
 </div>
 </div>
 </body>
diff --git a/git-stash.txt b/git-stash.txt
index 8dc35d493..baa4f55b4 100644
--- a/git-stash.txt
+++ b/git-stash.txt
@@ -182,4 +182,4 @@ Written by Nanako Shiraishi <nanako3@bluebottle.com>
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-status.html b/git-status.html
index 107c3b4a4..e74d60257 100644
--- a/git-status.html
+++ b/git-status.html
@@ -328,11 +328,11 @@ Junio C Hamano &lt;junkio@cox.net&gt;.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:49 UTC
+Last updated 06-Jun-2008 22:46:01 UTC
 </div>
 </div>
 </body>
diff --git a/git-status.txt b/git-status.txt
index 057e2a167..fef62b16d 100644
--- a/git-status.txt
+++ b/git-status.txt
@@ -72,4 +72,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-stripspace.html b/git-stripspace.html
index fde204abb..d6e4e8c75 100644
--- a/git-stripspace.html
+++ b/git-stripspace.html
@@ -309,11 +309,11 @@ git-stripspace(1) Manual Page
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:49 UTC
+Last updated 06-Jun-2008 22:46:01 UTC
 </div>
 </div>
 </body>
diff --git a/git-stripspace.txt b/git-stripspace.txt
index fc5687502..4883834a1 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 linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-submodule.html b/git-submodule.html
index b9cd275d0..80f821111 100644
--- a/git-submodule.html
+++ b/git-submodule.html
@@ -415,11 +415,11 @@ for details.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:49 UTC
+Last updated 06-Jun-2008 22:46:01 UTC
 </div>
 </div>
 </body>
diff --git a/git-submodule.txt b/git-submodule.txt
index 0668f295e..139206f01 100644
--- a/git-submodule.txt
+++ b/git-submodule.txt
@@ -98,4 +98,4 @@ Written by Lars Hjemli <hjemli@gmail.com>
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-symbolic-ref.html b/git-symbolic-ref.html
index a3499daa8..a4953d3ca 100644
--- a/git-symbolic-ref.html
+++ b/git-symbolic-ref.html
@@ -332,11 +332,11 @@ name is not a symbolic ref, or 128 if another error occurs.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:50 UTC
+Last updated 06-Jun-2008 22:46:01 UTC
 </div>
 </div>
 </body>
diff --git a/git-symbolic-ref.txt b/git-symbolic-ref.txt
index a5b40f3e8..e9b996baa 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 linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-tag.html b/git-tag.html
index b7223bd95..1b85af9e2 100644
--- a/git-tag.html
+++ b/git-tag.html
@@ -548,11 +548,11 @@ Junio C Hamano &lt;junkio@cox.net&gt; and Chris Wright &lt;chrisw@osdl.org&gt;.<
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:50 UTC
+Last updated 06-Jun-2008 22:46:02 UTC
 </div>
 </div>
 </body>
diff --git a/git-tag.txt b/git-tag.txt
index 9712392f7..8f40f4bf0 100644
--- a/git-tag.txt
+++ b/git-tag.txt
@@ -255,4 +255,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-tar-tree.html b/git-tar-tree.html
index 15924a739..c25aac554 100644
--- a/git-tar-tree.html
+++ b/git-tar-tree.html
@@ -395,11 +395,11 @@ git tar-tree HEAD:Documentation/ git-docs &gt; git-1.4.0-docs.tar
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:51 UTC
+Last updated 06-Jun-2008 22:46:02 UTC
 </div>
 </div>
 </body>
diff --git a/git-tar-tree.txt b/git-tar-tree.txt
index 65c68176e..74ed06525 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 linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-unpack-file.html b/git-unpack-file.html
index 3e8904375..d6498cfb2 100644
--- a/git-unpack-file.html
+++ b/git-unpack-file.html
@@ -303,11 +303,11 @@ returns the name of the temporary file in the following format:
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:51 UTC
+Last updated 06-Jun-2008 22:46:03 UTC
 </div>
 </div>
 </body>
diff --git a/git-unpack-file.txt b/git-unpack-file.txt
index 1864d13ed..d0552b2c7 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 linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-unpack-objects.html b/git-unpack-objects.html
index 6149ccd6c..369f9a35f 100644
--- a/git-unpack-objects.html
+++ b/git-unpack-objects.html
@@ -337,11 +337,11 @@ new packs and replace existing ones.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:51 UTC
+Last updated 06-Jun-2008 22:46:03 UTC
 </div>
 </div>
 </body>
diff --git a/git-unpack-objects.txt b/git-unpack-objects.txt
index 50947c50d..b9c4279a8 100644
--- a/git-unpack-objects.txt
+++ b/git-unpack-objects.txt
@@ -54,4 +54,4 @@ Documentation by Junio C Hamano
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-update-index.html b/git-update-index.html
index 3d1407d64..e8f3e0afa 100644
--- a/git-update-index.html
+++ b/git-update-index.html
@@ -723,11 +723,11 @@ from symbolic link to regular file.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:51 UTC
+Last updated 06-Jun-2008 22:46:03 UTC
 </div>
 </div>
 </body>
diff --git a/git-update-index.txt b/git-update-index.txt
index 77d312adc..c70336518 100644
--- a/git-update-index.txt
+++ b/git-update-index.txt
@@ -328,4 +328,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-update-ref.html b/git-update-ref.html
index 5da3730fd..7177d4828 100644
--- a/git-update-ref.html
+++ b/git-update-ref.html
@@ -356,11 +356,11 @@ or does not have committer information available.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:51 UTC
+Last updated 06-Jun-2008 22:46:03 UTC
 </div>
 </div>
 </body>
diff --git a/git-update-ref.txt b/git-update-ref.txt
index 4dc475992..7f7e3d197 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 linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-update-server-info.html b/git-update-server-info.html
index b34fe1640..6a1a4502c 100644
--- a/git-update-server-info.html
+++ b/git-update-server-info.html
@@ -298,8 +298,8 @@ generates such auxiliary files.</p>
 <h2>OUTPUT</h2>
 <div class="sectionbody">
 <p>Currently the command updates the following files.  Please see
-<a href="repository-layout.html">repository-layout</a> for description
-of what they are for:</p>
+<a href="gitrepository-layout.html">gitrepository-layout(5)</a>[repository-layout] for description of
+what they are for:</p>
 <ul>
 <li>
 <p>
@@ -328,11 +328,11 @@ info/refs file unless <tt>--force</tt> flag is given.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:52 UTC
+Last updated 06-Jun-2008 22:46:04 UTC
 </div>
 </div>
 </body>
diff --git a/git-update-server-info.txt b/git-update-server-info.txt
index 1cf89fd79..aa1ee67cb 100644
--- a/git-update-server-info.txt
+++ b/git-update-server-info.txt
@@ -30,8 +30,8 @@ OUTPUT
 ------
 
 Currently the command updates the following files.  Please see
-link:repository-layout.html[repository-layout] for description
-of what they are for:
+linkgit:gitrepository-layout[5][repository-layout] for description of
+what they are for:
 
 * objects/info/packs
 
@@ -54,4 +54,4 @@ Documentation by Junio C Hamano.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-upload-archive.html b/git-upload-archive.html
index 16a3133af..6131da773 100644
--- a/git-upload-archive.html
+++ b/git-upload-archive.html
@@ -305,11 +305,11 @@ is meant to be used to get an archive from a remote repository.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:52 UTC
+Last updated 06-Jun-2008 22:46:05 UTC
 </div>
 </div>
 </body>
diff --git a/git-upload-archive.txt b/git-upload-archive.txt
index c1ef1440b..e49f68f68 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 linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-upload-pack.html b/git-upload-pack.html
index 4ae5b8d0c..110ef7a90 100644
--- a/git-upload-pack.html
+++ b/git-upload-pack.html
@@ -322,11 +322,11 @@ repository.  For push operations, see <em>git-send-pack</em>.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:52 UTC
+Last updated 06-Jun-2008 22:46:05 UTC
 </div>
 </div>
 </body>
diff --git a/git-upload-pack.txt b/git-upload-pack.txt
index 2330d1381..521da5b20 100644
--- a/git-upload-pack.txt
+++ b/git-upload-pack.txt
@@ -43,4 +43,4 @@ Documentation by Junio C Hamano.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-var.html b/git-var.html
index 9e96191cd..3bb71a2c1 100644
--- a/git-var.html
+++ b/git-var.html
@@ -368,11 +368,11 @@ Your sysadmin must hate you!
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:52 UTC
+Last updated 06-Jun-2008 22:46:05 UTC
 </div>
 </div>
 </body>
diff --git a/git-var.txt b/git-var.txt
index 242a1d9bb..67e8e1f93 100644
--- a/git-var.txt
+++ b/git-var.txt
@@ -61,4 +61,4 @@ Documentation by Eric Biederman and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-verify-pack.html b/git-verify-pack.html
index bc2446e4c..8765cdc55 100644
--- a/git-verify-pack.html
+++ b/git-verify-pack.html
@@ -334,11 +334,11 @@ corresponding pack file.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:52 UTC
+Last updated 06-Jun-2008 22:46:05 UTC
 </div>
 </div>
 </body>
diff --git a/git-verify-pack.txt b/git-verify-pack.txt
index ba2a15729..478f23699 100644
--- a/git-verify-pack.txt
+++ b/git-verify-pack.txt
@@ -50,4 +50,4 @@ Documentation by Junio C Hamano
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-verify-tag.html b/git-verify-tag.html
index a84e71402..aae567a98 100644
--- a/git-verify-tag.html
+++ b/git-verify-tag.html
@@ -301,11 +301,11 @@ git-verify-tag(1) Manual Page
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:53 UTC
+Last updated 06-Jun-2008 22:46:06 UTC
 </div>
 </div>
 </body>
diff --git a/git-verify-tag.txt b/git-verify-tag.txt
index 7e9c1ed15..dffba8906 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 linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-web--browse.html b/git-web--browse.html
index 37a0ae829..fc43d39d0 100644
--- a/git-web--browse.html
+++ b/git-web--browse.html
@@ -415,11 +415,11 @@ git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:53 UTC
+Last updated 06-Jun-2008 22:46:06 UTC
 </div>
 </div>
 </body>
diff --git a/git-web--browse.txt b/git-web--browse.txt
index 5ba0b9f1c..f8d5fb11d 100644
--- a/git-web--browse.txt
+++ b/git-web--browse.txt
@@ -118,4 +118,4 @@ git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-whatchanged.html b/git-whatchanged.html
index 8da0dab6b..3f8f41ed2 100644
--- a/git-whatchanged.html
+++ b/git-whatchanged.html
@@ -703,11 +703,11 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:53 UTC
+Last updated 06-Jun-2008 22:46:06 UTC
 </div>
 </div>
 </body>
diff --git a/git-whatchanged.txt b/git-whatchanged.txt
index a6e7bd4c8..f5d39c787 100644
--- a/git-whatchanged.txt
+++ b/git-whatchanged.txt
@@ -76,4 +76,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git-write-tree.html b/git-write-tree.html
index 67c582032..cb61e7eee 100644
--- a/git-write-tree.html
+++ b/git-write-tree.html
@@ -319,11 +319,11 @@ now, you need to have done a <tt>git-update-index</tt> phase before you did the
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:53 UTC
+Last updated 06-Jun-2008 22:46:06 UTC
 </div>
 </div>
 </body>
diff --git a/git-write-tree.txt b/git-write-tree.txt
index 461c813f5..8744f6535 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 linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/git.html b/git.html
index a3ffd8cef..2fa731509 100644
--- a/git.html
+++ b/git.html
@@ -256,12 +256,12 @@ div.exampleblock-content {
   padding-left: 0.5em;
 }
 </style>
-<title>git(7)</title>
+<title>git(1)</title>
 </head>
 <body>
 <div id="header">
 <h1>
-git(7) Manual Page
+git(1) Manual Page
 </h1>
 <h2>NAME</h2>
 <div class="sectionbody">
@@ -1628,7 +1628,8 @@ HEAD
 </div>
 <h2>File/Directory Structure</h2>
 <div class="sectionbody">
-<p>Please see the <a href="repository-layout.html">repository layout</a> document.</p>
+<p>Please see the <a href="gitrepository-layout.html">gitrepository-layout(5)</a>[repository layout]
+document.</p>
 <p>Read <a href="githooks.html">githooks(5)</a>[hooks] for more details about each hook.</p>
 <p>Higher level SCMs may provide and manage additional information in the
 <tt>$GIT_DIR</tt>.</p>
@@ -1955,11 +1956,11 @@ contributors on the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 02-Jun-2008 07:30:02 UTC
+Last updated 06-Jun-2008 22:46:07 UTC
 </div>
 </div>
 </body>
diff --git a/git.txt b/git.txt
index dae1b4031..ba07e51f5 100644
--- a/git.txt
+++ b/git.txt
@@ -1,4 +1,4 @@
-git(7)
+git(1)
 ======
 
 NAME
@@ -364,7 +364,8 @@ For a more complete list of ways to spell object names, see
 File/Directory Structure
 ------------------------
 
-Please see the link:repository-layout.html[repository layout] document.
+Please see the linkgit:gitrepository-layout[5][repository layout]
+document.
 
 Read linkgit:githooks[5][hooks] for more details about each hook.
 
@@ -588,4 +589,4 @@ link:user-manual.html[The Git User's Manual]
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/gitattributes.html b/gitattributes.html
index e90814e77..8497f227b 100644
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -546,7 +546,7 @@ wrong place to talk about it.  However&#8230;</p>
 attribute set to <tt>jcdiff</tt>, it calls the command you specified
 with the above configuration, i.e. <tt>j-c-diff</tt>, with 7
 parameters, just like <tt>GIT_EXTERNAL_DIFF</tt> program is called.
-See <a href="git.html">git(7)</a> for details.</p>
+See <a href="git.html">git(1)</a> for details.</p>
 <h4>Defining a custom hunk-header</h4>
 <p>Each group of changes (called "hunk") in the textual diff output
 is prefixed with a line of the form:</p>
@@ -819,11 +819,11 @@ commit hash.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:54 UTC
+Last updated 06-Jun-2008 22:46:07 UTC
 </div>
 </div>
 </body>
diff --git a/gitattributes.txt b/gitattributes.txt
index 04ca63ca3..471754eb1 100644
--- a/gitattributes.txt
+++ b/gitattributes.txt
@@ -265,7 +265,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 linkgit:git[7] for details.
+See linkgit:git[1] for details.
 
 
 Defining a custom hunk-header
@@ -518,4 +518,4 @@ commit hash.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/gitcli.html b/gitcli.html
index a3993d682..41c527cbc 100644
--- a/gitcli.html
+++ b/gitcli.html
@@ -384,11 +384,11 @@ $ git describe --abbrev 10 HEAD  # NOT WHAT YOU MEANT</tt></pre>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:55 UTC
+Last updated 06-Jun-2008 22:46:10 UTC
 </div>
 </div>
 </body>
diff --git a/gitcli.txt b/gitcli.txt
index 835cb05f9..8fb5d889e 100644
--- a/gitcli.txt
+++ b/gitcli.txt
@@ -110,4 +110,4 @@ Documentation by Pierre Habouzit.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/gitcore-tutorial.html b/gitcore-tutorial.html
index 58468ee66..67efaa16d 100644
--- a/gitcore-tutorial.html
+++ b/gitcore-tutorial.html
@@ -385,7 +385,7 @@ populating your tree.</td>
 <div class="title">Note</div>
 </td>
 <td class="content">An advanced user may want to take a look at the
-<a href="repository-layout.html">repository layout</a> document
+<a href="gitrepository-layout.html">gitrepository-layout(5)</a>[repository layout] document
 after finishing this tutorial.</td>
 </tr></table>
 </div>
@@ -1986,11 +1986,11 @@ to follow, not easier.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite.</p>
+<p>Part of the <a href="git.html">git(1)</a> suite.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 02-Jun-2008 07:30:07 UTC
+Last updated 06-Jun-2008 22:46:12 UTC
 </div>
 </div>
 </body>
diff --git a/gitcore-tutorial.txt b/gitcore-tutorial.txt
index 5995a2e15..cb4ec4044 100644
--- a/gitcore-tutorial.txt
+++ b/gitcore-tutorial.txt
@@ -109,7 +109,7 @@ populating your tree.
 
 [NOTE]
 An advanced user may want to take a look at the
-link:repository-layout.html[repository layout] document
+linkgit:gitrepository-layout[5][repository layout] document
 after finishing this tutorial.
 
 You have now created your first git repository. Of course, since it's
@@ -1696,4 +1696,4 @@ link:user-manual.html[The Git User's Manual]
 
 GIT
 ---
-Part of the linkgit:git[7] suite.
+Part of the linkgit:git[1] suite.
diff --git a/gitcvs-migration.html b/gitcvs-migration.html
index 7625355d4..f7d2759d3 100644
--- a/gitcvs-migration.html
+++ b/gitcvs-migration.html
@@ -438,11 +438,11 @@ repositories without the need for a central maintainer.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite.</p>
+<p>Part of the <a href="git.html">git(1)</a> suite.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 02-Jun-2008 07:30:06 UTC
+Last updated 06-Jun-2008 22:46:12 UTC
 </div>
 </div>
 </body>
diff --git a/gitcvs-migration.txt b/gitcvs-migration.txt
index de02a4268..1db3f5294 100644
--- a/gitcvs-migration.txt
+++ b/gitcvs-migration.txt
@@ -193,4 +193,4 @@ link:user-manual.html[The Git User's Manual]
 
 GIT
 ---
-Part of the linkgit:git[7] suite.
+Part of the linkgit:git[1] suite.
diff --git a/gitdiffcore.html b/gitdiffcore.html
new file mode 100644
index 000000000..f29b5b572
--- /dev/null
+++ b/gitdiffcore.html
@@ -0,0 +1,575 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<meta name="generator" content="AsciiDoc 7.0.2" />
+<style type="text/css">
+/* Debug borders */
+p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
+/*
+  border: 1px solid red;
+*/
+}
+
+body {
+  margin: 1em 5% 1em 5%;
+}
+
+a { color: blue; }
+a:visited { color: fuchsia; }
+
+em {
+  font-style: italic;
+}
+
+strong {
+  font-weight: bold;
+}
+
+tt {
+  color: navy;
+}
+
+h1, h2, h3, h4, h5, h6 {
+  color: #527bbd;
+  font-family: sans-serif;
+  margin-top: 1.2em;
+  margin-bottom: 0.5em;
+  line-height: 1.3;
+}
+
+h1 {
+  border-bottom: 2px solid silver;
+}
+h2 {
+  border-bottom: 2px solid silver;
+  padding-top: 0.5em;
+}
+
+div.sectionbody {
+  font-family: serif;
+  margin-left: 0;
+}
+
+hr {
+  border: 1px solid silver;
+}
+
+p {
+  margin-top: 0.5em;
+  margin-bottom: 0.5em;
+}
+
+pre {
+  padding: 0;
+  margin: 0;
+}
+
+span#author {
+  color: #527bbd;
+  font-family: sans-serif;
+  font-weight: bold;
+  font-size: 1.2em;
+}
+span#email {
+}
+span#revision {
+  font-family: sans-serif;
+}
+
+div#footer {
+  font-family: sans-serif;
+  font-size: small;
+  border-top: 2px solid silver;
+  padding-top: 0.5em;
+  margin-top: 4.0em;
+}
+div#footer-text {
+  float: left;
+  padding-bottom: 0.5em;
+}
+div#footer-badges {
+  float: right;
+  padding-bottom: 0.5em;
+}
+
+div#preamble,
+div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
+div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
+div.admonitionblock {
+  margin-right: 10%;
+  margin-top: 1.5em;
+  margin-bottom: 1.5em;
+}
+div.admonitionblock {
+  margin-top: 2.5em;
+  margin-bottom: 2.5em;
+}
+
+div.content { /* Block element content. */
+  padding: 0;
+}
+
+/* Block element titles. */
+div.title, caption.title {
+  font-family: sans-serif;
+  font-weight: bold;
+  text-align: left;
+  margin-top: 1.0em;
+  margin-bottom: 0.5em;
+}
+div.title + * {
+  margin-top: 0;
+}
+
+td div.title:first-child {
+  margin-top: 0.0em;
+}
+div.content div.title:first-child {
+  margin-top: 0.0em;
+}
+div.content + div.title {
+  margin-top: 0.0em;
+}
+
+div.sidebarblock > div.content {
+  background: #ffffee;
+  border: 1px solid silver;
+  padding: 0.5em;
+}
+
+div.listingblock > div.content {
+  border: 1px solid silver;
+  background: #f4f4f4;
+  padding: 0.5em;
+}
+
+div.quoteblock > div.content {
+  padding-left: 2.0em;
+}
+div.quoteblock .attribution {
+  text-align: right;
+}
+
+div.admonitionblock .icon {
+  vertical-align: top;
+  font-size: 1.1em;
+  font-weight: bold;
+  text-decoration: underline;
+  color: #527bbd;
+  padding-right: 0.5em;
+}
+div.admonitionblock td.content {
+  padding-left: 0.5em;
+  border-left: 2px solid silver;
+}
+
+div.exampleblock > div.content {
+  border-left: 2px solid silver;
+  padding: 0.5em;
+}
+
+div.verseblock div.content {
+  white-space: pre;
+}
+
+div.imageblock div.content { padding-left: 0; }
+div.imageblock img { border: 1px solid silver; }
+span.image img { border-style: none; }
+
+dl {
+  margin-top: 0.8em;
+  margin-bottom: 0.8em;
+}
+dt {
+  margin-top: 0.5em;
+  margin-bottom: 0;
+  font-style: italic;
+}
+dd > *:first-child {
+  margin-top: 0;
+}
+
+ul, ol {
+    list-style-position: outside;
+}
+ol.olist2 {
+  list-style-type: lower-alpha;
+}
+
+div.tableblock > table {
+  border-color: #527bbd;
+  border-width: 3px;
+}
+thead {
+  font-family: sans-serif;
+  font-weight: bold;
+}
+tfoot {
+  font-weight: bold;
+}
+
+div.hlist {
+  margin-top: 0.8em;
+  margin-bottom: 0.8em;
+}
+td.hlist1 {
+  vertical-align: top;
+  font-style: italic;
+  padding-right: 0.8em;
+}
+td.hlist2 {
+  vertical-align: top;
+}
+
+@media print {
+  div#footer-badges { display: none; }
+}
+include::./stylesheets/xhtml11-manpage.css[]
+/* Workarounds for IE6's broken and incomplete CSS2. */
+
+div.sidebar-content {
+  background: #ffffee;
+  border: 1px solid silver;
+  padding: 0.5em;
+}
+div.sidebar-title, div.image-title {
+  font-family: sans-serif;
+  font-weight: bold;
+  margin-top: 0.0em;
+  margin-bottom: 0.5em;
+}
+
+div.listingblock div.content {
+  border: 1px solid silver;
+  background: #f4f4f4;
+  padding: 0.5em;
+}
+
+div.quoteblock-content {
+  padding-left: 2.0em;
+}
+
+div.exampleblock-content {
+  border-left: 2px solid silver;
+  padding-left: 0.5em;
+}
+</style>
+<title>gitdiffcore(7)</title>
+</head>
+<body>
+<div id="header">
+<h1>
+gitdiffcore(7) Manual Page
+</h1>
+<h2>NAME</h2>
+<div class="sectionbody">
+<p>gitdiffcore -
+   Tweaking diff output (June 2005)
+</p>
+</div>
+</div>
+<h2>SYNOPSIS</h2>
+<div class="sectionbody">
+<p>git diff *</p>
+</div>
+<h2>DESCRIPTION</h2>
+<div class="sectionbody">
+<p>The diff commands git-diff-index, git-diff-files, and git-diff-tree
+can be told to manipulate differences they find in
+unconventional ways before showing diff(1) output.  The manipulation
+is collectively called "diffcore transformation".  This short note
+describes what they are and how to use them to produce diff outputs
+that are easier to understand than the conventional kind.</p>
+</div>
+<h2>The chain of operation</h2>
+<div class="sectionbody">
+<p>The git-diff-* family works by first comparing two sets of
+files:</p>
+<ul>
+<li>
+<p>
+git-diff-index compares contents of a "tree" object and the
+   working directory (when <em>--cached</em> flag is not used) or a
+   "tree" object and the index file (when <em>--cached</em> flag is
+   used);
+</p>
+</li>
+<li>
+<p>
+git-diff-files compares contents of the index file and the
+   working directory;
+</p>
+</li>
+<li>
+<p>
+git-diff-tree compares contents of two "tree" objects;
+</p>
+</li>
+</ul>
+<p>In all of these cases, the commands themselves compare
+corresponding paths in the two sets of files.  The result of
+comparison is passed from these commands to what is internally
+called "diffcore", in a format similar to what is output when
+the -p option is not used.  E.g.</p>
+<div class="listingblock">
+<div class="content">
+<pre><tt>in-place edit  :100644 100644 bcd1234... 0123456... M file0
+create         :000000 100644 0000000... 1234567... A file4
+delete         :100644 000000 1234567... 0000000... D file5
+unmerged       :000000 000000 0000000... 0000000... U file6</tt></pre>
+</div></div>
+<p>The diffcore mechanism is fed a list of such comparison results
+(each of which is called "filepair", although at this point each
+of them talks about a single file), and transforms such a list
+into another list.  There are currently 6 such transformations:</p>
+<ul>
+<li>
+<p>
+diffcore-pathspec
+</p>
+</li>
+<li>
+<p>
+diffcore-break
+</p>
+</li>
+<li>
+<p>
+diffcore-rename
+</p>
+</li>
+<li>
+<p>
+diffcore-merge-broken
+</p>
+</li>
+<li>
+<p>
+diffcore-pickaxe
+</p>
+</li>
+<li>
+<p>
+diffcore-order
+</p>
+</li>
+</ul>
+<p>These are applied in sequence.  The set of filepairs git-diff-*
+commands find are used as the input to diffcore-pathspec, and
+the output from diffcore-pathspec is used as the input to the
+next transformation.  The final result is then passed to the
+output routine and generates either diff-raw format (see Output
+format sections of the manual for git-diff-* commands) or
+diff-patch format.</p>
+</div>
+<h2>diffcore-pathspec: For Ignoring Files Outside Our Consideration</h2>
+<div class="sectionbody">
+<p>The first transformation in the chain is diffcore-pathspec, and
+is controlled by giving the pathname parameters to the
+git-diff-* commands on the command line.  The pathspec is used
+to limit the world diff operates in.  It removes the filepairs
+outside the specified set of pathnames.  E.g. If the input set
+of filepairs included:</p>
+<div class="listingblock">
+<div class="content">
+<pre><tt>:100644 100644 bcd1234... 0123456... M junkfile</tt></pre>
+</div></div>
+<p>but the command invocation was "git-diff-files myfile", then the
+junkfile entry would be removed from the list because only "myfile"
+is under consideration.</p>
+<p>Implementation note.  For performance reasons, git-diff-tree
+uses the pathname parameters on the command line to cull set of
+filepairs it feeds the diffcore mechanism itself, and does not
+use diffcore-pathspec, but the end result is the same.</p>
+</div>
+<h2>diffcore-break: For Splitting Up "Complete Rewrites"</h2>
+<div class="sectionbody">
+<p>The second transformation in the chain is diffcore-break, and is
+controlled by the -B option to the git-diff-* commands.  This is
+used to detect a filepair that represents "complete rewrite" and
+break such filepair into two filepairs that represent delete and
+create.  E.g.  If the input contained this filepair:</p>
+<div class="listingblock">
+<div class="content">
+<pre><tt>:100644 100644 bcd1234... 0123456... M file0</tt></pre>
+</div></div>
+<p>and if it detects that the file "file0" is completely rewritten,
+it changes it to:</p>
+<div class="listingblock">
+<div class="content">
+<pre><tt>:100644 000000 bcd1234... 0000000... D file0
+:000000 100644 0000000... 0123456... A file0</tt></pre>
+</div></div>
+<p>For the purpose of breaking a filepair, diffcore-break examines
+the extent of changes between the contents of the files before
+and after modification (i.e. the contents that have "bcd1234&#8230;"
+and "0123456&#8230;" as their SHA1 content ID, in the above
+example).  The amount of deletion of original contents and
+insertion of new material are added together, and if it exceeds
+the "break score", the filepair is broken into two.  The break
+score defaults to 50% of the size of the smaller of the original
+and the result (i.e. if the edit shrinks the file, the size of
+the result is used; if the edit lengthens the file, the size of
+the original is used), and can be customized by giving a number
+after "-B" option (e.g. "-B75" to tell it to use 75%).</p>
+</div>
+<h2>diffcore-rename: For Detection Renames and Copies</h2>
+<div class="sectionbody">
+<p>This transformation is used to detect renames and copies, and is
+controlled by the -M option (to detect renames) and the -C option
+(to detect copies as well) to the git-diff-* commands.  If the
+input contained these filepairs:</p>
+<div class="listingblock">
+<div class="content">
+<pre><tt>:100644 000000 0123456... 0000000... D fileX
+:000000 100644 0000000... 0123456... A file0</tt></pre>
+</div></div>
+<p>and the contents of the deleted file fileX is similar enough to
+the contents of the created file file0, then rename detection
+merges these filepairs and creates:</p>
+<div class="listingblock">
+<div class="content">
+<pre><tt>:100644 100644 0123456... 0123456... R100 fileX file0</tt></pre>
+</div></div>
+<p>When the "-C" option is used, the original contents of modified files,
+and deleted files (and also unmodified files, if the
+"--find-copies-harder" option is used) are considered as candidates
+of the source files in rename/copy operation.  If the input were like
+these filepairs, that talk about a modified file fileY and a newly
+created file file0:</p>
+<div class="listingblock">
+<div class="content">
+<pre><tt>:100644 100644 0123456... 1234567... M fileY
+:000000 100644 0000000... bcd3456... A file0</tt></pre>
+</div></div>
+<p>the original contents of fileY and the resulting contents of
+file0 are compared, and if they are similar enough, they are
+changed to:</p>
+<div class="listingblock">
+<div class="content">
+<pre><tt>:100644 100644 0123456... 1234567... M fileY
+:100644 100644 0123456... bcd3456... C100 fileY file0</tt></pre>
+</div></div>
+<p>In both rename and copy detection, the same "extent of changes"
+algorithm used in diffcore-break is used to determine if two
+files are "similar enough", and can be customized to use
+a similarity score different from the default of 50% by giving a
+number after the "-M" or "-C" option (e.g. "-M8" to tell it to use
+8/10 = 80%).</p>
+<p>Note.  When the "-C" option is used with <tt>--find-copies-harder</tt>
+option, git-diff-* commands feed unmodified filepairs to
+diffcore mechanism as well as modified ones.  This lets the copy
+detector consider unmodified files as copy source candidates at
+the expense of making it slower.  Without <tt>--find-copies-harder</tt>,
+git-diff-* commands can detect copies only if the file that was
+copied happened to have been modified in the same changeset.</p>
+</div>
+<h2>diffcore-merge-broken: For Putting "Complete Rewrites" Back Together</h2>
+<div class="sectionbody">
+<p>This transformation is used to merge filepairs broken by
+diffcore-break, and not transformed into rename/copy by
+diffcore-rename, back into a single modification.  This always
+runs when diffcore-break is used.</p>
+<p>For the purpose of merging broken filepairs back, it uses a
+different "extent of changes" computation from the ones used by
+diffcore-break and diffcore-rename.  It counts only the deletion
+from the original, and does not count insertion.  If you removed
+only 10 lines from a 100-line document, even if you added 910
+new lines to make a new 1000-line document, you did not do a
+complete rewrite.  diffcore-break breaks such a case in order to
+help diffcore-rename to consider such filepairs as candidate of
+rename/copy detection, but if filepairs broken that way were not
+matched with other filepairs to create rename/copy, then this
+transformation merges them back into the original
+"modification".</p>
+<p>The "extent of changes" parameter can be tweaked from the
+default 80% (that is, unless more than 80% of the original
+material is deleted, the broken pairs are merged back into a
+single modification) by giving a second number to -B option,
+like these:</p>
+<ul>
+<li>
+<p>
+-B50/60 (give 50% "break score" to diffcore-break, use 60%
+  for diffcore-merge-broken).
+</p>
+</li>
+<li>
+<p>
+-B/60 (the same as above, since diffcore-break defaults to 50%).
+</p>
+</li>
+</ul>
+<p>Note that earlier implementation left a broken pair as a separate
+creation and deletion patches.  This was an unnecessary hack and
+the latest implementation always merges all the broken pairs
+back into modifications, but the resulting patch output is
+formatted differently for easier review in case of such
+a complete rewrite by showing the entire contents of old version
+prefixed with <em>-</em>, followed by the entire contents of new
+version prefixed with <em>+</em>.</p>
+</div>
+<h2>diffcore-pickaxe: For Detecting Addition/Deletion of Specified String</h2>
+<div class="sectionbody">
+<p>This transformation is used to find filepairs that represent
+changes that touch a specified string, and is controlled by the
+-S option and the <tt>--pickaxe-all</tt> option to the git-diff-*
+commands.</p>
+<p>When diffcore-pickaxe is in use, it checks if there are
+filepairs whose "original" side has the specified string and
+whose "result" side does not.  Such a filepair represents "the
+string appeared in this changeset".  It also checks for the
+opposite case that loses the specified string.</p>
+<p>When <tt>--pickaxe-all</tt> is not in effect, diffcore-pickaxe leaves
+only such filepairs that touch the specified string in its
+output.  When <tt>--pickaxe-all</tt> is used, diffcore-pickaxe leaves all
+filepairs intact if there is such a filepair, or makes the
+output empty otherwise.  The latter behaviour is designed to
+make reviewing of the changes in the context of the whole
+changeset easier.</p>
+</div>
+<h2>diffcore-order: For Sorting the Output Based on Filenames</h2>
+<div class="sectionbody">
+<p>This is used to reorder the filepairs according to the user's
+(or project's) taste, and is controlled by the -O option to the
+git-diff-* commands.</p>
+<p>This takes a text file each of whose lines is a shell glob
+pattern.  Filepairs that match a glob pattern on an earlier line
+in the file are output before ones that match a later line, and
+filepairs that do not match any glob pattern are output last.</p>
+<p>As an example, a typical orderfile for the core git probably
+would look like this:</p>
+<div class="listingblock">
+<div class="content">
+<pre><tt>README
+Makefile
+Documentation
+*.h
+*.c
+t</tt></pre>
+</div></div>
+</div>
+<h2>SEE ALSO</h2>
+<div class="sectionbody">
+<p><a href="git-diff.html">git-diff(1)</a>,
+<a href="git-diff-files.html">git-diff-files(1)</a>,
+<a href="git-diff-index.html">git-diff-index(1)</a>,
+<a href="git-diff-tree.html">git-diff-tree(1)</a>,
+<a href="git-format-patch.html">git-format-patch(1)</a>,
+<a href="git-log.html">git-log(1)</a>,
+<a href="gitglossary.html">gitglossary(7)</a>,
+<a href="user-manual.html">The Git User's Manual</a></p>
+</div>
+<h2>GIT</h2>
+<div class="sectionbody">
+<p>Part of the <a href="git.html">git(1)</a> suite.</p>
+</div>
+<div id="footer">
+<div id="footer-text">
+Last updated 06-Jun-2008 22:46:14 UTC
+</div>
+</div>
+</body>
+</html>
diff --git a/diffcore.txt b/gitdiffcore.txt
similarity index 96%
rename from diffcore.txt
rename to gitdiffcore.txt
index c6a983a5d..4d56c8526 100644
--- a/diffcore.txt
+++ b/gitdiffcore.txt
@@ -1,10 +1,16 @@
-Tweaking diff output
-====================
-June 2005
+gitdiffcore(7)
+==============
 
+NAME
+----
+gitdiffcore - Tweaking diff output (June 2005)
 
-Introduction
-------------
+SYNOPSIS
+--------
+git diff *
+
+DESCRIPTION
+-----------
 
 The diff commands git-diff-index, git-diff-files, and git-diff-tree
 can be told to manipulate differences they find in
@@ -269,3 +275,18 @@ Documentation
 *.c
 t
 ------------------------------------------------
+
+SEE ALSO
+--------
+linkgit:git-diff[1],
+linkgit:git-diff-files[1],
+linkgit:git-diff-index[1],
+linkgit:git-diff-tree[1],
+linkgit:git-format-patch[1],
+linkgit:git-log[1],
+linkgit:gitglossary[7],
+link:user-manual.html[The Git User's Manual]
+
+GIT
+---
+Part of the linkgit:git[1] suite.
diff --git a/gitglossary.html b/gitglossary.html
index b0d4c8675..011eeeed1 100644
--- a/gitglossary.html
+++ b/gitglossary.html
@@ -1100,11 +1100,11 @@ This commit is referred to as a "merge commit", or sometimes just a
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite.</p>
+<p>Part of the <a href="git.html">git(1)</a> suite.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 02-Jun-2008 07:30:08 UTC
+Last updated 06-Jun-2008 22:46:13 UTC
 </div>
 </div>
 </body>
diff --git a/gitglossary.txt b/gitglossary.txt
index e8475a042..5c5c31d31 100644
--- a/gitglossary.txt
+++ b/gitglossary.txt
@@ -22,4 +22,4 @@ link:user-manual.html[The Git User's Manual]
 
 GIT
 ---
-Part of the linkgit:git[7] suite.
+Part of the linkgit:git[1] suite.
diff --git a/githooks.html b/githooks.html
index 70473ce18..ba53140f0 100644
--- a/githooks.html
+++ b/githooks.html
@@ -521,11 +521,11 @@ to abort.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:54 UTC
+Last updated 06-Jun-2008 22:46:09 UTC
 </div>
 </div>
 </body>
diff --git a/githooks.txt b/githooks.txt
index 53747febd..4f06ae0ed 100644
--- a/githooks.txt
+++ b/githooks.txt
@@ -300,4 +300,4 @@ to abort.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/gitignore.html b/gitignore.html
index 73bbb8680..38e8b0af3 100644
--- a/gitignore.html
+++ b/gitignore.html
@@ -429,11 +429,11 @@ Frank Lichtenheld, and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:54 UTC
+Last updated 06-Jun-2008 22:46:08 UTC
 </div>
 </div>
 </body>
diff --git a/gitignore.txt b/gitignore.txt
index 613dca006..2881c9cb9 100644
--- a/gitignore.txt
+++ b/gitignore.txt
@@ -138,4 +138,4 @@ Frank Lichtenheld, and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/gitk.html b/gitk.html
index 807e17242..f2d5cd05f 100644
--- a/gitk.html
+++ b/gitk.html
@@ -436,11 +436,11 @@ such as display options, font, and colors.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:54 UTC
+Last updated 06-Jun-2008 22:46:07 UTC
 </div>
 </div>
 </body>
diff --git a/gitk.txt b/gitk.txt
index b88fd9566..14bcf91f4 100644
--- a/gitk.txt
+++ b/gitk.txt
@@ -109,4 +109,4 @@ Documentation by Junio C Hamano, Jonas Fonseca, and the git-list
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/gitmodules.html b/gitmodules.html
index 593802cca..237513571 100644
--- a/gitmodules.html
+++ b/gitmodules.html
@@ -333,11 +333,11 @@ submodules an url is specified which can be used for cloning the submodules.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite</p>
+<p>Part of the <a href="git.html">git(1)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Jun-2008 08:21:54 UTC
+Last updated 06-Jun-2008 22:46:09 UTC
 </div>
 </div>
 </body>
diff --git a/gitmodules.txt b/gitmodules.txt
index cc95b69f2..f8d122a8b 100644
--- a/gitmodules.txt
+++ b/gitmodules.txt
@@ -59,4 +59,4 @@ Documentation by Lars Hjemli <hjemli@gmail.com>
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/gitrepository-layout.html b/gitrepository-layout.html
new file mode 100644
index 000000000..99b37764c
--- /dev/null
+++ b/gitrepository-layout.html
@@ -0,0 +1,619 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<meta name="generator" content="AsciiDoc 7.0.2" />
+<style type="text/css">
+/* Debug borders */
+p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
+/*
+  border: 1px solid red;
+*/
+}
+
+body {
+  margin: 1em 5% 1em 5%;
+}
+
+a { color: blue; }
+a:visited { color: fuchsia; }
+
+em {
+  font-style: italic;
+}
+
+strong {
+  font-weight: bold;
+}
+
+tt {
+  color: navy;
+}
+
+h1, h2, h3, h4, h5, h6 {
+  color: #527bbd;
+  font-family: sans-serif;
+  margin-top: 1.2em;
+  margin-bottom: 0.5em;
+  line-height: 1.3;
+}
+
+h1 {
+  border-bottom: 2px solid silver;
+}
+h2 {
+  border-bottom: 2px solid silver;
+  padding-top: 0.5em;
+}
+
+div.sectionbody {
+  font-family: serif;
+  margin-left: 0;
+}
+
+hr {
+  border: 1px solid silver;
+}
+
+p {
+  margin-top: 0.5em;
+  margin-bottom: 0.5em;
+}
+
+pre {
+  padding: 0;
+  margin: 0;
+}
+
+span#author {
+  color: #527bbd;
+  font-family: sans-serif;
+  font-weight: bold;
+  font-size: 1.2em;
+}
+span#email {
+}
+span#revision {
+  font-family: sans-serif;
+}
+
+div#footer {
+  font-family: sans-serif;
+  font-size: small;
+  border-top: 2px solid silver;
+  padding-top: 0.5em;
+  margin-top: 4.0em;
+}
+div#footer-text {
+  float: left;
+  padding-bottom: 0.5em;
+}
+div#footer-badges {
+  float: right;
+  padding-bottom: 0.5em;
+}
+
+div#preamble,
+div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
+div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
+div.admonitionblock {
+  margin-right: 10%;
+  margin-top: 1.5em;
+  margin-bottom: 1.5em;
+}
+div.admonitionblock {
+  margin-top: 2.5em;
+  margin-bottom: 2.5em;
+}
+
+div.content { /* Block element content. */
+  padding: 0;
+}
+
+/* Block element titles. */
+div.title, caption.title {
+  font-family: sans-serif;
+  font-weight: bold;
+  text-align: left;
+  margin-top: 1.0em;
+  margin-bottom: 0.5em;
+}
+div.title + * {
+  margin-top: 0;
+}
+
+td div.title:first-child {
+  margin-top: 0.0em;
+}
+div.content div.title:first-child {
+  margin-top: 0.0em;
+}
+div.content + div.title {
+  margin-top: 0.0em;
+}
+
+div.sidebarblock > div.content {
+  background: #ffffee;
+  border: 1px solid silver;
+  padding: 0.5em;
+}
+
+div.listingblock > div.content {
+  border: 1px solid silver;
+  background: #f4f4f4;
+  padding: 0.5em;
+}
+
+div.quoteblock > div.content {
+  padding-left: 2.0em;
+}
+div.quoteblock .attribution {
+  text-align: right;
+}
+
+div.admonitionblock .icon {
+  vertical-align: top;
+  font-size: 1.1em;
+  font-weight: bold;
+  text-decoration: underline;
+  color: #527bbd;
+  padding-right: 0.5em;
+}
+div.admonitionblock td.content {
+  padding-left: 0.5em;
+  border-left: 2px solid silver;
+}
+
+div.exampleblock > div.content {
+  border-left: 2px solid silver;
+  padding: 0.5em;
+}
+
+div.verseblock div.content {
+  white-space: pre;
+}
+
+div.imageblock div.content { padding-left: 0; }
+div.imageblock img { border: 1px solid silver; }
+span.image img { border-style: none; }
+
+dl {
+  margin-top: 0.8em;
+  margin-bottom: 0.8em;
+}
+dt {
+  margin-top: 0.5em;
+  margin-bottom: 0;
+  font-style: italic;
+}
+dd > *:first-child {
+  margin-top: 0;
+}
+
+ul, ol {
+    list-style-position: outside;
+}
+ol.olist2 {
+  list-style-type: lower-alpha;
+}
+
+div.tableblock > table {
+  border-color: #527bbd;
+  border-width: 3px;
+}
+thead {
+  font-family: sans-serif;
+  font-weight: bold;
+}
+tfoot {
+  font-weight: bold;
+}
+
+div.hlist {
+  margin-top: 0.8em;
+  margin-bottom: 0.8em;
+}
+td.hlist1 {
+  vertical-align: top;
+  font-style: italic;
+  padding-right: 0.8em;
+}
+td.hlist2 {
+  vertical-align: top;
+}
+
+@media print {
+  div#footer-badges { display: none; }
+}
+include::./stylesheets/xhtml11-manpage.css[]
+/* Workarounds for IE6's broken and incomplete CSS2. */
+
+div.sidebar-content {
+  background: #ffffee;
+  border: 1px solid silver;
+  padding: 0.5em;
+}
+div.sidebar-title, div.image-title {
+  font-family: sans-serif;
+  font-weight: bold;
+  margin-top: 0.0em;
+  margin-bottom: 0.5em;
+}
+
+div.listingblock div.content {
+  border: 1px solid silver;
+  background: #f4f4f4;
+  padding: 0.5em;
+}
+
+div.quoteblock-content {
+  padding-left: 2.0em;
+}
+
+div.exampleblock-content {
+  border-left: 2px solid silver;
+  padding-left: 0.5em;
+}
+</style>
+<title>gitrepository-layout(5)</title>
+</head>
+<body>
+<div id="header">
+<h1>
+gitrepository-layout(5) Manual Page
+</h1>
+<h2>NAME</h2>
+<div class="sectionbody">
+<p>gitrepository-layout -
+   Git Repository Layout
+</p>
+</div>
+</div>
+<h2>SYNOPSIS</h2>
+<div class="sectionbody">
+<p>$GIT_DIR/*</p>
+</div>
+<h2>DESCRIPTION</h2>
+<div class="sectionbody">
+<p>You may find these things in your git repository (<tt>.git</tt>
+directory for a repository associated with your working tree, or
+<tt>&lt;project&gt;.git</tt> directory for a public <em>bare</em> repository. It is
+also possible to have a working tree where <tt>.git</tt> is a plain
+ascii file containing <tt>gitdir: &lt;path&gt;</tt>, i.e. the path to the
+real git repository).</p>
+<dl>
+<dt>
+objects
+</dt>
+<dd>
+<p>
+        Object store associated with this repository.  Usually
+        an object store is self sufficient (i.e. all the objects
+        that are referred to by an object found in it are also
+        found in it), but there are couple of ways to violate
+        it.
+</p>
+<ol>
+<li>
+<p>
+You could populate the repository by running a commit walker
+without <tt>-a</tt> option.  Depending on which options are given, you
+could have only commit objects without associated blobs and
+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.
+</p>
+</li>
+<li>
+<p>
+You also could have an incomplete but locally usable repository
+by cloning shallowly.  See <a href="git-clone.html">git-clone(1)</a>.
+</p>
+</li>
+<li>
+<p>
+You can be using <tt>objects/info/alternates</tt> mechanism, or
+<tt>$GIT_ALTERNATE_OBJECT_DIRECTORIES</tt> mechanism to <em>borrow</em>
+objects from other object stores.  A repository with this kind
+of incomplete object store is not suitable to be published for
+use with dumb transports but otherwise is OK as long as
+<tt>objects/info/alternates</tt> points at the right object stores
+it borrows from.
+</p>
+</li>
+</ol>
+</dd>
+<dt>
+objects/[0-9a-f][0-9a-f]
+</dt>
+<dd>
+<p>
+        Traditionally, each object is stored in its own file.
+        They are split into 256 subdirectories using the first
+        two letters from its object name to keep the number of
+        directory entries <tt>objects</tt> directory itself needs to
+        hold.  Objects found here are often called <em>unpacked</em>
+        (or <em>loose</em>) objects.
+</p>
+</dd>
+<dt>
+objects/pack
+</dt>
+<dd>
+<p>
+        Packs (files that store many object in compressed form,
+        along with index files to allow them to be randomly
+        accessed) are found in this directory.
+</p>
+</dd>
+<dt>
+objects/info
+</dt>
+<dd>
+<p>
+        Additional information about the object store is
+        recorded in this directory.
+</p>
+</dd>
+<dt>
+objects/info/packs
+</dt>
+<dd>
+<p>
+        This file is to help dumb transports discover what packs
+        are available in this object store.  Whenever a pack is
+        added or removed, <tt>git update-server-info</tt> should be run
+        to keep this file up-to-date if the repository is
+        published for dumb transports.  <tt>git repack</tt> does this
+        by default.
+</p>
+</dd>
+<dt>
+objects/info/alternates
+</dt>
+<dd>
+<p>
+        This file records paths to alternate object stores that
+        this object store borrows objects from, one pathname per
+        line. Note that not only native Git tools use it locally,
+        but the HTTP fetcher also tries to use it remotely; this
+        will usually work if you have relative paths (relative
+        to the object database, not to the repository!) in your
+        alternates file, but it will not work if you use absolute
+        paths unless the absolute path in filesystem and web URL
+        is the same. See also <em>objects/info/http-alternates</em>.
+</p>
+</dd>
+<dt>
+objects/info/http-alternates
+</dt>
+<dd>
+<p>
+        This file records URLs to alternate object stores that
+        this object store borrows objects from, to be used when
+        the repository is fetched over HTTP.
+</p>
+</dd>
+<dt>
+refs
+</dt>
+<dd>
+<p>
+        References are stored in subdirectories of this
+        directory.  The <tt>git prune</tt> command knows to keep
+        objects reachable from refs found in this directory and
+        its subdirectories.
+</p>
+</dd>
+<dt>
+refs/heads/<tt>name</tt>
+</dt>
+<dd>
+<p>
+        records tip-of-the-tree commit objects of branch <tt>name</tt>
+</p>
+</dd>
+<dt>
+refs/tags/<tt>name</tt>
+</dt>
+<dd>
+<p>
+        records any object name (not necessarily a commit
+        object, or a tag object that points at a commit object).
+</p>
+</dd>
+<dt>
+refs/remotes/<tt>name</tt>
+</dt>
+<dd>
+<p>
+        records tip-of-the-tree commit objects of branches copied
+        from a remote repository.
+</p>
+</dd>
+<dt>
+packed-refs
+</dt>
+<dd>
+<p>
+        records the same information as refs/heads/, refs/tags/,
+        and friends record in a more efficient way.  See
+        <a href="git-pack-refs.html">git-pack-refs(1)</a>.
+</p>
+</dd>
+<dt>
+HEAD
+</dt>
+<dd>
+<p>
+        A symref (see glossary) to the <tt>refs/heads/</tt> namespace
+        describing the currently active branch.  It does not mean
+        much if the repository is not associated with any working tree
+        (i.e. a <em>bare</em> repository), but a valid git repository
+        <strong>must</strong> have the HEAD file; some porcelains may use it to
+        guess the designated "default" branch of the repository
+        (usually <em>master</em>).  It is legal if the named branch
+        <em>name</em> does not (yet) exist.  In some legacy setups, it is
+        a symbolic link instead of a symref that points at the current
+        branch.
+</p>
+<p>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 <em>detached HEAD</em>, and almost all commands work
+identically as normal.  See <a href="git-checkout.html">git-checkout(1)</a> for
+details.</p>
+</dd>
+<dt>
+branches
+</dt>
+<dd>
+<p>
+        A slightly deprecated way to store shorthands to be used
+        to specify URL to <tt>git fetch</tt>, <tt>git pull</tt> and <tt>git push</tt>
+        commands is to store a file in <tt>branches/&lt;name&gt;</tt> and
+        give <em>name</em> to these commands in place of <em>repository</em>
+        argument.
+</p>
+</dd>
+<dt>
+hooks
+</dt>
+<dd>
+<p>
+        Hooks are customization scripts used by various git
+        commands.  A handful of sample hooks are installed when
+        <tt>git init</tt> is run, but all of them are disabled by
+        default.  To enable, they need to be made executable.
+        Read <a href="githooks.html">githooks(5)</a>[hooks] for more details about
+        each hook.
+</p>
+</dd>
+<dt>
+index
+</dt>
+<dd>
+<p>
+        The current index file for the repository.  It is
+        usually not found in a bare repository.
+</p>
+</dd>
+<dt>
+info
+</dt>
+<dd>
+<p>
+        Additional information about the repository is recorded
+        in this directory.
+</p>
+</dd>
+<dt>
+info/refs
+</dt>
+<dd>
+<p>
+        This file helps dumb transports discover what refs are
+        available in this repository.  If the repository is
+        published for dumb transports, this file should be
+        regenerated by <tt>git update-server-info</tt> every time a tag
+        or branch is created or modified.  This is normally done
+        from the <tt>hooks/update</tt> hook, which is run by the
+        <tt>git-receive-pack</tt> command when you <tt>git push</tt> into the
+        repository.
+</p>
+</dd>
+<dt>
+info/grafts
+</dt>
+<dd>
+<p>
+        This file records fake commit ancestry information, to
+        pretend the set of parents a commit has is different
+        from how the commit was actually created.  One record
+        per line describes a commit and its fake parents by
+        listing their 40-byte hexadecimal object names separated
+        by a space and terminated by a newline.
+</p>
+</dd>
+<dt>
+info/exclude
+</dt>
+<dd>
+<p>
+        This file, by convention among Porcelains, stores the
+        exclude pattern list. <tt>.gitignore</tt> is the per-directory
+        ignore file.  <tt>git status</tt>, <tt>git add</tt>, <tt>git rm</tt> and <tt>git
+        clean</tt> look at it but the core git commands do not look
+        at it.  See also: <a href="gitignore.html">gitignore(5)</a>.
+</p>
+</dd>
+<dt>
+remotes
+</dt>
+<dd>
+<p>
+        Stores shorthands to be used to give URL and default
+        refnames to interact with remote repository to <tt>git
+        fetch</tt>, <tt>git pull</tt> and <tt>git push</tt> commands.
+</p>
+</dd>
+<dt>
+logs
+</dt>
+<dd>
+<p>
+        Records of changes made to refs are stored in this
+        directory.  See the documentation on git-update-ref
+        for more information.
+</p>
+</dd>
+<dt>
+logs/refs/heads/<tt>name</tt>
+</dt>
+<dd>
+<p>
+        Records all changes made to the branch tip named <tt>name</tt>.
+</p>
+</dd>
+<dt>
+logs/refs/tags/<tt>name</tt>
+</dt>
+<dd>
+<p>
+        Records all changes made to the tag named <tt>name</tt>.
+</p>
+</dd>
+<dt>
+shallow
+</dt>
+<dd>
+<p>
+        This is similar to <tt>info/grafts</tt> but is internally used
+        and maintained by shallow clone mechanism.  See <tt>--depth</tt>
+        option to <a href="git-clone.html">git-clone(1)</a> and <a href="git-fetch.html">git-fetch(1)</a>.
+</p>
+</dd>
+</dl>
+</div>
+<h2>SEE ALSO</h2>
+<div class="sectionbody">
+<p><a href="git-init.html">git-init(1)</a>,
+<a href="git-clone.html">git-clone(1)</a>,
+<a href="git-fetch.html">git-fetch(1)</a>,
+<a href="git-pack-refs.html">git-pack-refs(1)</a>,
+<a href="git-gc.html">git-gc(1)</a>,
+<a href="git-checkout.html">git-checkout(1)</a>,
+<a href="gitglossary.html">gitglossary(7)</a>,
+<a href="user-manual.html">The Git User's Manual</a></p>
+</div>
+<h2>GIT</h2>
+<div class="sectionbody">
+<p>Part of the <a href="git.html">git(1)</a> suite.</p>
+</div>
+<div id="footer">
+<div id="footer-text">
+Last updated 06-Jun-2008 22:46:09 UTC
+</div>
+</div>
+</body>
+</html>
diff --git a/repository-layout.txt b/gitrepository-layout.txt
similarity index 92%
rename from repository-layout.txt
rename to gitrepository-layout.txt
index 7fd187be8..03c52ff52 100644
--- a/repository-layout.txt
+++ b/gitrepository-layout.txt
@@ -1,9 +1,20 @@
-git repository layout
-=====================
+gitrepository-layout(5)
+=======================
+
+NAME
+----
+gitrepository-layout - Git Repository Layout
+
+SYNOPSIS
+--------
+$GIT_DIR/*
+
+DESCRIPTION
+-----------
 
 You may find these things in your git repository (`.git`
 directory for a repository associated with your working tree, or
-`'project'.git` directory for a public 'bare' repository. It is
+`<project>.git` directory for a public 'bare' repository. It is
 also possible to have a working tree where `.git` is a plain
 ascii file containing `gitdir: <path>`, i.e. the path to the
 real git repository).
@@ -115,7 +126,7 @@ details.
 branches::
 	A slightly deprecated way to store shorthands to be used
 	to specify URL to `git fetch`, `git pull` and `git push`
-	commands is to store a file in `branches/'name'` and
+	commands is to store a file in `branches/<name>` and
 	give 'name' to these commands in place of 'repository'
 	argument.
 
@@ -180,3 +191,18 @@ shallow::
 	This is similar to `info/grafts` but is internally used
 	and maintained by shallow clone mechanism.  See `--depth`
 	option to linkgit:git-clone[1] and linkgit:git-fetch[1].
+
+SEE ALSO
+--------
+linkgit:git-init[1],
+linkgit:git-clone[1],
+linkgit:git-fetch[1],
+linkgit:git-pack-refs[1],
+linkgit:git-gc[1],
+linkgit:git-checkout[1],
+linkgit:gitglossary[7],
+link:user-manual.html[The Git User's Manual]
+
+GIT
+---
+Part of the linkgit:git[1] suite.
diff --git a/gittutorial-2.html b/gittutorial-2.html
index 37cc60c46..81c550ef5 100644
--- a/gittutorial-2.html
+++ b/gittutorial-2.html
@@ -668,11 +668,11 @@ example, creating a new commit.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite.</p>
+<p>Part of the <a href="git.html">git(1)</a> suite.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 02-Jun-2008 07:30:05 UTC
+Last updated 06-Jun-2008 22:46:11 UTC
 </div>
 </div>
 </body>
diff --git a/gittutorial-2.txt b/gittutorial-2.txt
index 4880ba9ae..e3d5c1fbf 100644
--- a/gittutorial-2.txt
+++ b/gittutorial-2.txt
@@ -427,4 +427,4 @@ link:user-manual.html[The Git User's Manual]
 
 GIT
 ---
-Part of the linkgit:git[7] suite.
+Part of the linkgit:git[1] suite.
diff --git a/gittutorial.html b/gittutorial.html
index de893eb97..8d9330ae9 100644
--- a/gittutorial.html
+++ b/gittutorial.html
@@ -807,11 +807,11 @@ digressions that may be interesting at this point are:</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(7)</a> suite.</p>
+<p>Part of the <a href="git.html">git(1)</a> suite.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 02-Jun-2008 07:30:03 UTC
+Last updated 06-Jun-2008 22:46:11 UTC
 </div>
 </div>
 </body>
diff --git a/gittutorial.txt b/gittutorial.txt
index 722b32321..9563a632e 100644
--- a/gittutorial.txt
+++ b/gittutorial.txt
@@ -605,4 +605,4 @@ link:user-manual.html[The Git User's Manual]
 
 GIT
 ---
-Part of the linkgit:git[7] suite.
+Part of the linkgit:git[1] suite.
-- 
2.26.2