/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-keygen.xml

adding missing words

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-keygen.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-keygen">
5
 
<!ENTITY TIMESTAMP "2016-03-05">
 
5
<!ENTITY TIMESTAMP "2012-01-01">
6
6
<!ENTITY % common SYSTEM "common.ent">
7
7
%common;
8
8
]>
33
33
    <copyright>
34
34
      <year>2008</year>
35
35
      <year>2009</year>
36
 
      <year>2010</year>
37
36
      <year>2011</year>
38
37
      <year>2012</year>
39
 
      <year>2013</year>
40
 
      <year>2014</year>
41
 
      <year>2015</year>
42
 
      <year>2016</year>
43
38
      <holder>Teddy Hogeborn</holder>
44
39
      <holder>Björn Påhlsson</holder>
45
40
    </copyright>
124
119
        <replaceable>TIME</replaceable></option></arg>
125
120
      </group>
126
121
      <sbr/>
127
 
      <group>
128
 
        <arg choice="plain"><option>--force</option></arg>
129
 
        <arg choice="plain"><option>-f</option></arg>
130
 
      </group>
 
122
      <arg><option>--force</option></arg>
131
123
    </cmdsynopsis>
132
124
    <cmdsynopsis>
133
125
      <command>&COMMANDNAME;</command>
153
145
        <arg choice="plain"><option>-n
154
146
        <replaceable>NAME</replaceable></option></arg>
155
147
      </group>
156
 
      <group>
157
 
        <arg choice="plain"><option>--no-ssh</option></arg>
158
 
        <arg choice="plain"><option>-S</option></arg>
159
 
      </group>
160
148
    </cmdsynopsis>
161
149
    <cmdsynopsis>
162
150
      <command>&COMMANDNAME;</command>
239
227
        <replaceable>TYPE</replaceable></option></term>
240
228
        <listitem>
241
229
          <para>
242
 
            Key type.  Default is <quote>RSA</quote>.
 
230
            Key type.  Default is <quote>DSA</quote>.
243
231
          </para>
244
232
        </listitem>
245
233
      </varlistentry>
251
239
        <replaceable>BITS</replaceable></option></term>
252
240
        <listitem>
253
241
          <para>
254
 
            Key length in bits.  Default is 4096.
 
242
            Key length in bits.  Default is 2048.
255
243
          </para>
256
244
        </listitem>
257
245
      </varlistentry>
263
251
        <replaceable>KEYTYPE</replaceable></option></term>
264
252
        <listitem>
265
253
          <para>
266
 
            Subkey type.  Default is <quote>RSA</quote> (Elgamal
 
254
            Subkey type.  Default is <quote>ELG-E</quote> (Elgamal
267
255
            encryption-only).
268
256
          </para>
269
257
        </listitem>
276
264
        <replaceable>BITS</replaceable></option></term>
277
265
        <listitem>
278
266
          <para>
279
 
            Subkey length in bits.  Default is 4096.
 
267
            Subkey length in bits.  Default is 2048.
280
268
          </para>
281
269
        </listitem>
282
270
      </varlistentry>
300
288
        <replaceable>TEXT</replaceable></option></term>
301
289
        <listitem>
302
290
          <para>
303
 
            Comment field for key.  Default is empty.
 
291
            Comment field for key.  The default value is
 
292
            <quote><literal>Mandos client key</literal></quote>.
304
293
          </para>
305
294
        </listitem>
306
295
      </varlistentry>
358
347
          </para>
359
348
        </listitem>
360
349
      </varlistentry>
361
 
      <varlistentry>
362
 
        <term><option>--no-ssh</option></term>
363
 
        <term><option>-S</option></term>
364
 
        <listitem>
365
 
          <para>
366
 
            When <option>--password</option> or
367
 
            <option>--passfile</option> is given, this option will
368
 
            prevent <command>&COMMANDNAME;</command> from calling
369
 
            <command>ssh-keyscan</command> to get an SSH fingerprint
370
 
            for this host and, if successful, output suitable config
371
 
            options to use this fingerprint as a
372
 
            <option>checker</option> option in the output.  This is
373
 
            otherwise the default behavior.
374
 
          </para>
375
 
        </listitem>
376
 
      </varlistentry>
377
350
    </variablelist>
378
351
  </refsect1>
379
352
  
450
423
    </variablelist>
451
424
  </refsect1>
452
425
  
453
 
  <refsect1 id="bugs">
454
 
    <title>BUGS</title>
455
 
    <xi:include href="bugs.xml"/>
456
 
  </refsect1>
 
426
<!--   <refsect1 id="bugs"> -->
 
427
<!--     <title>BUGS</title> -->
 
428
<!--     <para> -->
 
429
<!--     </para> -->
 
430
<!--   </refsect1> -->
457
431
  
458
432
  <refsect1 id="example">
459
433
    <title>EXAMPLE</title>
529
503
      <citerefentry><refentrytitle>mandos</refentrytitle>
530
504
      <manvolnum>8</manvolnum></citerefentry>,
531
505
      <citerefentry><refentrytitle>mandos-client</refentrytitle>
532
 
      <manvolnum>8mandos</manvolnum></citerefentry>,
533
 
      <citerefentry><refentrytitle>ssh-keyscan</refentrytitle>
534
 
      <manvolnum>1</manvolnum></citerefentry>
 
506
      <manvolnum>8mandos</manvolnum></citerefentry>
535
507
    </para>
536
508
  </refsect1>
537
509