Skip to content

Commit 2162f9f

Browse files
jnavilagitster
authored andcommitted
doc: enforce dashes in placeholders
The CodingGuidelines documents stipulates that multi-word placeholders are to be separated by dashes, not underscores nor spaces. Signed-off-by: Jean-Noël Avila <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 055bb6e commit 2162f9f

34 files changed

+90
-90
lines changed

Documentation/git-blame.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ annotated.
210210

211211
. Each blame entry always starts with a line of:
212212

213-
<40-byte hex sha1> <sourceline> <resultline> <num_lines>
213+
<40-byte-hex-sha1> <sourceline> <resultline> <num-lines>
214214
+
215215
Line numbers count from 1.
216216

Documentation/git-bugreport.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@ OPTIONS
5252
-s <format>::
5353
--suffix <format>::
5454
Specify an alternate suffix for the bugreport name, to create a file
55-
named 'git-bugreport-<formatted suffix>'. This should take the form of a
55+
named 'git-bugreport-<formatted-suffix>'. This should take the form of a
5656
strftime(3) format string; the current local time will be used.
5757

5858
--no-diagnose::
5959
--diagnose[=<mode>]::
6060
Create a zip archive of supplemental information about the user's
6161
machine, Git client, and repository state. The archive is written to the
6262
same output directory as the bug report and is named
63-
'git-diagnostics-<formatted suffix>'.
63+
'git-diagnostics-<formatted-suffix>'.
6464
+
6565
Without `mode` specified, the diagnostic archive will contain the default set of
6666
statistics reported by `git diagnose`. An optional `mode` value may be specified

Documentation/git-commit-graph.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ SYNOPSIS
1313
'git commit-graph write' [--object-dir <dir>] [--append]
1414
[--split[=<strategy>]] [--reachable | --stdin-packs | --stdin-commits]
1515
[--changed-paths] [--[no-]max-new-filters <n>] [--[no-]progress]
16-
<split options>
16+
<split-options>
1717

1818

1919
DESCRIPTION

Documentation/git-cvsserver.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ allowing access over SSH.
197197
5. Clients should now be able to check out the project. Use the CVS 'module'
198198
name to indicate what Git 'head' you want to check out. This also sets the
199199
name of your newly checked-out directory, unless you tell it otherwise with
200-
`-d <dir_name>`. For example, this checks out 'master' branch to the
200+
`-d <dir-name>`. For example, this checks out 'master' branch to the
201201
`project-master` directory:
202202
+
203203
------
@@ -224,7 +224,7 @@ the database to work reliably (otherwise you need to make sure
224224
that the database is up to date any time 'git-cvsserver' is executed).
225225

226226
By default it uses SQLite databases in the Git directory, named
227-
`gitcvs.<module_name>.sqlite`. Note that the SQLite backend creates
227+
`gitcvs.<module-name>.sqlite`. Note that the SQLite backend creates
228228
temporary files in the same directory as the database file on
229229
write so it might not be enough to grant the users using
230230
'git-cvsserver' write access to the database file without granting

Documentation/git-daemon.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ SYNOPSIS
1818
[--allow-override=<service>] [--forbid-override=<service>]
1919
[--access-hook=<path>] [--[no-]informative-errors]
2020
[--inetd |
21-
[--listen=<host_or_ipaddr>] [--port=<n>]
21+
[--listen=<host-or-ipaddr>] [--port=<n>]
2222
[--user=<user> [--group=<group>]]]
2323
[--log-destination=(stderr|syslog|none)]
2424
[<directory>...]
@@ -86,10 +86,10 @@ OPTIONS
8686
Incompatible with --detach, --port, --listen, --user and --group
8787
options.
8888

89-
--listen=<host_or_ipaddr>::
89+
--listen=<host-or-ipaddr>::
9090
Listen on a specific IP address or hostname. IP addresses can
9191
be either an IPv4 address or an IPv6 address if supported. If IPv6
92-
is not supported, then --listen=hostname is also not supported and
92+
is not supported, then --listen=<hostname> is also not supported and
9393
--listen must be given an IPv4 address.
9494
Can be given more than once.
9595
Incompatible with `--inetd` option.

Documentation/git-diagnose.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ OPTIONS
4545
-s <format>::
4646
--suffix <format>::
4747
Specify an alternate suffix for the diagnostics archive name, to create
48-
a file named 'git-diagnostics-<formatted suffix>'. This should take the
48+
a file named 'git-diagnostics-<formatted-suffix>'. This should take the
4949
form of a strftime(3) format string; the current local time will be
5050
used.
5151

Documentation/git-fast-import.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -745,11 +745,11 @@ paths for a commit are encouraged to do so.
745745

746746
`notemodify`
747747
^^^^^^^^^^^^
748-
Included in a `commit` `<notes_ref>` command to add a new note
748+
Included in a `commit` `<notes-ref>` command to add a new note
749749
annotating a `<commit-ish>` or change this annotation contents.
750750
Internally it is similar to filemodify 100644 on `<commit-ish>`
751751
path (maybe split into subdirectories). It's not advised to
752-
use any other commands to write to the `<notes_ref>` tree except
752+
use any other commands to write to the `<notes-ref>` tree except
753753
`filedeleteall` to delete all existing notes in this tree.
754754
This command has two different means of specifying the content
755755
of the note.

