Skip to content

Commit 9235687

Browse files
authored
Merge pull request #439 from rolfedh/on-first-use
Standardize on "the first use"
2 parents e216df8 + bd4f932 commit 9235687

File tree

11 files changed

+36
-36
lines changed

11 files changed

+36
-36
lines changed

GUIDELINES.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Use the following template for glossary entries:
3333
* `\image:images/caution.png[with caution]`
3434
|`<term>` |The term to be described. |
3535
|`<class>` |The part of speech of the term.|Possible values: noun, verb, adjective, adverb, pronoun, conjunction, preposition. Use noun for acronyms or abbreviations. Leave the field empty for symbols.
36-
|`<description>` |The description of the term.|Use full sentences with periods. If a term is specific to a particular product, start the description with "In <product_name>,". If a term has more than one meaning, use numbers to separate them. For example: (1) <first_meaning>. (2) <second_meaning>. Add information about why we should or shouldn't use the term in this form. Alternatively, explain why the terms listed in the *Incorrect forms* field are incorrect.
36+
|`<description>` |The description of the term.|Use full sentences with periods. If a term is specific to a particular product, start the description with "In <product_name>,". If a term has multiple meanings, use numbers to separate them. For example: (1) <first_meaning>. (2) <second_meaning>. Add information about why we should or shouldn't use the term in this form. Alternatively, explain why the terms listed in the *Incorrect forms* field are incorrect.
3737
|`<yes/no/with caution>`|"yes" if the term should be used.
3838

3939
"no" if the term should not be used.
@@ -49,7 +49,7 @@ Use the following template for glossary entries:
4949

5050
* Keep all fields, even if a field is empty. An empty field serves as a placeholder if the field is required later.
5151

52-
* Use quotation marks on the first occurrence of a term in the *Description* field. Do not include an abbreviation in parentheses within the quotation marks; for example, "Asynchronous Transfer Mode" (ATM) is a network technology based on transferring data in cells or packets of a fixed size.
52+
* Use quotation marks on first use of a term in the *Description* field. Do not include an abbreviation in parentheses within the quotation marks; for example, "Asynchronous Transfer Mode" (ATM) is a network technology based on transferring data in cells or packets of a fixed size.
5353

5454
* If the *Description* field contains more than one paragraph, only the last paragraph is displayed in the Atom linter's text. Ensure that word usage advice is contained in the last paragraph.
5555

@@ -59,7 +59,7 @@ Use the following template for glossary entries:
5959

6060
* If you want to add a term that we should not use and that does not have a correct form, use the incorrect version instead of `<term>` and add "no" to the *Use it* field. Explain why we should not use that term in the *Description* field.
6161

62-
* When creating IDs in accordance with the rules described in the template, the resulting IDs might be the same as those for separate entries. For example, the "kernel space" and "kernel-space" entries, or the "kB" and "KB" entries would have the same anchor tag ("kernel-space" and "kb"). If the IDs are not unique, however, it will cause an error in the document.
62+
* Creating an ID according to guidance in the template can produce duplicate IDs for distinct entries. For example, the IDs for the "kernel space" and "kernel-space" entries would both be "kernel-space". Similarly, the IDs for the "kB" and "KB" entries would be "kb". Duplicate IDs in a document lead to build errors.
6363
+
6464
To avoid this issue, use different IDs:
6565
+
@@ -136,4 +136,4 @@ Use the following template when adding a new style guide entry:
136136

137137
* Use double quotation marks ("") when emphasizing how to write a term. The following examples demonstrate the use of this guideline:
138138
** Hyphenate "look-up" when using it as a modifier.
139-
** Spell out "comma-separated values" on first use; use "CSV" thereafter.
139+
** Write "comma-separated values (CSV)" on first use and "CSV" after that.

supplementary_style_guide/glossary_terms_conventions/general_conventions/a.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ _Specify the system architecture of your cluster, such as `x86_64` or `aarch64`.
5858
// RHDS: General; kept as is
5959
[[access-control-instruction]]
6060
==== image:images/yes.png[yes] access control instruction (noun)
61-
*Description*: In an LDAP directory, an _access control instruction (ACI)_ grants or denies access to entries or attributes. Use "access control instruction" on the first usage and then the abbreviation "ACI" subsequently.
61+
*Description*: In an LDAP directory, an _access control instruction (ACI)_ grants or denies access to entries or attributes. Write "access control instruction (ACI)" on first use and "ACI" after that.
6262

