Skip to content

Commit 287c0fe

Browse files
committed
Merge branch 'ss/doclinks'
When we converted many documents that were traditionally text-only to be formatted to AsciiDoc, we did not update links that point at them to refer to the formatted HTML files. * ss/doclinks: Documentation: make AsciiDoc links always point to HTML files
2 parents 89dde78 + d5ff3b4 commit 287c0fe

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

Documentation/everyday.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ and maintain access to the repository by developers.
304304
* linkgit:git-shell[1] can be used as a 'restricted login shell'
305305
for shared central repository users.
306306

307-
link:howto/update-hook-example.txt[update hook howto] has a good
307+
link:howto/update-hook-example.html[update hook howto] has a good
308308
example of managing a shared central repository.
309309

310310

Documentation/git-credential.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ usernames and passwords. The git-credential command exposes this
2020
interface to scripts which may want to retrieve, store, or prompt for
2121
credentials in the same manner as Git. The design of this scriptable
2222
interface models the internal C API; see
23-
link:technical/api-credentials.txt[the Git credential API] for more
23+
link:technical/api-credentials.html[the Git credential API] for more
2424
background on the concepts.
2525

2626
git-credential takes an "action" option on the command-line (one of

Documentation/git-rebase.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ You may find this (or --no-ff with an interactive rebase) helpful after
322322
reverting a topic branch merge, as this option recreates the topic branch with
323323
fresh commits so it can be remerged successfully without needing to "revert
324324
the reversion" (see the
325-
link:howto/revert-a-faulty-merge.txt[revert-a-faulty-merge How-To] for details).
325+
link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details).
326326

327327
--ignore-whitespace::
328328
--whitespace=<option>::
@@ -416,7 +416,7 @@ Without --interactive, this is a synonym for --force-rebase.
416416
You may find this helpful after reverting a topic branch merge, as this option
417417
recreates the topic branch with fresh commits so it can be remerged
418418
successfully without needing to "revert the reversion" (see the
419-
link:howto/revert-a-faulty-merge.txt[revert-a-faulty-merge How-To] for details).
419+
link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details).
420420

421421
include::merge-strategies.txt[]
422422

Documentation/git-revert.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ brought in by the merge. As a result, later merges will only bring in tree
5959
changes introduced by commits that are not ancestors of the previously
6060
reverted merge. This may or may not be what you want.
6161
+
62-
See the link:howto/revert-a-faulty-merge.txt[revert-a-faulty-merge How-To] for
62+
See the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for
6363
more details.
6464

6565
--no-edit::

Documentation/gitcvs-migration.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ points. You can use these, for example, to send all commits to the shared
157157
repository to a mailing list. See linkgit:githooks[5].
158158

159159
You can enforce finer grained permissions using update hooks. See
160-
link:howto/update-hook-example.txt[Controlling access to branches using
160+
link:howto/update-hook-example.html[Controlling access to branches using
161161
update hooks].
162162

163163
Providing CVS Access to a Git Repository

Documentation/technical/http-protocol.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -499,5 +499,5 @@ References
499499

500500
link:http://www.ietf.org/rfc/rfc1738.txt[RFC 1738: Uniform Resource Locators (URL)]
501501
link:http://www.ietf.org/rfc/rfc2616.txt[RFC 2616: Hypertext Transfer Protocol -- HTTP/1.1]
502-
link:technical/pack-protocol.txt
503-
link:technical/protocol-capabilities.txt
502+
link:technical/pack-protocol.html
503+
link:technical/protocol-capabilities.html

Documentation/user-manual.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1973,7 +1973,7 @@ $ git clone http://yourserver.com/~you/proj.git
19731973
-------------------------------------------------
19741974

19751975
(See also
1976-
link:howto/setup-git-server-over-http.txt[setup-git-server-over-http]
1976+
link:howto/setup-git-server-over-http.html[setup-git-server-over-http]
19771977
for a slightly more sophisticated setup using WebDAV which also
19781978
allows pushing over HTTP.)
19791979

@@ -3187,7 +3187,7 @@ those "loose" objects.
31873187
You can save space and make Git faster by moving these loose objects in
31883188
to a "pack file", which stores a group of objects in an efficient
31893189
compressed format; the details of how pack files are formatted can be
3190-
found in link:technical/pack-format.txt[technical/pack-format.txt].
3190+
found in link:technical/pack-format.html[pack format].
31913191

31923192
To put the loose objects into a pack, just run git repack:
31933193

0 commit comments

Comments
 (0)