Merge branch 'master' into debian

10 files changed, 10 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index ad586ab..f8084ed 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ install: ${MANPAGES}
 	install -d $(DESTDIR)/etc/lacme
 	install -m0644 -t $(DESTDIR)/etc/lacme config/*.conf
 	install -d $(DESTDIR)/usr/share/lacme
-	install -m0644 -t $(DESTDIR)/usr/share/lacme lets-encrypt-x[1-4]-cross-signed.pem
+	install -m0644 -t $(DESTDIR)/usr/share/lacme certs/lets-encrypt-x[1-4]-cross-signed.pem
 	install -d $(DESTDIR)/usr/lib/lacme
 	install -m0755 -t $(DESTDIR)/usr/lib/lacme client webserver
 	install -d $(DESTDIR)/usr/share/man/man1
diff --git a/lets-encrypt-x1-cross-signed.pem b/certs/lets-encrypt-x1-cross-signed.pem
index 8a92a0b..8a92a0b 100644
--- a/lets-encrypt-x1-cross-signed.pem
+++ b/certs/lets-encrypt-x1-cross-signed.pem
diff --git a/lets-encrypt-x2-cross-signed.pem b/certs/lets-encrypt-x2-cross-signed.pem
index c152625..c152625 100644
--- a/lets-encrypt-x2-cross-signed.pem
+++ b/certs/lets-encrypt-x2-cross-signed.pem
diff --git a/lets-encrypt-x3-cross-signed.pem b/certs/lets-encrypt-x3-cross-signed.pem
index 0002462..0002462 100644
--- a/lets-encrypt-x3-cross-signed.pem
+++ b/certs/lets-encrypt-x3-cross-signed.pem
diff --git a/lets-encrypt-x4-cross-signed.pem b/certs/lets-encrypt-x4-cross-signed.pem
index c0b4eb6..c0b4eb6 100644
--- a/lets-encrypt-x4-cross-signed.pem
+++ b/certs/lets-encrypt-x4-cross-signed.pem
diff --git a/client b/client
index 409fc62..810cd35 100755
--- a/client
+++ b/client
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -T
 
 #----------------------------------------------------------------------
-# Let's Encrypt ACME client
+# ACME client
 # Copyright © 2015,2016 Guilhem Moulin <guilhem@fripost.org>
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/config/lacme.conf b/config/lacme.conf
index edcbbb0..c5c643d 100644
--- a/config/lacme.conf
+++ b/config/lacme.conf
@@ -6,8 +6,8 @@
 [client]
 # The value of "socket" specifies the lacme-accountd(1) UNIX-domain
 # socket to connect to for signature requests from the ACME client.
-# lacme aborts if the socket is readable or writable by other users, or
-# if its parent directory is writable by other users.
+# lacme(1) aborts if the socket is readable or writable by other users,
+# or if its parent directory is writable by other users.
 # Default: "$XDG_RUNTIME_DIR/S.lacme" if the XDG_RUNTIME_DIR environment
 # variable is set.
 #
@@ -77,7 +77,7 @@
 # Path to the ACME webserver executable.
 #command = /usr/lib/lacme/webserver
 
-# Whether to automatically install iptables(1) rules to open the
+# Whether to automatically install iptables(8) rules to open the
 # ADDRESS[:PORT] specified with listen.  Theses rules are automatically
 # removed once lacme(1) exits.
 #
diff --git a/lacme-accountd b/lacme-accountd
index 2bc648f..704f836 100755
--- a/lacme-accountd
+++ b/lacme-accountd
@@ -148,7 +148,7 @@ do {
 
     my $umask = umask(0177) // die "umask: $!";
 
-    print STDERR "Starting Let's Encrypt Account Key Manager at $sockname\n" unless $OPTS{quiet};
+    print STDERR "Starting lacme Account Key Manager at $sockname\n" unless $OPTS{quiet};
     socket(my $sock, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
     my $sockaddr = Socket::sockaddr_un($sockname) // die;
     bind($sock, $sockaddr) or die "bind: $!";
@@ -195,7 +195,7 @@ END {
         unlink $SOCKNAME or print STDERR "Can't unlink $SOCKNAME: $!\n";
     }
     if (defined $S) {
-        print STDERR "Shutting down and closing Let's Encrypt Account Key Manager\n" unless $OPTS{quiet};
+        print STDERR "Shutting down and closing lacme Account Key Manager\n" unless $OPTS{quiet};
         shutdown($S, SHUT_RDWR) or warn "shutdown: $!";
         close $S or print STDERR "Can't close: $!\n";
     }
diff --git a/lacme.md b/lacme.md
index a16f23d..04f2836 100644
--- a/lacme.md
+++ b/lacme.md
@@ -321,12 +321,12 @@ Valid options are:
 *chown*
 
 :   An optional `username[:groupname]` to chown the issued *certificate*
-    and *certificate-chain* with.
+    and *certificate-chain* to.
 
 *chmod*
 
 :   An optional octal mode to chmod the issued *certificate* and
-    *certificate-chain* with.
+    *certificate-chain* to.
 
 *notify*
 
diff --git a/webserver b/webserver
index 0fe2979..df4e3ba 100755
--- a/webserver
+++ b/webserver
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -T
 
 #----------------------------------------------------------------------
-# Let's Encrypt ACME client (webserver component)
+# ACME client (webserver component)
 # Copyright © 2015,2016 Guilhem Moulin <guilhem@fripost.org>
 #
 # This program is free software: you can redistribute it and/or modify