Skip to content

Commit a199ab2

Browse files
authored
Merge pull request #467 from StyleGuides/daobrien/458-vale-check
Closes #458 Run Vale over style guide part 4.
2 parents d1a34ef + bd57d57 commit a199ab2

File tree

7 files changed

+60
-36
lines changed

7 files changed

+60
-36
lines changed

en-US/T.xml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -149,32 +149,31 @@
149149
</listitem>
150150

151151
</varlistentry>
152-
<!-- IBM has now changed to use of one-word forms for many "time-" prefixed words: timebox, timeframe, timeline, timeout, timeslice, timestamp, but still "time zone". -->
153152
<varlistentry id="time-frame">
154-
<term>time frame (n.)</term>
153+
<term>time frame</term>
155154
<listitem>
156155
<para>
157-
Correct. Do not use "timeframe" or "time-frame".
156+
<emphasis>n.</emphasis> Correct. Do not use "timeframe" or "time-frame".
158157
</para>
159158

160159
</listitem>
161160

162161
</varlistentry>
163162
<varlistentry id="time-zone">
164-
<term>time zone (n.)</term>
163+
<term>time zone</term>
165164
<listitem>
166165
<para>
167-
Correct. Do not use "timezone" or "time-zone".
166+
<emphasis>n.</emphasis> Correct. Do not use "timezone" or "time-zone".
168167
</para>
169168

170169
</listitem>
171170

172171
</varlistentry>
173172
<varlistentry id="token-ring">
174-
<term>token-ring (n.)</term>
173+
<term>token-ring</term>
175174
<listitem>
176175
<para>
177-
When capitalized, Token-Ring refers to the PC network architecture that IBM developed. The IBM Token-Ring specification is standardized by the IEEE as the IEEE 802.5 standard.
176+
<emphasis>n.</emphasis> When capitalized, Token-Ring refers to the PC network architecture that IBM developed. The IBM Token-Ring specification is standardized by the IEEE as the IEEE 802.5 standard.
178177
<!-- See the <citetitle>IBM Style Guide</citetitle> for further uses of this term. -->
179178
</para>
180179

en-US/Translation.xml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,20 @@
1818
<section id="Sentence_Structure-Using_Lists_Correctly">
1919
<title>Using and Formatting Lists</title>
2020
<para>
21-
Lists appear in a range of formats, such as series, ordered, unordered (itemized), and so on. Avoid using itemized lists to format a single sentence. Some translation tools display list items and the introductory sentence (or <firstterm>sentence stem</firstterm>) as individual sentences for translation. If they are not complete sentences, they can be difficult to translate.
21+
Lists appear in a range of formats, such as series, ordered, unordered (bulleted), and so on.
22+
Avoid using bulleted lists to format a single sentence.
23+
Some translation tools display list items and the introductory sentence (or <firstterm>sentence stem</firstterm>) as individual sentences for translation.
24+
If they are not complete sentences, they can be difficult to translate.
2225
</para>
2326
<para>
2427
The following general guidelines apply to lists:
2528
</para>
2629
<variablelist>
2730
<varlistentry>
28-
<term>Itemized lists</term>
31+
<term>Bulleted lists</term>
2932
<listitem>
3033
<para>
31-
They appear as a bulleted list.
32-
Use this list type for three or more entries where order is not important, or in a demonstration section when students are encouraged not to perform steps but to watch the instructor instead.
34+
Use this list type for three or more entries where order is not important.
3335
Titles are optional.
3436
</para>
3537
</listitem>
@@ -38,7 +40,7 @@
3840
<term>Ordered lists</term>
3941
<listitem>
4042
<para>
41-
They appear as a numbered list.
43+
These appear as numbered lists.
4244
Use this list type for multiple entries if you need to refer to one of the entries from elsewhere in your document, or where order is important.
4345
For example, if you need to list the order of operations that are required to prepare for an installation, or list a sequence of events that occurs.
4446
Titles are optional.
@@ -49,7 +51,7 @@
4951
<term>Variable lists</term>
5052
<listitem>
5153
<para>
52-
They appear as a list of terms followed by definitions.
54+
These appear as a list of terms followed by definitions.
5355
Use this list type to list and describe a series of terms, such as variables, command options or arguments, and similar items.
5456
Titles are optional.
5557
(This list is written as a variable list.)
@@ -62,19 +64,18 @@
6264
<term>Procedures</term>
6365
<listitem>
6466
<para>
65-
They appear as a list of numbered steps.
67+
These appear as a list of numbered steps.
6668
Procedures always include a title, and are used to list the required steps to achieve a task.
6769
</para>
6870
</listitem>
6971
</varlistentry>
7072
</variablelist>
7173
<para>
7274
You can nest lists, but try to keep the number of levels to two or fewer.
73-
To nest procedures in DocBook, use &lt;substep&gt; elements.
7475
</para>
7576
<section><title>Formatting Lists for Readability</title>
7677
<para>
77-
It is important to provide sufficient spacing between elements in your documents to facilitate reading and comprehension.
78+
It is important to provide enough spacing between elements in your documents to facilitate reading and comprehension.
7879
You can include a lot of information in a few short paragraphs but readers need to be able to process that information in chunks.
7980
The same consideration applies to lists.
8081
</para>

