git/Documentation/Makefile, branch v1.8.2.2

Merge branch 'da/mergetool-docs'

2013-02-07T22:42:16Z

Build on top of the clean-up done by jk/mergetool and automatically generate the list of mergetool and difftool backends the build supports to be included in the documentation. * da/mergetool-docs: doc: generate a list of valid merge tools mergetool--lib: list user configured tools in '--tool-help' mergetool--lib: add functions for finding available tools mergetool--lib: improve the help text in guess_merge_tool() mergetool--lib: simplify command expressions

Merge branch 'jk/doc-makefile-cleanup'

2013-02-07T22:41:51Z

* jk/doc-makefile-cleanup: Documentation/Makefile: clean up MAN*_TXT lists

Merge branch 'jk/remote-helpers-doc'

2013-02-07T22:41:45Z

"git help remote-helpers" did not work; 'remote-helpers' is not a subcommand name but a concept, so its documentation should have been in gitremote-helpers, not git-remote-helpers. * jk/remote-helpers-doc: Rename {git- => git}remote-helpers.txt

doc: generate a list of valid merge tools

2013-02-03T05:46:52Z

Use the show_tool_names() function to build lists of all the built-in tools supported by difftool and mergetool. This frees us from needing to update the documentation whenever a new tool is added. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

Rename {git- => git}remote-helpers.txt

2013-02-01T22:12:34Z

When looking up a topic via "git help ", git-help prepends "git-" to topics that are the names of commands (either builtin or found on the path) and "git" (no hyphen) to any other topic name. "git-remote-helpers" is not the name of a command, so "git help remote-helpers" looks for "gitremote-helpers" and does not find it. Fix this by renaming "git-remote-helpers.txt" to "gitremote-helpers.txt". Signed-off-by: John Keeping Signed-off-by: Junio C Hamano

Documentation: the name of the system is 'Git', not 'git'

2013-02-01T21:53:33Z

Signed-off-by: Thomas Ackermann Signed-off-by: Junio C Hamano

Documentation/Makefile: clean up MAN*_TXT lists

2013-02-01T20:35:30Z

We keep a list of the various files that end up as man1, man5, etc. Let's break these single-line lists into sorted multi-line lists, which makes diffs that touch them much easier to read. Reviewed-by: Jonathan Nieder Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'jn/xml-depends-on-asciidoc-conf' into maint

2013-01-14T16:01:00Z

* jn/xml-depends-on-asciidoc-conf: docs: manpage XML depends on asciidoc.conf

Merge branch 'jn/xml-depends-on-asciidoc-conf'

2013-01-12T02:34:38Z

* jn/xml-depends-on-asciidoc-conf: docs: manpage XML depends on asciidoc.conf

docs: manpage XML depends on asciidoc.conf

2013-01-06T19:13:14Z

When building manual pages, the source text is transformed to XML with AsciiDoc before the man pages are generated from the XML with xmlto. Fix the dependencies in the Makefile so that the XML files are rebuilt when asciidoc.conf changes and not just the manual pages from unchanged XML, and move the dependencies from a recipeless rule to the rules with commands that use asciidoc.conf to make the dependencies easier to understand and maintain. Reported-by: John Keeping Signed-off-by: Jonathan Nieder Tested-by: John Keeping Signed-off-by: Junio C Hamano