man: rename less-variables→common-variables
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Sun, 28 Feb 2021 11:18:25 +0000 (12:18 +0100)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 1 Mar 2021 12:40:52 +0000 (13:40 +0100)
Some are not about less, e.g. $SYSTEMD_URLIFY.

15 files changed:
man/common-variables.xml [new file with mode: 0644]
man/homectl.xml
man/journalctl.xml
man/less-variables.xml [deleted file]
man/localectl.xml
man/loginctl.xml
man/machinectl.xml
man/portablectl.xml
man/systemctl.xml
man/systemd-analyze.xml
man/systemd-inhibit.xml
man/systemd-nspawn.xml
man/systemd.xml
man/timedatectl.xml
man/userdbctl.xml

diff --git a/man/common-variables.xml b/man/common-variables.xml
new file mode 100644 (file)
index 0000000..809a908
--- /dev/null
@@ -0,0 +1,125 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
+
+<refsect1>
+  <title>Environment</title>
+
+  <variablelist class='environment-variables'>
+    <varlistentry id='pager'>
+      <term><varname>$SYSTEMD_PAGER</varname></term>
+
+      <listitem><para>Pager to use when <option>--no-pager</option> is not given; overrides
+      <varname>$PAGER</varname>. If neither <varname>$SYSTEMD_PAGER</varname> nor <varname>$PAGER</varname> are set, a
+      set of well-known pager implementations are tried in turn, including
+      <citerefentry project='man-pages'><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></citerefentry> and
+      <citerefentry project='man-pages'><refentrytitle>more</refentrytitle><manvolnum>1</manvolnum></citerefentry>, until one is found. If
+      no pager implementation is discovered no pager is invoked. Setting this environment variable to an empty string
+      or the value <literal>cat</literal> is equivalent to passing <option>--no-pager</option>.</para></listitem>
+    </varlistentry>
+
+    <varlistentry id='less'>
+      <term><varname>$SYSTEMD_LESS</varname></term>
+
+      <listitem><para>Override the options passed to <command>less</command> (by default
+      <literal>FRSXMK</literal>).</para>
+
+      <para>Users might want to change two options in particular:</para>
+
+      <variablelist>
+        <varlistentry>
+          <term><option>K</option></term>
+
+          <para>This option instructs the pager to exit immediately when
+          <keycombo><keycap>Ctrl</keycap><keycap>C</keycap></keycombo> is pressed. To allow
+          <command>less</command> to handle <keycombo><keycap>Ctrl</keycap><keycap>C</keycap></keycombo>
+          itself to switch back to the pager command prompt, unset this option.</para>
+
+          <para>If the value of <varname>$SYSTEMD_LESS</varname> does not include <literal>K</literal>,
+          and the pager that is invoked is <command>less</command>,
+          <keycombo><keycap>Ctrl</keycap><keycap>C</keycap></keycombo> will be ignored by the
+          executable, and needs to be handled by the pager.</para>
+        </varlistentry>
+
+        <varlistentry>
+          <term><option>X</option></term>
+
+          <para>This option instructs the pager to not send termcap initialization and deinitialization
+          strings to the terminal. It is set by default to allow command output to remain visible in the
+          terminal even after the pager exits. Nevertheless, this prevents some pager functionality from
+          working, in particular paged output cannot be scrolled with the mouse.</para>
+        </varlistentry>
+      </variablelist>
+
+      <para>See
+      <citerefentry project='man-pages'><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+      for more discussion.</para></listitem>
+    </varlistentry>
+
+    <varlistentry id='lesscharset'>
+      <term><varname>$SYSTEMD_LESSCHARSET</varname></term>
+
+      <listitem><para>Override the charset passed to <command>less</command> (by default <literal>utf-8</literal>, if
+      the invoking terminal is determined to be UTF-8 compatible).</para></listitem>
+    </varlistentry>
+
+    <varlistentry id='lesssecure'>
+      <term><varname>$SYSTEMD_PAGERSECURE</varname></term>
+
+      <listitem><para>Takes a boolean argument. When true, the "secure" mode of the pager is enabled; if
+      false, disabled. If <varname>$SYSTEMD_PAGERSECURE</varname> is not set at all, secure mode is enabled
+      if the effective UID is not the same as the owner of the login session, see
+      <citerefentry project='man-pages'><refentrytitle>geteuid</refentrytitle><manvolnum>2</manvolnum></citerefentry>
+      and <citerefentry><refentrytitle>sd_pid_get_owner_uid</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
+      In secure mode, <option>LESSSECURE=1</option> will be set when invoking the pager, and the pager shall
+      disable commands that open or create new files or start new subprocesses. When
+      <varname>$SYSTEMD_PAGERSECURE</varname> is not set at all, pagers which are not known to implement
+      secure mode will not be used. (Currently only
+      <citerefentry project='man-pages'><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+      implements secure mode.)</para>
+
+      <para>Note: when commands are invoked with elevated privileges, for example under <citerefentry
+      project='man-pages'><refentrytitle>sudo</refentrytitle><manvolnum>8</manvolnum></citerefentry> or
+      <citerefentry
+      project='die-net'><refentrytitle>pkexec</refentrytitle><manvolnum>1</manvolnum></citerefentry>, care
+      must be taken to ensure that unintended interactive features are not enabled. "Secure" mode for the
+      pager may be enabled automatically as describe above. Setting <varname>SYSTEMD_PAGERSECURE=0</varname>
+      or not removing it from the inherited environment allows the user to invoke arbitrary commands. Note
+      that if the <varname>$SYSTEMD_PAGER</varname> or <varname>$PAGER</varname> variables are to be
+      honoured, <varname>$SYSTEMD_PAGERSECURE</varname> must be set too. It might be reasonable to completely
+      disable the pager using <option>--no-pager</option> instead.</para></listitem>
+    </varlistentry>
+
+    <varlistentry id='colors'>
+      <term><varname>$SYSTEMD_COLORS</varname></term>
+
+      <listitem><para>Takes a boolean argument. When true, <command>systemd</command> and related utilities
+      will use colors in their output, otherwise the output will be monochrome. Additionally, the variable can
+      take one of the following special values: <literal>16</literal>, <literal>256</literal> to restrict the use
+      of colors to the base 16 or 256 ANSI colors, respectively. This can be specified to override the automatic
+      decision based on <varname>$TERM</varname> and what the console is connected to.</para></listitem>
+    </varlistentry>
+
+    <!-- This is not documented on purpose, because it is not clear if $NO_COLOR will become supported
+         widely enough. So let's provide support, but without advertising this.
+    <varlistentry id='no-color'>
+      <term><varname>$NO_COLOR</varname></term>
+
+      <listitem><para>If set (to any value), and <varname>$SYSTEMD_COLORS</varname> is not set, equivalent to
+      <option>SYSTEMD_COLORS=0</option>. See <ulink url="https://no-color.org/">no-color.org</ulink>.</para>
+      </listitem>
+    </varlistentry>
+    -->
+
+    <varlistentry id='urlify'>
+      <term><varname>$SYSTEMD_URLIFY</varname></term>
+
+      <listitem><para>The value must be a boolean. Controls whether clickable links should be generated in
+      the output for terminal emulators supporting this. This can be specified to override the decision that
+      <command>systemd</command> makes based on <varname>$TERM</varname> and other conditions.</para>
+      </listitem>
+    </varlistentry>
+
+  </variablelist>
+</refsect1>
index 5e8866771e1fe991f1c40516427cb2b8e4943faf..184bdcf6fd0305271faf9e0e6d6127192bbb3923 100644 (file)
     <para>On success, 0 is returned, a non-zero failure code otherwise.</para>
   </refsect1>
 
