/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-12-06">
 
5
<!ENTITY TIMESTAMP "2013-10-20">
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>
326
322
        </listitem>
327
323
      </varlistentry>
328
324
      
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
325
    </variablelist>
337
326
  </refsect1>
338
327
  
533
522
          <para>
534
523
            The file containing the process id of the
535
524
            <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
525
          </para>
541
526
        </listitem>
542
527
      </varlistentry>
543
528
      <varlistentry>
 
529
        <term><filename class="devicefile">/dev/log</filename></term>
 
530
      </varlistentry>
 
531
      <varlistentry>
544
532
        <term><filename
545
533
        class="directory">/var/lib/mandos</filename></term>
546
534
        <listitem>
552
540
        </listitem>
553
541
      </varlistentry>
554
542
      <varlistentry>
555
 
        <term><filename class="devicefile">/dev/log</filename></term>
 
543
        <term><filename>/dev/log</filename></term>
556
544
        <listitem>
557
545
          <para>
558
546
            The Unix domain socket to where local syslog messages are
705
693
      </varlistentry>
706
694
      <varlistentry>
707
695
        <term>
708
 
          <ulink url="http://gnutls.org/">GnuTLS</ulink>
 
696
          <ulink url="http://www.gnu.org/software/gnutls/"
 
697
          >GnuTLS</ulink>
709
698
        </term>
710
699
      <listitem>
711
700
        <para>
749
738
      </varlistentry>
750
739
      <varlistentry>
751
740
        <term>
752
 
          RFC 5246: <citetitle>The Transport Layer Security (TLS)
753
 
          Protocol Version 1.2</citetitle>
 
741
          RFC 4346: <citetitle>The Transport Layer Security (TLS)
 
742
          Protocol Version 1.1</citetitle>
754
743
        </term>
755
744
      <listitem>
756
745
        <para>
757
 
          TLS 1.2 is the protocol implemented by GnuTLS.
 
746
          TLS 1.1 is the protocol implemented by GnuTLS.
758
747
        </para>
759
748
      </listitem>
760
749
      </varlistentry>
770
759
      </varlistentry>
771
760
      <varlistentry>
772
761
        <term>
773
 
          RFC 6091: <citetitle>Using OpenPGP Keys for Transport Layer
774
 
          Security (TLS) Authentication</citetitle>
 
762
          RFC 5081: <citetitle>Using OpenPGP Keys for Transport Layer
 
763
          Security</citetitle>
775
764
        </term>
776
765
      <listitem>
777
766
        <para>