Merge commit 'backupninja-0.9.10' into debian

4 files changed, 6 insertions, 8 deletions

diff --git a/man/backup.d.5 b/man/backup.d.5
index fd5c9b2..df2063e 100644
--- a/man/backup.d.5
+++ b/man/backup.d.5
@@ -39,8 +39,6 @@ backup action for slow, incremental rsyncs of tens of thousands of maildirs.
 backup action for safe MySQL dumps.
 .IP .pgsql
 backup action for safe PostgreSQL dumps.
-.IP .ldap
-backup action for safe OpenLdap dumps.
 .IP .sys
 backup action for general system reports and hardware information.
 .IP .svn
@@ -56,7 +54,7 @@ These files must be owned by root and must not be world or group readable/writab
 The configuration files are processed in alphabetical order. However, it is suggested that you name the config files in "sysvinit style." 
 .TP
 For example:
- 10-local.ldap.disabled
+ 10-local.pgsql.disabled
  15-runthisfirst.sh
  20-runthisnext.mysql
  90-runthislast.rdiff
@@ -67,7 +65,7 @@ Example templates for the action configuration files can be found in /usr/share/
 
 .SH SCHEDULING
 
-By default, each configuration file is processed everyday at 01:00 (1 AM). This can be changed by specifying the 'when' option in a backup action's config file or in the global configuration file. Special value 'manual' will disable scheduling for the backup action. It is possible to run the backup action manually by invoking \fBninjahelper(1)\fP with --run command line argument.
+By default, each configuration file is processed everyday at 01:00 (1 AM). This can be changed by specifying the 'when' option in a backup action's config file or in the global configuration file. Special value 'manual' will disable scheduling for the backup action. It is possible to run the backup action manually by invoking \fBninjahelper(1)\fP with \-\-run command line argument.
 
 For example:
   when = sundays at 02:00
diff --git a/man/backupninja.1 b/man/backupninja.1
index 4363222..b1d2875 100644
--- a/man/backupninja.1
+++ b/man/backupninja.1
@@ -104,9 +104,9 @@ Then, vital parts of the file system, including /var/backups, are nightly pushed
 .TP
 In order for this to work (ie for diff-backup to run unattended), you must create ssh keys on the source server and copy the public key to the remote user's authorized keys file. For example:
 .br
-root@srchost# ssh-keygen -t rsa -b 4096
+root@srchost# ssh-keygen \-t rsa \-b 4096
 .br
-root@srchost# ssh-copy-id -i /root/.ssh/id_dsa.pub backup@desthost
+root@srchost# ssh-copy-id \-i /root/.ssh/id_dsa.pub backup@desthost
 .TP
 Now, you should be able to ssh from user 'root' on srchost to user 'backup' on desthost without specifying a password. When prompted for a password by ssh-keygen, just leave it blank by hitting return. The "wizard" \fBninjahelper(1)\fP will walk you through these steps.
 
diff --git a/man/backupninja.conf.5 b/man/backupninja.conf.5
index 7911fdf..50e0238 100644
--- a/man/backupninja.conf.5
+++ b/man/backupninja.conf.5
@@ -24,7 +24,7 @@ BACKUPNINJA.CONF \- Configuration file(s) for \fBbackupninja (1)\fP.
 .br
 .SH DESCRIPTION
 .B backupninja.conf
-is the general configuration file. In this file you can set the log level and change the default directory locations.  You can force a different general configuration file with "backupninja -f /path/to/conf".
+is the general configuration file. In this file you can set the log level and change the default directory locations.  You can force a different general configuration file with "backupninja \-f /path/to/conf".
 
 .SH OPTIONS
 
diff --git a/man/ninjahelper.1 b/man/ninjahelper.1
index 34b1ce4..0135f69 100644
--- a/man/ninjahelper.1
+++ b/man/ninjahelper.1
@@ -33,7 +33,7 @@ menu-driven interface.
 To add an additional 'wizard' to ninjahelper, follow these steps:
 .IP (1)
 create a file in the handlers directory (eg. /usr/share/backupninja) using
-the .helper extention. For example, if you wish to create a helper for the
+the .helper extension. For example, if you wish to create a helper for the
 handler "blue", create the file /usr/share/backupninja/blue.helper.
 .IP (2)
 next, add your helper to the global HELPERS variable and define the main