6363
*Use it*: yes
6464

@@ -81,7 +81,7 @@ _Specify the system architecture of your cluster, such as `x86_64` or `aarch64`.
8181

8282
[[ack]]
8383
==== image:images/no.png[no] ACK (noun)
84-
*Description*: Do not use _ACK_ as acronym for "acknowledgement" in general. When writing about the acknowledgement flag ("ACK flag") in a TCP packet, use "ACK flag".
84+
*Description*: Do not use _ACK_ as an abbreviation for "acknowledgment". When writing about the acknowledgment flag ("ACK flag") in a TCP packet, use "ACK flag".
8585

8686
*Use it*: no
8787

@@ -92,7 +92,7 @@ _Specify the system architecture of your cluster, such as `x86_64` or `aarch64`.
9292

9393
[[ack-flag]]
9494
==== image:images/yes.png[yes] ACK flag (noun)
95-
*Description*: The acknowledgement flag (_ACK flag_) in a TCP packet indicates that the acknowledgement field in the packet is relevant. Do not expand on first usage and write as shown: "ACK flag".
95+
*Description*: The acknowledgment flag (_ACK flag_) in a TCP packet indicates that the acknowledgment field in the packet is relevant. Do not expand the abbreviation on first use. Write "ACK flag".
9696

9797
*Use it*: yes
9898

supplementary_style_guide/glossary_terms_conventions/general_conventions/b.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
==== image:images/yes.png[yes] Basic HTTP authentication (noun)
9494
*Description*: _Basic HTTP authentication_, or _Basic authentication_, is an authorization scheme that uses HTTP to send login credentials encoded in Base64.
9595
This scheme is often used by applications to authenticate with servers, services, and API endpoints.
96-
On first use, use "Basic HTTP authentication"; thereafter, use "Basic authentication".
96+
Write "Basic HTTP authentication" on first use and "Basic authentication" after that.
9797

9898
*Use it*: yes
9999

@@ -116,7 +116,7 @@ On first use, use "Basic HTTP authentication"; thereafter, use "Basic authentica
116116
// EAP: Added "In Red Hat JBoss Enterprise Application Platform,"
117117
[[batch-jberet]]
118118
==== image:images/yes.png[yes] batch-jberet subsystem (noun)
119-
*Description*: In Red Hat JBoss Enterprise Application Platform, the _batch-jberet subsystem_ is used to configure and manage batch jobs. In general text, write in lowercase as two words separated by a hyphen. Use "Batch subsystem" when referring to the `batch-jberet` subsystem in titles and headings.
119+
*Description*: In Red Hat JBoss Enterprise Application Platform, the _batch-jberet subsystem_ is used to configure and manage batch jobs. In general text, write in lowercase as two words separated by a hyphen. Write "Batch subsystem" when referring to the `batch-jberet` subsystem in titles and headings.
120120

121121
*Use it*: yes
122122

@@ -128,7 +128,7 @@ On first use, use "Basic HTTP authentication"; thereafter, use "Basic authentica
128128
// EAP: Added "In Red Hat JBoss Enterprise Application Platform,"
129129
[[bean-validation]]
130130
==== image:images/yes.png[yes] bean-validation subsystem (noun)
131-
*Description*: In Red Hat JBoss Enterprise Application Platform, the _bean-validation subsystem_ is used to configure validation of Java bean object data. In general text, write in lowercase as two words separated by a hyphen. Use "Bean Validation subsystem" when referring to the `bean-validation` subsystem in titles and headings.
131+
*Description*: In Red Hat JBoss Enterprise Application Platform, the _bean-validation subsystem_ is used to configure validation of Java bean object data. In general text, write in lowercase as two words separated by a hyphen. Write "Bean Validation subsystem" when referring to the `bean-validation` subsystem in titles and headings.
132132

133133
*Use it*: yes
134134

@@ -174,7 +174,7 @@ The practice of having both modes together is often referred to as _hybrid_, _ag
174174

