Skip to content

Fixes #262 #264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daobrien merged 1 commit into from
Aug 2, 2021
Merged

Fixes #262 #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions en-US/Design.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@
<term>Source options <replaceable>[username@]hostname:/repository_filename</replaceable>)</term>
<listitem>
<para>
The optional user name, indicated by brackets ([]), followed by the host name and path to the repository.
The optional username, indicated by brackets ([]), followed by the hostname and path to the repository.
All aspects of this component must be replaced with valid values.
</para>

Expand Down Expand Up @@ -284,7 +284,7 @@
<term>Target options (<replaceable>[username@]hostname:/directory</replaceable>)</term>
<listitem>
<para>
The optional user name, indicated by brackets ([]), followed by the host name and path to the target directory. All aspects of this component must be replaced with valid values.
The optional username, indicated by brackets ([]), followed by the hostname and path to the target directory. All aspects of this component must be replaced with valid values.
</para>

</listitem>
Expand Down Expand Up @@ -528,9 +528,9 @@ $ vi myFile.txt

</section>
<section id="use-hostnames-correctly">
<title>Using Host and User Names Correctly</title>
<title>Using Host and Usernames Correctly</title>
<para>
Many examples in Red&nbsp;Hat documentation require the use of user names, host names, IP addresses, and similar information. In an effort to reduce security risks, to minimize translation overhead, and to maintain consistency, Red&nbsp;Hat recommends the following approach.
Many examples in Red&nbsp;Hat documentation require the use of usernames, hostnames, IP addresses, and similar information. In an effort to reduce security risks, to minimize translation overhead, and to maintain consistency, Red&nbsp;Hat recommends the following approach.
</para>
<note>
<para>
Expand Down Expand Up @@ -594,7 +594,7 @@ $ vi myFile.txt
Sometimes, the recommended list of user and group names is too restrictive for the scope of a book or article. In such cases, the following extended model is acceptable.
</para>
<formalpara id="using-realistic-names">
<title>Using Realistic User Names</title>
<title>Using Realistic Usernames</title>
<para>
When you are writing a detailed case study, such as training exercises, reviews, and similar material, use realistic names. These names should not be real people. In other words, do not use the name of an employee, a well-known person, or your neighbor.
</para>
Expand Down Expand Up @@ -671,7 +671,7 @@ $ vi myFile.txt
<formalpara id="using-extended-group-names">
<title>Group Names</title>
<para>
Use any lowercase name that is a logical extension of the accepted user names, without the numerical suffix. For example, <systemitem>architects</systemitem>, <systemitem>developers</systemitem>, <systemitem>operators</systemitem>.
Use any lowercase name that is a logical extension of the accepted usernames, without the numerical suffix. For example, <systemitem>architects</systemitem>, <systemitem>developers</systemitem>, <systemitem>operators</systemitem>.
</para>

</formalpara>
Expand Down
4 changes: 2 additions & 2 deletions en-US/E.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<para>
Refer to the primary reference for the type of copy you are creating, either AP or IBM.
</para>
<!-- Deleted the dated term "e-business". -->
<!-- Deleted the dated term "e-business". -->

</listitem>

Expand Down Expand Up @@ -172,7 +172,7 @@
<term>extranet</term>
<listitem>
<para>
Refers to an intranet that is partially accessible to authorized outsiders. Whereas an intranet resides behind a firewall and is accessible only to members of the same company or organization, an extranet provides various levels of accessibility to outsiders. You can access an extranet only if you have a valid user name and password, and your identity determines which parts of the extranet you can view.
Refers to an intranet that is partially accessible to authorized outsiders. Whereas an intranet resides behind a firewall and is accessible only to members of the same company or organization, an extranet provides various levels of accessibility to outsiders. You can access an extranet only if you have a valid username and password, and your identity determines which parts of the extranet you can view.
</para>
<para>
Capitalize only at the beginning of a sentence.
Expand Down
10 changes: 5 additions & 5 deletions en-US/F.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
<para>
Correct. Do not use "Firewire" or "firewire." Although FireWire is a trademark of Apple Computer, it is not needed to append a trademark symbol, except to refer to Apple's FireWire software license or specific logos. See <ulink url="https://www.apple.com/legal/intellectual-property/guidelinesfor3rdparties.html">https://www.apple.com/legal/intellectual-property/guidelinesfor3rdparties.html</ulink>.
</para>
<!-- Updated Apple trademark guidelines URL. -->
<!-- Updated Apple trademark guidelines URL. -->

