Merge branch 'jk/remote-helpers-doc' into maint
* jk/remote-helpers-doc: Rename {git- => git}remote-helpers.txt
This commit is contained in:
commit
7be093133c
@ -1,7 +1,7 @@
|
||||
MAN1_TXT= \
|
||||
$(filter-out $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \
|
||||
$(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 \
|
||||
gitrepository-layout.txt gitweb.conf.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_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 += everyday
|
||||
@ -261,6 +262,12 @@ $(MAN_HTML): %.html : %.txt asciidoc.conf
|
||||
$(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< && \
|
||||
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
|
||||
sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@
|
||||
|
||||
|
9
Documentation/git-remote-helpers.txto
Normal file
9
Documentation/git-remote-helpers.txto
Normal 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.
|
@ -23,7 +23,7 @@ The best way to learn more is to read the comments and source code in
|
||||
|
||||
SEE ALSO
|
||||
--------
|
||||
linkgit:git-remote-helpers[1]
|
||||
linkgit:gitremote-helpers[1]
|
||||
|
||||
GIT
|
||||
---
|
||||
|
@ -1,9 +1,9 @@
|
||||
git-remote-helpers(1)
|
||||
=====================
|
||||
gitremote-helpers(1)
|
||||
====================
|
||||
|
||||
NAME
|
||||
----
|
||||
git-remote-helpers - Helper programs to interact with remote repositories
|
||||
gitremote-helpers - Helper programs to interact with remote repositories
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
@ -55,7 +55,7 @@ may be used:
|
||||
|
||||
where <address> may be a path, a server and path, or an arbitrary
|
||||
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
|
||||
you want to use a different format for them (such that the URLs you
|
||||
|
Loading…
Reference in New Issue
Block a user