doc: split placeholders as individual tokens
The placeholders represent atoms of tokens and must not be aggregates. Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jean-Noël Avila committed
Oct 28, 2021 at 16:21 UTC
06ebae09f57da52ae28b3c1548718c42063fab31
3 files changed
+9
-9
Documentation/git-archimport.txt
+7
-7
@@ -9,14 +9,14 @@ git-archimport - Import a GNU Arch repository into Git
9
SYNOPSIS
10
--------
11
[verse]
12
-'git archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir]
13
- <archive/branch>[:<git-branch>] ...
12
+'git archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D <depth>] [-t <tempdir>]
13
+ <archive>/<branch>[:<git-branch>]...
14
15
DESCRIPTION
16
-----------
17
Imports a project from one or more GNU Arch repositories.
18
It will follow branches
19
-and repositories within the namespaces defined by the <archive/branch>
19
+and repositories within the namespaces defined by the <archive>/<branch>
20
parameters supplied. If it cannot find the remote branch a merge comes from
21
it will just import it as a regular commit. If it can find it, it will mark it
22
as a merge whenever possible (see discussion below).
@@ -27,7 +27,7 @@ import new branches within the provided roots.
27
28
It expects to be dealing with one project only. If it sees
29
branches that have different roots, it will refuse to run. In that case,
30
-edit your <archive/branch> parameters to define clearly the scope of the
30
+edit your <archive>/<branch> parameters to define clearly the scope of the
31
import.
32
33
'git archimport' uses `tla` extensively in the background to access the
@@ -42,7 +42,7 @@ incremental imports.
42
43
While 'git archimport' will try to create sensible branch names for the
44
archives that it imports, it is also possible to specify Git branch names
45
-manually. To do so, write a Git branch name after each <archive/branch>
45
+manually. To do so, write a Git branch name after each <archive>/<branch>
46
parameter, separated by a colon. This way, you can shorten the Arch
47
branch names and convert Arch jargon to Git jargon, for example mapping a
48
"PROJECT{litdd}devo{litdd}VERSION" branch to "master".
@@ -104,8 +104,8 @@ OPTIONS
104
Override the default tempdir.
105
106
107
-<archive/branch>::
108
- Archive/branch identifier in a format that `tla log` understands.
107
+<archive>/<branch>::
108
+ <archive>/<branch> identifier in a format that `tla log` understands.
109
110
111
GIT
Documentation/git-p4.txt
+1
-1
@@ -361,7 +361,7 @@ These options can be used to modify 'git p4 submit' behavior.
361
p4/master. See the "Sync options" section above for more
362
information.
363
364
---commit <sha1>|<sha1..sha1>::
364
+--commit (<sha1>|<sha1>..<sha1>)::
365
Submit only the specified commit or range of commits, instead of the full
366
list of changes that are in the current Git branch.
367
Documentation/git-web--browse.txt
+1
-1
@@ -8,7 +8,7 @@ git-web--browse - Git helper script to launch a web browser
8
SYNOPSIS
9
--------
10
[verse]
11
-'git web{litdd}browse' [<options>] <url|file>...
11
+'git web{litdd}browse' [<options>] (<URL>|<file>)...
12
13
DESCRIPTION
14
-----------