diff --git a/Makefile.am b/Makefile.am
index 35bbc3a64a..4330db06dd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -509,7 +509,8 @@ MANPAGES = \
man/hostname.5 \
man/vconsole.conf.5 \
man/locale.conf.5 \
- man/os-release.5
+ man/os-release.5 \
+ man/modules-load.d.5
MANPAGES_ALIAS = \
man/reboot.8 \
diff --git a/TODO b/TODO
index 7de0ebb701..b083529baf 100644
--- a/TODO
+++ b/TODO
@@ -53,8 +53,6 @@
* readahead: btrfs/LVM SSD detection
-* man pages for: modules-load.d, /etc/os-release
-
* when processes remain in a service even though the start command failed enter active
* add seperate man page for [Install] settings
diff --git a/man/modules-load.d.xml b/man/modules-load.d.xml
new file mode 100644
index 0000000000..47acc08e63
--- /dev/null
+++ b/man/modules-load.d.xml
@@ -0,0 +1,95 @@
+
+
+
+
+
+
+
+ modules-load.d
+ systemd
+
+
+
+ Developer
+ Lennart
+ Poettering
+ lennart@poettering.net
+
+
+
+
+
+ modules-load.d
+ 5
+
+
+
+ modules-load.d
+ Configure kernel modules to load at boot
+
+
+
+ /etc/modules-load.d/*.conf
+
+
+
+ Description
+
+ systemd uses
+ /etc/modules-load.d/ to configure
+ kernel modules to load during boot in a static list.
+ Each configuration file is named in the style of
+ /etc/modules-load.d/<program>.conf. Note
+ that it is usally a better idea to use the automatic
+ module loading by PCI ID, by DMI ID or similar
+ triggers configured in the kernel modules themselves
+ instead of relying on static configuration like
+ this.
+
+
+
+ Configuration Format
+
+ The configuration files should simply contain a
+ list of kernel modul names to load, seperated by
+ newlines. Empty lines and lines whose first
+ non-whitespace character is # or ; are ignored.
+
+
+
+
+ Example
+
+ /etc/modules-load.d/uinput.conf example:
+
+ # Load uinput.ko at boot
+uinput
+
+
+
+
+ See Also
+
+ systemd1,
+ modprobe8
+
+
+
+
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index 7bdb6de0b0..1df4a043e8 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -42,9 +42,13 @@
tmpfiles.d
- configuration for creation, deletion and cleaning of tmpfiles
+ Configuration for creation, deletion and cleaning of temporary and volatile files
+
+ /etc/tmpfiles.d/*.conf
+
+
Description
@@ -55,7 +59,7 @@
/var/run or
/tmp). Each configuration file
is named in the style of
- /etc/tmpfiles.d/<program>.conf
+ /etc/tmpfiles.d/<program>.conf.
@@ -73,37 +77,37 @@ d /var/run/user 0755 root root 10d
f
- create a file if it doesn't exist yet
+ Create a file if it doesn't exist yet
F
- create or truncate a file
+ Create or truncate a file
d
- create a directory if it doesn't exist yet
+ Create a directory if it doesn't exist yet
D
- create or empty a directory
+ Create or empty a directory
x
- ignore a path
+ Ignore a path
r
- remove a path
+ Remove a path
R
- recursively remove a path
+ Recursively remove a path