-  <xi:include href="less-variables.xml" />
+  <xi:include href="common-variables.xml" />
 
   <refsect1>
     <title>Examples</title>
index 379344170d1add7e17efed24a85d70d99443e93f..4be2ed3476e7cd55fda9cde04caba513a8245de9 100644 (file)
     code is returned.</para>
   </refsect1>
 
-  <xi:include href="less-variables.xml" />
+  <xi:include href="common-variables.xml" />
 
   <refsect1>
     <title>Examples</title>
diff --git a/man/less-variables.xml b/man/less-variables.xml
deleted file mode 100644 (file)
index 809a908..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
-
-<refsect1>
-  <title>Environment</title>
-
-  <variablelist class='environment-variables'>
-    <varlistentry id='pager'>
-      <term><varname>$SYSTEMD_PAGER</varname></term>
-
-      <listitem><para>Pager to use when <option>--no-pager</option> is not given; overrides
-      <varname>$PAGER</varname>. If neither <varname>$SYSTEMD_PAGER</varname> nor <varname>$PAGER</varname> are set, a
-      set of well-known pager implementations are tried in turn, including
-      <citerefentry project='man-pages'><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></citerefentry> and
-      <citerefentry project='man-pages'><refentrytitle>more</refentrytitle><manvolnum>1</manvolnum></citerefentry>, until one is found. If
-      no pager implementation is discovered no pager is invoked. Setting this environment variable to an empty string
-      or the value <literal>cat</literal> is equivalent to passing <option>--no-pager</option>.</para></listitem>
-    </varlistentry>
-
-    <varlistentry id='less'>
-      <term><varname>$SYSTEMD_LESS</varname></term>
-
-      <listitem><para>Override the options passed to <command>less</command> (by default
-      <literal>FRSXMK</literal>).</para>
-
-      <para>Users might want to change two options in particular:</para>
-
-      <variablelist>
-        <varlistentry>
-          <term><option>K</option></term>
-
-          <para>This option instructs the pager to exit immediately when
-          <keycombo><keycap>Ctrl</keycap><keycap>C</keycap></keycombo> is pressed. To allow
-          <command>less</command> to handle <keycombo><keycap>Ctrl</keycap><keycap>C</keycap></keycombo>
-          itself to switch back to the pager command prompt, unset this option.</para>
-
-          <para>If the value of <varname>$SYSTEMD_LESS</varname> does not include <literal>K</literal>,
-          and the pager that is invoked is <command>less</command>,
-          <keycombo><keycap>Ctrl</keycap><keycap>C</keycap></keycombo> will be ignored by the
-          executable, and needs to be handled by the pager.</para>
-        </varlistentry>
-
-        <varlistentry>
-          <term><option>X</option></term>
-
-          <para>This option instructs the pager to not send termcap initialization and deinitialization
-          strings to the terminal. It is set by default to allow command output to remain visible in the
-          terminal even after the pager exits. Nevertheless, this prevents some pager functionality from
-          working, in particular paged output cannot be scrolled with the mouse.</para>
-        </varlistentry>
-      </variablelist>
-
-      <para>See
-      <citerefentry project='man-pages'><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-      for more discussion.</para></listitem>
-    </varlistentry>
-
-    <varlistentry id='lesscharset'>
-      <term><varname>$SYSTEMD_LESSCHARSET</varname></term>
-
-      <listitem><para>Override the charset passed to <command>less</command> (by default <literal>utf-8</literal>, if
-      the invoking terminal is determined to be UTF-8 compatible).</para></listitem>
-    </varlistentry>
-
-    <varlistentry id='lesssecure'>
-      <term><varname>$SYSTEMD_PAGERSECURE</varname></term>
-
-      <listitem><para>Takes a boolean argument. When true, the "secure" mode of the pager is enabled; if
-      false, disabled. If <varname>$SYSTEMD_PAGERSECURE</varname> is not set at all, secure mode is enabled
-      if the effective UID is not the same as the owner of the login session, see
-      <citerefentry project='man-pages'><refentrytitle>geteuid</refentrytitle><manvolnum>2</manvolnum></citerefentry>
-      and <citerefentry><refentrytitle>sd_pid_get_owner_uid</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
-      In secure mode, <option>LESSSECURE=1</option> will be set when invoking the pager, and the pager shall
-      disable commands that open or create new files or start new subprocesses. When
-      <varname>$SYSTEMD_PAGERSECURE</varname> is not set at all, pagers which are not known to implement
-      secure mode will not be used. (Currently only
-      <citerefentry project='man-pages'><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-      implements secure mode.)</para>
-
-      <para>Note: when commands are invoked with elevated privileges, for example under <citerefentry
-      project='man-pages'><refentrytitle>sudo</refentrytitle><manvolnum>8</manvolnum></citerefentry> or
-      <citerefentry
-      project='die-net'><refentrytitle>pkexec</refentrytitle><manvolnum>1</manvolnum></citerefentry>, care
-      must be taken to ensure that unintended interactive features are not enabled. "Secure" mode for the
-      pager may be enabled automatically as describe above. Setting <varname>SYSTEMD_PAGERSECURE=0</varname>
-      or not removing it from the inherited environment allows the user to invoke arbitrary commands. Note
-      that if the <varname>$SYSTEMD_PAGER</varname> or <varname>$PAGER</varname> variables are to be
-      honoured, <varname>$SYSTEMD_PAGERSECURE</varname> must be set too. It might be reasonable to completely
-      disable the pager using <option>--no-pager</option> instead.</para></listitem>
-    </varlistentry>
-
-    <varlistentry id='colors'>
-      <term><varname>$SYSTEMD_COLORS</varname></term>
-
-      <listitem><para>Takes a boolean argument. When true, <command>systemd</command> and related utilities
-      will use colors in their output, otherwise the output will be monochrome. Additionally, the variable can
-      take one of the following special values: <literal>16</literal>, <literal>256</literal> to restrict the use
-      of colors to the base 16 or 256 ANSI colors, respectively. This can be specified to override the automatic
-      decision based on <varname>$TERM</varname> and what the console is connected to.</para></listitem>
-    </varlistentry>
-
-    <!-- This is not documented on purpose, because it is not clear if $NO_COLOR will become supported
-         widely enough. So let's provide support, but without advertising this.
-    <varlistentry id='no-color'>
-      <term><varname>$NO_COLOR</varname></term>
-
-      <listitem><para>If set (to any value), and <varname>$SYSTEMD_COLORS</varname> is not set, equivalent to
-      <option>SYSTEMD_COLORS=0</option>. See <ulink url="https://no-color.org/">no-color.org</ulink>.</para>
-      </listitem>
-    </varlistentry>
-    -->
-
-    <varlistentry id='urlify'>
-      <term><varname>$SYSTEMD_URLIFY</varname></term>
-
-      <listitem><para>The value must be a boolean. Controls whether clickable links should be generated in
-      the output for terminal emulators supporting this. This can be specified to override the decision that
-      <command>systemd</command> makes based on <varname>$TERM</varname> and other conditions.</para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-</refsect1>
index 7f7e5775c00128b3eb9d1a91bfada428606ab347..9fa34854eda45bcb5b9225cdfefa3c1fbf03116f 100644 (file)
     otherwise.</para>
   </refsect1>
 