Documentation/git-fetch.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@ origin:
186186
------------------------------------------------
187187
$ git fetch origin --prune --prune-tags
188188
$ git fetch origin --prune 'refs/tags/*:refs/tags/*'
189-
$ git fetch <url of origin> --prune --prune-tags
190-
$ git fetch <url of origin> --prune 'refs/tags/*:refs/tags/*'
189+
$ git fetch <url-of-origin> --prune --prune-tags
190+
$ git fetch <url-of-origin> --prune 'refs/tags/*:refs/tags/*'
191191
------------------------------------------------
192192

193193
OUTPUT

Documentation/git-filter-branch.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ SYNOPSIS
1414
[--msg-filter <command>] [--commit-filter <command>]
1515
[--tag-name-filter <command>] [--prune-empty]
1616
[--original <namespace>] [-d <directory>] [-f | --force]
17-
[--state-branch <branch>] [--] [<rev-list options>...]
17+
[--state-branch <branch>] [--] [<rev-list-options>...]
1818

1919
WARNING
2020
-------
@@ -32,7 +32,7 @@ listed there as reasonably possible.
3232
DESCRIPTION
3333
-----------
3434
Lets you rewrite Git revision history by rewriting the branches mentioned
35-
in the <rev-list options>, applying custom filters on each revision.
35+
in the <rev-list-options>, applying custom filters on each revision.
3636
Those filters can modify each tree (e.g. removing a file or running
3737
a perl rewrite on all files) or information about each commit.
3838
Otherwise, all information (including original commit times or merge
@@ -624,7 +624,7 @@ with:
624624
real backup; it dereferences tags first.)
625625

626626
** Running git-filter-branch with either --tags or --all in your
627-
<rev-list options>. In order to retain annotated tags as
627+
<rev-list-options>. In order to retain annotated tags as
628628
annotated, you must use --tag-name-filter (and must not have
629629
restored from refs/original/ in a previously botched rewrite).
630630

Documentation/git-format-patch.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ SYNOPSIS
1717
[--signature-file=<file>]
1818
[-n | --numbered | -N | --no-numbered]
1919
[--start-number <n>] [--numbered-files]
20-
[--in-reply-to=<message id>] [--suffix=.<sfx>]
20+
[--in-reply-to=<message-id>] [--suffix=.<sfx>]
2121
[--ignore-if-in-upstream] [--always]
2222
[--cover-from-description=<mode>]
23-
[--rfc] [--subject-prefix=<subject prefix>]
23+
[--rfc] [--subject-prefix=<subject-prefix>]
2424
[(--reroll-count|-v) <n>]
2525
[--to=<email>] [--cc=<email>]
2626
[--[no-]cover-letter] [--quiet]
@@ -30,8 +30,8 @@ SYNOPSIS
3030
[--range-diff=<previous> [--creation-factor=<percent>]]
3131
[--filename-max-length=<n>]
3232
[--progress]
33-
[<common diff options>]
34-
[ <since> | <revision range> ]
33+
[<common-diff-options>]
34+
[ <since> | <revision-range> ]
3535

3636
DESCRIPTION
3737
-----------
@@ -64,7 +64,7 @@ There are two ways to specify which commits to operate on.
6464
to the tip of the current branch that are not in the history
6565
that leads to the <since> to be output.
6666

67-
2. Generic <revision range> expression (see "SPECIFYING
67+
2. Generic <revision-range> expression (see "SPECIFYING
6868
REVISIONS" section in linkgit:gitrevisions[7]) means the
6969
commits in the specified range.
7070

@@ -179,9 +179,9 @@ Beware that the default for 'git send-email' is to thread emails
179179
itself. If you want `git format-patch` to take care of threading, you
180180
will want to ensure that threading is disabled for `git send-email`.
181181

182-
--in-reply-to=<message id>::
182+
--in-reply-to=<message-id>::
183183
Make the first mail (or all the mails with `--no-thread`) appear as a
184-
reply to the given <message id>, which avoids breaking threads to
184+
reply to the given <message-id>, which avoids breaking threads to
185185
provide a new patch series.
186186

187187
--ignore-if-in-upstream::
@@ -219,9 +219,9 @@ populated with placeholder text.
219219
Use the contents of <file> instead of the branch's description
220220
for generating the cover letter.
221221

222-
--subject-prefix=<subject prefix>::
222+
--subject-prefix=<subject-prefix>::
223223
Instead of the standard '[PATCH]' prefix in the subject
224-
line, instead use '[<subject prefix>]'. This can be used
224+
line, instead use '[<subject-prefix>]'. This can be used
225225
to name a patch series, and can be combined with the
226226
`--numbered` option.
227227
+
@@ -403,7 +403,7 @@ you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`.
403403
`format.useAutoBase` configuration.
404404

405405
--root::
406-
Treat the revision argument as a <revision range>, even if it
406+
Treat the revision argument as a <revision-range>, even if it
407407
is just a single commit (that would normally be treated as a
408408
<since>). Note that root commits included in the specified
409409
range are always formatted as creation patches, independently

0 commit comments

Comments
 (0)