en-US/U.xml

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,12 @@
2020
<term>UltraSPARC</term>
2121
<listitem>
2222
<para>
23-
Correct. Do not use "ULTRASPARC", "UltraSparc", or other variations.
23+
Correct.
24+
Do not use "ULTRASPARC", "UltraSparc", or other variations.
2425
</para>
2526
<para>
26-
UltraSPARC is a trademark of SPARC International, Inc., and is used under license by Sun Microsystems, Inc. Products that bear the SPARC trademarks are based on an architecture developed by Sun Microsystems, Inc.
27+
UltraSPARC is a trademark of SPARC International, Inc., and is used under license by Sun Microsystems, Inc.
28+
Products that bear the SPARC trademarks are based on an architecture developed by Sun Microsystems, Inc.
2729
</para>
2830

2931
</listitem>
@@ -33,7 +35,10 @@
3335
<term>undercloud</term>
3436
<listitem>
3537
<para>
36-
<emphasis>n.</emphasis> Always lowercase. It is a concept, not a technology or product name. Being a common noun, it requires an article in most cases. See also <xref linkend="overcloud" />.
38+
<emphasis>n.</emphasis> Always lowercase.
39+
It is a concept, not a technology or product name.
40+
Being a common noun, it normally requires an article.
41+
See also <xref linkend="overcloud" />.
3742
</para>
3843

3944
</listitem>
@@ -185,10 +190,14 @@
185190
<term>user interface</term>
186191
<listitem>
187192
<para>
188-
<emphasis>n.</emphasis> Correct. Do not use "user-interface" or "userinterface".
193+
<emphasis>n.</emphasis> Correct.
194+
Do not use "user-interface" or "userinterface".
189195
</para>
190196
<para>
191-
The junction between a user and a computer program. An interface is a set of commands or menus through which a user communicates with a program. In a command-driven interface, you enter commands. In a menu-driven interface, you select command choices from various menus that are displayed on the screen.
197+
The junction between a user and a computer program.
198+
An interface is a set of commands or menus through which a user communicates with a program.
199+
In a command-driven interface, you enter commands.
200+
In a menu-driven interface, you select command choices from various menus that are displayed on the screen.
192201
</para>
193202

194203
</listitem>
@@ -198,7 +207,7 @@
198207
<term>username</term>
199208
<listitem>
200209
<para>
201-
<emphasis>n.</emphasis> One word in most cases.
210+
<emphasis>n.</emphasis> Usually one word.
202211
Capitalize the "U" at the beginning of a sentence.
203212
See the <citetitle>IBM Style Guide</citetitle> for more information.
204213
</para>
@@ -210,7 +219,9 @@
210219
<term>user space</term>
211220
<listitem>
212221
<para>
213-
<emphasis>n.</emphasis> Correct when used as a noun. When used as a modifier, use the hyphenated form, "user-space". Do not use "userspace".
222+
<emphasis>n.</emphasis> Correct when used as a noun.
223+
When used as a modifier, use the hyphenated form, "user-space".
224+
Do not use "userspace".
214225
</para>
215226

216227
</listitem>

en-US/V.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,10 @@
5858
Only use "vim" (all lowercase) when referring to the command to start the application.
5959
</para>
6060
<para>
61-
Vim is an acronym, derived from Vi IMproved. (In the original 1991 release for the Amiga platform, the acronym was derived from Vi IMitation. It became Vi IMproved when ported to various UNIX-based operating systems in 1992.) Despite being an acronym, and despite the first word of the "About" text that appears when you start the editor, the standard, proper noun-derived, mixed-case spelling has been in use since its release on the Amiga.
61+
Vim is an acronym, derived from Vi IMproved.
62+
(In the original 1991 release for the Amiga platform, the acronym was derived from Vi IMitation.
63+
It became Vi IMproved when ported to various UNIX-based operating systems in 1992.)
64+
Despite being an acronym, and despite the first word of the "About" text that appears when you start the editor, the standard, proper noun-derived, mixed-case spelling has been in use since its release on the Amiga.
6265
</para>
6366

6467
</listitem>

en-US/W.xml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@
6363
<term>web page</term>
6464
<listitem>
6565
<para>
66-
<emphasis>n.</emphasis> Two words. Capitalize the "W" at the beginning of a sentence. If part of a proper noun, capitalize accordingly.
66+
<emphasis>n.</emphasis> Two words.
67+
Capitalize the "W" at the beginning of a sentence.
68+
If part of a proper noun, capitalize accordingly.
6769
</para>
6870

