Merge branch 'mm/api-credentials-doc'

Finishing touches...

* mm/api-credentials-doc:
  docs: fix cross-directory linkgit references

Documentation/technical/api-config.txt

@@ -2,7 +2,7 @@ config API
 ==========
 
 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.
 
 General Usage

Documentation/technical/api-credentials.txt

@@ -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).
 
 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
 these rules:
 
@@ -293,6 +293,6 @@ helpers will just ignore the new requests).
 See also
 --------
 
-linkgit:../gitcredentials[7]
+linkgit:gitcredentials[7]
 
-linkgit:../git-config[5] (See configuration variables `credential.*`)
+linkgit:git-config[5] (See configuration variables `credential.*`)

Documentation/technical/api-merge.txt

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