fix for #693333, hard-coding of amandabackup as user in many scripts and docs

[debian/amanda] / man / xml-source / amcrypt.8.xml

diff --git a/man/xml-source/amcrypt.8.xml b/man/xml-source/amcrypt.8.xml
old mode 100755 (executable)
new mode 100644 (file)
index 8a12db1..83e2c1c
--- a/man/xml-source/amcrypt.8.xml
+++ b/man/xml-source/amcrypt.8.xml
@@ -3,7 +3,7 @@
                    "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"
 [
   <!-- entities files to use -->
-  <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
+  <!ENTITY % global_entities SYSTEM 'global.entities'>
   %global_entities;
 ]>
 
@@ -11,11 +11,17 @@
 <refmeta>
 <refentrytitle>amcrypt</refentrytitle>
 <manvolnum>8</manvolnum>
+&rmi.source;
+&rmi.version;
+&rmi.manual.8;
 </refmeta>
 <refnamediv>
 <refname>amcrypt</refname>
-<refpurpose>reference crypt program for &A; symmetric data encryption</refpurpose>
+<refpurpose>reference crypt program for Amanda symmetric data encryption</refpurpose>
 </refnamediv>
+<refentryinfo>
+&author.ktill;
+</refentryinfo>
 <!-- body begins here -->
 <refsynopsisdiv>
 <cmdsynopsis>
@@ -26,21 +32,22 @@
 
 <refsect1><title>DESCRIPTION</title>
 <para>&amcrypt; 
-requires <emphasis remap='B'>aespipe</emphasis> and <emphasis
+requires <emphasis remap='B'>aespipe</emphasis>, <emphasis
+remap='B'>uuencode</emphasis> and <emphasis
 remap='B'>gpg</emphasis>  to work. Aespipe is available from <ulink
 url="http://loop-aes.sourceforge.net"/></para>
 <para>&amcrypt; will search for the aespipe program in the following directories:
 /usr/bin:/usr/local/bin:/sbin:/usr/sbin.</para>
-&amcrypt; calls &amaespipe; and pass the
+<para>&amcrypt; calls &amaespipe; and pass the
 <emphasis remap='B'>passphrase</emphasis> through file descriptor 3.
-The passphrase should be stored in ~amanda/.am_passphrase.
+The passphrase should be stored in ~amanda/.am_passphrase.</para>
 </refsect1>
 
 <refsect1><title>How to create encryption keys for amcrypt</title>
-1. Create 65 random encryption keys and encrypt those keys using gpg. Reading
+<para>1. Create 65 random encryption keys and encrypt those keys using gpg. Reading
 from /dev/random may take indefinitely long if kernel's random entropy pool
 is empty. If that happens, do some other work on some other console (use
-keyboard, mouse and disks). 
+keyboard, mouse and disks).</para>
 <para> head -c 2925 /dev/random | uuencode -m - | head -n 66 | tail -n 65 \
         | gpg --symmetric -a > ~amanda/.gnupg/am_key.gpg
 </para>
@@ -59,18 +66,17 @@ chmod 700 ~amanda/.am_passphrase
 
 <refsect1><title>Key and Passphrase</title>
 <para>&amcrypt; uses the same key to encrypt and decrypt data.</para>
-It is very important to store and protect the key and the passphrase
+<para>It is very important to store and protect the key and the passphrase
 properly. Encrypted backup data can <emphasis remap='B'>only</emphasis> be recovered with the correct key and
-passphrase.
+passphrase.</para>
 </refsect1>
 
-<refsect1><title>SEE ALSO</title>
-<para><citerefentry><refentrytitle>amanda</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>amanda.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>aespipe</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>amaespipe</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>gpg</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-</para>
-</refsect1>
+<seealso>
+<manref name="amanda.conf" vol="5"/>,
+<manref name="aespipe" vol="1"/>,
+<manref name="amaespipe" vol="8"/>,
+<manref name="gpg" vol="1"/>
+</seealso>
+
 </refentry>