tags 436793 + patch
thanks
The attached patch should fix this issue.
Cheers,
FJP
diff --git a/doc/BackupPC.html b/doc/BackupPC.html
index ca0dd67..fd8a0fc 100644
--- a/doc/BackupPC.html
+++ b/doc/BackupPC.html
@@ -785,7 +785,7 @@ located in the following locations:</p>
<pre>
__CONFDIR__/config.pl main config file
__CONFDIR__/hosts hosts file
- __CONFDIR__/pc/HOST.pl per-pc config file
+ __CONFDIR__/HOST.pl per-pc config file
__LOGDIR__/BackupPC log files, pid, status</pre>
</dd>
<dd>
@@ -1007,7 +1007,7 @@ here you must make sure this file is not world (other) readable.</p>
</li>
<li>
<p>As a configuration variable <a href="#item__conf_smbsharepasswd_">$Conf{SmbSharePasswd}</A> in the per-PC
-configuration file (__CONFDIR__/pc/$host.pl or
+configuration file (__CONFDIR__/$host.pl or
__TOPDIR__/pc/$host/config.pl in non-FHS versions of BackupPC).
You will have to use this option if the smb share password is different
for each host. If you put the password here you must make sure this file
@@ -2239,9 +2239,9 @@ below for more details.</p>
<dt><strong><a name="item_pc">pc</a></strong>
<dd>
-<p>The directory __CONFDIR__/pc contains per-client configuration files
+<p>The directory __CONFDIR__ contains per-client configuration files
that override settings in the main configuration file. Each file
-is named __CONFDIR__/pc/HOST.pl, where HOST is the host name.</p>
+is named __CONFDIR__/HOST.pl, where HOST is the host name.</p>
</dd>
<dd>
<p>In pre-FHS versions of BackupPC these files were located in
@@ -2474,7 +2474,7 @@ to the backup or restore number.)</p>
<p>Old location of optional configuration settings specific to this host.
Settings in this file override the main configuration file.
In new versions of BackupPC the per-host configuration files are
-stored in __CONFDIR__/pc/HOST.pl.</p>
+stored in __CONFDIR__/HOST.pl.</p>
</dd>
</li>
<dt><strong><a name="item_backups">backups</a></strong>
@@ -2933,7 +2933,7 @@ discussion of some of various security issues.</p>
<hr />
<h1><a name="configuration_file">Configuration File</a></h1>
<p>The BackupPC configuration file resides in __CONFDIR__/config.pl.
-Optional per-PC configuration files reside in __CONFDIR__/pc/$host.pl
+Optional per-PC configuration files reside in __CONFDIR__/$host.pl
(or __TOPDIR__/pc/$host/config.pl in non-FHS versions of BackupPC).
This file can be used to override settings just for a particular PC.</p>
<p>
@@ -2965,7 +2965,7 @@ wakeup period.</p>
LOG file, so you can tail it (or view it via the CGI interface) to make
sure your kill -HUP worked. Errors in parsing the configuration file are
also reported in the LOG file.</p>
-<p>The optional per-PC configuration file (__CONFDIR__/pc/$host.pl or
+<p>The optional per-PC configuration file (__CONFDIR__/$host.pl or
__TOPDIR__/pc/$host/config.pl in non-FHS versions of BackupPC)
is read whenever it is needed by BackupPC_dump, BackupPC_link and others.</p>
<p>
diff --git a/doc/BackupPC.pod b/doc/BackupPC.pod
index 609ee1e..da9857e 100644
--- a/doc/BackupPC.pod
+++ b/doc/BackupPC.pod
@@ -644,7 +644,7 @@ located in the following locations:
__CONFDIR__/config.pl main config file
__CONFDIR__/hosts hosts file
- __CONFDIR__/pc/HOST.pl per-pc config file
+ __CONFDIR__/HOST.pl per-pc config file
__LOGDIR__/BackupPC log files, pid, status
The configure.pl script doesn't prompt for these locations but
@@ -859,7 +859,7 @@ here you must make sure this file is not world (other) readable.
=item *
As a configuration variable $Conf{SmbSharePasswd} in the per-PC
-configuration file (__CONFDIR__/pc/$host.pl or
+configuration file (__CONFDIR__/$host.pl or
__TOPDIR__/pc/$host/config.pl in non-FHS versions of BackupPC).
You will have to use this option if the smb share password is different
for each host. If you put the password here you must make sure this file
@@ -2055,9 +2055,9 @@ Hosts file, which lists all the PCs to backup.
=item pc
-The directory __CONFDIR__/pc contains per-client configuration files
+The directory __CONFDIR__ contains per-client configuration files
that override settings in the main configuration file. Each file
-is named __CONFDIR__/pc/HOST.pl, where HOST is the host name.
+is named __CONFDIR__/HOST.pl, where HOST is the host name.
In pre-FHS versions of BackupPC these files were located in
__TOPDIR__/pc/HOST/config.pl.
@@ -2244,7 +2244,7 @@ to the backup or restore number.)
Old location of optional configuration settings specific to this host.
Settings in this file override the main configuration file.
In new versions of BackupPC the per-host configuration files are
-stored in __CONFDIR__/pc/HOST.pl.
+stored in __CONFDIR__/HOST.pl.
=item backups
@@ -2656,7 +2656,7 @@ discussion of some of various security issues.
=head1 Configuration File
The BackupPC configuration file resides in __CONFDIR__/config.pl.
-Optional per-PC configuration files reside in __CONFDIR__/pc/$host.pl
+Optional per-PC configuration files reside in __CONFDIR__/$host.pl
(or __TOPDIR__/pc/$host/config.pl in non-FHS versions of BackupPC).
This file can be used to override settings just for a particular PC.
@@ -2697,7 +2697,7 @@ LOG file, so you can tail it (or view it via the CGI interface) to make
sure your kill -HUP worked. Errors in parsing the configuration file are
also reported in the LOG file.
-The optional per-PC configuration file (__CONFDIR__/pc/$host.pl or
+The optional per-PC configuration file (__CONFDIR__/$host.pl or
__TOPDIR__/pc/$host/config.pl in non-FHS versions of BackupPC)
is read whenever it is needed by BackupPC_dump, BackupPC_link and others.
