/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos.xml

  • Committer: Teddy Hogeborn
  • Date: 2012-06-17 22:58:07 UTC
  • mfrom: (302 release)
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 303.
  • Revision ID: teddy@recompile.se-20120617225807-6o4z294a5fxfvlyf
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
 
      <year>2014</year>
41
 
      <year>2015</year>
42
39
      <holder>Teddy Hogeborn</holder>
43
40
      <holder>Björn Påhlsson</holder>
44
41
    </copyright>
108
105
      <replaceable>FD</replaceable></option></arg>
109
106
      <sbr/>
110
107
      <arg><option>--foreground</option></arg>
111
 
      <sbr/>
112
 
      <arg><option>--no-zeroconf</option></arg>
113
108
    </cmdsynopsis>
114
109
    <cmdsynopsis>
115
110
      <command>&COMMANDNAME;</command>
326
321
        </listitem>
327
322
      </varlistentry>
328
323
      
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
324
    </variablelist>
337
325
  </refsect1>
338
326
  
528
516
        </listitem>
529
517
      </varlistentry>
530
518
      <varlistentry>
531
 
        <term><filename>/run/mandos.pid</filename></term>
 
519
        <term><filename>/var/run/mandos.pid</filename></term>
532
520
        <listitem>
533
521
          <para>
534
522
            The file containing the process id of the
535
523
            <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
524
          </para>
541
525
        </listitem>
542
526
      </varlistentry>
708
692
      </varlistentry>
709
693
      <varlistentry>
710
694
        <term>
711
 
          <ulink url="http://gnutls.org/">GnuTLS</ulink>
 
695
          <ulink url="http://www.gnu.org/software/gnutls/"
 
696
          >GnuTLS</ulink>
712
697
        </term>
713
698
      <listitem>
714
699
        <para>
752
737
      </varlistentry>
753
738
      <varlistentry>
754
739
        <term>
755
 
          RFC 5246: <citetitle>The Transport Layer Security (TLS)
756
 
          Protocol Version 1.2</citetitle>
 
740
          RFC 4346: <citetitle>The Transport Layer Security (TLS)
 
741
          Protocol Version 1.1</citetitle>
757
742
        </term>
758
743
      <listitem>
759
744
        <para>
760
 
          TLS 1.2 is the protocol implemented by GnuTLS.
 
745
          TLS 1.1 is the protocol implemented by GnuTLS.
761
746
        </para>
762
747
      </listitem>
763
748
      </varlistentry>
773
758
      </varlistentry>
774
759
      <varlistentry>
775
760
        <term>
776
 
          RFC 6091: <citetitle>Using OpenPGP Keys for Transport Layer
777
 
          Security (TLS) Authentication</citetitle>
 
761
          RFC 5081: <citetitle>Using OpenPGP Keys for Transport Layer
 
762
          Security</citetitle>
778
763
        </term>
779
764
      <listitem>
780
765
        <para>