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

  • Committer: Teddy Hogeborn
  • Date: 2014-05-13 06:49:43 UTC
  • mfrom: (314 release)
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 315.
  • Revision ID: teddy@recompile.se-20140513064943-ah584pkbiql7l7nh
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 "2017-02-23">
 
5
<!ENTITY TIMESTAMP "2013-10-26">
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>
44
40
      <holder>Teddy Hogeborn</holder>
45
41
      <holder>Björn Påhlsson</holder>
46
42
    </copyright>
110
106
      <replaceable>FD</replaceable></option></arg>
111
107
      <sbr/>
112
108
      <arg><option>--foreground</option></arg>
113
 
      <sbr/>
114
 
      <arg><option>--no-zeroconf</option></arg>
115
109
    </cmdsynopsis>
116
110
    <cmdsynopsis>
117
111
      <command>&COMMANDNAME;</command>
240
234
        <term><option>--priority <replaceable>
241
235
        PRIORITY</replaceable></option></term>
242
236
        <listitem>
243
 
          <xi:include href="mandos-options.xml" xpointer="priority"/>
 
237
          <xi:include href="mandos-options.xml"
 
238
                      xpointer="priority_compat"/>
244
239
        </listitem>
245
240
      </varlistentry>
246
241
      
328
323
        </listitem>
329
324
      </varlistentry>
330
325
      
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
 
      
338
326
    </variablelist>
339
327
  </refsect1>
340
328
  
543
531
        </listitem>
544
532
      </varlistentry>
545
533
      <varlistentry>
 
534
        <term><filename class="devicefile">/dev/log</filename></term>
 
535
      </varlistentry>
 
536
      <varlistentry>
546
537
        <term><filename
547
538
        class="directory">/var/lib/mandos</filename></term>
548
539
        <listitem>
554
545
        </listitem>
555
546
      </varlistentry>
556
547
      <varlistentry>
557
 
        <term><filename class="devicefile">/dev/log</filename></term>
 
548
        <term><filename>/dev/log</filename></term>
558
549
        <listitem>
559
550
          <para>
560
551
            The Unix domain socket to where local syslog messages are
589
580
      This server does not check the expire time of clients’ OpenPGP
590
581
      keys.
591
582
    </para>
592
 
    <xi:include href="bugs.xml"/>
593
583
  </refsect1>
594
584
  
595
585
  <refsect1 id="example">
708
698
      </varlistentry>
709
699
      <varlistentry>
710
700
        <term>
711
 
          <ulink url="https://gnutls.org/">GnuTLS</ulink>
 
701
          <ulink url="http://www.gnu.org/software/gnutls/"
 
702
          >GnuTLS</ulink>
712
703
        </term>
713
704
      <listitem>
714
705
        <para>
752
743
      </varlistentry>
753
744
      <varlistentry>
754
745
        <term>
755
 
          RFC 5246: <citetitle>The Transport Layer Security (TLS)
756
 
          Protocol Version 1.2</citetitle>
 
746
          RFC 4346: <citetitle>The Transport Layer Security (TLS)
 
747
          Protocol Version 1.1</citetitle>
757
748
        </term>
758
749
      <listitem>
759
750
        <para>
760
 
          TLS 1.2 is the protocol implemented by GnuTLS.
 
751
          TLS 1.1 is the protocol implemented by GnuTLS.
761
752
        </para>
762
753
      </listitem>
763
754
      </varlistentry>
773
764
      </varlistentry>
774
765
      <varlistentry>
775
766
        <term>
776
 
          RFC 6091: <citetitle>Using OpenPGP Keys for Transport Layer
777
 
          Security (TLS) Authentication</citetitle>
 
767
          RFC 5081: <citetitle>Using OpenPGP Keys for Transport Layer
 
768
          Security</citetitle>
778
769
        </term>
779
770
      <listitem>
780
771
        <para>