175175
[[bind]]
176176
==== image:images/yes.png[yes] BIND (noun)
177-
*Description*: Use "BIND" when referring to the DNS software.
177+
*Description*: Write "BIND" when referring to the DNS software.
178178

179179
*Use it*: yes
180180

@@ -197,9 +197,9 @@ The practice of having both modes together is often referred to as _hybrid_, _ag
197197

198198
[[bios]]
199199
==== image:images/caution.png[with caution] BIOS (noun)
200-
*Description*: _BIOS_ is an abbreviation for "Basic Input/Output System". The plural form is "BIOSes". BIOS is the specific name for the motherboard firmware that provides runtime services for operating systems in older PCs. Modern computers use a different kind of firmware, called either EFI or UEFI.
200+
*Description*: _BIOS_ is an abbreviation for "Basic Input/Output System". The plural form is "BIOSes". BIOS is the specific name for the system board firmware that provides runtime services for operating systems in older PCs. Modern computers use a different kind of firmware, called either EFI or UEFI.
201201

202-
Do not use "BIOS" as a generic term to refer to computer firmware. Use "firmware" or a specific phrase such as "UEFI firmware" or "legacy BIOS" instead.
202+
Do not use "BIOS" as a generic term for computer firmware. Instead, write "firmware" or a specific phrase such as "UEFI firmware" or "legacy BIOS".
203203

204204
*Use it*: with caution
205205

@@ -474,7 +474,7 @@ Do not use "BIOS" as a generic term to refer to computer firmware. Use "firmware
474474

475475
[[built-in]]
476476
==== image:images/yes.png[yes] built-in (adjective)
477-
*Description*: Use "built-in" when referring to something that is included or incorporated into a larger unit.
477+
*Description*: Write "built-in" when referring to something that is included or incorporated into a larger unit.
478478

479479
*Use it*: yes
480480

supplementary_style_guide/glossary_terms_conventions/general_conventions/c.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
// Satellite: Added "In Red Hat Satellite"
3939
[[capsule-server]]
4040
==== image:images/yes.png[yes] Capsule Server (noun)
41-
*Description*: In Red Hat Satellite, _Capsule Server_ is an additional server that acts as a proxy to the Satellite and can provide services such as DHCP, DNS, and TFTP. Use the two-word name on first use in a section; the single term 'Capsule' is acceptable thereafter.
41+
*Description*: In Red Hat Satellite, _Capsule Server_ is an additional server that acts as a proxy to the Satellite and can provide services such as DHCP, DNS, and TFTP. Write "Capsule Server" on first use. "Capsule" is acceptable after that.
4242

4343
*Use it*: yes
4444

@@ -287,7 +287,7 @@
287287

288288
[[cidr]]
289289
==== image:images/yes.png[yes] CIDR (noun)
290-
*Description*: Classless Inter-Domain Routing (_CIDR_) is a method to efficiently allocate IP addresses and for IP routing. CIDR replaces the classful network addressing architecture. In CIDR notation, IP addresses contain a suffix that represents the number of bits of the prefix. Expand on first usage, and write it as shown: "Classless Inter-Domain Routing".
290+
*Description*: Classless Inter-Domain Routing (_CIDR_) is a method to efficiently allocate IP addresses and for IP routing. CIDR replaces the classful network addressing architecture. In CIDR notation, IP addresses contain a suffix that represents the number of bits of the prefix. Write "Classless Inter-Domain Routing (CIDR)" on first use and "CIDR" after that.
291291

292292
*Use it*: yes
293293

@@ -469,7 +469,7 @@
469469

470470
[[comma-separated-values]]
471471
==== image:images/yes.png[yes] comma-separated values (noun)
472-
*Description*: _Comma-separated values_ are a set of values in which each value is separated by a comma. Spell out "comma-separated values" on first use; use "CSV" thereafter.
472+
*Description*: _Comma-separated values_ are a set of values in which each value is separated by a comma. Write "comma-separated values (CSV)" on first use and "CSV" after that.
473473

474474
*Use it*: yes
475475

