improve man page based on feedback from debian-l10n-english (fixes #873, closes ...

Also propagate changes to dehydrated help and README.md

diff --git a/README.md b/README.md
index 7db98805bc2fe9df0cd6bf86505210c5e6547ba1..c9e532dfeab443aa7b89b3bbb287596d5b547c43 100644 (file)
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ Parameters:
  --ca url/preset                  Use specified CA URL or preset
  --alias certalias                Use specified name for certificate directory (and per-certificate config) instead of the primary domain (only used if --domain is specified)
  --keep-going (-g)                Keep going after encountering an error while creating/renewing multiple certificates in cron mode
- --force (-x)                     Force renew of certificate even if it is longer valid than value in RENEW_DAYS
+ --force (-x)                     Force certificate renewal even if it is not due to expire within RENEW_DAYS
  --force-validation               Force revalidation of domain names (used in combination with --force)
  --no-lock (-n)                   Don't use lockfile (potentially dangerous!)
  --lock-suffix example.com        Suffix lockfile name with a string (useful for with -d)

diff --git a/dehydrated b/dehydrated
index 2befdfb6a407c2d6a7589e7cc14c838c56045af4..791fe41ee3f1f5a5982684adfcc86875645cbaef 100755 (executable)
--- a/dehydrated
+++ b/dehydrated
@@ -2262,7 +2262,7 @@ main() {
         ;;
 
       # PARAM_Usage: --force (-x)
-      # PARAM_Description: Force renew of certificate even if it is longer valid than value in RENEW_DAYS
+      # PARAM_Description: Force certificate renewal even if it is not due to expire within RENEW_DAYS
       --force|-x)
         PARAM_FORCE="yes"
         ;;

diff --git a/docs/man/dehydrated.1 b/docs/man/dehydrated.1
index d866fec3dda60de316cb3368e60c7679b250f85b..1dadc69c4b314ab6eee8d2cf00dbb01444c68783 100644 (file)
--- a/docs/man/dehydrated.1
+++ b/docs/man/dehydrated.1
@@ -20,8 +20,8 @@ Dehydrated will notify if no account is configured. Run with \fB--register
 
 Next, all domain names must be provided in domains.txt. The format is line
 based: If the file contains two lines "example.com" and "example.net",
-Dehydrated will request two certificate, one for "example.com" and the other
-for "example.net". A single line while "example.com example.net" will request a
+dehydrated will request two certificate, one for "example.com" and the other
+for "example.net". A single line containing "example.com example.net" will request a
 single certificate valid for both "example.net" and "example.com" through the \fISubject
 Alternative Name\fR (SAN) field.
 
@@ -106,7 +106,7 @@ Keep going after encountering an error while creating/renewing multiple
 certificates in cron mode
 .TP
 .BR \-\-force ", " \-x
-Force renew of certificate even if it is longer valid than value in RENEW_DAYS
+Force certificate renewal even if it is not due to expire within RENEW_DAYS
 .TP
 .BR \-\-no\-lock ", " \-n
 Don't use lockfile (potentially dangerous!)