kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'jk/remote-helpers-doc' 

"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
maint
Junio C Hamano 2013-02-07 14:41:45 -08:00
parent b5b56ea40c bd4a3d6168
commit 8e12ab2f33
5 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Documentation/Makefile
View File

@ -1,7 +1,7 @@
MAN1_TXT= \ MAN1_TXT= \
$(filter-out $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \ $(filter-out $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \
$(wildcard git-*.txt)) \ $(wildcard git-*.txt)) \
gitk.txt gitweb.txt git.txt gitk.txt gitweb.txt git.txt gitremote-helpers.txt
MAN5_TXT=gitattributes.txt gitignore.txt gitmodules.txt githooks.txt \ MAN5_TXT=gitattributes.txt gitignore.txt gitmodules.txt githooks.txt \
gitrepository-layout.txt gitweb.conf.txt gitrepository-layout.txt gitweb.conf.txt
MAN7_TXT=gitcli.txt gittutorial.txt gittutorial-2.txt \ MAN7_TXT=gitcli.txt gittutorial.txt gittutorial-2.txt \
@ -13,7 +13,8 @@ MAN_TXT = $(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT)
MAN_XML=$(patsubst %.txt,%.xml,$(MAN_TXT)) MAN_XML=$(patsubst %.txt,%.xml,$(MAN_TXT))
MAN_HTML=$(patsubst %.txt,%.html,$(MAN_TXT)) MAN_HTML=$(patsubst %.txt,%.html,$(MAN_TXT))


DOC_HTML=$(MAN_HTML) OBSOLETE_HTML = git-remote-helpers.html
DOC_HTML=$(MAN_HTML) $(OBSOLETE_HTML)


ARTICLES = howto-index ARTICLES = howto-index
ARTICLES += everyday ARTICLES += everyday
@ -261,6 +262,12 @@ $(MAN_HTML): %.html : %.txt asciidoc.conf
$(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< && \ $(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< && \
mv $@+ $@ mv $@+ $@


$(OBSOLETE_HTML): %.html : %.txto asciidoc.conf
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
$(ASCIIDOC) -b xhtml11 -f asciidoc.conf \
$(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< && \
mv $@+ $@

manpage-base-url.xsl: manpage-base-url.xsl.in manpage-base-url.xsl: manpage-base-url.xsl.in
sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@ sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@



9
Documentation/git-remote-helpers.txto Normal file
View File

@ -0,0 +1,9 @@
git-remote-helpers
==================

This document has been moved to linkgit:gitremote-helpers[1].

Please let the owners of the referring site know so that they can update the
link you clicked to get here.

Thanks.

2
Documentation/git-remote-testgit.txt
View File

@ -23,7 +23,7 @@ The best way to learn more is to read the comments and source code in


SEE ALSO SEE ALSO
-------- --------
linkgit:git-remote-helpers[1] linkgit:gitremote-helpers[1]


GIT GIT
--- ---

6
Documentation/git-remote-helpers.txt → Documentation/gitremote-helpers.txt
View File

@ -1,9 +1,9 @@
git-remote-helpers(1) gitremote-helpers(1)
===================== ====================


NAME NAME
---- ----
git-remote-helpers - Helper programs to interact with remote repositories gitremote-helpers - Helper programs to interact with remote repositories


SYNOPSIS SYNOPSIS
-------- --------

2
Documentation/urls.txt
View File

@ -55,7 +55,7 @@ may be used:


where <address> may be a path, a server and path, or an arbitrary where <address> may be a path, a server and path, or an arbitrary
URL-like string recognized by the specific remote helper being URL-like string recognized by the specific remote helper being
invoked. See linkgit:git-remote-helpers[1] for details. invoked. See linkgit:gitremote-helpers[1] for details.


If there are a large number of similarly-named remote repositories and If there are a large number of similarly-named remote repositories and
you want to use a different format for them (such that the URLs you you want to use a different format for them (such that the URLs you