From e9f52a57564b209c17482fbfbbaed512e7b53b91 Mon Sep 17 00:00:00 2001
From: alex <alex@pdp7.net>
Date: Mon, 15 Nov 2021 11:25:34 +0100
Subject: [PATCH 1/2] Fix small issues

---
 en-US/O.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/en-US/O.xml b/en-US/O.xml
index 3fcecf6..ed2c28e 100644
--- a/en-US/O.xml
+++ b/en-US/O.xml
@@ -115,8 +115,8 @@
 			 <listitem>
 				<para>
 					<emphasis>adverb</emphasis> Write as shown.
-					If an adjective before a noun, use "<xref linkend="on-premise">on-premise</xref>."
-					Do not use "<xref linkend="onpremises">on premises</xref>".
+					If an adjective before a noun, use "<xref linkend="on-premise"/>."
+					Do not use "<xref linkend="onpremises"/>."
 				</para>
 
 			</listitem>
@@ -128,8 +128,8 @@
 			 <listitem>
 				<para>
 					<emphasis>adjective</emphasis> Write as shown.
-					Use as an adjective before a noun, otherwise use "<xref linkend="onpremise">on premise</xref>."
-					Do not use "<xref linkend="on-premises">on-premises</xref>."
+					Use as an adjective before a noun, otherwise use "<xref linkend="onpremise"/>."
+					Do not use "<xref linkend="on-premises"/>."
 				</para>
 			</listitem>
 
@@ -139,7 +139,7 @@
 			<term>on premises</term>
 			 <listitem>
 				<para>
-					Do not use, use "<xref linkend="onpremise">on premise</xref>."
+					Do not use, use "<xref linkend="onpremise"/>."
 				</para>
 
 			</listitem>
@@ -150,7 +150,7 @@
 			<term>on-premises</term>
 			 <listitem>
 				<para>
-					Do not use, use "<xref linkend="on-premise">on premise</xref>."
+					Do not use, use "<xref linkend="on-premise"/>."
 				</para>
 
 			</listitem>

From f8ca7a289d4725a569df14b082e115188fcf0c35 Mon Sep 17 00:00:00 2001
From: daobrien <noreply@solaris.milky.way>
Date: Mon, 15 Nov 2021 21:57:56 +1000
Subject: [PATCH 2/2] A bit of clean up to Alex's PR.

---
 en-US/O.xml | 36 ++++++++++--------------------------
 1 file changed, 10 insertions(+), 26 deletions(-)

diff --git a/en-US/O.xml b/en-US/O.xml
index ed2c28e..b0a021f 100644
--- a/en-US/O.xml
+++ b/en-US/O.xml
@@ -114,48 +114,32 @@
 			<term>on premise</term>
 			 <listitem>
 				<para>
-					<emphasis>adverb</emphasis> Write as shown.
-					If an adjective before a noun, use "<xref linkend="on-premise"/>."
-					Do not use "<xref linkend="onpremises"/>."
+					<emphasis>adverb</emphasis>
+          Two words.
+        </para>
+        <para>
+					<emphasis>adj.</emphasis>
+          Hyphenate if used as an adjective before a noun.
+          Otherwise, use the two-word form.
 				</para>
 
 			</listitem>
 
 		</varlistentry>
 
-		 <varlistentry id="on-premise">
-			<term>on-premise</term>
-			 <listitem>
-				<para>
-					<emphasis>adjective</emphasis> Write as shown.
-					Use as an adjective before a noun, otherwise use "<xref linkend="onpremise"/>."
-					Do not use "<xref linkend="on-premises"/>."
-				</para>
-			</listitem>
-
-		</varlistentry>
 
 		 <varlistentry id="onpremises">
-			<term>on premises</term>
+			<term>on premises, on-premises</term>
 			 <listitem>
 				<para>
-					Do not use, use "<xref linkend="onpremise"/>."
+					Do not use.
+          See <xref linkend="onpremise"/>.
 				</para>
 
 			</listitem>
 
 		</varlistentry>
 
-		 <varlistentry id="on-premises">
-			<term>on-premises</term>
-			 <listitem>
-				<para>
-					Do not use, use "<xref linkend="on-premise"/>."
-				</para>
-
-			</listitem>
-
-		</varlistentry>
 
 <!-- Advice differs from IBM Style, which says to use "onsite". -->
 		 <varlistentry id="on-site">