/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-07-13 20:37:44 UTC
  • mfrom: (710 trunk)
  • mto: This revision was merged to the branch mainline in revision 711.
  • Revision ID: teddy@recompile.se-20140713203744-538hqhk81vw9dixv
Merge from trunk.

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 "2014-06-15">
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>
238
236
        <term><option>--priority <replaceable>
239
237
        PRIORITY</replaceable></option></term>
240
238
        <listitem>
241
 
          <xi:include href="mandos-options.xml" xpointer="priority"/>
 
239
          <xi:include href="mandos-options.xml"
 
240
                      xpointer="priority_compat"/>
242
241
        </listitem>
243
242
      </varlistentry>
244
243
      
708
707
      </varlistentry>
709
708
      <varlistentry>
710
709
        <term>
711
 
          <ulink url="http://gnutls.org/">GnuTLS</ulink>
 
710
          <ulink url="http://www.gnu.org/software/gnutls/"
 
711
          >GnuTLS</ulink>
712
712
        </term>
713
713
      <listitem>
714
714
        <para>
752
752
      </varlistentry>
753
753
      <varlistentry>
754
754
        <term>
755
 
          RFC 5246: <citetitle>The Transport Layer Security (TLS)
756
 
          Protocol Version 1.2</citetitle>
 
755
          RFC 4346: <citetitle>The Transport Layer Security (TLS)
 
756
          Protocol Version 1.1</citetitle>
757
757
        </term>
758
758
      <listitem>
759
759
        <para>
760
 
          TLS 1.2 is the protocol implemented by GnuTLS.
 
760
          TLS 1.1 is the protocol implemented by GnuTLS.
761
761
        </para>
762
762
      </listitem>
763
763
      </varlistentry>
773
773
      </varlistentry>
774
774
      <varlistentry>
775
775
        <term>
776
 
          RFC 6091: <citetitle>Using OpenPGP Keys for Transport Layer
777
 
          Security (TLS) Authentication</citetitle>
 
776
          RFC 5081: <citetitle>Using OpenPGP Keys for Transport Layer
 
777
          Security</citetitle>
778
778
        </term>
779
779
      <listitem>
780
780
        <para>