/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: 2013-10-24 20:38:44 UTC
  • mto: This revision was merged to the branch mainline in revision 635.
  • Revision ID: teddy@recompile.se-20131024203844-j0y0ir6vnlj9mkix
Tags: version-1.6.2-1
http://bugs.debian.org/702120
* Makefile (version): Changed to "1.6.2".
* NEWS (Version 1.6.2): New entry.
* debian/changelog (1.6.2-1): - '' -

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 "2015-07-20">
 
5
<!ENTITY TIMESTAMP "2013-10-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
40
      <holder>Teddy Hogeborn</holder>
43
41
      <holder>Björn Påhlsson</holder>
44
42
    </copyright>
108
106
      <replaceable>FD</replaceable></option></arg>
109
107
      <sbr/>
110
108
      <arg><option>--foreground</option></arg>
111
 
      <sbr/>
112
 
      <arg><option>--no-zeroconf</option></arg>
113
109
    </cmdsynopsis>
114
110
    <cmdsynopsis>
115
111
      <command>&COMMANDNAME;</command>
238
234
        <term><option>--priority <replaceable>
239
235
        PRIORITY</replaceable></option></term>
240
236
        <listitem>
241
 
          <xi:include href="mandos-options.xml" xpointer="priority"/>
 
237
          <xi:include href="mandos-options.xml"
 
238
                      xpointer="priority_compat"/>
242
239
        </listitem>
243
240
      </varlistentry>
244
241
      
326
323
        </listitem>
327
324
      </varlistentry>
328
325
      
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
 
      
336
326
    </variablelist>
337
327
  </refsect1>
338
328
  
533
523
          <para>
534
524
            The file containing the process id of the
535
525
            <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.
540
526
          </para>
541
527
        </listitem>
542
528
      </varlistentry>
708
694
      </varlistentry>
709
695
      <varlistentry>
710
696
        <term>
711
 
          <ulink url="http://gnutls.org/">GnuTLS</ulink>
 
697
          <ulink url="http://www.gnu.org/software/gnutls/"
 
698
          >GnuTLS</ulink>
712
699
        </term>
713
700
      <listitem>
714
701
        <para>
752
739
      </varlistentry>
753
740
      <varlistentry>
754
741
        <term>
755
 
          RFC 5246: <citetitle>The Transport Layer Security (TLS)
756
 
          Protocol Version 1.2</citetitle>
 
742
          RFC 4346: <citetitle>The Transport Layer Security (TLS)
 
743
          Protocol Version 1.1</citetitle>
757
744
        </term>
758
745
      <listitem>
759
746
        <para>
760
 
          TLS 1.2 is the protocol implemented by GnuTLS.
 
747
          TLS 1.1 is the protocol implemented by GnuTLS.
761
748
        </para>
762
749
      </listitem>
763
750
      </varlistentry>
773
760
      </varlistentry>
774
761
      <varlistentry>
775
762
        <term>
776
 
          RFC 6091: <citetitle>Using OpenPGP Keys for Transport Layer
777
 
          Security (TLS) Authentication</citetitle>
 
763
          RFC 5081: <citetitle>Using OpenPGP Keys for Transport Layer
 
764
          Security</citetitle>
778
765
        </term>
779
766
      <listitem>
780
767
        <para>