From 712c2e5672ba029674fb2eafc40e6d2022f2b639 Mon Sep 17 00:00:00 2001 From: daobrien Date: Mon, 2 Aug 2021 15:02:53 +1000 Subject: [PATCH] Fixes #262 s/host name/hostname/ and s/user name/username/ based on revised guidance in IBM. --- en-US/Design.xml | 12 ++++++------ en-US/E.xml | 4 ++-- en-US/F.xml | 10 +++++----- en-US/H.xml | 12 +++++++----- en-US/U.xml | 8 +++++--- 5 files changed, 25 insertions(+), 21 deletions(-) diff --git a/en-US/Design.xml b/en-US/Design.xml index d1eefcf..1fa44a6 100644 --- a/en-US/Design.xml +++ b/en-US/Design.xml @@ -219,7 +219,7 @@ Source options [username@]hostname:/repository_filename) - 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. @@ -284,7 +284,7 @@ Target options ([username@]hostname:/directory) - 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. @@ -528,9 +528,9 @@ $ vi myFile.txt
- Using Host and User Names Correctly + Using Host and Usernames Correctly - Many examples in Red 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 Hat recommends the following approach. + Many examples in Red 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 Hat recommends the following approach. @@ -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. - Using Realistic User Names + Using Realistic Usernames 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. @@ -671,7 +671,7 @@ $ vi myFile.txt Group Names - Use any lowercase name that is a logical extension of the accepted user names, without the numerical suffix. For example, architects, developers, operators. + Use any lowercase name that is a logical extension of the accepted usernames, without the numerical suffix. For example, architects, developers, operators. diff --git a/en-US/E.xml b/en-US/E.xml index 4659c4a..01cafdf 100644 --- a/en-US/E.xml +++ b/en-US/E.xml @@ -12,7 +12,7 @@ Refer to the primary reference for the type of copy you are creating, either AP or IBM. - + @@ -172,7 +172,7 @@ extranet - 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. Capitalize only at the beginning of a sentence. diff --git a/en-US/F.xml b/en-US/F.xml index 4120192..c840078 100644 --- a/en-US/F.xml +++ b/en-US/F.xml @@ -119,7 +119,7 @@ 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 https://www.apple.com/legal/intellectual-property/guidelinesfor3rdparties.html. - + @@ -258,9 +258,9 @@ For example, www.redhat.com is a fully qualified domain name, where www is the host, redhat is the second-level domain, and com is the top-level domain. - An FQDN always starts with a host name and continues all the way up to the top-level domain name; consequently www.parc.xerox.com is also an FQDN. + An FQDN always starts with a hostname and continues all the way up to the top-level domain name; consequently www.parc.xerox.com is also an FQDN. - + @@ -310,7 +310,7 @@ Correct. "Futex" is an abbreviation of "fast user-space mutex." Consequently, "futexes" is the correct plural form. - + @@ -321,7 +321,7 @@ Correct only when referring to fuzzy searches. See for details and examples. - + diff --git a/en-US/H.xml b/en-US/H.xml index 020f633..fc7bf97 100644 --- a/en-US/H.xml +++ b/en-US/H.xml @@ -115,7 +115,7 @@ - + hertz @@ -126,12 +126,12 @@ - + high-availability, high availability - adj. Hyphenate, except as part of a product name. For example, "high-availability cluster." + adj. Hyphenate, except as part of a product name. For example, "high-availability cluster." @@ -173,10 +173,12 @@ - host name + hostname - n. Two words in most cases. Capitalize the "H" at the beginning of a sentence. See the IBM Style Guide for more information. + n. One word in most cases. + Capitalize the "H" at the beginning of a sentence. + See the IBM Style Guide for more information. diff --git a/en-US/U.xml b/en-US/U.xml index 7d55d87..5a8c1be 100644 --- a/en-US/U.xml +++ b/en-US/U.xml @@ -164,7 +164,7 @@ - + user @@ -192,10 +192,12 @@ - user name + username - n. Correct. Do not use "username" unless you are using it as a variable. + n. One word in most cases. + Capitalize the "U" at the beginning of a sentence. + See the IBM Style Guide for more information.