/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: 2014-03-28 22:32:21 UTC
  • Revision ID: teddy@recompile.se-20140328223221-w579qlvlex5if3dn
Fix location and format of signing key file.

* debian/upstream/signing-key.asc: Added.
* debian/upstream-signing-key.pgp: Removed.

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 "2018-02-08">
 
5
<!ENTITY TIMESTAMP "2013-10-26">
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
 
      <year>2016</year>
43
 
      <year>2017</year>
44
 
      <year>2018</year>
45
40
      <holder>Teddy Hogeborn</holder>
46
41
      <holder>Björn Påhlsson</holder>
47
42
    </copyright>
111
106
      <replaceable>FD</replaceable></option></arg>
112
107
      <sbr/>
113
108
      <arg><option>--foreground</option></arg>
114
 
      <sbr/>
115
 
      <arg><option>--no-zeroconf</option></arg>
116
109
    </cmdsynopsis>
117
110
    <cmdsynopsis>
118
111
      <command>&COMMANDNAME;</command>
241
234
        <term><option>--priority <replaceable>
242
235
        PRIORITY</replaceable></option></term>
243
236
        <listitem>
244
 
          <xi:include href="mandos-options.xml" xpointer="priority"/>
 
237
          <xi:include href="mandos-options.xml"
 
238
                      xpointer="priority_compat"/>
245
239
        </listitem>
246
240
      </varlistentry>
247
241
      
329
323
        </listitem>
330
324
      </varlistentry>
331
325
      
332
 
      <varlistentry>
333
 
        <term><option>--no-zeroconf</option></term>
334
 
        <listitem>
335
 
          <xi:include href="mandos-options.xml" xpointer="zeroconf"/>
336
 
        </listitem>
337
 
      </varlistentry>
338
 
      
339
326
    </variablelist>
340
327
  </refsect1>
341
328
  
544
531
        </listitem>
545
532
      </varlistentry>
546
533
      <varlistentry>
 
534
        <term><filename class="devicefile">/dev/log</filename></term>
 
535
      </varlistentry>
 
536
      <varlistentry>
547
537
        <term><filename
548
538
        class="directory">/var/lib/mandos</filename></term>
549
539
        <listitem>
555
545
        </listitem>
556
546
      </varlistentry>
557
547
      <varlistentry>
558
 
        <term><filename class="devicefile">/dev/log</filename></term>
 
548
        <term><filename>/dev/log</filename></term>
559
549
        <listitem>
560
550
          <para>
561
551
            The Unix domain socket to where local syslog messages are
590
580
      This server does not check the expire time of clients’ OpenPGP
591
581
      keys.
592
582
    </para>
593
 
    <xi:include href="bugs.xml"/>
594
583
  </refsect1>
595
584
  
596
585
  <refsect1 id="example">
709
698
      </varlistentry>
710
699
      <varlistentry>
711
700
        <term>
712
 
          <ulink url="https://gnutls.org/">GnuTLS</ulink>
 
701
          <ulink url="http://www.gnu.org/software/gnutls/"
 
702
          >GnuTLS</ulink>
713
703
        </term>
714
704
      <listitem>
715
705
        <para>
753
743
      </varlistentry>
754
744
      <varlistentry>
755
745
        <term>
756
 
          RFC 5246: <citetitle>The Transport Layer Security (TLS)
757
 
          Protocol Version 1.2</citetitle>
 
746
          RFC 4346: <citetitle>The Transport Layer Security (TLS)
 
747
          Protocol Version 1.1</citetitle>
758
748
        </term>
759
749
      <listitem>
760
750
        <para>
761
 
          TLS 1.2 is the protocol implemented by GnuTLS.
 
751
          TLS 1.1 is the protocol implemented by GnuTLS.
762
752
        </para>
763
753
      </listitem>
764
754
      </varlistentry>
774
764
      </varlistentry>
775
765
      <varlistentry>
776
766
        <term>
777
 
          RFC 6091: <citetitle>Using OpenPGP Keys for Transport Layer
778
 
          Security (TLS) Authentication</citetitle>
 
767
          RFC 5081: <citetitle>Using OpenPGP Keys for Transport Layer
 
768
          Security</citetitle>
779
769
        </term>
780
770
      <listitem>
781
771
        <para>