{"thread":{"id":"13368","subject":"[PATCH] Documentation: convert \"glossary\" and \"core-tutorial\" to man pages","startedAt":"2008-05-04T10:21:57Z","lastAt":"2008-05-05T01:50:48Z","messageCount":5,"participants":["Christian Couder","Jakub Narebski","Pieter de Bie","Ping Yin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"76006","messageId":"20080504122157.ca98c75d.chriscool@tuxfamily.org","threadId":"13368","inReplyTo":null,"subject":"[PATCH] Documentation: convert \"glossary\" and \"core-tutorial\" to man pages","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2008-05-04T10:21:57Z","receivedAt":"2008-05-04T10:21:57Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"This patch renames the following documents and at the same time converts\nthem to the man format:\n\ncore-tutorial.txt -> gitcore-tutorial.txt\nglossary.txt      -> gitglossary.txt\n\nBut as the glossary is included in the user manual and as the new\ngitglossary man page cannot be included as a whole in the user manual,\nthe actual glossary content is now in its own \"glossary-content.txt\"\nnew file. And this file is included by both the user manual and the\ngitglossary man page.\n\nOther documents that reference the above ones are changed accordingly\nand sometimes improved a little too.\n---\n Documentation/Makefile                             |    7 ++---\n Documentation/git.txt                              |   13 +++++++--\n .../{core-tutorial.txt => gitcore-tutorial.txt}    |   26 ++++++++++++++++---\n Documentation/gitcvs-migration.txt                 |    6 +++-\n Documentation/giteveryday.txt                      |    5 ++-\n Documentation/gitglossary.txt                      |   25 +++++++++++++++++++\n Documentation/gittutorial-2.txt                    |   11 ++++----\n Documentation/gittutorial.txt                      |    5 ++-\n .../{glossary.txt => glossary-content.txt}         |    3 --\n Documentation/user-manual.txt                      |    5 +++-\n 10 files changed, 80 insertions(+), 26 deletions(-)\n rename Documentation/{core-tutorial.txt => gitcore-tutorial.txt} (99%)\n create mode 100644 Documentation/gitglossary.txt\n rename Documentation/{glossary.txt => glossary-content.txt} (99%)\n\n\n\tThis is another patch to convert some help documents to\n\tman pages. It should apply on top of the previous ones.\n\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex 9a8043f..5ec7bd8 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -4,7 +4,8 @@ MAN1_TXT= \\\n \tgitk.txt\n MAN5_TXT=gitattributes.txt gitignore.txt gitmodules.txt githooks.txt\n MAN7_TXT=git.txt gitcli.txt gittutorial.txt gittutorial-2.txt \\\n-\tgitcvs-migration.txt giteveryday.txt\n+\tgitcvs-migration.txt giteveryday.txt gitcore-tutorial.txt \\\n+\tgitglossary.txt\n \n MAN_TXT = $(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT)\n MAN_XML=$(patsubst %.txt,%.xml,$(MAN_TXT))\n@@ -12,12 +13,10 @@ MAN_HTML=$(patsubst %.txt,%.html,$(MAN_TXT))\n \n DOC_HTML=$(MAN_HTML)\n \n-ARTICLES = core-tutorial\n-ARTICLES += diffcore\n+ARTICLES = diffcore\n ARTICLES += howto-index\n ARTICLES += repository-layout\n ARTICLES += git-tools\n-ARTICLES += glossary\n # with their own formatting rules.\n SP_ARTICLES = howto/revert-branch-rebase howto/using-merge-subtree user-manual\n API_DOCS = $(patsubst %.txt,%,$(filter-out technical/api-index-skel.txt technical/api-index.txt, $(wildcard technical/api-*.txt)))\ndiff --git a/Documentation/git.txt b/Documentation/git.txt\nindex 1c3c56e..855e90e 100644\n--- a/Documentation/git.txt\n+++ b/Documentation/git.txt\n@@ -172,7 +172,7 @@ See the references above to get started using git.  The following is\n probably more detail than necessary for a first-time user.\n \n The link:user-manual.html#git-concepts[git concepts chapter of the\n-user-manual] and the link:core-tutorial.html[Core tutorial] both provide\n+user-manual] and the linkgit:gitcore-tutorial[7][Core tutorial] both provide\n introductions to the underlying git architecture.\n \n See also the link:howto-index.html[howto] documents for some useful\n@@ -372,7 +372,7 @@ Higher level SCMs may provide and manage additional information in the\n \n Terminology\n -----------\n-Please see the link:glossary.html[glossary] document.\n+Please see the linkgit:gitglossary[7][glossary] document.\n \n \n Environment Variables\n@@ -516,7 +516,7 @@ Discussion[[Discussion]]\n \n More detail on the following is available from the\n link:user-manual.html#git-concepts[git concepts chapter of the\n-user-manual] and the link:core-tutorial.html[Core tutorial].\n+user-manual] and the linkgit:gitcore-tutorial[7][Core tutorial].\n \n A git project normally consists of a working directory with a \".git\"\n subdirectory at the top level.  The .git directory contains, among other\n@@ -577,6 +577,13 @@ The documentation for git suite was started by David Greaves\n <david@dgreaves.com>, and later enhanced greatly by the\n contributors on the git-list <git@vger.kernel.org>.\n \n+SEE ALSO\n+--------\n+linkgit:gittutorial[7], linkgit:gittutorial-2[7],\n+linkgit:giteveryday[7], linkgit:gitcvs-migration[7],\n+linkgit:gitglossary[7], linkgit:gitcore-tutorial[7],\n+link:user-manual.html[The Git User's Manual]\n+\n GIT\n ---\n Part of the linkgit:git[7] suite\ndiff --git a/Documentation/core-tutorial.txt b/Documentation/gitcore-tutorial.txt\nsimilarity index 99%\nrename from Documentation/core-tutorial.txt\nrename to Documentation/gitcore-tutorial.txt\nindex b50b5dd..5995a2e 100644\n--- a/Documentation/core-tutorial.txt\n+++ b/Documentation/gitcore-tutorial.txt\n@@ -1,8 +1,16 @@\n-A git core tutorial for developers\n-==================================\n+gitcore-tutorial(7)\n+===================\n \n-Introduction\n-------------\n+NAME\n+----\n+gitcore-tutorial - A git core tutorial for developers\n+\n+SYNOPSIS\n+--------\n+git *\n+\n+DESCRIPTION\n+-----------\n \n This tutorial explains how to use the \"core\" git programs to set up and\n work with a git repository.\n@@ -1679,3 +1687,13 @@ merge two at a time, documenting how you resolved the conflicts,\n and the reason why you preferred changes made in one side over\n the other.  Otherwise it would make the project history harder\n to follow, not easier.\n+\n+SEE ALSO\n+--------\n+linkgit:gittutorial[7], linkgit:gittutorial-2[7],\n+linkgit:giteveryday[7], linkgit:gitcvs-migration[7],\n+link:user-manual.html[The Git User's Manual]\n+\n+GIT\n+---\n+Part of the linkgit:git[7] suite.\ndiff --git a/Documentation/gitcvs-migration.txt b/Documentation/gitcvs-migration.txt\nindex 4e5ea33..3eaf4b8 100644\n--- a/Documentation/gitcvs-migration.txt\n+++ b/Documentation/gitcvs-migration.txt\n@@ -20,7 +20,7 @@ can synchronize with; this document explains how to do that.\n \n Some basic familiarity with git is required.  This\n linkgit:gittutorial[7][tutorial introduction to git] and the\n-link:glossary.html[git glossary] should be sufficient.\n+linkgit:gitglossary[7][git glossary] should be sufficient.\n \n Developing against a shared repository\n --------------------------------------\n@@ -187,7 +187,9 @@ repositories without the need for a central maintainer.\n SEE ALSO\n --------\n linkgit:gittutorial[7], linkgit:gittutorial-2[7],\n-linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]\n+linkgit:giteveryday[7], linkgit:gitcore-tutorial[7],\n+linkgit:gitglossary[7],\n+link:user-manual.html[The Git User's Manual]\n \n GIT\n ---\ndiff --git a/Documentation/giteveryday.txt b/Documentation/giteveryday.txt\nindex d7c3a35..6b33242 100644\n--- a/Documentation/giteveryday.txt\n+++ b/Documentation/giteveryday.txt\n@@ -474,8 +474,9 @@ ftp> cp -r .git /home/user/myproject.git\n SEE ALSO\n --------\n linkgit:gittutorial[7], linkgit:gittutorial-2[7],\n-linkgit:gitcvs-migration[7], link:user-manual.html[The Git User's\n-Manual]\n+linkgit:gitcvs-migration[7], linkgit:gitcore-tutorial[7],\n+linkgit:gitglossary[7],\n+link:user-manual.html[The Git User's Manual]\n \n GIT\n ---\ndiff --git a/Documentation/gitglossary.txt b/Documentation/gitglossary.txt\nnew file mode 100644\nindex 0000000..e8475a0\n--- /dev/null\n+++ b/Documentation/gitglossary.txt\n@@ -0,0 +1,25 @@\n+gitglossary(7)\n+==============\n+\n+NAME\n+----\n+gitglossary - A GIT Glossary\n+\n+SYNOPSIS\n+--------\n+*\n+\n+DESCRIPTION\n+-----------\n+\n+include::glossary-content.txt[]\n+\n+SEE ALSO\n+--------\n+linkgit:gittutorial[7], linkgit:gittutorial-2[7],\n+linkgit:giteveryday[7], linkgit:gitcvs-migration[7],\n+link:user-manual.html[The Git User's Manual]\n+\n+GIT\n+---\n+Part of the linkgit:git[7] suite.\ndiff --git a/Documentation/gittutorial-2.txt b/Documentation/gittutorial-2.txt\nindex 4af9073..c7f59bd 100644\n--- a/Documentation/gittutorial-2.txt\n+++ b/Documentation/gittutorial-2.txt\n@@ -390,7 +390,7 @@ in the index file is identical to the one in the working directory.\n In addition to being the staging area for new commits, the index file\n is also populated from the object database when checking out a\n branch, and is used to hold the trees involved in a merge operation.\n-See the link:core-tutorial.html[core tutorial] and the relevant man\n+See the linkgit:gitcore-tutorial[7][core tutorial] and the relevant man\n pages for details.\n \n What next?\n@@ -400,7 +400,7 @@ At this point you should know everything necessary to read the man\n pages for any of the git commands; one good place to start would be\n with the commands mentioned in linkgit:giteveryday[7][Everyday git].\n You should be able to find any unknown jargon in the\n-link:glossary.html[Glossary].\n+linkgit:gitglossary[7][Glossary].\n \n The link:user-manual.html[Git User's Manual] provides a more\n comprehensive introduction to git.\n@@ -412,15 +412,16 @@ CVS-like way.\n For some interesting examples of git use, see the\n link:howto-index.html[howtos].\n \n-For git developers, the link:core-tutorial.html[Core tutorial] goes\n+For git developers, the linkgit:gitcore-tutorial[7][Core tutorial] goes\n into detail on the lower-level git mechanisms involved in, for\n example, creating a new commit.\n \n SEE ALSO\n --------\n linkgit:gittutorial[7], linkgit:giteveryday[7],\n-linkgit:gitcvs-migration[7], link:user-manual.html[The Git User's\n-Manual]\n+linkgit:gitcvs-migration[7], linkgit:gitcore-tutorial[7],\n+linkgit:gitglossary[7],\n+link:user-manual.html[The Git User's Manual]\n \n GIT\n ---\ndiff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt\nindex 470f7f7..34469be 100644\n--- a/Documentation/gittutorial.txt\n+++ b/Documentation/gittutorial.txt\n@@ -598,8 +598,9 @@ digressions that may be interesting at this point are:\n SEE ALSO\n --------\n linkgit:gittutorial-2[7], linkgit:giteveryday[7],\n-linkgit:gitcvs-migration[7], link:user-manual.html[The Git User's\n-Manual]\n+linkgit:gitcvs-migration[7], linkgit:gitcore-tutorial[7],\n+linkgit:gitglossary[7],\n+link:user-manual.html[The Git User's Manual]\n \n GIT\n ---\ndiff --git a/Documentation/glossary.txt b/Documentation/glossary-content.txt\nsimilarity index 99%\nrename from Documentation/glossary.txt\nrename to Documentation/glossary-content.txt\nindex 51b6353..f981fee 100644\n--- a/Documentation/glossary.txt\n+++ b/Documentation/glossary-content.txt\n@@ -1,6 +1,3 @@\n-GIT Glossary\n-============\n-\n [[def_alternate_object_database]]alternate object database::\n \tVia the alternates mechanism, a <<def_repository,repository>>\n \tcan inherit part of its <<def_object_database,object database>>\ndiff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\nindex b2c4f2c..a99489e 100644\n--- a/Documentation/user-manual.txt\n+++ b/Documentation/user-manual.txt\n@@ -4252,7 +4252,10 @@ You see, Git is actually the best tool to find out about the source of Git\n itself!\n \n [[glossary]]\n-include::glossary.txt[]\n+GIT Glossary\n+============\n+\n+include::glossary-content.txt[]\n \n [[git-quick-start]]\n Appendix A: Git Quick Reference\n-- \n1.5.5.1.124.g7e5fa.dirty\n"},{"id":"76012","messageId":"200805041313.03499.jnareb@gmail.com","threadId":"13368","inReplyTo":"20080504122157.ca98c75d.chriscool@tuxfamily.org","subject":"Re: [PATCH] Documentation: convert \"glossary\" and \"core-tutorial\" to man pages","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2008-05-04T11:13:01Z","receivedAt":"2008-05-04T11:13:01Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"On Sun, 4. May 2008, Christian Couder wrote:\n\n> This patch renames the following documents and at the same time converts\n> them to the man format:\n> \n> core-tutorial.txt -> gitcore-tutorial.txt\n> glossary.txt      -> gitglossary.txt\n\nI like this, although I think that perhaps git-core-tutorial.txt would\nbe a better filename.\n\n> But as the glossary is included in the user manual and as the new\n> gitglossary man page cannot be included as a whole in the user manual,\n> the actual glossary content is now in its own \"glossary-content.txt\"\n> new file. And this file is included by both the user manual and the\n> gitglossary man page.\n\nAnother solution would be to use conditionals.  I'm not sure which\none is better; I guess the include one...\n\n-- \nJakub Narebski\nPoland\n"},{"id":"76013","messageId":"1F80B8CA-7FF5-4455-857A-E078C79DB479@ai.rug.nl","threadId":"13368","inReplyTo":"200805041313.03499.jnareb@gmail.com","subject":"Re: [PATCH] Documentation: convert \"glossary\" and \"core-tutorial\" to man pages","fromName":"Pieter de Bie","fromEmail":"pdebie@ai.rug.nl","sentAt":"2008-05-04T11:16:25Z","receivedAt":"2008-05-04T11:16:25Z","isPatch":true,"sender":{"key":"pdebie@ai.rug.nl","avatar":null},"body":"\nOn 4 mei 2008, at 13:13, Jakub Narebski wrote:\n>> core-tutorial.txt -> gitcore-tutorial.txt\n>> glossary.txt      -> gitglossary.txt\n>\n> I like this, although I think that perhaps git-core-tutorial.txt would\n> be a better filename.\n\nI would change it to just \"git-tutorial\".\n"},{"id":"76016","messageId":"200805041413.28464.jnareb@gmail.com","threadId":"13368","inReplyTo":"1F80B8CA-7FF5-4455-857A-E078C79DB479@ai.rug.nl","subject":"Re: [PATCH] Documentation: convert \"glossary\" and \"core-tutorial\" to man pages","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2008-05-04T12:13:27Z","receivedAt":"2008-05-04T12:13:27Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"On Sun, 4 May 2008, Pieter de Bie napisał:\n> \n> On 4 mei 2008, at 13:13, Jakub Narebski wrote:\n>>>\n>>> core-tutorial.txt -> gitcore-tutorial.txt\n>>> glossary.txt      -> gitglossary.txt\n>>\n>> I like this, although I think that perhaps git-core-tutorial.txt would\n>> be a better filename.\n> \n> I would change it to just \"git-tutorial\".\n\nNot possible.  There are two other git tutorials (I think they are\nbeing slowly into \"Git User's Manual\", user-manual.txt), and this\nis core git/plumbing tutorial.  Perhaps git-plumbing-tutorial.txt,\nif at that...\n\nBTW. what I'd like to see is to have \"Git from bottom up\" incorporated\n(added to) core-tutorial...\n\n-- \nJakub Narebski\nPoland\n"},{"id":"76059","messageId":"46dff0320805041850u4e40c5c2s360fd9198537cf68@mail.gmail.com","threadId":"13368","inReplyTo":"20080504122157.ca98c75d.chriscool@tuxfamily.org","subject":"Re: [PATCH] Documentation: convert \"glossary\" and \"core-tutorial\" to man pages","fromName":"Ping Yin","fromEmail":"pkufranky@gmail.com","sentAt":"2008-05-05T01:50:48Z","receivedAt":"2008-05-05T01:50:48Z","isPatch":true,"sender":{"key":"pkufranky@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5346?v=4"},"body":"On Sun, May 4, 2008 at 6:21 PM, Christian Couder\n<chriscool@tuxfamily.org> wrote:\n> This patch renames the following documents and at the same time converts\n>  them to the man format:\n>\n>  core-tutorial.txt -> gitcore-tutorial.txt\n>  glossary.txt      -> gitglossary.txt\n>\n>  But as the glossary is included in the user manual and as the new\n>  gitglossary man page cannot be included as a whole in the user manual,\n>  the actual glossary content is now in its own \"glossary-content.txt\"\n>  new file. And this file is included by both the user manual and the\n>  gitglossary man page.\n>\n>  Other documents that reference the above ones are changed accordingly\n>  and sometimes improved a little too.\n>  ---\n>   Documentation/Makefile                             |    7 ++---\n>   Documentation/git.txt                              |   13 +++++++--\n>   .../{core-tutorial.txt => gitcore-tutorial.txt}    |   26 ++++++++++++++++---\n>   Documentation/gitcvs-migration.txt                 |    6 +++-\n>   Documentation/giteveryday.txt                      |    5 ++-\n>   Documentation/gitglossary.txt                      |   25 +++++++++++++++++++\n>   Documentation/gittutorial-2.txt                    |   11 ++++----\n>   Documentation/gittutorial.txt                      |    5 ++-\n>   .../{glossary.txt => glossary-content.txt}         |    3 --\n>   Documentation/user-manual.txt                      |    5 +++-\n>   10 files changed, 80 insertions(+), 26 deletions(-)\n>   rename Documentation/{core-tutorial.txt => gitcore-tutorial.txt} (99%)\n>   create mode 100644 Documentation/gitglossary.txt\n>   rename Documentation/{glossary.txt => glossary-content.txt} (99%)\n>\n>\n>         This is another patch to convert some help documents to\n>         man pages. It should apply on top of the previous ones.\n>\n>\n>  diff --git a/Documentation/Makefile b/Documentation/Makefile\n>  index 9a8043f..5ec7bd8 100644\n>  --- a/Documentation/Makefile\n>  +++ b/Documentation/Makefile\n>  @@ -4,7 +4,8 @@ MAN1_TXT= \\\n>         gitk.txt\n>   MAN5_TXT=gitattributes.txt gitignore.txt gitmodules.txt githooks.txt\n>   MAN7_TXT=git.txt gitcli.txt gittutorial.txt gittutorial-2.txt \\\n>  -       gitcvs-migration.txt giteveryday.txt\n>  +       gitcvs-migration.txt giteveryday.txt gitcore-tutorial.txt \\\n>  +       gitglossary.txt\n>\n>   MAN_TXT = $(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT)\n>   MAN_XML=$(patsubst %.txt,%.xml,$(MAN_TXT))\n>  @@ -12,12 +13,10 @@ MAN_HTML=$(patsubst %.txt,%.html,$(MAN_TXT))\n>\n>   DOC_HTML=$(MAN_HTML)\n>\n>  -ARTICLES = core-tutorial\n>  -ARTICLES += diffcore\n>  +ARTICLES = diffcore\n>   ARTICLES += howto-index\n>   ARTICLES += repository-layout\n>   ARTICLES += git-tools\n>  -ARTICLES += glossary\n>   # with their own formatting rules.\n>   SP_ARTICLES = howto/revert-branch-rebase howto/using-merge-subtree user-manual\n>   API_DOCS = $(patsubst %.txt,%,$(filter-out technical/api-index-skel.txt technical/api-index.txt, $(wildcard technical/api-*.txt)))\n>  diff --git a/Documentation/git.txt b/Documentation/git.txt\n>  index 1c3c56e..855e90e 100644\n>  --- a/Documentation/git.txt\n>  +++ b/Documentation/git.txt\n>  @@ -172,7 +172,7 @@ See the references above to get started using git.  The following is\n>   probably more detail than necessary for a first-time user.\n>\n>   The link:user-manual.html#git-concepts[git concepts chapter of the\n>  -user-manual] and the link:core-tutorial.html[Core tutorial] both provide\n>  +user-manual] and the linkgit:gitcore-tutorial[7][Core tutorial] both provide\n>   introductions to the underlying git architecture.\n>\n>   See also the link:howto-index.html[howto] documents for some useful\n>  @@ -372,7 +372,7 @@ Higher level SCMs may provide and manage additional information in the\n>\n>   Terminology\n>   -----------\n>  -Please see the link:glossary.html[glossary] document.\n>  +Please see the linkgit:gitglossary[7][glossary] document.\n>\n>\n>   Environment Variables\n>  @@ -516,7 +516,7 @@ Discussion[[Discussion]]\n>\n>   More detail on the following is available from the\n>   link:user-manual.html#git-concepts[git concepts chapter of the\n>  -user-manual] and the link:core-tutorial.html[Core tutorial].\n>  +user-manual] and the linkgit:gitcore-tutorial[7][Core tutorial].\n>\n>   A git project normally consists of a working directory with a \".git\"\n>   subdirectory at the top level.  The .git directory contains, among other\n>  @@ -577,6 +577,13 @@ The documentation for git suite was started by David Greaves\n>   <david@dgreaves.com>, and later enhanced greatly by the\n>   contributors on the git-list <git@vger.kernel.org>.\n>\n>  +SEE ALSO\n>  +--------\n>  +linkgit:gittutorial[7], linkgit:gittutorial-2[7],\n>  +linkgit:giteveryday[7], linkgit:gitcvs-migration[7],\n>  +linkgit:gitglossary[7], linkgit:gitcore-tutorial[7],\n>  +link:user-manual.html[The Git User's Manual]\n>  +\n>   GIT\n>   ---\n>   Part of the linkgit:git[7] suite\n>  diff --git a/Documentation/core-tutorial.txt b/Documentation/gitcore-tutorial.txt\n>  similarity index 99%\n>  rename from Documentation/core-tutorial.txt\n>  rename to Documentation/gitcore-tutorial.txt\n>  index b50b5dd..5995a2e 100644\n>  --- a/Documentation/core-tutorial.txt\n>  +++ b/Documentation/gitcore-tutorial.txt\n>  @@ -1,8 +1,16 @@\n>  -A git core tutorial for developers\n>  -==================================\n>  +gitcore-tutorial(7)\n>  +===================\n>\n>  -Introduction\n>  -------------\n>  +NAME\n>  +----\n>  +gitcore-tutorial - A git core tutorial for developers\n>  +\n>  +SYNOPSIS\n>  +--------\n>  +git *\n>  +\n>  +DESCRIPTION\n>  +-----------\n>\n>   This tutorial explains how to use the \"core\" git programs to set up and\n>   work with a git repository.\n>  @@ -1679,3 +1687,13 @@ merge two at a time, documenting how you resolved the conflicts,\n>   and the reason why you preferred changes made in one side over\n>   the other.  Otherwise it would make the project history harder\n>   to follow, not easier.\n>  +\n>  +SEE ALSO\n>  +--------\n>  +linkgit:gittutorial[7], linkgit:gittutorial-2[7],\n>  +linkgit:giteveryday[7], linkgit:gitcvs-migration[7],\n>  +link:user-manual.html[The Git User's Manual]\n>  +\n>  +GIT\n>  +---\n>  +Part of the linkgit:git[7] suite.\n>  diff --git a/Documentation/gitcvs-migration.txt b/Documentation/gitcvs-migration.txt\n>  index 4e5ea33..3eaf4b8 100644\n>  --- a/Documentation/gitcvs-migration.txt\n>  +++ b/Documentation/gitcvs-migration.txt\n>  @@ -20,7 +20,7 @@ can synchronize with; this document explains how to do that.\n>\n>   Some basic familiarity with git is required.  This\n>   linkgit:gittutorial[7][tutorial introduction to git] and the\n>  -link:glossary.html[git glossary] should be sufficient.\n>  +linkgit:gitglossary[7][git glossary] should be sufficient.\n>\n>   Developing against a shared repository\n>   --------------------------------------\n>  @@ -187,7 +187,9 @@ repositories without the need for a central maintainer.\n>   SEE ALSO\n>   --------\n>   linkgit:gittutorial[7], linkgit:gittutorial-2[7],\n>  -linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]\n>  +linkgit:giteveryday[7], linkgit:gitcore-tutorial[7],\n>  +linkgit:gitglossary[7],\n>  +link:user-manual.html[The Git User's Manual]\n>\n>   GIT\n>   ---\n>  diff --git a/Documentation/giteveryday.txt b/Documentation/giteveryday.txt\n>  index d7c3a35..6b33242 100644\n>  --- a/Documentation/giteveryday.txt\n>  +++ b/Documentation/giteveryday.txt\n>  @@ -474,8 +474,9 @@ ftp> cp -r .git /home/user/myproject.git\n>   SEE ALSO\n>   --------\n>   linkgit:gittutorial[7], linkgit:gittutorial-2[7],\n>  -linkgit:gitcvs-migration[7], link:user-manual.html[The Git User's\n>  -Manual]\n>  +linkgit:gitcvs-migration[7], linkgit:gitcore-tutorial[7],\n>  +linkgit:gitglossary[7],\n>  +link:user-manual.html[The Git User's Manual]\n>\n>   GIT\n>   ---\n>  diff --git a/Documentation/gitglossary.txt b/Documentation/gitglossary.txt\n>  new file mode 100644\n>  index 0000000..e8475a0\n>  --- /dev/null\n>  +++ b/Documentation/gitglossary.txt\n>  @@ -0,0 +1,25 @@\n>  +gitglossary(7)\n>  +==============\n>  +\n>  +NAME\n>  +----\n>  +gitglossary - A GIT Glossary\n>  +\n>  +SYNOPSIS\n>  +--------\n>  +*\n>  +\n>  +DESCRIPTION\n>  +-----------\n>  +\n>  +include::glossary-content.txt[]\n>  +\n>  +SEE ALSO\n>  +--------\n>  +linkgit:gittutorial[7], linkgit:gittutorial-2[7],\n>  +linkgit:giteveryday[7], linkgit:gitcvs-migration[7],\n>  +link:user-manual.html[The Git User's Manual]\n>  +\n>  +GIT\n>  +---\n>  +Part of the linkgit:git[7] suite.\n>  diff --git a/Documentation/gittutorial-2.txt b/Documentation/gittutorial-2.txt\n>  index 4af9073..c7f59bd 100644\n>  --- a/Documentation/gittutorial-2.txt\n>  +++ b/Documentation/gittutorial-2.txt\n>  @@ -390,7 +390,7 @@ in the index file is identical to the one in the working directory.\n>   In addition to being the staging area for new commits, the index file\n>   is also populated from the object database when checking out a\n>   branch, and is used to hold the trees involved in a merge operation.\n>  -See the link:core-tutorial.html[core tutorial] and the relevant man\n>  +See the linkgit:gitcore-tutorial[7][core tutorial] and the relevant man\n>   pages for details.\n>\n>   What next?\n>  @@ -400,7 +400,7 @@ At this point you should know everything necessary to read the man\n>   pages for any of the git commands; one good place to start would be\n>   with the commands mentioned in linkgit:giteveryday[7][Everyday git].\n>   You should be able to find any unknown jargon in the\n>  -link:glossary.html[Glossary].\n>  +linkgit:gitglossary[7][Glossary].\n>\n>   The link:user-manual.html[Git User's Manual] provides a more\n>   comprehensive introduction to git.\n>  @@ -412,15 +412,16 @@ CVS-like way.\n>   For some interesting examples of git use, see the\n>   link:howto-index.html[howtos].\n>\n>  -For git developers, the link:core-tutorial.html[Core tutorial] goes\n>  +For git developers, the linkgit:gitcore-tutorial[7][Core tutorial] goes\n>   into detail on the lower-level git mechanisms involved in, for\n>   example, creating a new commit.\n>\n>   SEE ALSO\n>   --------\n>   linkgit:gittutorial[7], linkgit:giteveryday[7],\n>  -linkgit:gitcvs-migration[7], link:user-manual.html[The Git User's\n>  -Manual]\n>  +linkgit:gitcvs-migration[7], linkgit:gitcore-tutorial[7],\n>  +linkgit:gitglossary[7],\n>  +link:user-manual.html[The Git User's Manual]\n>\n>   GIT\n>   ---\n>  diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt\n>  index 470f7f7..34469be 100644\n>  --- a/Documentation/gittutorial.txt\n>  +++ b/Documentation/gittutorial.txt\n>  @@ -598,8 +598,9 @@ digressions that may be interesting at this point are:\n>   SEE ALSO\n>   --------\n>   linkgit:gittutorial-2[7], linkgit:giteveryday[7],\n>  -linkgit:gitcvs-migration[7], link:user-manual.html[The Git User's\n>  -Manual]\n>  +linkgit:gitcvs-migration[7], linkgit:gitcore-tutorial[7],\n>  +linkgit:gitglossary[7],\n>  +link:user-manual.html[The Git User's Manual]\n>\n>   GIT\n>   ---\n>  diff --git a/Documentation/glossary.txt b/Documentation/glossary-content.txt\n>  similarity index 99%\n>  rename from Documentation/glossary.txt\n>  rename to Documentation/glossary-content.txt\n>  index 51b6353..f981fee 100644\n>  --- a/Documentation/glossary.txt\n>  +++ b/Documentation/glossary-content.txt\n>  @@ -1,6 +1,3 @@\n>  -GIT Glossary\n>  -============\n>  -\n>   [[def_alternate_object_database]]alternate object database::\n>         Via the alternates mechanism, a <<def_repository,repository>>\n>         can inherit part of its <<def_object_database,object database>>\n>  diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\n>  index b2c4f2c..a99489e 100644\n>  --- a/Documentation/user-manual.txt\n>  +++ b/Documentation/user-manual.txt\n>  @@ -4252,7 +4252,10 @@ You see, Git is actually the best tool to find out about the source of Git\n>   itself!\n>\n>   [[glossary]]\n>  -include::glossary.txt[]\n>  +GIT Glossary\n>  +============\n>  +\n>  +include::glossary-content.txt[]\n>\n>   [[git-quick-start]]\n>   Appendix A: Git Quick Reference\n>  --\n\nTHX very much for the great work.\n\n-- \nPing Yin\n"}]}