Merge dev to master for 7.1 release (Conflicts Resolved)

en-US/A.xml

@@ -14,6 +14,44 @@
 				</para>
 			</listitem>
 
+		</varlistentry>
+		 <varlistentry id="aarch64">
+			<term role="true">AArch64, aarch64</term>
+			 <listitem>
+				<para>
+					<emphasis>n.</emphasis> A 64-bit version of the ARM architecture. 
+					Use this term when referring to operating systems and server instances, for example Red&nbsp;Hat Enterprise Linux, Fedora, CoreOS, and other Linux distributions. 
+				</para>
+				 <para>
+					Use the uppercase (AArch64) format in general cases when referring to system architecture.
+					Use the lowercase (aarch64) format only when referring to objects or parameters. 
+					It can be styled as code (monospace font or a code-styled block) when referring to code.
+				</para>
+				 <para>
+					Cloud providers might use different formats of this term to refer to architectures. 
+					If you are documenting code, commands, or outputs, then confer with your subject-matter expert on the correct format for the specific use case.
+				</para>
+				 <para>
+					Examples:
+				</para>
+				 <itemizedlist>
+					<listitem>
+						<para>
+							When running Red&nbsp;Hat Enterprise Linux with an AArch64 system, run the following commands:
+						</para>
+					</listitem>
+					 <listitem>
+						<para>
+							Specify the system architecture of your cluster, such as <code>x86_64</code> or <code>aarch64</code>.
+						</para>
+					</listitem>
+				 </itemizedlist>
+        <para>
+          Refer also to <xref linkend="a64-bit"/>, <xref linkend="a64-bit-x86"/>, <xref linkend="AMD64"/>, <xref linkend="ARM64"/>, <xref linkend="Intel64"/>, and <xref linkend="x86-64"/>.
+        </para>
+
+			</listitem>
+
 		</varlistentry>
 		 <varlistentry id="above">
 			<term role="caution">above</term>
@@ -102,44 +140,6 @@
 
 			</listitem>
 
-		</varlistentry>
-		 <varlistentry id="aarch64">
-			<term role="true">AArch64, aarch64</term>
-			 <listitem>
-				<para>
-					<emphasis>n.</emphasis> A 64-bit version of the ARM architecture. 
-					Use this term when referring to operating systems and server instances, for example Red&nbsp;Hat Enterprise Linux, Fedora, CoreOS, and other Linux distributions. 
-				</para>
-				 <para>
-					Use the uppercase (AArch64) format in general cases when referring to system architecture.
-					Use the lowercase (aarch64) format only when referring to objects or parameters. 
-					It can be styled as code (monospace font or a code-styled block) when referring to code.
-				</para>
-				 <para>
-					Cloud providers might use different formats of this term to refer to architectures. 
-					If you are documenting code, commands, or outputs, then confer with your subject-matter expert on the correct format for the specific use case.
-				</para>
-				 <para>
-					Examples:
-				</para>
-				 <itemizedlist>
-					<listitem>
-						<para>
-							When running Red&nbsp;Hat Enterprise Linux with an AArch64 system, run the following commands:
-						</para>
-					</listitem>
-					 <listitem>
-						<para>
-							Specify the system architecture of your cluster, such as <code>x86_64</code> or <code>aarch64</code>.
-						</para>
-					</listitem>
-				 </itemizedlist>
-        <para>
-          Refer also to <xref linkend="a64-bit"/>, <xref linkend="a64-bit-x86"/>, <xref linkend="AMD64"/>, <xref linkend="ARM64"/>, <xref linkend="Intel64"/>, and <xref linkend="x86-64"/>.
-        </para>
-
-			</listitem>
-
 		</varlistentry>
 		 <varlistentry id="AMD64">
 			<term role="true">AMD64, amd64</term>
@@ -299,24 +299,21 @@
         </para>
       </listitem>
     </varlistentry>
-		 <varlistentry id="as-well-as">
-			<term role="caution">as well as</term>
+		 <varlistentry id="artificial-intelligence">
+			<term>artificial intelligence (AI)</term>
 			 <listitem>
 				<para>
-					Not interchangeable with "and".
-          "As well as" used in a series places more emphasis on the items preceding it, whereas "and" places equal weight on all items in the series.
-          For example, "We sell kitchen electronics and china, as well as some gourmet foods."
-          But "We sell kitchen electronics, china, and silverware."
+				Unless clarity requires it or the concept is being introduced or explained, "artificial intelligence" does not have to be spelled out on first use; "AI" is understood and suffices. When spelling it out, do not capitalize the term.	
 				</para>
 
 			</listitem>
 
 		</varlistentry>
 		 <varlistentry id="as-a-service">
-			<term role="caution">as-a-Service</term>
+			<term>as-a-Service</term>
 			 <listitem>
 				<para>
-					Some as-a-Service acronyms overlap.
+					Some "as-a-Service" acronyms overlap.
           To avoid confusion, always spell out the full term on first use.
 				</para>
 				 <itemizedlist>
@@ -412,7 +409,43 @@
 
 			</listitem>
 
-<!-- Suggested addition of "as long as" -->
+		</varlistentry>
+		 <varlistentry id="as-code">
+			<term>as Code</term>
+			 <listitem>
+				<para>
+					Use camel case for both the full term and the acronym. 
+					Do not hyphenate.
+					Some "as Code" acronyms might overlap.
+          			To avoid confusion, always spell out the full term on first use.					
+				</para>
+				<para>
+					Examples:
+				</para>
+				 <itemizedlist>
+					<listitem>
+						<para>
+							Configuration as Code (CaC)
+						</para>
+
+					</listitem>
+					 <listitem>
+						<para>
+							Infrastructure as Code (IaC)
+						</para>
+
+					</listitem>
+					 <listitem>
+						<para>
+							Policy as Code (PaC)
+						</para>
+
+					</listitem>
+
+				</itemizedlist>
+
+			</listitem>
+
 		</varlistentry>
 		<varlistentry id="as-long-as">
 			<term role="caution">as long as</term>
