/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-22 19:24:01 UTC
  • Revision ID: teddy@recompile.se-20131022192401-op6mwsb7f7gygjyh
http://bugs.debian.org/702120
* mandos (priority): Bug fix: Add even more magic to make the old
                     DSA/ELG 2048-bit keys work with GnuTLS.
* mandos-keygen (KEYCOMMENT): Changed default to "".
* mandos-keygen (OPTIONS): Document new default value of "--comment".
* mandos-options.xml (priority): Document new default value.
* mandos.conf (priority): - '' -

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-01-25">
 
5
<!ENTITY TIMESTAMP "2013-10-20">
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"
240
 
                      xpointer="priority_compat"/>
 
237
          <xi:include href="mandos-options.xml" xpointer="priority"/>
241
238
        </listitem>
242
239
      </varlistentry>
243
240
      
325
322
        </listitem>
326
323
      </varlistentry>
327
324
      
328
 
      <varlistentry>
329
 
        <term><option>--no-zeroconf</option></term>
330
 
        <listitem>
331
 
          <xi:include href="mandos-options.xml" xpointer="zeroconf"/>
332
 
        </listitem>
333
 
      </varlistentry>
334
 
      
335
325
    </variablelist>
336
326
  </refsect1>
337
327
  
532
522
          <para>
533
523
            The file containing the process id of the
534
524
            <command>&COMMANDNAME;</command> process started last.
535
 
            <emphasis >Note:</emphasis> If the <filename
536
 
            class="directory">/run</filename> directory does not
537
 
            exist, <filename>/var/run/mandos.pid</filename> will be
538
 
            used instead.
539
525
          </para>
540
526
        </listitem>
541
527
      </varlistentry>
707
693
      </varlistentry>
708
694
      <varlistentry>
709
695
        <term>
710
 
          <ulink url="http://gnutls.org/">GnuTLS</ulink>
 
696
          <ulink url="http://www.gnu.org/software/gnutls/"
 
697
          >GnuTLS</ulink>
711
698
        </term>
712
699
      <listitem>
713
700
        <para>
751
738
      </varlistentry>
752
739
      <varlistentry>
753
740
        <term>
754
 
          RFC 5246: <citetitle>The Transport Layer Security (TLS)
755
 
          Protocol Version 1.2</citetitle>
 
741
          RFC 4346: <citetitle>The Transport Layer Security (TLS)
 
742
          Protocol Version 1.1</citetitle>
756
743
        </term>
757
744
      <listitem>
758
745
        <para>
759
 
          TLS 1.2 is the protocol implemented by GnuTLS.
 
746
          TLS 1.1 is the protocol implemented by GnuTLS.
760
747
        </para>
761
748
      </listitem>
762
749
      </varlistentry>
772
759
      </varlistentry>
773
760
      <varlistentry>
774
761
        <term>
775
 
          RFC 6091: <citetitle>Using OpenPGP Keys for Transport Layer
776
 
          Security (TLS) Authentication</citetitle>
 
762
          RFC 5081: <citetitle>Using OpenPGP Keys for Transport Layer
 
763
          Security</citetitle>
777
764
        </term>
778
765
      <listitem>
779
766
        <para>