man/: ENV_HZ is only used without PAM

Contrary to the comment in ENV_HZ.xml, ENV_HZ is not even used in
sulogin (anymore) if PAM support is enabled.

Skip paragraphs of sulogin if PAM support is enabled, since they would
be empty now.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>

diff --git a/man/login.1.xml b/man/login.1.xml
index fbfbbf18dccae76cb0fb10d2056dddb25e744941..0826b1f01f0da546ea6f64bed46847a1b9065c72 100644 (file)
--- a/man/login.1.xml
+++ b/man/login.1.xml
@@ -277,7 +277,7 @@
       &CONSOLE;
       &CONSOLE_GROUPS;
       &DEFAULT_HOME;
-      <phrase condition="no_pam">&ENV_HZ;</phrase>
+      &ENV_HZ;
       <phrase>&ENV_PATH;</phrase>
       <phrase>&ENV_SUPATH;</phrase>
       &ENV_TZ;

diff --git a/man/login.defs.5.xml b/man/login.defs.5.xml
index ab62fa865fb2ef219b0ac710111d0ec697d97989..dc64cfc2e40f921aded4abc78858c80e1eed3e77 100644 (file)
--- a/man/login.defs.5.xml
+++ b/man/login.defs.5.xml
@@ -449,12 +449,12 @@
          </para>
        </listitem>
       </varlistentry>
-      <varlistentry>
+      <varlistentry condition="no_pam">
        <term>sulogin</term>
        <listitem>
          <para>
            ENV_HZ
-           <phrase condition="no_pam">ENV_TZ</phrase>
+           ENV_TZ
          </para>
        </listitem>
       </varlistentry>

diff --git a/man/login.defs.d/ENV_HZ.xml b/man/login.defs.d/ENV_HZ.xml
index daf1752fcc6e46e122530fea2a2c0e3196d44545..e1298cb21ba1397d394d9bc8149fd81d9eeb80c5 100644 (file)
--- a/man/login.defs.d/ENV_HZ.xml
+++ b/man/login.defs.d/ENV_HZ.xml
@@ -4,8 +4,7 @@
    SPDX-FileCopyrightText: 2007 - 2008, Nicolas François
    SPDX-License-Identifier: BSD-3-Clause
 -->
-<varlistentry>
-  <!-- XXX: When compiled with PAM support, only sulogin uses ENV_HZ -->
+<varlistentry condition="no_pam">
   <term><option>ENV_HZ</option> (string)</term>
   <listitem>
     <para>
@@ -14,10 +13,6 @@
       <replaceable>HZ=</replaceable>. A common value on Linux is
       <replaceable>HZ=100</replaceable>.
     </para>
-    <para condition="pam">
-      The <envar>HZ</envar> environment variable is only set when the user
-      (the superuser) logs in with <command>sulogin</command>.
-    </para>
     <!-- TODO: it can in fact be used to set any other variable-->
   </listitem>
 </varlistentry>

diff --git a/man/su.1.xml b/man/su.1.xml
index 02cae5aefee23141846afe4ccfadc619430cb2b2..5c5001453e0897de079aa8657f619f6763d2a6db 100644 (file)
--- a/man/su.1.xml
+++ b/man/su.1.xml
@@ -321,7 +321,7 @@
       &CONSOLE;
       &CONSOLE_GROUPS;
       &DEFAULT_HOME;
-      <phrase condition="no_pam">&ENV_HZ;</phrase>
+      &ENV_HZ;
       &ENVIRON_FILE;
       &ENV_PATH;
       &ENV_SUPATH;

diff --git a/man/sulogin.8.xml b/man/sulogin.8.xml
index da4a7e2b17da8a3a620322fa5541a6e5378ca5bd..5fb60a9615ddcd76b7ce73aae6acac7623723a05 100644 (file)
--- a/man/sulogin.8.xml
+++ b/man/sulogin.8.xml
@@ -106,7 +106,7 @@
     </para>
   </refsect1>
 
-  <refsect1 id='configuration'>
+  <refsect1 condition="no_pam" id='configuration'>
     <title>CONFIGURATION</title>
     <para>
       The following configuration variables in