-  <xi:include href="less-variables.xml" />
+  <xi:include href="common-variables.xml" />
 
   <refsect1>
     <title>See Also</title>
index 33683144fa3fcc4beb88f695745f649f98794eb4..56a86e56efeb8ccb3b2587a08d9c1b9829f45ca4 100644 (file)
@@ -415,7 +415,7 @@ Apr 09 14:40:30 laptop login[2325]: LOGIN ON tty3 BY fatima
     </example>
   </refsect1>
 
-  <xi:include href="less-variables.xml" />
+  <xi:include href="common-variables.xml" />
 
   <refsect1>
     <title>See Also</title>
index 556fe309dc469a9a4e73a7a5e0043aa270e2ddbb..ad47b6102e342af99ef8d1355d7812eeb66e3d3f 100644 (file)
     otherwise.</para>
   </refsect1>
 
-  <xi:include href="less-variables.xml" />
+  <xi:include href="common-variables.xml" />
 
   <refsect1>
     <title>See Also</title>
index 3f37ad11642d8fb28a80ca660f277d2248da6705..2dae537a40ab2ef3cca94d88b6a32695e7935959 100644 (file)
     <para>On success, 0 is returned, a non-zero failure code otherwise.</para>
   </refsect1>
 
-  <xi:include href="less-variables.xml" />
+  <xi:include href="common-variables.xml" />
 
   <refsect1>
     <title>See Also</title>
