/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-13 19:12:58 UTC
  • mfrom: (237.4.35 release)
  • Revision ID: teddy@recompile.se-20131013191258-2a4lmsq5eqbw0sy1
Merge from release branch.

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 "2012-06-17">
6
6
<!ENTITY % common SYSTEM "common.ent">
7
7
%common;
8
8
]>
36
36
      <year>2010</year>
37
37
      <year>2011</year>
38
38
      <year>2012</year>
39
 
      <year>2013</year>
40
39
      <holder>Teddy Hogeborn</holder>
41
40
      <holder>Björn Påhlsson</holder>
42
41
    </copyright>
106
105
      <replaceable>FD</replaceable></option></arg>
107
106
      <sbr/>
108
107
      <arg><option>--foreground</option></arg>
109
 
      <sbr/>
110
 
      <arg><option>--no-zeroconf</option></arg>
111
108
    </cmdsynopsis>
112
109
    <cmdsynopsis>
113
110
      <command>&COMMANDNAME;</command>
324
321
        </listitem>
325
322
      </varlistentry>
326
323
      
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
324
    </variablelist>
335
325
  </refsect1>
336
326
  
526
516
        </listitem>
527
517
      </varlistentry>
528
518
      <varlistentry>
529
 
        <term><filename>/run/mandos.pid</filename></term>
 
519
        <term><filename>/var/run/mandos.pid</filename></term>
530
520
        <listitem>
531
521
          <para>
532
522
            The file containing the process id of the
533
523
            <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
524
          </para>
539
525
        </listitem>
540
526
      </varlistentry>
706
692
      </varlistentry>
707
693
      <varlistentry>
708
694
        <term>
709
 
          <ulink url="http://gnutls.org/">GnuTLS</ulink>
 
695
          <ulink url="http://www.gnu.org/software/gnutls/"
 
696
          >GnuTLS</ulink>
710
697
        </term>
711
698
      <listitem>
712
699
        <para>
750
737
      </varlistentry>
751
738
      <varlistentry>
752
739
        <term>
753
 
          RFC 5246: <citetitle>The Transport Layer Security (TLS)
754
 
          Protocol Version 1.2</citetitle>
 
740
          RFC 4346: <citetitle>The Transport Layer Security (TLS)
 
741
          Protocol Version 1.1</citetitle>
755
742
        </term>
756
743
      <listitem>
757
744
        <para>
758
 
          TLS 1.2 is the protocol implemented by GnuTLS.
 
745
          TLS 1.1 is the protocol implemented by GnuTLS.
759
746
        </para>
760
747
      </listitem>
761
748
      </varlistentry>
771
758
      </varlistentry>
772
759
      <varlistentry>
773
760
        <term>
774
 
          RFC 6091: <citetitle>Using OpenPGP Keys for Transport Layer
775
 
          Security (TLS) Authentication</citetitle>
 
761
          RFC 5081: <citetitle>Using OpenPGP Keys for Transport Layer
 
762
          Security</citetitle>
776
763
        </term>
777
764
      <listitem>
778
765
        <para>