@@ -540,7 +540,7 @@
540540
// Satellite: Added "In Red Hat Satellite"
541541
[[composite-content-view]]
542542
==== image:images/yes.png[yes] Composite Content View (noun)
543-
*Description*: In Red Hat Satellite, a _Composite Content View_ is a collection of Content Views. Use the three-word name in full on first use in a section; the abbreviation "CCV" is acceptable thereafter.
543+
*Description*: In Red Hat Satellite, a _Composite Content View_ is a collection of Content Views. Write "Composite Content View (CCV)" on first use and "CCV" after that.
544544

545545
*Use it*: yes
546546

@@ -729,7 +729,7 @@ image repository contains one or more tagged images.
729729
// Satellite: Added "In Red Hat Satellite"
730730
[[content-view]]
731731
==== image:images/yes.png[yes] Content View (noun)
732-
*Description*: In Red Hat Satellite, a _Content View_ is a subset of Library content created by intelligent filtering. Use the two-word name in full on first use in a section; the abbreviation "CV" is acceptable thereafter.
732+
*Description*: In Red Hat Satellite, a _Content View_ is a subset of Library content created by intelligent filtering. Write "Content View (CV)" on first use and "CV" after that.
733733

734734
*Use it*: yes
735735

@@ -961,7 +961,7 @@ With a _cross-forest trust_ between an Active Directory (AD) forest root domain
961961

962962
[[csv]]
963963
==== image:images/yes.png[yes] CSV (noun)
964-
*Description*: _CSV_ is an abbreviation for "comma-separated values", which is a set of values in which each value is separated by a comma. Spell out "comma-separated values" on first occurrence; use "CSV" thereafter.
964+
*Description*: _CSV_ is an abbreviation for "comma-separated values", which is a set of values in which each value is separated by a comma. Write "comma-separated values (CSV)" on first use and "CSV" after that.
965965

966966
*Use it*: yes
967967

@@ -1029,7 +1029,7 @@ With a _cross-forest trust_ between an Active Directory (AD) forest root domain
10291029

10301030
[[customer-portal]]
10311031
==== image:images/caution.png[with caution] Customer Portal (noun)
1032-
*Description*: _Customer Portal_ is the shortened form of "Red Hat Customer Portal", the official name for https://access.redhat.com. Use "Red Hat Customer Portal" on the first use. You can shorten it to "Customer Portal" after that.
1032+
*Description*: _Customer Portal_ is the shortened form of "Red Hat Customer Portal", the official name for https://access.redhat.com. Write "Red Hat Customer Portal" on first use. You can shorten it to "Customer Portal" after that.
10331033

10341034
*Use it*: with caution
10351035

supplementary_style_guide/glossary_terms_conventions/general_conventions/e.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ If referring to the program, use "Emacs", for example, "Source-Navigator support
195195

196196
[[executable]]
197197
==== image:images/caution.png[with caution] executable (noun)
198-
*Description*: When it runs, an _executable_ performs specific operations based on its coded instructions. Write "executable file (executable)" on the first use.
198+
*Description*: When it runs, an _executable_ performs specific operations based on its coded instructions. Write "executable file (executable)" on first use.
199199

200200
*Use it*: with caution
201201

supplementary_style_guide/glossary_terms_conventions/general_conventions/h.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
[[hashbang]]
2424
==== image:images/no.png[no] hashbang (noun)
25-
*Description*: Do not use _hashbang_ when referring to a computer language construct that controls which interpreter parses and interprets instructions in a computer program. Instead, on the first mention, include both "interpreter directive" and "shebang", for example, "Interpreter directives, also known as shebangs ...".
25+
*Description*: Do not use _hashbang_ when referring to a computer language construct that controls which interpreter parses and interprets instructions in a computer program. Write "interpreter directives, also known as shebangs ..." on first use.
2626

2727
*Use it*: no
2828

supplementary_style_guide/glossary_terms_conventions/general_conventions/i.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ Red Hat Trusted Application Pipeline users can configure secrets to inject sensi
556556

