aboutsummaryrefslogtreecommitdiff
path: root/Documentation/user-manual.txt
diff options
context:
space:
mode:
authorChristian Couder <chriscool@tuxfamily.org>2008-05-29 19:21:46 +0200
committerJunio C Hamano <gitster@pobox.com>2008-06-01 22:23:10 -0700
commit497c83314c1a595ef26dd4ea452022b0848d3219 (patch)
tree72189cd1aaa1f538c32042ee197b2a4db2fd9d8c /Documentation/user-manual.txt
parent58c8dd217384b8d1a464a55a98c665ed108c6b15 (diff)
downloadgit-497c83314c1a595ef26dd4ea452022b0848d3219.tar.gz
git-497c83314c1a595ef26dd4ea452022b0848d3219.tar.xz
Documentation: convert "glossary" and "core-tutorial" to man pages
This patch renames the following documents and at the same time converts them to the man format: core-tutorial.txt -> gitcore-tutorial.txt glossary.txt -> gitglossary.txt But as the glossary is included in the user manual and as the new gitglossary man page cannot be included as a whole in the user manual, the actual glossary content is now in its own "glossary-content.txt" new file. And this file is included by both the user manual and the gitglossary man page. Other documents that reference the above ones are changed accordingly and sometimes improved a little too. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/user-manual.txt')
-rw-r--r--Documentation/user-manual.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index fd8cdb625..bfde507e0 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -4252,7 +4252,10 @@ You see, Git is actually the best tool to find out about the source of Git
itself!
[[glossary]]
-include::glossary.txt[]
+GIT Glossary
+============
+
+include::glossary-content.txt[]
[[git-quick-start]]
Appendix A: Git Quick Reference