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

Merge branch 'mm/api-credentials-doc' 

Finishing touches...

* mm/api-credentials-doc:
  docs: fix cross-directory linkgit references
maint
Junio C Hamano 2012-06-08 08:32:19 -07:00
parent a1a031d935 fe77b416c7
commit 02101c969d
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/Makefile
View File

@ -280,6 +280,7 @@ technical/api-index.txt: technical/api-index-skel.txt \
technical/api-index.sh $(patsubst %,%.txt,$(API_DOCS)) technical/api-index.sh $(patsubst %,%.txt,$(API_DOCS))
$(QUIET_GEN)cd technical && '$(SHELL_PATH_SQ)' ./api-index.sh $(QUIET_GEN)cd technical && '$(SHELL_PATH_SQ)' ./api-index.sh


technical/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../
$(patsubst %,%.html,$(API_DOCS) technical/api-index): %.html : %.txt $(patsubst %,%.html,$(API_DOCS) technical/api-index): %.html : %.txt
$(QUIET_ASCIIDOC)$(ASCIIDOC) -b xhtml11 -f asciidoc.conf \ $(QUIET_ASCIIDOC)$(ASCIIDOC) -b xhtml11 -f asciidoc.conf \
$(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) $*.txt $(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) $*.txt
@ -333,6 +334,7 @@ $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt


WEBDOC_DEST = /pub/software/scm/git/docs WEBDOC_DEST = /pub/software/scm/git/docs


howto/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../
$(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt $(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
sed -e '1,/^$$/d' $< | $(ASCIIDOC) $(ASCIIDOC_EXTRA) -b xhtml11 - >$@+ && \ sed -e '1,/^$$/d' $< | $(ASCIIDOC) $(ASCIIDOC_EXTRA) -b xhtml11 - >$@+ && \

2
Documentation/asciidoc.conf
View File

@ -91,5 +91,5 @@ endif::doctype-manpage[]


ifdef::backend-xhtml11[] ifdef::backend-xhtml11[]
[linkgit-inlinemacro] [linkgit-inlinemacro]
<a href="{target}.html">{target}{0?({0})}</a> <a href="{git-relative-html-prefix}{target}.html">{target}{0?({0})}</a>
endif::backend-xhtml11[] endif::backend-xhtml11[]

2
Documentation/technical/api-config.txt
View File

@ -2,7 +2,7 @@ config API
========== ==========


The config API gives callers a way to access git configuration files The config API gives callers a way to access git configuration files
(and files which have the same syntax). See linkgit:../git-config[1] for a (and files which have the same syntax). See linkgit:git-config[1] for a
discussion of the config file syntax. discussion of the config file syntax.


General Usage General Usage

6
Documentation/technical/api-credentials.txt
View File

@ -180,7 +180,7 @@ longer than a single git process; e.g., credentials may be stored
in-memory for a few minutes, or indefinitely on disk). in-memory for a few minutes, or indefinitely on disk).


Each helper is specified by a single string in the configuration Each helper is specified by a single string in the configuration
variable `credential.helper` (and others, see linkgit:../git-config[1]). variable `credential.helper` (and others, see linkgit:git-config[1]).
The string is transformed by git into a command to be executed using The string is transformed by git into a command to be executed using
these rules: these rules:


@ -293,6 +293,6 @@ helpers will just ignore the new requests).
See also See also
-------- --------


linkgit:../gitcredentials[7] linkgit:gitcredentials[7]


linkgit:../git-config[5] (See configuration variables `credential.*`) linkgit:git-config[5] (See configuration variables `credential.*`)

2
Documentation/technical/api-merge.txt
View File

@ -36,7 +36,7 @@ the operation of a low-level (single file) merge. Some options:
ancestors in a recursive merge. ancestors in a recursive merge.
If a helper program is specified by the If a helper program is specified by the
`[merge "<driver>"] recursive` configuration, it will `[merge "<driver>"] recursive` configuration, it will
be used (see linkgit:../gitattributes[5]). be used (see linkgit:gitattributes[5]).


`variant`:: `variant`::
Resolve local conflicts automatically in favor Resolve local conflicts automatically in favor