man: sort specifiers alphabetically

diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index c848146f3a92097582de6245e10ba37b6d972e5f..5364c4c975db1bf6c7627774da8e7a2043e2ea8d 100644 (file)
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -1786,6 +1786,16 @@
             <entry>Unescaped filename</entry>
             <entry>This is either the unescaped instance name (if applicable) with <filename>/</filename> prepended (if applicable), or the unescaped prefix name prepended with <filename>/</filename>. This implements unescaping according to the rules for escaping absolute file system paths discussed above.</entry>
           </row>
+          <row>
+            <entry><literal>%g</literal></entry>
+            <entry>User group</entry>
+            <entry>This is the name of the group running the service manager instance. In case of the system manager this resolves to <literal>root</literal>.</entry>
+          </row>
+          <row>
+            <entry><literal>%G</literal></entry>
+            <entry>User GID</entry>
+            <entry>This is the numeric GID of the user running the service manager instance. In case of the system manager this resolves to <literal>0</literal>.</entry>
+          </row>
           <row>
             <entry><literal>%h</literal></entry>
             <entry>User home directory</entry>
@@ -1800,11 +1810,6 @@ Note that this setting is <emphasis>not</emphasis> influenced by the <varname>Us
             <entry>Host name</entry>
             <entry>The hostname of the running system at the point in time the unit configuration is loaded.</entry>
           </row>
-          <row>
-            <entry><literal>%l</literal></entry>
-            <entry>Short host name</entry>
-            <entry>The hostname of the running system at the point in time the unit configuration is loaded, truncated at the first dot to remove any domain component.</entry>
-          </row>
           <row>
             <entry><literal>%i</literal></entry>
             <entry>Instance name</entry>
@@ -1825,13 +1830,17 @@ Note that this setting is <emphasis>not</emphasis> influenced by the <varname>Us
             <entry>Unescaped final component of the prefix</entry>
             <entry>Same as <literal>%j</literal>, but with escaping undone.</entry>
           </row>
+          <row>
+            <entry><literal>%l</literal></entry>
+            <entry>Short host name</entry>
+            <entry>The hostname of the running system at the point in time the unit configuration is loaded, truncated at the first dot to remove any domain component.</entry>
+          </row>
           <row>
             <entry><literal>%L</literal></entry>
             <entry>Log directory root</entry>
             <entry>This is either <filename>/var/log</filename> (for the system manager) or the path <literal>$XDG_CONFIG_HOME</literal> resolves to with <filename index="false">/log</filename> appended (for user managers).</entry>
           </row>
           <xi:include href="standard-specifiers.xml" xpointer="m"/>
-          <xi:include href="standard-specifiers.xml" xpointer="o"/>
           <row>
             <entry><literal>%n</literal></entry>
             <entry>Full unit name</entry>
@@ -1842,6 +1851,7 @@ Note that this setting is <emphasis>not</emphasis> influenced by the <varname>Us
             <entry>Full unit name</entry>
             <entry>Same as <literal>%n</literal>, but with the type suffix removed.</entry>
           </row>
+          <xi:include href="standard-specifiers.xml" xpointer="o"/>
           <row>
             <entry><literal>%p</literal></entry>
             <entry>Prefix name</entry>
@@ -1868,16 +1878,6 @@ Note that this setting is <emphasis>not</emphasis> influenced by the <varname>Us
             <entry>This is either <filename>/run/</filename> (for the system manager) or the path <literal>$XDG_RUNTIME_DIR</literal> resolves to (for user managers).</entry>
           </row>
           <xi:include href="standard-specifiers.xml" xpointer="T"/>
-          <row>
-            <entry><literal>%g</literal></entry>
-            <entry>User group</entry>
-            <entry>This is the name of the group running the service manager instance. In case of the system manager this resolves to <literal>root</literal>.</entry>
-          </row>
-          <row>
-            <entry><literal>%G</literal></entry>
-            <entry>User GID</entry>
-            <entry>This is the numeric GID of the user running the service manager instance. In case of the system manager this resolves to <literal>0</literal>.</entry>
-          </row>
           <row>
             <entry><literal>%u</literal></entry>
             <entry>User name</entry>

diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index 5f690548470b4727879d8e06a5f862d258be2683..49ce8375a40b84459dad1179ab86b37520d2d8fe 100644 (file)
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -639,6 +639,16 @@ w- /proc/sys/vm/swappiness - - - - 10</programlisting></para>
               <entry>System or user cache directory</entry>
               <entry>In <option>--user</option> mode, this is the same as <varname>$XDG_CACHE_HOME</varname>, and <filename>/var/cache</filename> otherwise.</entry>
             </row>
+            <row>
+              <entry><literal>%g</literal></entry>
+              <entry>User group</entry>
+              <entry>This is the name of the group running the command. In case of the system instance this resolves to <literal>root</literal>.</entry>
+            </row>
+            <row>
+              <entry><literal>%G</literal></entry>
+              <entry>User GID</entry>
+              <entry>This is the numeric GID of the group running the command. In case of the system instance this resolves to <constant>0</constant>.</entry>
+            </row>
             <row>
               <entry><literal>%h</literal></entry>
               <entry>User home directory</entry>
@@ -664,16 +674,6 @@ w- /proc/sys/vm/swappiness - - - - 10</programlisting></para>
               <entry>In <option>--user</option> mode, this is the same <varname>$XDG_RUNTIME_DIR</varname>, and <filename>/run/</filename> otherwise.</entry>
             </row>
             <xi:include href="standard-specifiers.xml" xpointer="T"/>
-            <row>
-              <entry><literal>%g</literal></entry>
-              <entry>User group</entry>
-              <entry>This is the name of the group running the command. In case of the system instance this resolves to <literal>root</literal>.</entry>
-            </row>
-            <row>
-              <entry><literal>%G</literal></entry>
-              <entry>User GID</entry>
-              <entry>This is the numeric GID of the group running the command. In case of the system instance this resolves to <constant>0</constant>.</entry>
-            </row>
             <row>
               <entry><literal>%u</literal></entry>
               <entry>User name</entry>