Skip to content

Commit 7ccd2bd

Browse files
authored
Implementing various feedback suggestions from Rachel (#513)
* Implementing various feedback suggestions from Rachel * Addressed review comments * Addressed further review comment
1 parent 02fcf95 commit 7ccd2bd

File tree

3 files changed

+85
-62
lines changed

3 files changed

+85
-62
lines changed

en-US/Cross_references.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@
4040

4141
</section>
4242
<section id="repeatability-test">
43-
<title>The Repeatability Test</title>
43+
<title>Repetition</title>
4444
<para>
45-
Must the information be repeated?
45+
Repetition is a useful tool for reinforcing new knowledge and skills, emphasizing important ideas, and providing readers with important information at their point of need.
4646
</para>
4747
<para>
48-
This is a hard question, and one that many authors abhor. Often the answer is yes. If the information is vital, and must appear in multiple places, then it must be repeated. In some circumstances, such is in online help, the reader wants the answer immediately. Do not force even one extra click on them. In a safety situation, it might be the only chance for the reader to find critical information quickly. Any vital information, which is not more than a couple of paragraphs (or half a page, or five rows of a table), can be repeated rather than be cross-referenced to.
48+
Repeating necessary information also saves the reader time and effort. In some circumstances, such as when using online help, the reader is trying to answer an immediate question or to solve a problem. In a safety situation, it is important for the reader to find critical information quickly.
4949
</para>
5050
<para>
51-
Cross-referencing is a good servant but a poor master. Content still rules!
51+
If the information is vital, and must appear in multiple places, then it must be repeated. Any vital information, which is not more than a couple of paragraphs (or half a page, or five rows of a table), can be repeated rather than be cross-referenced to.
5252
</para>
5353

5454
</section>

en-US/Design.xml

Lines changed: 46 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -923,11 +923,11 @@ STEP 14: COMMIT <emphasis>...output omitted...</emphasis> localhost/nexus:latest
923923

924924
</section>
925925
<section id="using-abbreviations">
926-
<title>Using Abbreviations, Acronyms, Initialisms, and Special Characters Correctly</title>
926+
<title>Abbreviations, Acronyms, Initialisms, and Special Characters</title>
927927
<para>
928-
This section describes how to use abbreviations, acronyms, and initialisms correctly in Red&nbsp;Hat documentation.
928+
This section defines abbreviations, acronyms, initialisms, and special characters.
929929
</para>
930-
<formalpara>
930+
<formalpara id="abbreviations">
931931
<title>Abbreviations</title>
932932
<para>
933933
An abbreviation is a shortened form of a word or phrase. For example, <abbrev>Pty.</abbrev> and <abbrev>Inc.</abbrev> are abbreviations for "proprietary" and "incorporated", respectively. Read them as the word for which they are an abbreviation.
@@ -937,46 +937,68 @@ STEP 14: COMMIT <emphasis>...output omitted...</emphasis> localhost/nexus:latest
937937
<formalpara id="acronyms">
938938
<title>Acronyms</title>
939939
<para>
940-
What are acronyms anyway?
941-
They are similar to abbreviations and initialisms but they are pronounced as a word.
942-
An acronym is a word that is formed from the initial letters of a name, such as ROM for <emphasis>R</emphasis>ead-<emphasis>O</emphasis>nly <emphasis>M</emphasis>emory, or by combining initial letters or part of a series of words, such as LILO for <emphasis>LI</emphasis>nux <emphasis>LO</emphasis>ader.
943-
<acronym>COBOL</acronym> is the acronym for Common Business-oriented Language, and <acronym>POP</acronym> is the acronym for Post Office Protocol.
940+
An acronym is a word that is formed from the initial letters of a name, such as ROM for <emphasis>R</emphasis>ead-<emphasis>O</emphasis>nly <emphasis>M</emphasis>emory, or by combining initial letters or part of a series of words, such as LILO for <emphasis>LI</emphasis>nux <emphasis>LO</emphasis>ader.
941+
<acronym>COBOL</acronym> is the acronym for Common Business-oriented Language, and <acronym>POP</acronym> is the acronym for Post Office Protocol.
942+
</para>
943+
944+
</formalpara>
945+
<formalpara id="initialisms">
946+
<title>Initialisms</title>
947+
<para>
948+
An initialism is an abbreviation that consists of the first letters of words in a phrase, syllables, or some combination thereof. Each character is pronounced separately. For example, FTP is an initialism for File Transfer Protocol.
944949
</para>
945950
</formalpara>
946951

952+
<formalpara id="special-chars">
953+
<title>Special Characters</title>
954+
<para>
955+
For the purposes of this guide, special characters refer to those characters that are listed in <xref linkend="punc-names" />.
956+
This section addresses how to use special characters as part of a file or directory name, such as "the <filename>.bashrc</filename> file" and "the <filename>_build/</filename> directory".
957+
</para>
958+
</formalpara>
959+
960+
<section id="abbreviations-correctly">
961+
<title>Using Abbreviations, Acronyms, Initialisms, and Special Characters Correctly</title>
947962
<para>
948-
Consider pronunciation when using articles. For example, use "an <abbrev>RTS</abbrev> (real-time strategy)", because <abbrev>RTS</abbrev> is an initialism and you pronounce the first character as an "R" (är). Conversely, use "a <acronym>RAM</acronym> upgrade", because <acronym>RAM</acronym> is an acronym and you pronounce it as a word (răm).
963+
This section describes how to use abbreviations, acronyms, initialisms, and special characters correctly in Red&nbsp;Hat documentation.
949964
</para>
950965

966+
<formalpara id="first-mentions">
967+
<title>First Mentions</title>
951968
<para>
952969
Spell out most acronyms and initialisms before using them in text, such as "The Embedded DevKit (EDK) ...".
953-
Unless the acronym or initialism stands for a proper noun, use sentence case for the spelled out version: for example, "central processing unit (CPU)".
954-
Unless required for the audience or the topic, do not spell out well-known abbreviations, such as HTML.
970+
Unless required for the audience or the topic, do not spell out well-known abbreviations, such as HTML.
955971
</para>
972+
</formalpara>
956973

974+
<formalpara id="cap">
975+
<title>Capitalization</title>
957976
<para>
958-
To form the plural of an acronym, add a trailing, lowercase "s" or "es" without an apostrophe, for example, ROMs, PINs, BIOSes.
977+
Unless the acronym or initialism stands for a proper noun, use sentence case for the spelled out version: for example, "central processing unit (CPU)".
978+
Not all acronyms are capitalized (for example, "spool"); see the <citetitle>IBM Style Guide</citetitle> or another suitable reference if you are unsure.
959979
</para>
980+
</formalpara>
960981

982+
<formalpara id="articles">
983+
<title>Articles</title>
961984
<para>
962-
Be sure to use correct capitalization for acronyms. Not all acronyms are capitalized (for example, "spool"); see the <citetitle>IBM Style Guide</citetitle> or another suitable reference if you are unsure.
985+
When deciding which articles to use, consider pronunciation.
986+
For example, use "an <abbrev>RTS</abbrev> (real-time strategy)", because <abbrev>RTS</abbrev> is an initialism and you pronounce the first character as an "R" (är). Conversely, use "a <acronym>RAM</acronym> upgrade", because <acronym>RAM</acronym> is an acronym and you pronounce it as a word (răm).
963987
</para>
964-
965-
<formalpara id="initialisms">
966-
<title>Initialisms</title>
967-
<para>
968-
An initialism is an abbreviation that consists of the first letters of words in a phrase, syllables, or some combination thereof. Each character is pronounced separately. For example, <abbrev>FTP</abbrev> is an initialism for <systemitem class="protocol">File Transfer Protocol.</systemitem>
969-
</para>
970-
971988
</formalpara>
989+
990+
<formalpara id="plurals">
991+
<title>Plurals</title>
972992
<para>
973-
Consider pronunciation when using articles. See <xref linkend="acronyms" /> for more information.
993+
To form the plural of an acronym, add a trailing, lowercase "s" or "es" without an apostrophe, for example, ROMs, PINs, BIOSes.
974994
</para>
995+
</formalpara>
996+
975997
<formalpara id="special-characters">
976998
<title>Special Characters</title>
977-
<para>
978-
Consider pronunciation when referring to file or directory names that begin with special characters, and use the correct indefinite article.
979-
</para>
999+
<para>
1000+
Consider pronunciation when referring to file or directory names that begin with special characters, and use the correct indefinite article.
1001+
</para>
9801002

9811003
</formalpara>
9821004
<para>
@@ -990,6 +1012,7 @@ STEP 14: COMMIT <emphasis>...output omitted...</emphasis> localhost/nexus:latest
9901012
<para>
9911013
Using "a <filename>-compile/</filename> directory" is correct, because you pronounce "a dash compile directory".
9921014
</para>
1015+
</section>
9931016

9941017
</section>
9951018
<section id="product-names">

en-US/Language.xml

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1092,13 +1092,16 @@
10921092
<title>Avoiding Ambiguities</title>
10931093
<variablelist>
10941094

1095-
<varlistentry id="proper-nouns">
1096-
<term> Capitalizing Proper Nouns </term>
1095+
<varlistentry id="homographs">
1096+
<term> Avoid May and Should </term>
10971097
<listitem>
10981098
<para>
1099-
In some cases it is not clear if a term refers to a concept or a proper noun or product name.
1100-
By using the correct capitalization, you help translators identify untranslatable proper nouns and Red&nbsp;Hat product names.
1099+
The verb "may" might indicate possibility or grant permission.
1100+
Similarly, "should" might imply a recommendation or express obligation or expectation.
1101+
A sentence containing one of these verbs often has a double meaning.
1102+
Avoid these types of words.
11011103
</para>
1104+
11021105
<table>
11031106
<title></title>
11041107
<tgroup cols="2" colsep="1" rowsep="1">
@@ -1114,8 +1117,27 @@
11141117
</thead>
11151118
<tbody>
11161119
<row>
1117-
<entry> This property must be enabled when you are using CTDB in a Windows domain or in active directory security mode. </entry>
1118-
<entry> This property must be enabled when you are using CTDB in a Windows domain or in Active Directory security mode. </entry>
1120+
<entry> The <methodname>next()</methodname> method should return <code>null</code> to indicate the end of results. </entry>
1121+
<entry>
1122+
<para>
1123+
The <methodname>next()</methodname> method is expected to return <code>null</code> to indicate the end of results.
1124+
</para>
1125+
<para>
1126+
<emphasis>Or:</emphasis> The <methodname>next()</methodname> method must return <code>null</code> to indicate the end of results.
1127+
</para>
1128+
</entry>
1129+
1130+
</row>
1131+
<row>
1132+
<entry> It may be held in memory. </entry>
1133+
<entry>
1134+
<para>
1135+
It can be held in memory.
1136+
</para>
1137+
<para>
1138+
<emphasis>Or:</emphasis> It might be held in memory.
1139+
</para>
1140+
</entry>
11191141

11201142
</row>
11211143

@@ -1127,7 +1149,7 @@
11271149

11281150
</listitem>
11291151

1130-
</varlistentry>
1152+
</varlistentry>
11311153
<varlistentry id="easy">
11321154
<term> Avoid Stating that Something Is Easy </term>
11331155
<listitem>
@@ -1172,16 +1194,13 @@
11721194
</listitem>
11731195

11741196
</varlistentry>
1175-
<varlistentry id="homographs">
1176-
<term> Homographic Verbs </term>
1197+
<varlistentry id="proper-nouns">
1198+
<term> Capitalizing Proper Nouns </term>
11771199
<listitem>
11781200
<para>
1179-
The verb "may" might indicate possibility or grant permission.
1180-
Similarly, "should" might imply a recommendation or express obligation or expectation.
1181-
A sentence containing one of these verbs often has a double meaning.
1182-
Avoid these types of words.
1201+
In some cases it is not clear if a term refers to a concept or a proper noun or product name.
1202+
By using the correct capitalization, you help translators identify untranslatable proper nouns and Red&nbsp;Hat product names.
11831203
</para>
1184-
11851204
<table>
11861205
<title></title>
11871206
<tgroup cols="2" colsep="1" rowsep="1">
@@ -1197,27 +1216,8 @@
11971216
</thead>
11981217
<tbody>
11991218
<row>
1200-
<entry> The <methodname>next()</methodname> method should return <code>null</code> to indicate the end of results. </entry>
1201-
<entry>
1202-
<para>
1203-
The <methodname>next()</methodname> method is expected to return <code>null</code> to indicate the end of results.
1204-
</para>
1205-
<para>
1206-
<emphasis>Or:</emphasis> The <methodname>next()</methodname> method must return <code>null</code> to indicate the end of results.
1207-
</para>
1208-
</entry>
1209-
1210-
</row>
1211-
<row>
1212-
<entry> It may be held in memory. </entry>
1213-
<entry>
1214-
<para>
1215-
It can be held in memory.
1216-
</para>
1217-
<para>
1218-
<emphasis>Or:</emphasis> It might be held in memory.
1219-
</para>
1220-
</entry>
1219+
<entry> This property must be enabled when you are using CTDB in a Windows domain or in active directory security mode. </entry>
1220+
<entry> This property must be enabled when you are using CTDB in a Windows domain or in Active Directory security mode. </entry>
12211221

12221222
</row>
12231223

0 commit comments

Comments
 (0)