/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 mandos.xml

  • Committer: Teddy Hogeborn
  • Date: 2016-02-29 22:51:57 UTC
  • mfrom: (237.4.65 release)
  • Revision ID: teddy@recompile.se-20160229225157-if6c17o8ziwncvro
Merge from release branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos.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 "mandos">
5
 
<!ENTITY TIMESTAMP "2012-06-17">
 
5
<!ENTITY TIMESTAMP "2016-02-28">
6
6
<!ENTITY % common SYSTEM "common.ent">
7
7
%common;
8
8
]>
36
36
      <year>2010</year>
37
37
      <year>2011</year>
38
38
      <year>2012</year>
 
39
      <year>2013</year>
 
40
      <year>2014</year>
 
41
      <year>2015</year>
 
42
      <year>2016</year>
39
43
      <holder>Teddy Hogeborn</holder>
40
44
      <holder>Björn Påhlsson</holder>
41
45
    </copyright>
105
109
      <replaceable>FD</replaceable></option></arg>
106
110
      <sbr/>
107
111
      <arg><option>--foreground</option></arg>
 
112
      <sbr/>
 
113
      <arg><option>--no-zeroconf</option></arg>
108
114
    </cmdsynopsis>
109
115
    <cmdsynopsis>
110
116
      <command>&COMMANDNAME;</command>
321
327
        </listitem>
322
328
      </varlistentry>
323
329
      
 
330
      <varlistentry>
 
331
        <term><option>--no-zeroconf</option></term>
 
332
        <listitem>
 
333
          <xi:include href="mandos-options.xml" xpointer="zeroconf"/>
 
334
        </listitem>
 
335
      </varlistentry>
 
336
      
324
337
    </variablelist>
325
338
  </refsect1>
326
339
  
516
529
        </listitem>
517
530
      </varlistentry>
518
531
      <varlistentry>
519
 
        <term><filename>/var/run/mandos.pid</filename></term>
 
532
        <term><filename>/run/mandos.pid</filename></term>
520
533
        <listitem>
521
534
          <para>
522
535
            The file containing the process id of the
523
536
            <command>&COMMANDNAME;</command> process started last.
 
537
            <emphasis >Note:</emphasis> If the <filename
 
538
            class="directory">/run</filename> directory does not
 
539
            exist, <filename>/var/run/mandos.pid</filename> will be
 
540
            used instead.
524
541
          </para>
525
542
        </listitem>
526
543
      </varlistentry>
527
544
      <varlistentry>
528
 
        <term><filename class="devicefile">/dev/log</filename></term>
529
 
      </varlistentry>
530
 
      <varlistentry>
531
545
        <term><filename
532
546
        class="directory">/var/lib/mandos</filename></term>
533
547
        <listitem>
539
553
        </listitem>
540
554
      </varlistentry>
541
555
      <varlistentry>
542
 
        <term><filename>/dev/log</filename></term>
 
556
        <term><filename class="devicefile">/dev/log</filename></term>
543
557
        <listitem>
544
558
          <para>
545
559
            The Unix domain socket to where local syslog messages are
692
706
      </varlistentry>
693
707
      <varlistentry>
694
708
        <term>
695
 
          <ulink url="http://www.gnu.org/software/gnutls/"
696
 
          >GnuTLS</ulink>
 
709
          <ulink url="http://gnutls.org/">GnuTLS</ulink>
697
710
        </term>
698
711
      <listitem>
699
712
        <para>
737
750
      </varlistentry>
738
751
      <varlistentry>
739
752
        <term>
740
 
          RFC 4346: <citetitle>The Transport Layer Security (TLS)
741
 
          Protocol Version 1.1</citetitle>
 
753
          RFC 5246: <citetitle>The Transport Layer Security (TLS)
 
754
          Protocol Version 1.2</citetitle>
742
755
        </term>
743
756
      <listitem>
744
757
        <para>
745
 
          TLS 1.1 is the protocol implemented by GnuTLS.
 
758
          TLS 1.2 is the protocol implemented by GnuTLS.
746
759
        </para>
747
760
      </listitem>
748
761
      </varlistentry>
758
771
      </varlistentry>
759
772
      <varlistentry>
760
773
        <term>
761
 
          RFC 5081: <citetitle>Using OpenPGP Keys for Transport Layer
762
 
          Security</citetitle>
 
774
          RFC 6091: <citetitle>Using OpenPGP Keys for Transport Layer
 
775
          Security (TLS) Authentication</citetitle>
763
776
        </term>
764
777
      <listitem>
765
778
        <para>