index 73ca3a6be0495dba62610640b5a42a3e7466f241..62bc7fe832bcafef736e8544ed7c6d3f18505a0e 100644 (file)
@@ -2407,12 +2407,12 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err
         </para></listitem>
       </varlistentry>
     </variablelist>
-    <xi:include href="less-variables.xml" xpointer="pager"/>
-    <xi:include href="less-variables.xml" xpointer="less"/>
-    <xi:include href="less-variables.xml" xpointer="lesscharset"/>
-    <xi:include href="less-variables.xml" xpointer="lesssecure"/>
-    <xi:include href="less-variables.xml" xpointer="colors"/>
-    <xi:include href="less-variables.xml" xpointer="urlify"/>
+    <xi:include href="common-variables.xml" xpointer="pager"/>
+    <xi:include href="common-variables.xml" xpointer="less"/>
+    <xi:include href="common-variables.xml" xpointer="lesscharset"/>
+    <xi:include href="common-variables.xml" xpointer="lesssecure"/>
+    <xi:include href="common-variables.xml" xpointer="colors"/>
+    <xi:include href="common-variables.xml" xpointer="urlify"/>
   </refsect1>
 
   <refsect1>
index 16143d4d0fb4ccc38f4b1adcb937474dff83e4e3..4da066e05c26854a032e0b0e5b0fcccc4a9f2380 100644 (file)
@@ -782,7 +782,7 @@ Service b@0.service not loaded, b.socket cannot be started.
     otherwise.</para>
   </refsect1>
 
