aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--examples/example.dup4
-rw-r--r--examples/example.rsync2
-rw-r--r--handlers/dup.helper.in2
-rw-r--r--handlers/rsync.in4
5 files changed, 8 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 6063fa9..2a94593 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,10 +26,12 @@ version 0.9.9 -- UNRELEASED
#2370). Thanks to ale for the patch.
rsync:
. Fix long rotation.
+ . Make units clearer (Closes Redmine bug #2737)
helper changes
dup:
. Fix separate signing key usecase. Thanks to Ian Beckwith for
the patch.
+ . Make units clearer (Closes Redmine bug #2737)
rdiff:
. Generate 4096 bits RSA keys.
documentation changes
diff --git a/examples/example.dup b/examples/example.dup
index 3eb4529..cc64790 100644
--- a/examples/example.dup
+++ b/examples/example.dup
@@ -191,9 +191,9 @@ exclude = /var/cache/backupninja/duplicity
## Default:
# ftp_password =
-## bandwith limit, in kbit/s ; default is 0, i.e. no limit
+## bandwith limit, in Kbit/s ; default is 0, i.e. no limit
## if using 'desturl' above, 'bandwidthlimit' must not be set
-## an example setting of 128 kbps would be:
+## an example setting of 128 Kbit/s would be:
## bandwidthlimit = 128
##
## Default:
diff --git a/examples/example.rsync b/examples/example.rsync
index 9053f3e..3c280ba 100644
--- a/examples/example.rsync
+++ b/examples/example.rsync
@@ -89,7 +89,7 @@ exclude_vserver = excluded_vserver2
# if set to 1, compress data on rsync (remote source only)
#compress = 0
-# set a badnwidth limit in kbps (remote source only)
+# set a badnwidth limit in KB/s (remote source only)
#bandwidthlimit =
# remote rsync program (remote source only)
diff --git a/handlers/dup.helper.in b/handlers/dup.helper.in
index f85cf87..5cd9dc6 100644
--- a/handlers/dup.helper.in
+++ b/handlers/dup.helper.in
@@ -442,7 +442,7 @@ keep = $dup_keep
# bandwith limit, in kbit/s ; default is 0, i.e. no limit
# if using 'desturl' above, 'bandwidthlimit' must not be set
-# an example setting of 128 kbps would be:
+# an example setting of 128 Kbit/s would be:
#bandwidthlimit = 128
bandwidthlimit = $dup_bandwidth
diff --git a/handlers/rsync.in b/handlers/rsync.in
index 7b06c24..d35445e 100644
--- a/handlers/rsync.in
+++ b/handlers/rsync.in
@@ -60,7 +60,7 @@
# exclude_vserver = vserver-name (valid only if vservers = yes on backupninja.conf)
# numericids = when set to 1, use numeric ids instead of user/group mappings on rsync
# compress = if set to 1, compress data on rsync (remote source only)
-# bandwidthlimit = set a badnwidth limit in kbps (remote source only)
+# bandwidthlimit = set a badnwidth limit in KB/s (remote source only)
# remote_rsync = remote rsync program (remote source only)
# id_file = ssh key file (remote source only)
# batch = set to "yes" to rsync use a batch file as source
@@ -79,7 +79,7 @@
# port = remote port number (remote destination only)
# user = remote user name (remote destination only)
# id_file = ssh key file (remote destination only)
-# bandwidthlimit = set a badnwidth limit in kbps (remote destination only)
+# bandwidthlimit = set a badnwidth limit in KB/s (remote destination only)
# remote_rsync = remote rsync program (remote dest only)
# batch = set to "yes" to rsync write a batch file from the changes
# batchbase = folder where the batch file should be written