Merge branch 'master' into debian

1 files changed, 6 insertions, 6 deletions

diff --git a/lacme-accountd.md b/lacme-accountd.md
index 81c0802..4d3e1a5 100644
--- a/lacme-accountd.md
+++ b/lacme-accountd.md
@@ -58,15 +58,15 @@ Options
     The following command can be used to generate a new 4096-bits RSA
     key in PEM format with mode 0600:
 
-        openssl genrsa 4096 | install -m0600 /dev/stdin /path/to/priv.key
+        openssl genrsa 4096 | install -m0600 /dev/stdin /path/to/account.key
 
-`-socket=`*path*
+`--socket=`*path*
 
 :   Use *path* as the UNIX-domain socket to bind against for signature
     requests from the [ACME] client.  `lacme-accountd` aborts if *path*
     exists or if its parent directory is writable by other users.
 
-`-?`, `--help`
+`-h`, `--help`
 
 :   Display a brief help and exit.
 
@@ -117,17 +117,17 @@ Examples
 
 Run `lacme-accountd` in a first terminal:
 
-    ~$ lacme-accountd --privkey=file:/path/to/priv.key --socket=/run/user/1000/S.lacme
+    ~$ lacme-accountd --privkey=file:/path/to/account.key --socket=$XDG_RUNTIME_DIR/S.lacme
 
 Then, while `lacme-accountd` is running, execute locally [`lacme`(1)] in
 another terminal:
 
-    ~$ sudo lacme --socket=/run/user/1000/S.lacme new-cert
+    ~$ sudo lacme --socket=$XDG_RUNTIME_DIR/S.lacme new-cert
 
 Alternatively, use [OpenSSH] 6.7 or later to forward the socket and
 execute [`lacme`(1)] remotely:
 
-    ~$ ssh -oExitOnForwardFailure=yes -tt -R /path/to/remote.sock:/run/user/1000/S.lacme user@example.org \
+    ~$ ssh -oExitOnForwardFailure=yes -tt -R /path/to/remote.sock:$XDG_RUNTIME_DIR/S.lacme user@example.org \
        sudo lacme --socket=/path/to/remote.sock new-cert
 
 See also