/mandos/release

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

« 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
  • mto: This revision was merged to the branch mainline in revision 384.
  • 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:
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 "2017-02-23">
 
5
<!ENTITY TIMESTAMP "2019-02-10">
6
6
<!ENTITY % common SYSTEM "../common.ent">
7
7
%common;
8
8
]>
41
41
      <year>2015</year>
42
42
      <year>2016</year>
43
43
      <year>2017</year>
 
44
      <year>2018</year>
 
45
      <year>2019</year>
44
46
      <holder>Teddy Hogeborn</holder>
45
47
      <holder>Björn Påhlsson</holder>
46
48
    </copyright>
133
135
        <para>
134
136
          These variables will normally be inherited from
135
137
          <citerefentry><refentrytitle>plugin-runner</refentrytitle>
136
 
          <manvolnum>8mandos</manvolnum></citerefentry>, which will
137
 
          normally have inherited them from
138
 
          <filename>/scripts/local-top/cryptroot</filename> in the
139
 
          initial <acronym>RAM</acronym> disk environment, which will
140
 
          have set them from parsing kernel arguments and
141
 
          <filename>/conf/conf.d/cryptroot</filename> (also in the
142
 
          initial RAM disk environment), which in turn will have been
143
 
          created when the initial RAM disk image was created by
144
 
          <filename
145
 
          >/usr/share/initramfs-tools/hooks/cryptroot</filename>, by
146
 
          extracting the information of the root file system from
147
 
          <filename >/etc/crypttab</filename>.
 
138
          <manvolnum>8mandos</manvolnum></citerefentry>, which might
 
139
          have in turn inherited them from its calling process.
148
140
        </para>
149
141
        <para>
150
142
          This behavior is meant to exactly mirror the behavior of
274
266
    <para>
275
267
      <citerefentry><refentrytitle>intro</refentrytitle>
276
268
      <manvolnum>8mandos</manvolnum></citerefentry>,
277
 
      <citerefentry><refentrytitle>crypttab</refentrytitle>
278
 
      <manvolnum>5</manvolnum></citerefentry>,
279
269
      <citerefentry><refentrytitle>plugin-runner</refentrytitle>
280
270
      <manvolnum>8mandos</manvolnum></citerefentry>,
281
271
      <citerefentry><refentrytitle>proc</refentrytitle>