/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: 2016-02-28 16:18:14 UTC
  • mfrom: (332 release)
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 333.
  • Revision ID: teddy@recompile.se-20160228161814-tu6d4uw6oruqc5eo
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 "2013-10-26">
 
5
<!ENTITY TIMESTAMP "2016-02-28">
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>
40
43
      <holder>Teddy Hogeborn</holder>
41
44
      <holder>Björn Påhlsson</holder>
42
45
    </copyright>
106
109
      <replaceable>FD</replaceable></option></arg>
107
110
      <sbr/>
108
111
      <arg><option>--foreground</option></arg>
 
112
      <sbr/>
 
113
      <arg><option>--no-zeroconf</option></arg>
109
114
    </cmdsynopsis>
110
115
    <cmdsynopsis>
111
116
      <command>&COMMANDNAME;</command>
234
239
        <term><option>--priority <replaceable>
235
240
        PRIORITY</replaceable></option></term>
236
241
        <listitem>
237
 
          <xi:include href="mandos-options.xml"
238
 
                      xpointer="priority_compat"/>
 
242
          <xi:include href="mandos-options.xml" xpointer="priority"/>
239
243
        </listitem>
240
244
      </varlistentry>
241
245
      
323
327
        </listitem>
324
328
      </varlistentry>
325
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
      
326
337
    </variablelist>
327
338
  </refsect1>
328
339
  
531
542
        </listitem>
532
543
      </varlistentry>
533
544
      <varlistentry>
534
 
        <term><filename class="devicefile">/dev/log</filename></term>
535
 
      </varlistentry>
536
 
      <varlistentry>
537
545
        <term><filename
538
546
        class="directory">/var/lib/mandos</filename></term>
539
547
        <listitem>
545
553
        </listitem>
546
554
      </varlistentry>
547
555
      <varlistentry>
548
 
        <term><filename>/dev/log</filename></term>
 
556
        <term><filename class="devicefile">/dev/log</filename></term>
549
557
        <listitem>
550
558
          <para>
551
559
            The Unix domain socket to where local syslog messages are
698
706
      </varlistentry>
699
707
      <varlistentry>
700
708
        <term>
701
 
          <ulink url="http://www.gnu.org/software/gnutls/"
702
 
          >GnuTLS</ulink>
 
709
          <ulink url="http://gnutls.org/">GnuTLS</ulink>
703
710
        </term>
704
711
      <listitem>
705
712
        <para>
743
750
      </varlistentry>
744
751
      <varlistentry>
745
752
        <term>
746
 
          RFC 4346: <citetitle>The Transport Layer Security (TLS)
747
 
          Protocol Version 1.1</citetitle>
 
753
          RFC 5246: <citetitle>The Transport Layer Security (TLS)
 
754
          Protocol Version 1.2</citetitle>
748
755
        </term>
749
756
      <listitem>
750
757
        <para>
751
 
          TLS 1.1 is the protocol implemented by GnuTLS.
 
758
          TLS 1.2 is the protocol implemented by GnuTLS.
752
759
        </para>
753
760
      </listitem>
754
761
      </varlistentry>
764
771
      </varlistentry>
765
772
      <varlistentry>
766
773
        <term>
767
 
          RFC 5081: <citetitle>Using OpenPGP Keys for Transport Layer
768
 
          Security</citetitle>
 
774
          RFC 6091: <citetitle>Using OpenPGP Keys for Transport Layer
 
775
          Security (TLS) Authentication</citetitle>
769
776
        </term>
770
777
      <listitem>
771
778
        <para>