-  <xi:include href="less-variables.xml" />
+  <xi:include href="common-variables.xml" />
 
   <refsect1>
     <title>See Also</title>
index 2fee0ede8458bf1d4a554ce424dc54aaecb4562e..f6595f1e26cdc0ece4a42021c8d7280b66661546 100644 (file)
     doing so.</para>
   </refsect1>
 
-  <xi:include href="less-variables.xml" />
+  <xi:include href="common-variables.xml" />
 
   <refsect1>
     <title>See Also</title>
index d282238146e0cd10fb1dfed355759bd8d92ff44c..187baceec2196f0d2342b360730384abae0ae016 100644 (file)
    </refsect2>
   </refsect1>
 
-  <xi:include href="less-variables.xml" />
+  <xi:include href="common-variables.xml" />
 
   <refsect1>
     <title>Examples</title>
index 893f113431ee4f6f6cea933d567e53e1715b1469..b0b6c7236e2a98f44b4f3d515696748659dd0b00 100644 (file)
         script runlevel link farms.</para></listitem>
       </varlistentry>
 
-      <xi:include href="less-variables.xml" xpointer="pager"/>
-      <xi:include href="less-variables.xml" xpointer="less"/>
-      <xi:include href="less-variables.xml" xpointer="lesscharset"/>
-      <xi:include href="less-variables.xml" xpointer="lesssecure"/>
-      <xi:include href="less-variables.xml" xpointer="colors"/>
-      <xi:include href="less-variables.xml" xpointer="urlify"/>
+      <xi:include href="common-variables.xml" xpointer="pager"/>
+      <xi:include href="common-variables.xml" xpointer="less"/>
+      <xi:include href="common-variables.xml" xpointer="lesscharset"/>
+      <xi:include href="common-variables.xml" xpointer="lesssecure"/>
+      <xi:include href="common-variables.xml" xpointer="colors"/>
+      <xi:include href="common-variables.xml" xpointer="urlify"/>
 
       <varlistentry>
         <term><varname>$LISTEN_PID</varname></term>
index e7db4870c05ad39e684939db8ae3edf9c9c9d2a9..ce1415237059ebd95d0202e878fcbee674ede2cd 100644 (file)
     <para>On success, 0 is returned, a non-zero failure code otherwise.</para>
   </refsect1>
 
-  <xi:include href="less-variables.xml" />
+  <xi:include href="common-variables.xml" />
 
   <refsect1>
     <title>Examples</title>
index 15e9a72373efeffa74c2ef030f38f97b8b100a93..896ad22256589b6583bf06d5a18f31f0486a0373 100644 (file)
@@ -256,7 +256,7 @@ AuthorizedKeysCommandUser root
     <para>On success, 0 is returned, a non-zero failure code otherwise.</para>
   </refsect1>
 
-  <xi:include href="less-variables.xml" />
+  <xi:include href="common-variables.xml" />
 
   <refsect1>
     <title>See Also</title>