/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: 2014-01-21 21:04:25 UTC
  • mto: This revision was merged to the branch mainline in revision 653.
  • Revision ID: teddy@recompile.se-20140121210425-j1bgxxghrb751jej
Tags: version-1.6.3-1
* Makefile (version): Changed to "1.3.2".
* NEWS (Version 1.6.3): New entry.
* debian/changelog (1.6.3-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-26">
6
6
<!ENTITY % common SYSTEM "common.ent">
7
7
%common;
8
8
]>
106
106
      <replaceable>FD</replaceable></option></arg>
107
107
      <sbr/>
108
108
      <arg><option>--foreground</option></arg>
109
 
      <sbr/>
110
 
      <arg><option>--no-zeroconf</option></arg>
111
109
    </cmdsynopsis>
112
110
    <cmdsynopsis>
113
111
      <command>&COMMANDNAME;</command>
236
234
        <term><option>--priority <replaceable>
237
235
        PRIORITY</replaceable></option></term>
238
236
        <listitem>
239
 
          <xi:include href="mandos-options.xml" xpointer="priority"/>
 
237
          <xi:include href="mandos-options.xml"
 
238
                      xpointer="priority_compat"/>
240
239
        </listitem>
241
240
      </varlistentry>
242
241
      
324
323
        </listitem>
325
324
      </varlistentry>
326
325
      
327
 
      <varlistentry>
328
 
        <term><option>--no-zeroconf</option></term>
329
 
        <listitem>
330
 
          <xi:include href="mandos-options.xml" xpointer="zeroconf"/>
331
 
        </listitem>
332
 
      </varlistentry>
333
 
      
334
326
    </variablelist>
335
327
  </refsect1>
336
328
  
706
698
      </varlistentry>
707
699
      <varlistentry>
708
700
        <term>
709
 
          <ulink url="http://gnutls.org/">GnuTLS</ulink>
 
701
          <ulink url="http://www.gnu.org/software/gnutls/"
 
702
          >GnuTLS</ulink>
710
703
        </term>
711
704
      <listitem>
712
705
        <para>
750
743
      </varlistentry>
751
744
      <varlistentry>
752
745
        <term>
753
 
          RFC 5246: <citetitle>The Transport Layer Security (TLS)
754
 
          Protocol Version 1.2</citetitle>
 
746
          RFC 4346: <citetitle>The Transport Layer Security (TLS)
 
747
          Protocol Version 1.1</citetitle>
755
748
        </term>
756
749
      <listitem>
757
750
        <para>
758
 
          TLS 1.2 is the protocol implemented by GnuTLS.
 
751
          TLS 1.1 is the protocol implemented by GnuTLS.
759
752
        </para>
760
753
      </listitem>
761
754
      </varlistentry>
771
764
      </varlistentry>
772
765
      <varlistentry>
773
766
        <term>
774
 
          RFC 6091: <citetitle>Using OpenPGP Keys for Transport Layer
775
 
          Security (TLS) Authentication</citetitle>
 
767
          RFC 5081: <citetitle>Using OpenPGP Keys for Transport Layer
 
768
          Security</citetitle>
776
769
        </term>
777
770
      <listitem>
778
771
        <para>