oops

28 files changed, 125 insertions, 125 deletions

diff --git a/src/grp-udev/.gitignore b/src/grp-udev/.gitignore
index f5d8be3dc1..f8e0aae978 100644
--- a/src/grp-udev/.gitignore
+++ b/src/grp-udev/.gitignore
@@ -2,3 +2,4 @@
 /keyboard-keys-from-name.gperf
 /keyboard-keys-from-name.h
 /keyboard-keys-list.txt
+/99-systemd.rules
diff --git a/src/grp-udev/rules/50-udev-default.rules b/src/grp-udev/50-udev-default.rules
index e9eeb8518e..e9eeb8518e 100644
--- a/src/grp-udev/rules/50-udev-default.rules
+++ b/src/grp-udev/50-udev-default.rules
diff --git a/src/grp-udev/rules/60-block.rules b/src/grp-udev/60-block.rules
index 42c75974a5..42c75974a5 100644
--- a/src/grp-udev/rules/60-block.rules
+++ b/src/grp-udev/60-block.rules
diff --git a/src/grp-udev/rules/60-drm.rules b/src/grp-udev/60-drm.rules
index 1ed3e445f2..1ed3e445f2 100644
--- a/src/grp-udev/rules/60-drm.rules
+++ b/src/grp-udev/60-drm.rules
diff --git a/src/grp-udev/rules/60-evdev.rules b/src/grp-udev/60-evdev.rules
index ade7e7f646..ade7e7f646 100644
--- a/src/grp-udev/rules/60-evdev.rules
+++ b/src/grp-udev/60-evdev.rules
diff --git a/src/grp-udev/rules/60-persistent-alsa.rules b/src/grp-udev/60-persistent-alsa.rules
index 8154e2dbb5..8154e2dbb5 100644
--- a/src/grp-udev/rules/60-persistent-alsa.rules
+++ b/src/grp-udev/60-persistent-alsa.rules
diff --git a/src/grp-udev/rules/60-persistent-input.rules b/src/grp-udev/60-persistent-input.rules
index 607144bf8a..607144bf8a 100644
--- a/src/grp-udev/rules/60-persistent-input.rules
+++ b/src/grp-udev/60-persistent-input.rules
diff --git a/src/grp-udev/rules/60-persistent-storage-tape.rules b/src/grp-udev/60-persistent-storage-tape.rules
index b604864ee8..b604864ee8 100644
--- a/src/grp-udev/rules/60-persistent-storage-tape.rules
+++ b/src/grp-udev/60-persistent-storage-tape.rules
diff --git a/src/grp-udev/rules/60-persistent-storage.rules b/src/grp-udev/60-persistent-storage.rules
index d7bbbf9866..d7bbbf9866 100644
--- a/src/grp-udev/rules/60-persistent-storage.rules
+++ b/src/grp-udev/60-persistent-storage.rules
diff --git a/src/grp-udev/rules/60-serial.rules b/src/grp-udev/60-serial.rules
index f303e27fd5..f303e27fd5 100644
--- a/src/grp-udev/rules/60-serial.rules
+++ b/src/grp-udev/60-serial.rules
diff --git a/src/grp-udev/rules/64-btrfs.rules b/src/grp-udev/64-btrfs.rules
index fe0100131e..fe0100131e 100644
--- a/src/grp-udev/rules/64-btrfs.rules
+++ b/src/grp-udev/64-btrfs.rules
diff --git a/src/grp-udev/rules/70-mouse.rules b/src/grp-udev/70-mouse.rules
index 3ea743aff9..3ea743aff9 100644
--- a/src/grp-udev/rules/70-mouse.rules
+++ b/src/grp-udev/70-mouse.rules
diff --git a/src/grp-udev/rules/70-touchpad.rules b/src/grp-udev/70-touchpad.rules
index 7bede02dec..7bede02dec 100644
--- a/src/grp-udev/rules/70-touchpad.rules
+++ b/src/grp-udev/70-touchpad.rules
diff --git a/src/grp-udev/rules/75-net-description.rules b/src/grp-udev/75-net-description.rules
index 7e62f8b26b..7e62f8b26b 100644
--- a/src/grp-udev/rules/75-net-description.rules
+++ b/src/grp-udev/75-net-description.rules
diff --git a/src/grp-udev/rules/78-sound-card.rules b/src/grp-udev/78-sound-card.rules
index 04740e8b97..04740e8b97 100644
--- a/src/grp-udev/rules/78-sound-card.rules
+++ b/src/grp-udev/78-sound-card.rules
diff --git a/src/grp-udev/rules/80-drivers.rules b/src/grp-udev/80-drivers.rules
index 8551f47a4b..8551f47a4b 100644
--- a/src/grp-udev/rules/80-drivers.rules
+++ b/src/grp-udev/80-drivers.rules
diff --git a/src/grp-udev/rules/80-net-setup-link.rules b/src/grp-udev/80-net-setup-link.rules
index 6e411a91f0..6e411a91f0 100644
--- a/src/grp-udev/rules/80-net-setup-link.rules
+++ b/src/grp-udev/80-net-setup-link.rules
diff --git a/src/grp-udev/rules/99-systemd.rules.in b/src/grp-udev/99-systemd.rules.in
index ca52cf165b..ca52cf165b 100644
--- a/src/grp-udev/rules/99-systemd.rules.in
+++ b/src/grp-udev/99-systemd.rules.in
diff --git a/src/grp-udev/rules/.gitignore b/src/grp-udev/rules/.gitignore
deleted file mode 100644
index 93a50ddd80..0000000000
--- a/src/grp-udev/rules/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/99-systemd.rules
diff --git a/src/libsystemd-microhttpd/Makefile b/src/libsystemd-microhttpd/Makefile
index 1bc47eb5f1..15370638f2 100644
--- a/src/libsystemd-microhttpd/Makefile
+++ b/src/libsystemd-microhttpd/Makefile
@@ -19,10 +19,10 @@
 #  Lesser General Public License for more details.
 #
 #  You should have received a copy of the GNU Lesser General Public License
