Skip to content

Commit 06ebae0

Browse files
jnavilagitster
authored andcommitted
doc: split placeholders as individual tokens
The placeholders represent atoms of tokens and must not be aggregates. Signed-off-by: Jean-Noël Avila <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent b7bf32b commit 06ebae0

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

Documentation/git-archimport.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ git-archimport - Import a GNU Arch repository into Git
99
SYNOPSIS
1010
--------
1111
[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>]...
1414

1515
DESCRIPTION
1616
-----------
1717
Imports a project from one or more GNU Arch repositories.
1818
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>
2020
parameters supplied. If it cannot find the remote branch a merge comes from
2121
it will just import it as a regular commit. If it can find it, it will mark it
2222
as a merge whenever possible (see discussion below).
@@ -27,7 +27,7 @@ import new branches within the provided roots.
2727

2828
It expects to be dealing with one project only. If it sees
2929
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
3131
import.
3232

3333
'git archimport' uses `tla` extensively in the background to access the
@@ -42,7 +42,7 @@ incremental imports.
4242

4343
While 'git archimport' will try to create sensible branch names for the
4444
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>
4646
parameter, separated by a colon. This way, you can shorten the Arch
4747
branch names and convert Arch jargon to Git jargon, for example mapping a
4848
"PROJECT{litdd}devo{litdd}VERSION" branch to "master".
@@ -104,8 +104,8 @@ OPTIONS
104104
Override the default tempdir.
105105

106106

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.
109109

110110

111111
GIT

Documentation/git-p4.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ These options can be used to modify 'git p4 submit' behavior.
361361
p4/master. See the "Sync options" section above for more
362362
information.
363363

364-
--commit <sha1>|<sha1..sha1>::
364+
--commit (<sha1>|<sha1>..<sha1>)::
365365
Submit only the specified commit or range of commits, instead of the full
366366
list of changes that are in the current Git branch.
367367

Documentation/git-web--browse.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ git-web--browse - Git helper script to launch a web browser
88
SYNOPSIS
99
--------
1010
[verse]
11-
'git web{litdd}browse' [<options>] <url|file>...
11+
'git web{litdd}browse' [<options>] (<URL>|<file>)...
1212

1313
DESCRIPTION
1414
-----------

0 commit comments

Comments
 (0)