From cf2fc5ff7b4a8555fda2a5ebe5f6ab0e45c22996 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <schubi@suse.de>
Date: Tue, 25 Oct 2022 16:29:41 +0200
Subject: doc: Update PAM documentation from DockBook 4 to DocBook 5

Changed files
--------------

Make.xml.rules.in:
- Using RNG file instead of DTD file for checking XML files.
- Taking the correct stylesheet for README files.

doc/sag/Makefile.am, doc/adg/Makefile.am, doc/mwg/Makefile.am:
- Using RNG file instead of DTD file for checking XML files.

configure.ac:
- Adding a new option for selecting RNG check file (-enable-docbook-rng)
- Switching stylesheets to docbook 5
- Checking DocBook 5 environment instead of DocBook 4 environment

*.xml:
Update from DockBook 4 to DocBook 5
---
 modules/pam_issue/README.xml      | 32 ++++++--------------
 modules/pam_issue/pam_issue.8.xml | 63 +++++++++++++++++++--------------------
 2 files changed, 39 insertions(+), 56 deletions(-)

(limited to 'modules/pam_issue')

diff --git a/modules/pam_issue/README.xml b/modules/pam_issue/README.xml
index b5b61c3a..36742c77 100644
--- a/modules/pam_issue/README.xml
+++ b/modules/pam_issue/README.xml
@@ -1,41 +1,27 @@
-<?xml version="1.0" encoding='UTF-8'?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.docbook.org/xml/4.3/docbookx.dtd"
-[
-<!--
-<!ENTITY pamaccess SYSTEM "pam_issue.8.xml">
--->
-]>
+<article xmlns="http://docbook.org/ns/docbook" version="5.0">
 
-<article>
-
-  <articleinfo>
+  <info>
 
     <title>
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="pam_issue.8.xml" xpointer='xpointer(//refnamediv[@id = "pam_issue-name"]/*)'/>
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pam_issue.8.xml" xpointer='xpointer(id("pam_issue-name")/*)'/>
     </title>
 
-  </articleinfo>
+  </info>
 
   <section>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="pam_issue.8.xml" xpointer='xpointer(//refsect1[@id = "pam_issue-description"]/*)'/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pam_issue.8.xml" xpointer='xpointer(id("pam_issue-description")/*)'/>
   </section>
 
   <section>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="pam_issue.8.xml" xpointer='xpointer(//refsect1[@id = "pam_issue-options"]/*)'/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pam_issue.8.xml" xpointer='xpointer(id("pam_issue-options")/*)'/>
   </section>
 
   <section>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="pam_issue.8.xml" xpointer='xpointer(//refsect1[@id = "pam_issue-examples"]/*)'/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pam_issue.8.xml" xpointer='xpointer(id("pam_issue-examples")/*)'/>
   </section>
 
   <section>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="pam_issue.8.xml" xpointer='xpointer(//refsect1[@id = "pam_issue-author"]/*)'/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pam_issue.8.xml" xpointer='xpointer(id("pam_issue-author")/*)'/>
   </section>
 
-</article>
+</article>
\ No newline at end of file
diff --git a/modules/pam_issue/pam_issue.8.xml b/modules/pam_issue/pam_issue.8.xml
index fb9b7377..20d32451 100644
--- a/modules/pam_issue/pam_issue.8.xml
+++ b/modules/pam_issue/pam_issue.8.xml
@@ -1,110 +1,107 @@
-<?xml version="1.0" encoding='UTF-8'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-	"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
-
-<refentry id="pam_issue">
+<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="pam_issue">
 
   <refmeta>
     <refentrytitle>pam_issue</refentrytitle>
     <manvolnum>8</manvolnum>
-    <refmiscinfo class="sectdesc">Linux-PAM Manual</refmiscinfo>
+    <refmiscinfo class="source">Linux-PAM</refmiscinfo>
+    <refmiscinfo class="manual">Linux-PAM Manual</refmiscinfo>
   </refmeta>
 
-  <refnamediv id="pam_issue-name">
+  <refnamediv xml:id="pam_issue-name">
     <refname>pam_issue</refname>
     <refpurpose>PAM module to add issue file to user prompt</refpurpose>
   </refnamediv>
 
   <refsynopsisdiv>
-    <cmdsynopsis id="pam_issue-cmdsynopsis">
+    <cmdsynopsis xml:id="pam_issue-cmdsynopsis" sepchar=" ">
       <command>pam_issue.so</command>
-      <arg choice="opt">
+      <arg choice="opt" rep="norepeat">
         noesc
       </arg>
