/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-20 19:13:09 UTC
  • Revision ID: teddy@recompile.se-20131020191309-7tyca3oo0zqxn45s
* mandos-keygen: Bug fix: Specify key usage to avoid creating keys
                 with key usage flags which GnuTLS does not like.
                 Also fix --help output documentation about default
                 subkey type.

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-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>
324
322
        </listitem>
325
323
      </varlistentry>
326
324
      
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
325
    </variablelist>
335
326
  </refsect1>
336
327
  
531
522
          <para>
532
523
            The file containing the process id of the
533
524
            <command>&COMMANDNAME;</command> process started last.
534
 
            <emphasis >Note:</emphasis> If the <filename
535
 
            class="directory">/run</filename> directory does not
536
 
            exist, <filename>/var/run/mandos.pid</filename> will be
537
 
            used instead.
538
525
          </para>
539
526
        </listitem>
540
527
      </varlistentry>
706
693
      </varlistentry>
707
694
      <varlistentry>
708
695
        <term>
709
 
          <ulink url="http://gnutls.org/">GnuTLS</ulink>
 
696
          <ulink url="http://www.gnu.org/software/gnutls/"
 
697
          >GnuTLS</ulink>
710
698
        </term>
711
699
      <listitem>
712
700
        <para>
750
738
      </varlistentry>
751
739
      <varlistentry>
752
740
        <term>
753
 
          RFC 5246: <citetitle>The Transport Layer Security (TLS)
754
 
          Protocol Version 1.2</citetitle>
 
741
          RFC 4346: <citetitle>The Transport Layer Security (TLS)
 
742
          Protocol Version 1.1</citetitle>
755
743
        </term>
756
744
      <listitem>
757
745
        <para>
758
 
          TLS 1.2 is the protocol implemented by GnuTLS.
 
746
          TLS 1.1 is the protocol implemented by GnuTLS.
759
747
        </para>
760
748
      </listitem>
761
749
      </varlistentry>
771
759
      </varlistentry>
772
760
      <varlistentry>
773
761
        <term>
774
 
          RFC 6091: <citetitle>Using OpenPGP Keys for Transport Layer
775
 
          Security (TLS) Authentication</citetitle>
 
762
          RFC 5081: <citetitle>Using OpenPGP Keys for Transport Layer
 
763
          Security</citetitle>
776
764
        </term>
777
765
      <listitem>
778
766
        <para>