/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: 2017-02-23 20:20:34 UTC
  • mfrom: (899 trunk)
  • mto: This revision was merged to the branch mainline in revision 900.
  • Revision ID: teddy@recompile.se-20170223202034-0820bcq0k7d1j9kf
Merge from trunk

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 "2013-10-23">
 
5
<!ENTITY TIMESTAMP "2017-02-23">
6
6
<!ENTITY % common SYSTEM "common.ent">
7
7
%common;
8
8
]>
37
37
      <year>2011</year>
38
38
      <year>2012</year>
39
39
      <year>2013</year>
 
40
      <year>2014</year>
 
41
      <year>2015</year>
 
42
      <year>2016</year>
 
43
      <year>2017</year>
40
44
      <holder>Teddy Hogeborn</holder>
41
45
      <holder>Björn Påhlsson</holder>
42
46
    </copyright>
106
110
      <replaceable>FD</replaceable></option></arg>
107
111
      <sbr/>
108
112
      <arg><option>--foreground</option></arg>
 
113
      <sbr/>
 
114
      <arg><option>--no-zeroconf</option></arg>
109
115
    </cmdsynopsis>
110
116
    <cmdsynopsis>
111
117
      <command>&COMMANDNAME;</command>
234
240
        <term><option>--priority <replaceable>
235
241
        PRIORITY</replaceable></option></term>
236
242
        <listitem>
237
 
          <xi:include href="mandos-options.xml"
238
 
                      xpointer="priority_compat"/>
 
243
          <xi:include href="mandos-options.xml" xpointer="priority"/>
239
244
        </listitem>
240
245
      </varlistentry>
241
246
      
323
328
        </listitem>
324
329
      </varlistentry>
325
330
      
 
331
      <varlistentry>
 
332
        <term><option>--no-zeroconf</option></term>
 
333
        <listitem>
 
334
          <xi:include href="mandos-options.xml" xpointer="zeroconf"/>
 
335
        </listitem>
 
336
      </varlistentry>
 
337
      
326
338
    </variablelist>
327
339
  </refsect1>
328
340
  
523
535
          <para>
524
536
            The file containing the process id of the
525
537
            <command>&COMMANDNAME;</command> process started last.
 
538
            <emphasis >Note:</emphasis> If the <filename
 
539
            class="directory">/run</filename> directory does not
 
540
            exist, <filename>/var/run/mandos.pid</filename> will be
 
541
            used instead.
526
542
          </para>
527
543
        </listitem>
528
544
      </varlistentry>
529
545
      <varlistentry>
530
 
        <term><filename class="devicefile">/dev/log</filename></term>
531
 
      </varlistentry>
532
 
      <varlistentry>
533
546
        <term><filename
534
547
        class="directory">/var/lib/mandos</filename></term>
535
548
        <listitem>
541
554
        </listitem>
542
555
      </varlistentry>
543
556
      <varlistentry>
544
 
        <term><filename>/dev/log</filename></term>
 
557
        <term><filename class="devicefile">/dev/log</filename></term>
545
558
        <listitem>
546
559
          <para>
547
560
            The Unix domain socket to where local syslog messages are
576
589
      This server does not check the expire time of clients’ OpenPGP
577
590
      keys.
578
591
    </para>
 
592
    <xi:include href="bugs.xml"/>
579
593
  </refsect1>
580
594
  
581
595
  <refsect1 id="example">
694
708
      </varlistentry>
695
709
      <varlistentry>
696
710
        <term>
697
 
          <ulink url="http://www.gnu.org/software/gnutls/"
698
 
          >GnuTLS</ulink>
 
711
          <ulink url="https://gnutls.org/">GnuTLS</ulink>
699
712
        </term>
700
713
      <listitem>
701
714
        <para>
739
752
      </varlistentry>
740
753
      <varlistentry>
741
754
        <term>
742
 
          RFC 4346: <citetitle>The Transport Layer Security (TLS)
743
 
          Protocol Version 1.1</citetitle>
 
755
          RFC 5246: <citetitle>The Transport Layer Security (TLS)
 
756
          Protocol Version 1.2</citetitle>
744
757
        </term>
745
758
      <listitem>
746
759
        <para>
747
 
          TLS 1.1 is the protocol implemented by GnuTLS.
 
760
          TLS 1.2 is the protocol implemented by GnuTLS.
748
761
        </para>
749
762
      </listitem>
750
763
      </varlistentry>
760
773
      </varlistentry>
761
774
      <varlistentry>
762
775
        <term>
763
 
          RFC 5081: <citetitle>Using OpenPGP Keys for Transport Layer
764
 
          Security</citetitle>
 
776
          RFC 6091: <citetitle>Using OpenPGP Keys for Transport Layer
 
777
          Security (TLS) Authentication</citetitle>
765
778
        </term>
766
779
      <listitem>
767
780
        <para>