diff options
author | Stefan Schubert <schubi@suse.de> | 2022-10-25 16:29:41 +0200 |
---|---|---|
committer | Thorsten Kukuk <5908016+thkukuk@users.noreply.github.com> | 2022-12-16 10:31:37 +0100 |
commit | cf2fc5ff7b4a8555fda2a5ebe5f6ab0e45c22996 (patch) | |
tree | 28c25df584fc32ba8f02af48c249c987be91e9ac /modules/pam_time | |
parent | 6135c45347b6173e305fda66eef138bde693b795 (diff) | |
download | pam-cf2fc5ff7b4a8555fda2a5ebe5f6ab0e45c22996.tar.gz pam-cf2fc5ff7b4a8555fda2a5ebe5f6ab0e45c22996.tar.bz2 pam-cf2fc5ff7b4a8555fda2a5ebe5f6ab0e45c22996.zip |
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
Diffstat (limited to 'modules/pam_time')
-rw-r--r-- | modules/pam_time/README.xml | 29 | ||||
-rw-r--r-- | modules/pam_time/pam_time.8.xml | 45 | ||||
-rw-r--r-- | modules/pam_time/time.conf.5.xml | 23 |
3 files changed, 38 insertions, 59 deletions
diff --git a/modules/pam_time/README.xml b/modules/pam_time/README.xml index 6c11eec1..8a2faa0b 100644 --- a/modules/pam_time/README.xml +++ b/modules/pam_time/README.xml @@ -1,34 +1,19 @@ -<?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 pamtime SYSTEM "pam_time.8.xml"> ---> -<!-- -<!ENTITY timeconf SYSTEM "time.conf.5.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_time.8.xml" xpointer='xpointer(//refnamediv[@id = "pam_time-name"]/*)'/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pam_time.8.xml" xpointer='xpointer(id("pam_time-name")/*)'/> </title> - </articleinfo> + </info> <section> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" - href="pam_time.8.xml" xpointer='xpointer(//refsect1[@id = "pam_time-description"]/*)'/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pam_time.8.xml" xpointer='xpointer(id("pam_time-description")/*)'/> </section> <section> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" - href="time.conf.5.xml" xpointer='xpointer(//refsect1[@id = "time.conf-examples"]/*)'/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="time.conf.5.xml" xpointer='xpointer(id("time.conf-examples")/*)'/> </section> -</article> +</article>
\ No newline at end of file diff --git a/modules/pam_time/pam_time.8.xml b/modules/pam_time/pam_time.8.xml index a33744ea..1fa60a10 100644 --- a/modules/pam_time/pam_time.8.xml +++ b/modules/pam_time/pam_time.8.xml @@ -1,16 +1,13 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" - "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> - -<refentry id='pam_time'> +<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="pam_time"> <refmeta> <refentrytitle>pam_time</refentrytitle> <manvolnum>8</manvolnum> - <refmiscinfo class='setdesc'>Linux-PAM Manual</refmiscinfo> + <refmiscinfo class="source">Linux-PAM</refmiscinfo> + <refmiscinfo class="manual">Linux-PAM Manual</refmiscinfo> </refmeta> - <refnamediv id='pam_time-name'> + <refnamediv xml:id="pam_time-name"> <refname>pam_time</refname> <refpurpose> PAM module for time control access @@ -20,22 +17,22 @@ <!-- body begins here --> <refsynopsisdiv> - <cmdsynopsis id="pam_time-cmdsynopsis"> + <cmdsynopsis xml:id="pam_time-cmdsynopsis" sepchar=" "> <command>pam_time.so</command> - <arg choice="opt"> + <arg choice="opt" rep="norepeat"> conffile=conf-file </arg> - <arg choice="opt"> + <arg choice="opt" rep="norepeat"> debug </arg> - <arg choice="opt"> + <arg choice="opt" rep="norepeat"> noaudit </arg> </cmdsynopsis> </refsynopsisdiv> - <refsect1 id="pam_time-description"> + <refsect1 xml:id="pam_time-description"> <title>DESCRIPTION</title> <para> The pam_time PAM module does not authenticate the user, but instead @@ -62,13 +59,13 @@ </para> </refsect1> - <refsect1 id="pam_time-options"> + <refsect1 xml:id="pam_time-options"> <title>OPTIONS</title> <variablelist> <varlistentry> <term> - <option>conffile=/path/to/time.conf</option> + conffile=/path/to/time.conf </term> <listitem> <para> @@ -79,7 +76,7 @@ <varlistentry> <term> - <option>debug</option> + debug </term> <listitem> <para> @@ -91,7 +88,7 @@ <varlistentry> <term> - <option>noaudit</option> + noaudit </term> <listitem> <para> @@ -103,14 +100,14 @@ </variablelist> </refsect1> - <refsect1 id="pam_time-types"> + <refsect1 xml:id="pam_time-types"> <title>MODULE TYPES PROVIDED</title> <para> Only the <option>account</option> type is provided. </para> </refsect1> - <refsect1 id="pam_time-return_values"> + <refsect1 xml:id="pam_time-return_values"> <title>RETURN VALUES</title> <variablelist> <varlistentry> @@ -156,11 +153,11 @@ </variablelist> </refsect1> - <refsect1 id="pam_time-files"> + <refsect1 xml:id="pam_time-files"> <title>FILES</title> <variablelist> <varlistentry> - <term><filename>/etc/security/time.conf</filename></term> + <term>/etc/security/time.conf</term> <listitem> <para>Default configuration file</para> </listitem> @@ -168,7 +165,7 @@ </variablelist> </refsect1> - <refsect1 id='pam_time-examples'> + <refsect1 xml:id="pam_time-examples"> <title>EXAMPLES</title> <programlisting> #%PAM-1.0 @@ -179,7 +176,7 @@ login account required pam_time.so </programlisting> </refsect1> - <refsect1 id="pam_time-see_also"> + <refsect1 xml:id="pam_time-see_also"> <title>SEE ALSO</title> <para> <citerefentry> @@ -194,10 +191,10 @@ login account required pam_time.so </para> </refsect1> - <refsect1 id="pam_time-authors"> + <refsect1 xml:id="pam_time-authors"> <title>AUTHOR</title> <para> pam_time was written by Andrew G. Morgan <morgan@kernel.org>. </para> </refsect1> -</refentry> +</refentry>
\ No newline at end of file diff --git a/modules/pam_time/time.conf.5.xml b/modules/pam_time/time.conf.5.xml index acbe2329..3fe263d5 100644 --- a/modules/pam_time/time.conf.5.xml +++ b/modules/pam_time/time.conf.5.xml @@ -1,13 +1,10 @@ -<?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="time.conf"> +<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="time.conf"> <refmeta> <refentrytitle>time.conf</refentrytitle> <manvolnum>5</manvolnum> - <refmiscinfo class="sectdesc">Linux-PAM Manual</refmiscinfo> + <refmiscinfo class="source">Linux-PAM</refmiscinfo> + <refmiscinfo class="manual">Linux-PAM Manual</refmiscinfo> </refmeta> <refnamediv> @@ -15,7 +12,7 @@ <refpurpose>configuration file for the pam_time module</refpurpose> </refnamediv> - <refsect1 id='time.conf-description'> + <refsect1 xml:id="time.conf-description"> <title>DESCRIPTION</title> <para> @@ -43,9 +40,9 @@ </para> <para> In words, each rule occupies a line, terminated with a newline - or the beginning of a comment; a '<emphasis remap='B'>#</emphasis>'. + or the beginning of a comment; a '<emphasis remap="B">#</emphasis>'. It contains four fields separated with semicolons, - '<emphasis remap='B'>;</emphasis>'. + '<emphasis remap="B">;</emphasis>'. </para> <para> @@ -107,7 +104,7 @@ </para> </refsect1> - <refsect1 id="time.conf-examples"> + <refsect1 xml:id="time.conf-examples"> <title>EXAMPLES</title> <para> These are some example lines which might be specified in @@ -131,7 +128,7 @@ games ; * ; !waster ; Wd0000-2400 | Wk1800-0800 </para> </refsect1> - <refsect1 id="time.conf-see_also"> + <refsect1 xml:id="time.conf-see_also"> <title>SEE ALSO</title> <para> <citerefentry><refentrytitle>pam_time</refentrytitle><manvolnum>8</manvolnum></citerefentry>, @@ -140,10 +137,10 @@ games ; * ; !waster ; Wd0000-2400 | Wk1800-0800 </para> </refsect1> - <refsect1 id="time.conf-author"> + <refsect1 xml:id="time.conf-author"> <title>AUTHOR</title> <para> pam_time was written by Andrew G. Morgan <morgan@kernel.org>. </para> </refsect1> -</refentry> +</refentry>
\ No newline at end of file |