/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: 2015-12-05 01:29:53 UTC
  • mto: This revision was merged to the branch mainline in revision 794.
  • Revision ID: teddy@recompile.se-20151205012953-oi5hosp5yqhrmudh
Tags: version-1.7.1-2
http://bugs.debian.org/804967
http://bugs.debian.org/806073
* debian/changelog (1.7.1-2): New entry.

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-20">
 
5
<!ENTITY TIMESTAMP "2015-07-20">
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>
40
42
      <holder>Teddy Hogeborn</holder>
41
43
      <holder>Björn Påhlsson</holder>
42
44
    </copyright>
106
108
      <replaceable>FD</replaceable></option></arg>
107
109
      <sbr/>
108
110
      <arg><option>--foreground</option></arg>
 
111
      <sbr/>
 
112
      <arg><option>--no-zeroconf</option></arg>
109
113
    </cmdsynopsis>
110
114
    <cmdsynopsis>
111
115
      <command>&COMMANDNAME;</command>
322
326
        </listitem>
323
327
      </varlistentry>
324
328
      
 
329
      <varlistentry>
 
330
        <term><option>--no-zeroconf</option></term>
 
331
        <listitem>
 
332
          <xi:include href="mandos-options.xml" xpointer="zeroconf"/>
 
333
        </listitem>
 
334
      </varlistentry>
 
335
      
325
336
    </variablelist>
326
337
  </refsect1>
327
338
  
522
533
          <para>
523
534
            The file containing the process id of the
524
535
            <command>&COMMANDNAME;</command> process started last.
 
536
            <emphasis >Note:</emphasis> If the <filename
 
537
            class="directory">/run</filename> directory does not
 
538
            exist, <filename>/var/run/mandos.pid</filename> will be
 
539
            used instead.
525
540
          </para>
526
541
        </listitem>
527
542
      </varlistentry>
693
708
      </varlistentry>
694
709
      <varlistentry>
695
710
        <term>
696
 
          <ulink url="http://www.gnu.org/software/gnutls/"
697
 
          >GnuTLS</ulink>
 
711
          <ulink url="http://gnutls.org/">GnuTLS</ulink>
698
712
        </term>
699
713
      <listitem>
700
714
        <para>
738
752
      </varlistentry>
739
753
      <varlistentry>
740
754
        <term>
741
 
          RFC 4346: <citetitle>The Transport Layer Security (TLS)
742
 
          Protocol Version 1.1</citetitle>
 
755
          RFC 5246: <citetitle>The Transport Layer Security (TLS)
 
756
          Protocol Version 1.2</citetitle>
743
757
        </term>
744
758
      <listitem>
745
759
        <para>
746
 
          TLS 1.1 is the protocol implemented by GnuTLS.
 
760
          TLS 1.2 is the protocol implemented by GnuTLS.
747
761
        </para>
748
762
      </listitem>
749
763
      </varlistentry>
759
773
      </varlistentry>
760
774
      <varlistentry>
761
775
        <term>
762
 
          RFC 5081: <citetitle>Using OpenPGP Keys for Transport Layer
763
 
          Security</citetitle>
 
776
          RFC 6091: <citetitle>Using OpenPGP Keys for Transport Layer
 
777
          Security (TLS) Authentication</citetitle>
764
778
        </term>
765
779
      <listitem>
766
780
        <para>