557557
[[intel-virtualization-technology]]
558558
==== image:images/yes.png[yes] Intel Virtualization Technology (noun)
559-
*Description*: The first and all prominent uses of _Intel Virtualization Technology_ should be spelled out, immediately followed by the abbreviation, for example, "Intel Virtualization Technology (Intel VT) for Intel 64" or "Itanium architecture (Intel VT-i)". Subsequent uses can be abbreviated to "Intel VT-i". Always write the abbreviation in uppercase letters, accompanied by the Intel mark. Do not use the abbreviation in any prominent places, such as in titles or paragraph headings. Do not include any trademark symbols, such as "(TM)" or "\(TM)".
559+
*Description*: Write "Intel Virtualization Technology (Intel VT)" or "Itanium architecture (Intel VT-i)" on first use and then "Intel VT" or "Intel VT-i" after that. Do not use the abbreviation in prominent places such as in titles or paragraph headings. Do not include trademark symbols such as "(TM)" or "\(TM)".
560560

561561
*Use it*: yes
562562

@@ -629,7 +629,7 @@ _This feature can run only on Intel 64 processors_
629629

630630
[[interpreter-directive]]
631631
==== image:images/yes.png[yes] interpreter directive (noun)
632-
*Description*: An _interpreter directive_, such as `#!/bin/bash`, is a computer language construct that controls which interpreter parses and interprets instructions in a computer program. This term is also commonly known as _shebang_. On the first mention, include both "interpreter directive" and "shebang", for example, "Interpreter directives, also known as shebangs ...". Do not use "hashbang".
632+
*Description*: An _interpreter directive_, such as `#!/bin/bash`, is a computer language construct that controls which interpreter parses and interprets instructions in a computer program. This term is also commonly known as _shebang_. Write "interpreter directives, also known as shebangs ..." on first use. Do not use "hashbang".
633633

634634
*Use it*: yes
635635

@@ -674,7 +674,7 @@ _This feature can run only on Intel 64 processors_
674674

675675
[[ip]]
676676
==== image:images/yes.png[yes] IP (noun)
677-
*Description*: _IP_ is an abbreviation for "Internet Protocol". Use "IP" to refer to the Internet Protocol in general if the specific versions, IPv4 and IPv6, do not matter. Use "IP address" instead of "IP" when writing about IP addresses. Do not expand the abbreviation on the first usage.
677+
*Description*: _IP_ is an abbreviation for "Internet Protocol". Use "IP" to refer to the Internet Protocol in general if the specific versions, IPv4 and IPv6, do not matter. Use "IP address" instead of "IP" when writing about IP addresses. Do not expand the abbreviation on first use.
678678

679679
*Use it*: yes
680680

@@ -696,7 +696,7 @@ _This feature can run only on Intel 64 processors_
696696

697697
[[ipv4]]
698698
==== image:images/yes.png[yes] IPv4 (noun)
699-
*Description*: Use _IPv4_ to explicitly refer to version 4 of the Internet Protocol. Do not expand the abbreviation on the first usage.
699+
*Description*: Use _IPv4_ to explicitly refer to version 4 of the Internet Protocol. Do not expand the abbreviation on first use.
700700

701701
*Use it*: yes
702702

@@ -707,7 +707,7 @@ _This feature can run only on Intel 64 processors_
707707

708708
[[ipv6]]
709709
==== image:images/yes.png[yes] IPv6 (noun)
710-
*Description*: Use _IPv6_ to explicitly refer to version 6 of the Internet Protocol. Do not expand the abbreviation on the first usage.
710+
*Description*: Use _IPv6_ to explicitly refer to version 6 of the Internet Protocol. Do not expand the abbreviation on first use.
711711

712712
*Use it*: yes
713713

supplementary_style_guide/glossary_terms_conventions/general_conventions/k.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ Do not capitalize the first letter.
183183

184184
[[kernel-based-virtual-machine]]
185185
==== image:images/yes.png[yes] Kernel-based Virtual Machine (noun)
186-
*Description*: _Kernel-based Virtual Machine_ is a loadable kernel module that converts the Linux kernel into a bare-metal hypervisor. Spell out "Kernel-based Virtual Machine" on first occurrence, and use "KVM" thereafter. It is an industry standard and a proper noun.
186+
*Description*: _Kernel-based Virtual Machine_ is a loadable kernel module that converts the Linux kernel into a bare-metal hypervisor. Write "Kernel-based Virtual Machine (KVM)" on first use and "KVM" after that. It is an industry standard and a proper noun.
187187

188188
*Use it*: yes
189189

0 commit comments

Comments
 (0)