/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: 2017-08-20 14:08:59 UTC
  • Revision ID: teddy@recompile.se-20170820140859-6niaa0ebf6bdovfn
Use || instead of -o in shell scripts.

* mandos-keygen: Use || instead of -o.
* network-hooks.d/bridge: - '' -

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