Skip to content

Commit 04b029c

Browse files
committed
Merge branch 'jw/doc-txt-to-adoc-refs' into seen
Some leftover references to documentation source files that no longer exist, due to recent ".txt" -> ".adoc" renaming, have been corrected. Will squash in the fix-up and merge to 'next'. * jw/doc-txt-to-adoc-refs: SQUASH??? doc: update references to renamed AsciiDoc files
2 parents ea5eb18 + 5fb7b1f commit 04b029c

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

Documentation/gitprotocol-v2.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ In general a client can request to speak protocol v2 by sending
5454
`version=2` through the respective side-channel for the transport being
5555
used which inevitably sets `GIT_PROTOCOL`. More information can be
5656
found in linkgit:gitprotocol-pack[5] and linkgit:gitprotocol-http[5], as well as the
57-
`GIT_PROTOCOL` definition in `git.txt`. In all cases the
57+
`GIT_PROTOCOL` definition in linkgit:git[1]. In all cases the
5858
response from the server is the capability advertisement.
5959

6060
Git Transport
@@ -99,7 +99,7 @@ Uses the `--http-backend-info-refs` option to
9999
linkgit:git-upload-pack[1].
100100

101101
The server may need to be configured to pass this header's contents via
102-
the `GIT_PROTOCOL` variable. See the discussion in `git-http-backend.txt`.
102+
the `GIT_PROTOCOL` variable. See the discussion in linkgit:git-http-backend[1].
103103

104104
Capability Advertisement
105105
------------------------

Documentation/technical/build-systems.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ that generally have somebody running test pipelines against regularly:
3232
- OpenBSD
3333

3434
The platforms which must be supported by the tool should be aligned with our
35-
[platform support policy](platform-support.txt).
35+
xref:platform-support.adoc[platform support policy].
3636

3737
=== Auto-detection of supported features
3838

contrib/subtree/README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
Please read git-subtree.txt for documentation.
2+
Please read git-subtree.adoc for documentation.
33

44
Please don't contact me using github mail; it's slow, ugly, and worst of
55
all, redundant. Email me instead at [email protected] and I'll be happy to

mergetools/vimdiff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,8 +274,8 @@ gen_cmd () {
274274
# definition.
275275
#
276276
# The syntax of the "layout definitions" is explained in "Documentation/
277-
# mergetools/vimdiff.txt" but you can already intuitively understand how
278-
# it works by knowing that...
277+
# mergetools/vimdiff.adoc" but you can already intuitively understand
278+
# how it works by knowing that...
279279
#
280280
# * "+" means "a new vim tab"
281281
# * "/" means "a new vim horizontal split"

sub-process.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ static inline struct child_process *subprocess_get_child_process(
7373

7474
/*
7575
* Perform the version and capability negotiation as described in the
76-
* "Handshake" section of long-running-process-protocol.txt using the
76+
* "Handshake" section of long-running-process-protocol.adoc using the
7777
* given requested versions and capabilities. The "versions" and "capabilities"
7878
* parameters are arrays terminated by a 0 or blank struct.
7979
*

0 commit comments

Comments
 (0)