6971
</listitem>
@@ -73,7 +75,8 @@
7375
<term>web UI</term>
7476
<listitem>
7577
<para>
76-
Correct. Use this term to refer to a browser-based interface to a software application, even if that application has no connection to the web.
78+
Correct.
79+
Use this term to refer to a browser-based interface to a software application, even if that application has no connection to the web.
7780
Do not hyphenate the abbreviation or use the one-word form.
7881
</para>
7982

@@ -97,7 +100,7 @@
97100
<term>whether</term>
98101
<listitem>
99102
<para>
100-
Use whether instead of “if” to refer to a choice or to alternatives.
103+
Use "whether" instead of "if" to refer to a choice or to alternatives.
101104
For example, instead of "Test if authenticated FTP access is restored", write "Test whether authenticated FTP access is restored".
102105
</para>
103106

@@ -109,23 +112,23 @@
109112
<term>while</term>
110113
<listitem>
111114
<para>
112-
In technical content, use while only to indicate that many tasks or processes occur at the same time.
113-
For example, instead of "While most targets use one target portal group (TPG), advanced configurations might define multiple TPGs", write "Although most targets use one target portal group (TPG), advanced configurations might define multiple TPGs".
115+
In technical content, use "while" only to indicate that many tasks or processes occur at the same time.
116+
For example, instead of "While most targets use one target portal group (TPG), advanced configurations might define multiple TPGs", write "Although most targets use one target portal group (TPG), advanced configurations might define multiple TPGs."
114117
</para>
115118

116119
</listitem>
117120

118121
</varlistentry>
119122

120-
<!-- Added for inclusive language -->
121123
<varlistentry id="whitelist">
122124
<term>whitelist</term>
123125
<listitem>
124126
<para>
125127
Do not use. Use "allowlist".
126128
</para>
127129
<para>
128-
Do not use the terms "white" or "black" in a context where white is represented as good or black is represented as bad. Such usage reinforces a model that promotes racial bias.
130+
Do not use the terms "white" or "black" in a context where white is represented as good or black is represented as bad.
131+
Such usage reinforces a model that promotes racial bias.
129132
</para>
130133
</listitem>
131134

@@ -138,7 +141,8 @@
138141
Use the pronoun "whom" as a direct object, an indirect object, or the object of a preposition.
139142
</para>
140143
<para>
141-
For example: Who owns this phone? To whom does this phone belong?
144+
For example: Who owns this phone?
145+
To whom does this phone belong?
142146
</para>
143147

144148
</listitem>

en-US/WUG_Intro.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,18 @@
66
<chapter id="usage-dictionary">
77
<title>Usage Dictionary</title>
88
<para>
9-
This page provides guidelines for the correct use of common terms in Red Hat documentation, which terms to avoid, and the preferred spelling where variations exist. This page is constantly evolving, and open to discussion and improvement.
9+
This page provides guidelines for the correct use of common terms in Red&nbsp;Hat documentation, which terms to avoid, and the preferred spelling where variations exist.
10+
This page is constantly evolving, and open to discussion and improvement.
1011
</para>
1112
<variablelist>
1213
<varlistentry id="Usage_Dictionary-A_note_about_trademarks">
1314
<term>A note about trademarks</term>
1415
<listitem>
1516
<para>
16-
The status of a trademark can vary from country to country. Therefore, do not attach the symbols for trademark or registered trademark (™ and ®) to any third-party trademarks that you mention in your document unless Red Hat legal asks you to do so. In XML terms, this means that you should not generally tag trademarks with the &lt;trademark&gt; tag. We do mark Red Hat's own trademarks. See <ulink url="https://home.corp.redhat.com/node/34059">Copyright Notices and Trademark Legends</ulink> for more information.
17+
The status of a trademark can vary from country to country.
18+
Therefore, do not attach the symbols for trademark or registered trademark (™ and ®) to any third-party trademarks that you mention in your document unless Red&nbsp;Hat legal asks you to do so.
19+
We do mark Red&nbsp;Hat trademarks.
20+
See <ulink url="https://home.corp.redhat.com/node/34059">Copyright Notices and Trademark Legends</ulink> for more information.
1721
</para>
1822

1923
</listitem>

en-US/XYZ.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@
7070
<term>YAML</term>
7171
<listitem>
7272
<para>
73-
Recursive acronym for "YAML Ain't Markup Language." Expand on first use only.
73+
Recursive acronym for "YAML Ain't Markup Language."
74+
Expand on first use only.
7475
</para>
7576

7677
</listitem>
@@ -80,7 +81,8 @@
8081
<term>you</term>
8182
<listitem>
8283
<para>
83-
Use second person wherever possible. Do not use "I", "we", "he", or "she."
84+
Use second person wherever possible.
85+
Do not use "I", "we", "he", or "she."
8486
</para>
8587

8688
</listitem>

0 commit comments

Comments
 (0)