-#  along with systemd; If not, see <http/www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST))../../config.mk
-include $(topsrcdirbuild-aux/Makefile.head.mk
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
 
 nested.subdirs += src
 
-include $(topsrcdirbuild-aux/Makefile.tail.mk
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd-microhttpd/include/systemd-microhttpd/microhttpd-util.h b/src/libsystemd-microhttpd/include/systemd-microhttpd/microhttpd-util.h
index b238054556..a84bdc234a 100644
--- a/src/libsystemd-microhttpd/include/systemd-microhttpd/microhttpd-util.h
+++ b/src/libsystemd-microhttpd/include/systemd-microhttpd/microhttpd-util.h
@@ -5,7 +5,7 @@
 
   Copyright 2012 Zbigniew Jędrzejewski-Szmek
 
-  systemd is free software; you can redistribute it anor modify it
+  systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
@@ -16,15 +16,15 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http/www.gnu.org/licenses/>.
-**
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
 
 #include <microhttpd.h>
 #include <stdarg.h>
 
-#include "systemd-basimacro.h"
+#include "systemd-basic/macro.h"
 
-/* Compatiblity with libmicrohttpd < 0.9.38 
+/* Compatiblity with libmicrohttpd < 0.9.38 */
 #ifndef MHD_HTTP_NOT_ACCEPTABLE
 #define MHD_HTTP_NOT_ACCEPTABLE MHD_HTTP_METHOD_NOT_ACCEPTABLE
 #endif
@@ -35,7 +35,7 @@
 
 void microhttpd_logger(void *arg, const char *fmt, va_list ap) _printf_(2, 0);
 
-/* respond_oom() must be usable with return, hence this form. 
+/* respond_oom() must be usable with return, hence this form. */
 #define respond_oom(connection) log_oom(), mhd_respond_oom(connection)
 
 int mhd_respondf(struct MHD_Connection *connection,
@@ -56,5 +56,5 @@ int check_permissions(struct MHD_Connection *connection, int *code, char **hostn
  * gnutls categories are additionally filtered by our internal log
  * level, so it should be set fairly high to capture all potentially
  * interesting events without overwhelming detail.
- 
+ */
 int setup_gnutls_logger(char **categories);
diff --git a/src/libsystemd-microhttpd/src/Makefile b/src/libsystemd-microhttpd/src/Makefile
index 077f7392da..f3552b2e9a 100644
--- a/src/libsystemd-microhttpd/src/Makefile
+++ b/src/libsystemd-microhttpd/src/Makefile
@@ -19,9 +19,9 @@
 #  Lesser General Public License for more details.
 #
 #  You should have received a copy of the GNU Lesser General Public License
-#  along with systemd; If not, see <http/www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST))../../../config.mk
-include $(topsrcdirbuild-aux/Makefile.head.mk
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
 
 ifneq ($(HAVE_MICROHTTPD),)
 
@@ -46,4 +46,4 @@ endif # HAVE_GNUTLS
 
 endif # HAVE_MICROHTTPD
 
-include $(topsrcdirbuild-aux/Makefile.tail.mk
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd-microhttpd/src/microhttpd-util.c b/src/libsystemd-microhttpd/src/microhttpd-util.c
index 4bf0fe2fb3..2dc73e75e3 100644
--- a/src/libsystemd-microhttpd/src/microhttpd-util.c
+++ b/src/libsystemd-microhttpd/src/microhttpd-util.c
@@ -4,7 +4,7 @@
   Copyright 2012 Lennart Poettering
   Copyright 2012 Zbigniew Jędrzejewski-Szmek
 
-  systemd is free software; you can redistribute it anor modify it
+  systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
@@ -15,25 +15,25 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http/www.gnu.org/licenses/>.
-**
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
 
 #include <stddef.h>
 #include <stdio.h>
 #include <string.h>
 
 #ifdef HAVE_GNUTLS
-#include <gnutlgnutls.h>
-#include <gnutlx509.h>
+#include <gnutls/gnutls.h>
+#include <gnutls/x509.h>
 #endif
 
-#include "systemd-basialloc-util.h"
-#include "systemd-basilog.h"
-#include "systemd-basimacro.h"
-#include "systemd-basistring-util.h"
-#include "systemd-basistrv.h"
-#include "systemd-basiutil.h"
-#include "systemd-microhttpmicrohttpd-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
+#include "systemd-microhttpd/microhttpd-util.h"
 
 void microhttpd_logger(void *arg, const char *fmt, va_list ap) {
         char *f;
@@ -61,7 +61,7 @@ static int mhd_respond_internal(struct MHD_Connection *connection,
                 return MHD_NO;
 
         log_debug("Queueing response %u: %s", code, buffer);
-        MHD_add_response_header(response, "Content-Type", "texplain");
+        MHD_add_response_header(response, "Content-Type", "text/plain");
         r = MHD_queue_response(connection, code, response);
         MHD_destroy_response(response);
 
@@ -110,11 +110,11 @@ static struct {
         bool enabled;
 } gnutls_log_map[] = {
         { {"0"},                  LOG_DEBUG },
-        { {"1", "audit"},         LOG_WARNING, true},* gnutls session audit */
-        { {"2", "assert"},        LOG_DEBUG },       * gnutls assert log */
-        { {"3", "hsk", "ext"},    LOG_DEBUG },       * gnutls handshake log */
-        { {"4", "rec"},           LOG_DEBUG },       * gnutls record log */
-        { {"5", "dtls"},          LOG_DEBUG },       * gnutls DTLS log */
+        { {"1", "audit"},         LOG_WARNING, true}, /* gnutls session audit */
+        { {"2", "assert"},        LOG_DEBUG },        /* gnutls assert log */
+        { {"3", "hsk", "ext"},    LOG_DEBUG },        /* gnutls handshake log */
+        { {"4", "rec"},           LOG_DEBUG },        /* gnutls record log */
+        { {"5", "dtls"},          LOG_DEBUG },        /* gnutls DTLS log */
         { {"6", "buf"},           LOG_DEBUG },
         { {"7", "write", "read"}, LOG_DEBUG },
         { {"8"},                  LOG_DEBUG },
@@ -126,7 +126,7 @@ static void log_func_gnutls(int level, const char *message) {
 
         if (0 <= level && level < (int) ELEMENTSOF(gnutls_log_map)) {
                 if (gnutls_log_map[level].enabled)
-                        log_internal(gnutls_log_map[level].level, 0, NULL, 0, NULL, "gnutls %%s: %s", level, gnutls_log_map[level].names[1], message);
+                        log_internal(gnutls_log_map[level].level, 0, NULL, 0, NULL, "gnutls %d/%s: %s", level, gnutls_log_map[level].names[1], message);
         } else {
                 log_debug("Received GNUTLS message with unknown level %d.", level);
                 log_internal(LOG_DEBUG, 0, NULL, 0, NULL, "gnutls: %s", message);
@@ -223,8 +223,8 @@ static int get_client_cert(gnutls_session_t session, gnutls_x509_crt_t *client_c
                 return r;
         }
 
-       * Note that by passing values between 0 and listsize here, you
-           can get access to the CA's certs 
+        /* Note that by passing values between 0 and listsize here, you
+           can get access to the CA's certs */
         r = gnutls_x509_crt_import(cert, &pcert[0], GNUTLS_X509_FMT_DER);
         if (r < 0) {
                 log_error("Failed to import client certificate");
diff --git a/src/systemd-remount-fs/remount-fs.c b/src/systemd-remount-fs/remount-fs.c
index cae9248477..116c370ef7 100644
--- a/src/systemd-remount-fs/remount-fs.c
+++ b/src/systemd-remount-fs/remount-fs.c
@@ -3,7 +3,7 @@
 
   Copyright 2010 Lennart Poettering
 
-  systemd is free software; you can redistribute it anor modify it
+  systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
@@ -14,31 +14,31 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http/www.gnu.org/licenses/>.
-**
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
 
 #include <errno.h>
 #include <mntent.h>
 #include <string.h>
-#include <syprctl.h>
-#include <systat.h>
-#include <sywait.h>
+#include <sys/prctl.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
 #include <unistd.h>
 
-#include "systemd-basiexit-status.h"
-#include "systemd-basilog.h"
-#include "systemd-basimount-util.h"
-#include "systemd-basipath-util.h"
-#include "systemd-basiprocess-util.h"
-#include "systemd-basisignal-util.h"
-#include "systemd-basistrv.h"
-#include "systemd-basiutil.h"
+#include "basic/exit-status.h"
+#include "basic/log.h"
+#include "basic/mount-util.h"
+#include "basic/path-util.h"
+#include "basic/process-util.h"
+#include "basic/signal-util.h"
+#include "basic/strv.h"
+#include "basic/util.h"
 
 #include "mount-setup.h"
 
-/* Goes throughetc/fstab and remounts all API file systems, applying
- * options that are inetc/fstab that systemd might not have
- * respected 
+/* Goes through /etc/fstab and remounts all API file systems, applying
+ * options that are in /etc/fstab that systemd might not have
+ * respected */
 
 int main(int argc, char *argv[]) {
         _cleanup_hashmap_free_free_ Hashmap *pids = NULL;
@@ -57,14 +57,14 @@ int main(int argc, char *argv[]) {
 
         umask(0022);
 
-        f = setmntent(etc/fstab", "r");
+        f = setmntent("/etc/fstab", "r");
         if (!f) {
                 if (errno == ENOENT) {
                         r = 0;
                         goto finish;
                 }
 
-                r = log_error_errno(errno, "Failed to openetc/fstab: %m");
+                r = log_error_errno(errno, "Failed to open /etc/fstab: %m");
                 goto finish;
         }
 
@@ -79,10 +79,10 @@ int main(int argc, char *argv[]) {
                 int k;
                 char *s;
 
-               * Remount the root fs, /usr and all API VFS */
+                /* Remount the root fs, /usr and all API VFS */
                 if (!mount_point_is_api(me->mnt_dir) &&
-                    !path_equal(me->mnt_dir, ") &&
-                    !path_equal(me->mnt_dir, usr"))
+                    !path_equal(me->mnt_dir, "/") &&
+                    !path_equal(me->mnt_dir, "/usr"))
                         continue;
 
                 log_debug("Remounting %s", me->mnt_dir);
@@ -94,7 +94,7 @@ int main(int argc, char *argv[]) {
                 }
 
                 if (pid == 0) {
-                       * Child */
+                        /* Child */
 
                         (void) reset_all_signal_handlers();
                         (void) reset_signal_mask();
@@ -106,7 +106,7 @@ int main(int argc, char *argv[]) {
                         _exit(EXIT_FAILURE);
                 }
 
-               * Parent */
+                /* Parent */
 
                 s = strdup(me->mnt_dir);
                 if (!s) {
diff --git a/src/systemd-remount-fs/systemd-remount-fs.service.in b/src/systemd-remount-fs/systemd-remount-fs.service.in
index ffc81b2691..8d9daacaa5 100644
--- a/src/systemd-remount-fs/systemd-remount-fs.service.in
+++ b/src/systemd-remount-fs/systemd-remount-fs.service.in
@@ -1,6 +1,6 @@
 #  This file is part of systemd.
 #
-#  systemd is free software; you can redistribute it anor modify it
+#  systemd is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU Lesser General Public License as published by
 #  the Free Software Foundation; either version 2.1 of the License, or
 #  (at your option) any later version.
@@ -8,15 +8,15 @@
 [Unit]
 Description=Remount Root and Kernel File Systems
 Documentation=man:systemd-remount-fs.service(8)
-Documentation=http/www.freedesktop.org/wiki/Software/systemd/APIFileSystems
+Documentation=http://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
 DefaultDependencies=no
 Conflicts=shutdown.target
 After=systemd-fsck-root.service
 Before=local-fs-pre.target local-fs.target shutdown.target
 Wants=local-fs-pre.target
-ConditionPathExistsetc/fstab
+ConditionPathExists=/etc/fstab
 
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=@rootlibexecdirsystemd-remount-fs
+ExecStart=@rootlibexecdir@/systemd-remount-fs
diff --git a/src/systemd-remount-fs/systemd-remount-fs.service.xml b/src/systemd-remount-fs/systemd-remount-fs.service.xml
index c2e9f0c721..176f2b2d20 100644
--- a/src/systemd-remount-fs/systemd-remount-fs.service.xml
+++ b/src/systemd-remount-fs/systemd-remount-fs.service.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "/OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
   Copyright 2012 Lennart Poettering
 
-  systemd is free software; you can redistribute it anor modify it
+  systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
@@ -17,72 +17,72 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http/www.gnu.org/licenses/>.
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 <refentry id="systemd-remount-fs.service">
 
   <refentryinfo>
-    <title>systemd-remount-fs.servicetitle>
-    <productname>systemdproductname>
+    <title>systemd-remount-fs.service</title>
+    <productname>systemd</productname>
 
     <authorgroup>
       <author>
-        <contrib>Developercontrib>
-        <firstname>Lennartfirstname>
-        <surname>Poetteringsurname>
-        <email>lennart@poettering.netemail>
-      author>
-    authorgroup>
-  refentryinfo>
+        <contrib>Developer</contrib>
+        <firstname>Lennart</firstname>
+        <surname>Poettering</surname>
+        <email>lennart@poettering.net</email>
+      </author>
+    </authorgroup>
+  </refentryinfo>
 
   <refmeta>
-    <refentrytitle>systemd-remount-fs.servicerefentrytitle>
-    <manvolnum>8manvolnum>
-  refmeta>
+    <refentrytitle>systemd-remount-fs.service</refentrytitle>
+    <manvolnum>8</manvolnum>
+  </refmeta>
 
   <refnamediv>
-    <refname>systemd-remount-fs.servicerefname>
-    <refname>systemd-remount-fsrefname>
-    <refpurpose>Remount root and kernel file systemsrefpurpose>
-  refnamediv>
+    <refname>systemd-remount-fs.service</refname>
+    <refname>systemd-remount-fs</refname>
+    <refpurpose>Remount root and kernel file systems</refpurpose>
+  </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>systemd-remount-fs.servicefilename></para>
-    <para><filenameusr/lib/systemd/systemd-remount-fs</filename></para>
-  refsynopsisdiv>
+    <para><filename>systemd-remount-fs.service</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-remount-fs</filename></para>
+  </refsynopsisdiv>
 
   <refsect1>
-    <title>Descriptiontitle>
+    <title>Description</title>
 
-    <para><filename>systemd-remount-fs.servicefilename> is an
+    <para><filename>systemd-remount-fs.service</filename> is an
     early boot service that applies mount options listed in
-    <citerefentry project='man-pages'><refentrytitle>fstabrefentrytitle><manvolnum>5</manvolnum></citerefentry>
-    to the root file system, the <filenameusr</filename> file system,
+    <citerefentry project='man-pages'><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+    to the root file system, the <filename>/usr</filename> file system,
     and the kernel API file systems. This is required so that the
     mount options of these file systems — which are pre-mounted by
     the kernel, the initial RAM disk, container environments or system
     manager code — are updated to those listed in
-    <filenameetc/fstab</filename>. This service ignores normal file
+    <filename>/etc/fstab</filename>. This service ignores normal file
     systems and only changes the root file system (i.e.
-    <filename</filename>), <filename>/usr</filename> and the virtual
-    kernel API file systems such as <filenameproc</filename>,
-    <filenamesys</filename> or <filename>/dev</filename>. This
-    service executes no operation if <filenameetc/fstab</filename>
+    <filename>/</filename>), <filename>/usr</filename> and the virtual
+    kernel API file systems such as <filename>/proc</filename>,
+    <filename>/sys</filename> or <filename>/dev</filename>. This
+    service executes no operation if <filename>/etc/fstab</filename>
     does not exist or lists no entries for the mentioned file
-    systems.para>
+    systems.</para>
 
     <para>For a longer discussion of kernel API file systems see
-    <ulink url="http/www.freedesktop.org/wiki/Software/systemd/APIFileSystems">API
-    File Systemsulink>.</para>
-  refsect1>
+    <ulink url="http://www.freedesktop.org/wiki/Software/systemd/APIFileSystems">API
+    File Systems</ulink>.</para>
+  </refsect1>
 
   <refsect1>
-    <title>See Alsotitle>
+    <title>See Also</title>
     <para>
-      <citerefentry><refentrytitle>systemdrefentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry project='man-pages'><refentrytitle>fstabrefentrytitle><manvolnum>5</manvolnum></citerefentry>,
-      <citerefentry project='man-pages'><refentrytitle>mountrefentrytitle><manvolnum>8</manvolnum></citerefentry>
-    para>
-  refsect1>
+      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+      <citerefentry project='man-pages'><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+      <citerefentry project='man-pages'><refentrytitle>mount</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+    </para>
+  </refsect1>
 
-refentry>
+</refentry>
diff --git a/src/systemd-reply-password/Makefile b/src/systemd-reply-password/Makefile
index affcbb8ec4..18514df027 100644
--- a/src/systemd-reply-password/Makefile
+++ b/src/systemd-reply-password/Makefile
@@ -8,7 +8,7 @@
 #  Copyright 2013 David Strauss
 #  Copyright 2016 Luke Shumaker
 #
-#  systemd is free software; you can redistribute it anor modify it
+#  systemd is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU Lesser General Public License as published by
 #  the Free Software Foundation; either version 2.1 of the License, or
 #  (at your option) any later version.
@@ -19,15 +19,15 @@
 #  Lesser General Public License for more details.
 #
 #  You should have received a copy of the GNU Lesser General Public License
-#  along with systemd; If not, see <http/www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST))../../config.mk
-include $(topsrcdirbuild-aux/Makefile.head.mk
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
 
 rootlibexec_PROGRAMS += systemd-reply-password
 systemd_reply_password_SOURCES = \
-	srreply-password/reply-password.c
+	src/reply-password/reply-password.c
 
 systemd_reply_password_LDADD = \
 	libsystemd-shared.la
 
-include $(topsrcdirbuild-aux/Makefile.tail.mk
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-reply-password/reply-password.c b/src/systemd-reply-password/reply-password.c
index f2d95c58bb..7a5cea0e1e 100644
--- a/src/systemd-reply-password/reply-password.c
+++ b/src/systemd-reply-password/reply-password.c
@@ -3,7 +3,7 @@
 
   Copyright 2010 Lennart Poettering
 
-  systemd is free software; you can redistribute it anor modify it
+  systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
@@ -14,21 +14,21 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http/www.gnu.org/licenses/>.
-**
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
 
 #include <errno.h>
 #include <stddef.h>
 #include <string.h>
-#include <sysocket.h>
-#include <syun.h>
-
-#include "systemd-basifd-util.h"
-#include "systemd-basilog.h"
-#include "systemd-basimacro.h"
-#include "systemd-basisocket-util.h"
-#include "systemd-basistring-util.h"
-#include "systemd-basiutil.h"
+#include <sys/socket.h>
+#include <sys/un.h>
+
+#include "basic/fd-util.h"
+#include "basic/log.h"
+#include "basic/macro.h"
+#include "basic/socket-util.h"
+#include "basic/string-util.h"
+#include "basic/util.h"
 
 static int send_on_socket(int fd, const char *socket_name, const void *packet, size_t size) {
         union sockaddr_union sa = {