@@ -423,6 +456,19 @@
 
 			</listitem>
 
+		</varlistentry>
+		 <varlistentry id="as-well-as">
+			<term role="caution">as well as</term>
+			 <listitem>
+				<para>
+					Not interchangeable with "and".
+          "As well as" used in a series places more emphasis on the items preceding it, whereas "and" places equal weight on all items in the series.
+          For example, "We sell kitchen electronics and china, as well as some gourmet foods."
+          But "We sell kitchen electronics, china, and silverware."
+				</para>
+
+			</listitem>
+
 		</varlistentry>
 		 <varlistentry id="atm">
 			<term role="true">ATM</term>

en-US/B.xml

@@ -24,6 +24,15 @@
 
 			</listitem>
 
+		</varlistentry>
+		 <varlistentry id="backtrace">
+			<term>backtrace</term>
+			 <listitem>
+				<para>
+					<emphasis>n.</emphasis> "Backtrace" is the most common term to refer to a stack trace (or stack backtrace), which is a report of the active stack frames (that is, function calls) at a certain point in time during the execution of a program. In contrast, the Python programming language calls its stack trace a "traceback", possibly because the stack frames are printed in the opposite order of those presented by gdb, the GNU Debugger. "Traceback" is the preferred term when referring to a Python stack trace.
+				</para>
+
+			</listitem>
 		</varlistentry>
 		 <varlistentry id="back-up">
 			<term>backup, back up</term>
@@ -59,15 +68,6 @@
 
 			</listitem>
 
-		</varlistentry>
-		 <varlistentry id="backtrace">
-			<term>backtrace</term>
-			 <listitem>
-				<para>
-					<emphasis>n.</emphasis> "Backtrace" is the most common term to refer to a stack trace (or stack backtrace), which is a report of the active stack frames (that is, function calls) at a certain point in time during the execution of a program. In contrast, the Python programming language calls its stack trace a "traceback", possibly because the stack frames are printed in the opposite order of those presented by gdb, the GNU Debugger. "Traceback" is the preferred term when referring to a Python stack trace.
-				</para>
-
-			</listitem>
 		</varlistentry>
 		 <varlistentry id="backwards-compatible">
 			<term>backwards compatible</term>

en-US/Book_Info.xml

@@ -8,7 +8,7 @@
 	<!-- Change title to "The Red Hat Style Guide" -->
 	 <productname>Red&nbsp;Hat Technical Writing Style&nbsp;Guide</productname>
 	 <productnumber></productnumber>
-	 <edition>7.0</edition>
+	 <edition>7.1</edition>
 	 <pubsnumber>1</pubsnumber>
 	 <abstract>
 		<para>

en-US/C.xml

@@ -248,6 +248,17 @@
 			</listitem>
 
 		</varlistentry>
+		 <varlistentry id="code-base">
+			<term>code base</term>
+			 <listitem>
+				<para>
+					<emphasis>n.</emphasis> Two words.
+					Do not use "codebase", outside the specific context of codebase.com.
+				</para>
+
+			</listitem>
+
+		</varlistentry>		
 <!-- Added "colocate, colocation" -->
 		 <varlistentry id="colocate">
 			<term>colocate, colocation</term>
@@ -388,16 +399,7 @@
 			</listitem>
 
 		</varlistentry>
-		 <varlistentry id="containers-as-a-service">
-			<term>Containers-as-a-Service</term>
-			 <listitem>
-				<para>
-					The term "Containers-as-a-Service" is owned by Docker and should be used only when referring to that company's offering. Refer also to <xref linkend="as-a-service" />.
-				</para>
 
-			</listitem>
-
-		</varlistentry>
 		 <varlistentry id="container-based">
 			<term>container-based</term>
 			 <listitem>
@@ -417,6 +419,16 @@
 
 			</listitem>
 
+		</varlistentry>
+		 <varlistentry id="containers-as-a-service">
+			<term>Containers-as-a-Service</term>
+			 <listitem>
+				<para>
+					The term "Containers-as-a-Service" is owned by Docker and should be used only when referring to that company's offering. Refer also to <xref linkend="as-a-service" />.
+				</para>
+
+			</listitem>
+
 		</varlistentry>
 		 <varlistentry id="continuous-delivery">
 			<term>continuous delivery (CD)</term>

en-US/D.xml

@@ -218,23 +218,23 @@
           Describe, rather than label.
         </para></listitem>
       </varlistentry>
-		 <varlistentry id="disk-druid">
-			<term>Disk Druid</term>
+		 <varlistentry id="disk-disc">
+			<term>disk, disc</term>
 			 <listitem>
 				<para>
-					Correct. Do not use "Disk druid", "disk druid", or "diskdruid". This is a partitioning tool that is  incorporated into Red&nbsp;Hat Enterprise&nbsp;Linux.
+					Use "compact disc" or "hard disk".
 				</para>
+<!-- Removed reference to "diskette". -->
 
 			</listitem>
 
 		</varlistentry>
-		 <varlistentry id="disk-disc">
-			<term>disk, disc</term>
+		 <varlistentry id="disk-druid">
+			<term>Disk Druid</term>
 			 <listitem>
 				<para>
-					Use "compact disc" or "hard disk".
+					Correct. Do not use "Disk druid", "disk druid", or "diskdruid". This is a partitioning tool that is  incorporated into Red&nbsp;Hat Enterprise&nbsp;Linux.
 				</para>
-<!-- Removed reference to "diskette". -->
 
 			</listitem>