-      <arg choice="opt">
+      <arg choice="opt" rep="norepeat">
         issue=<replaceable>issue-file-name</replaceable>
       </arg>
     </cmdsynopsis>
   </refsynopsisdiv>
 
-  <refsect1 id="pam_issue-description">
+  <refsect1 xml:id="pam_issue-description">
 
     <title>DESCRIPTION</title>
 
     <para>
       pam_issue is a PAM module to prepend an issue file to the username
       prompt. It also by default parses escape codes in the issue file
-      similar to some common getty's (using &bsol;x format).
+      similar to some common getty's (using \x format).
     </para>
     <para>
       Recognized escapes:
     </para>
     <variablelist>
       <varlistentry>
-        <term><emphasis remap='B'>&bsol;d</emphasis></term>
+        <term>\d</term>
         <listitem>
           <para>current day</para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><emphasis remap='B'>&bsol;l</emphasis></term>
+        <term>\l</term>
         <listitem>
           <para>name of this tty</para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><emphasis remap='B'>&bsol;m</emphasis></term>
+        <term>\m</term>
         <listitem>
           <para>machine architecture (uname -m)</para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><emphasis remap='B'>&bsol;n</emphasis></term>
+        <term>\n</term>
         <listitem>
           <para>machine's network node hostname (uname -n)</para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><emphasis remap='B'>&bsol;o</emphasis></term>
+        <term>\o</term>
         <listitem>
           <para>domain name of this system</para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><emphasis remap='B'>&bsol;r</emphasis></term>
+        <term>\r</term>
         <listitem>
           <para>release number of operating system (uname -r)</para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><emphasis remap='B'>&bsol;t</emphasis></term>
+        <term>\t</term>
         <listitem>
           <para>current time</para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><emphasis remap='B'>&bsol;s</emphasis></term>
+        <term>\s</term>
         <listitem>
           <para>operating system name (uname -s)</para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><emphasis remap='B'>&bsol;u</emphasis></term>
+        <term>\u</term>
         <listitem>
           <para>number of users currently logged in</para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><emphasis remap='B'>&bsol;U</emphasis></term>
+        <term>\U</term>
         <listitem>
           <para>
-            same as &bsol;u except it is suffixed with "user" or
+            same as \u except it is suffixed with "user" or
             "users" (eg. "1 user" or "10 users")
           </para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><emphasis remap='B'>&bsol;v</emphasis></term>
+        <term>\v</term>
         <listitem>
           <para>operating system version and build date (uname -v)</para>
         </listitem>
@@ -113,7 +110,7 @@
 
   </refsect1>
 
-  <refsect1 id="pam_issue-options">
+  <refsect1 xml:id="pam_issue-options">
 
     <title>OPTIONS</title>
     <para>
@@ -121,7 +118,7 @@
 
         <varlistentry>
           <term>
-            <option>noesc</option>
+            noesc
           </term>
           <listitem>
             <para>
@@ -132,7 +129,7 @@
 
         <varlistentry>
           <term>
-            <option>issue=<replaceable>issue-file-name</replaceable></option>
+            issue=issue-file-name
           </term>
           <listitem>
             <para>
@@ -146,14 +143,14 @@
     </para>
   </refsect1>
 
-  <refsect1 id="pam_issue-types">
+  <refsect1 xml:id="pam_issue-types">
     <title>MODULE TYPES PROVIDED</title>
     <para>
       Only the <option>auth</option> module type is provided.
     </para>
   </refsect1>
 
-  <refsect1 id='pam_issue-return_values'>
+  <refsect1 xml:id="pam_issue-return_values">
     <title>RETURN VALUES</title>
     <para>
       <variablelist>
@@ -198,7 +195,7 @@
     </para>
   </refsect1>
 
-  <refsect1 id='pam_issue-examples'>
+  <refsect1 xml:id="pam_issue-examples">
     <title>EXAMPLES</title>
     <para>
       Add the following line to <filename>/etc/pam.d/login</filename> to
@@ -209,7 +206,7 @@
     </para>
   </refsect1>
 
-  <refsect1 id='pam_issue-see_also'>
+  <refsect1 xml:id="pam_issue-see_also">
     <title>SEE ALSO</title>
     <para>
       <citerefentry>
@@ -224,11 +221,11 @@
     </para>
   </refsect1>
 
-  <refsect1 id='pam_issue-author'>
+  <refsect1 xml:id="pam_issue-author">
     <title>AUTHOR</title>
       <para>
         pam_issue was written by Ben Collins &lt;bcollins@debian.org&gt;.
       </para>
   </refsect1>
 
-</refentry>
+</refentry>
\ No newline at end of file
-- 
cgit v1.2.3