Skip to content

Commit 97350e1

Browse files
tmzullingergitster
authored andcommitted
doc: *.txt -> *.adoc fixes
Update a few more instances of Documentation/*.txt files which have been renamed to *.adoc. Signed-off-by: Todd Zullinger <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 59d9280 commit 97350e1

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Documentation/gitattributes.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ If the filter command (a string value) is defined via
513513
`filter.<driver>.process` then Git can process all blobs with a
514514
single filter invocation for the entire life of a single Git
515515
command. This is achieved by using the long-running process protocol
516-
(described in technical/long-running-process-protocol.txt).
516+
(described in Documentation/technical/long-running-process-protocol.adoc).
517517

518518
When Git encounters the first file that needs to be cleaned or smudged,
519519
it starts the filter and performs the handshake. In the handshake, the
@@ -1177,11 +1177,11 @@ integer has a meaningful effect.
11771177

11781178
For example, this line in `.gitattributes` can be used to tell the merge
11791179
machinery to leave much longer (instead of the usual 7-character-long)
1180-
conflict markers when merging the file `Documentation/git-merge.txt`
1180+
conflict markers when merging the file `Documentation/git-merge.adoc`
11811181
results in a conflict.
11821182

11831183
------------------------
1184-
Documentation/git-merge.txt conflict-marker-size=32
1184+
Documentation/git-merge.adoc conflict-marker-size=32
11851185
------------------------
11861186

11871187

Documentation/technical/api-simple-ipc.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Comparison with sub-process model
3636
---------------------------------
3737

3838
The Simple-IPC mechanism differs from the existing `sub-process.c`
39-
model (Documentation/technical/long-running-process-protocol.txt) and
39+
model (Documentation/technical/long-running-process-protocol.adoc) and
4040
used by applications like Git-LFS. In the LFS-style sub-process model,
4141
the helper is started by the foreground process, communication happens
4242
via a pair of file descriptors bound to the stdin/stdout of the

Documentation/technical/hash-function-transition.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ inflated again in step 3, for a total of two inflations.
394394

395395
Step 4 is probably necessary for good read-time performance. "git
396396
pack-objects" on the server optimizes the pack file for good data
397-
locality (see Documentation/technical/pack-heuristics.txt).
397+
locality (see Documentation/technical/pack-heuristics.adoc).
398398

399399
Details of this process are likely to change. It will take some
400400
experimenting to get this to perform well.

0 commit comments

Comments
 (0)