</listitem>

Expand Down Expand Up @@ -258,9 +258,9 @@
For example, <uri>www.redhat.com</uri> is a fully qualified domain name, where <quote>www</quote> is the host, <quote>redhat</quote> is the second-level domain, and <quote>com</quote> is the top-level domain.
</para>
<para>
An FQDN always starts with a host name and continues all the way up to the top-level domain name; consequently <quote>www.parc.xerox.com</quote> is also an FQDN.
An FQDN always starts with a hostname and continues all the way up to the top-level domain name; consequently <quote>www.parc.xerox.com</quote> is also an FQDN.
</para>
<!-- Changed to "an FQDN". -->
<!-- Changed to "an FQDN". -->

</listitem>

Expand Down Expand Up @@ -310,7 +310,7 @@
<para>
Correct. "Futex" is an abbreviation of "fast user-space mutex." Consequently, "futexes" is the correct plural form.
</para>
<!-- Removed term capitalization for "futexes". -->
<!-- Removed term capitalization for "futexes". -->

</listitem>

Expand All @@ -321,7 +321,7 @@
<para>
Correct only when referring to fuzzy searches. See <xref linkend="avoiding-slang" /> for details and examples.
</para>
<!-- Removed term capitalization for "fuzzy". -->
<!-- Removed term capitalization for "fuzzy". -->

</listitem>

Expand Down
12 changes: 7 additions & 5 deletions en-US/H.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@

</listitem>

</varlistentry>
</varlistentry>
<varlistentry id="hertz">
<term>hertz</term>
<listitem>
Expand All @@ -126,12 +126,12 @@
</listitem>

</varlistentry>
<!-- Hyphenate except as part of a product name. -->
<!-- Hyphenate except as part of a product name. -->
<varlistentry id="high-availability">
<term>high-availability, high availability</term>
<listitem>
<para>
<emphasis>adj.</emphasis> Hyphenate, except as part of a product name. For example, "high-availability cluster."
<emphasis>adj.</emphasis> Hyphenate, except as part of a product name. For example, "high-availability cluster."
<!-- Do not use "high availability." -->
</para>

Expand Down Expand Up @@ -173,10 +173,12 @@

</varlistentry>
<varlistentry id="host-name">
<term>host name</term>
<term>hostname</term>
<listitem>
<para>
<emphasis>n.</emphasis> Two words in most cases. Capitalize the "H" at the beginning of a sentence. See the <citetitle>IBM Style Guide</citetitle> for more information.
<emphasis>n.</emphasis> One word in most cases.
Capitalize the "H" at the beginning of a sentence.
See the <citetitle>IBM Style Guide</citetitle> for more information.
</para>

</listitem>
Expand Down
8 changes: 5 additions & 3 deletions en-US/U.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
</listitem>

</varlistentry>

<varlistentry id="user">
<term>user</term>
<listitem>
Expand Down Expand Up @@ -192,10 +192,12 @@

</varlistentry>
<varlistentry id="user-name">
<term>user name</term>
<term>username</term>
<listitem>
<para>
<emphasis>n.</emphasis> Correct. Do not use "username" unless you are using it as a variable.
<emphasis>n.</emphasis> One word in most cases.
Capitalize the "U" at the beginning of a sentence.
See the <citetitle>IBM Style Guide</citetitle> for more information.
</para>

</listitem>
Expand Down