aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/howto
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/howto')
-rwxr-xr-xDocumentation/howto/howto-index.sh14
-rw-r--r--Documentation/howto/meson.build36
-rw-r--r--Documentation/howto/new-command.adoc2
3 files changed, 26 insertions, 26 deletions
diff --git a/Documentation/howto/howto-index.sh b/Documentation/howto/howto-index.sh
index eecd123a93..ace49830a8 100755
--- a/Documentation/howto/howto-index.sh
+++ b/Documentation/howto/howto-index.sh
@@ -9,9 +9,9 @@ people describing how they use Git in their workflow.
EOF
-for txt
+for adoc
do
- title=$(expr "$txt" : '.*/\(.*\)\.txt$')
+ title=$(expr "$adoc" : '.*/\(.*\)\.adoc$')
from=$(sed -ne '
/^$/q
/^From:[ ]/{
@@ -21,7 +21,7 @@ do
s/^/by /
p
}
- ' "$txt")
+ ' "$adoc")
abstract=$(sed -ne '
/^Abstract:[ ]/{
@@ -39,13 +39,13 @@ do
x
p
q
- }' "$txt")
+ }' "$adoc")
- if grep 'Content-type: text/asciidoc' >/dev/null $txt
+ if grep 'Content-type: text/asciidoc' >/dev/null $adoc
then
- file=$(expr "$txt" : '\(.*\)\.txt$').html
+ file=$(expr "$adoc" : '\(.*\)\.adoc$').html
else
- file="$txt"
+ file="$adoc"
fi
echo "* link:howto/$(basename "$file")[$title] $from
diff --git a/Documentation/howto/meson.build b/Documentation/howto/meson.build
index c023c10416..81000028c0 100644
--- a/Documentation/howto/meson.build
+++ b/Documentation/howto/meson.build
@@ -1,20 +1,20 @@
howto_sources = [
- 'coordinate-embargoed-releases.txt',
- 'keep-canonical-history-correct.txt',
- 'maintain-git.txt',
- 'new-command.txt',
- 'rebase-from-internal-branch.txt',
- 'rebuild-from-update-hook.txt',
- 'recover-corrupted-blob-object.txt',
- 'recover-corrupted-object-harder.txt',
- 'revert-a-faulty-merge.txt',
- 'revert-branch-rebase.txt',
- 'separating-topic-branches.txt',
- 'setup-git-server-over-http.txt',
- 'update-hook-example.txt',
- 'use-git-daemon.txt',
- 'using-merge-subtree.txt',
- 'using-signed-tag-in-pull-request.txt',
+ 'coordinate-embargoed-releases.adoc',
+ 'keep-canonical-history-correct.adoc',
+ 'maintain-git.adoc',
+ 'new-command.adoc',
+ 'rebase-from-internal-branch.adoc',
+ 'rebuild-from-update-hook.adoc',
+ 'recover-corrupted-blob-object.adoc',
+ 'recover-corrupted-object-harder.adoc',
+ 'revert-a-faulty-merge.adoc',
+ 'revert-branch-rebase.adoc',
+ 'separating-topic-branches.adoc',
+ 'setup-git-server-over-http.adoc',
+ 'update-hook-example.adoc',
+ 'use-git-daemon.adoc',
+ 'using-merge-subtree.adoc',
+ 'using-signed-tag-in-pull-request.adoc',
]
howto_index = custom_target(
@@ -26,7 +26,7 @@ howto_index = custom_target(
env: script_environment,
capture: true,
input: howto_sources,
- output: 'howto-index.txt',
+ output: 'howto-index.adoc',
)
custom_target(
@@ -41,7 +41,7 @@ custom_target(
foreach howto : howto_sources
howto_stripped = custom_target(
command: [
- find_program('sed'),
+ sed,
'-e',
'1,/^$/d',
'@INPUT@',
diff --git a/Documentation/howto/new-command.adoc b/Documentation/howto/new-command.adoc
index 880c51112b..ac73c98be7 100644
--- a/Documentation/howto/new-command.adoc
+++ b/Documentation/howto/new-command.adoc
@@ -48,7 +48,7 @@ binary); this organization makes it easy for people reading the code
to find things.
See the CodingGuidelines document for other guidance on what we consider
-good practice in C and shell, and api-builtin.txt for the support
+good practice in C and shell, and builtin.h for the support
functions available to built-in commands written in C.
What every extension command needs