/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to plugins.d/splashy.xml

  • Committer: Teddy Hogeborn
  • Date: 2019-07-29 16:35:53 UTC
  • Revision ID: teddy@recompile.se-20190729163553-1i442i2cbx64c537
Make tests and man page examples match

Make the tests test_manual_page_example[1-5] match exactly what is
written in the manual page, and add comments to manual page as
reminders to keep tests and manual page examples in sync.

* mandos-ctl (Test_commands_from_options.test_manual_page_example_1):
  Remove "--verbose" option, since the manual does not have it as the
  first example, and change assertion to match.
* mandos-ctl.xml (EXAMPLE): Add comments to all examples documenting
  which test function they correspond to.  Also remove unnecessary
  quotes from option arguments in fourth example, and clarify language
  slightly in fifth example.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/splashy.xml
2
2
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
3
3
        "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
4
4
<!ENTITY COMMANDNAME "splashy">
5
 
<!ENTITY TIMESTAMP "2015-07-20">
 
5
<!ENTITY TIMESTAMP "2019-02-10">
6
6
<!ENTITY % common SYSTEM "../common.ent">
7
7
%common;
8
8
]>
39
39
      <year>2013</year>
40
40
      <year>2014</year>
41
41
      <year>2015</year>
 
42
      <year>2016</year>
 
43
      <year>2017</year>
 
44
      <year>2018</year>
 
45
      <year>2019</year>
42
46
      <holder>Teddy Hogeborn</holder>
43
47
      <holder>Björn Påhlsson</holder>
44
48
    </copyright>
131
135
        <para>
132
136
          These variables will normally be inherited from
133
137
          <citerefentry><refentrytitle>plugin-runner</refentrytitle>
134
 
          <manvolnum>8mandos</manvolnum></citerefentry>, which will
135
 
          normally have inherited them from
136
 
          <filename>/scripts/local-top/cryptroot</filename> in the
137
 
          initial <acronym>RAM</acronym> disk environment, which will
138
 
          have set them from parsing kernel arguments and
139
 
          <filename>/conf/conf.d/cryptroot</filename> (also in the
140
 
          initial RAM disk environment), which in turn will have been
141
 
          created when the initial RAM disk image was created by
142
 
          <filename
143
 
          >/usr/share/initramfs-tools/hooks/cryptroot</filename>, by
144
 
          extracting the information of the root file system from
145
 
          <filename >/etc/crypttab</filename>.
 
138
          <manvolnum>8mandos</manvolnum></citerefentry>, which might
 
139
          have in turn inherited them from its calling process.
146
140
        </para>
147
141
        <para>
148
142
          This behavior is meant to exactly mirror the behavior of
208
202
      is ugly, but necessary as long as it does not support aborting a
209
203
      password request.
210
204
    </para>
 
205
    <xi:include href="../bugs.xml"/>
211
206
  </refsect1>
212
207
  
213
208
  <refsect1 id="example">
271
266
    <para>
272
267
      <citerefentry><refentrytitle>intro</refentrytitle>
273
268
      <manvolnum>8mandos</manvolnum></citerefentry>,
274
 
      <citerefentry><refentrytitle>crypttab</refentrytitle>
275
 
      <manvolnum>5</manvolnum></citerefentry>,
276
269
      <citerefentry><refentrytitle>plugin-runner</refentrytitle>
277
270
      <manvolnum>8mandos</manvolnum></citerefentry>,
278
271
      <citerefentry><refentrytitle>proc</refentrytitle>