diff options
| author | Christian Couder <chriscool@tuxfamily.org> | 2008-05-29 19:21:46 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-01 22:23:10 -0700 |
| commit | 497c83314c1a595ef26dd4ea452022b0848d3219 (patch) | |
| tree | 72189cd1aaa1f538c32042ee197b2a4db2fd9d8c /Documentation/Makefile | |
| parent | 58c8dd217384b8d1a464a55a98c665ed108c6b15 (diff) | |
| download | git-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/Makefile')
| -rw-r--r-- | Documentation/Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index 9750334b9..ca4dadf94 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -4,7 +4,7 @@ MAN1_TXT= \ gitk.txt MAN5_TXT=gitattributes.txt gitignore.txt gitmodules.txt githooks.txt MAN7_TXT=git.txt gitcli.txt gittutorial.txt gittutorial-2.txt \ - gitcvs-migration.txt + gitcvs-migration.txt gitcore-tutorial.txt gitglossary.txt MAN_TXT = $(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT) MAN_XML=$(patsubst %.txt,%.xml,$(MAN_TXT)) @@ -12,13 +12,11 @@ MAN_HTML=$(patsubst %.txt,%.html,$(MAN_TXT)) DOC_HTML=$(MAN_HTML) -ARTICLES = core-tutorial -ARTICLES += diffcore +ARTICLES = diffcore ARTICLES += howto-index ARTICLES += repository-layout ARTICLES += everyday ARTICLES += git-tools -ARTICLES += glossary # with their own formatting rules. SP_ARTICLES = howto/revert-branch-rebase howto/using-merge-subtree user-manual API_DOCS = $(patsubst %.txt,%,$(filter-out technical/api-index-skel.txt technical/api-index.txt, $(wildcard technical/api-*.txt))) |