diff --git a/TODO b/TODO
index f4b5fb3c54..42534989a6 100644
--- a/TODO
+++ b/TODO
@@ -21,9 +21,6 @@ External:
* wiki: update journal format documentation for lz4 additions
-* When lz4 gets an API for lz4 command output, make use of it to
- compress coredumps in a way compatible with /usr/bin/lz4.
-
Janitorial Clean-ups:
* code cleanup: retire FOREACH_WORD_QUOTED, port to extract_first_word() loops instead
@@ -77,8 +74,6 @@ Features:
* man: document that unless you use StandardError=null the shell >/dev/stderr won't work in shell scripts in services
-* man: clarify that "machinectl show" shows different information than "machinectl status" (no cgroup tree, no IP addresses, ...)
-
* "systemctl daemon-reload" should result in /etc/systemd/system.conf being reloaded by systemd
* install: include generator dirs in unit file search paths
@@ -601,7 +596,6 @@ Features:
- add API to close/reopen/get fd for journal client fd in libsystemd-journal.
- fallback to /dev/log based logging in libsystemd-journal, if we cannot log natively?
- declare the local journal protocol stable in the wiki interface chart
- - journal: reuse XZ context
- sd-journal: speed up sd_journal_get_data() with transparent hash table in bg
- journald: when dropping msgs due to ratelimit make sure to write
"dropped %u messages" not only when we are about to print the next
@@ -655,7 +649,6 @@ Features:
- document systemd-journal-flush.service properly
- documentation: recommend to connect the timer units of a service to the service via Also= in [Install]
- man: document the very specific env the shutdown drop-in tools live in
- - man: extend runlevel(8) to mention that runlevels suck, and are dead. Maybe add runlevel(7) with a note about that too
- man: add more examples to man pages
- man: maybe sort directives in man pages, and take sections from --help and apply them to man too
diff --git a/man/machinectl.xml b/man/machinectl.xml
index d1da7f60a6..0e18953700 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -317,7 +317,7 @@
statusNAME...
- Show terse runtime status information about
+ Show runtime status information about
one or more virtual machines and containers, followed by the
most recent log data from the journal. This function is
intended to generate human-readable output. If you are looking
@@ -339,7 +339,8 @@
are suppressed. Use to show those too.
To select specific properties to show, use
. This command is intended to be
- used whenever computer-parsable output is required. Use
+ used whenever computer-parsable output is required, and does
+ not print the cgroup tree or journal entries. Use
status if you are looking for formatted
human-readable output.
diff --git a/man/runlevel.xml b/man/runlevel.xml
index fc1f523855..ca29c7c22c 100644
--- a/man/runlevel.xml
+++ b/man/runlevel.xml
@@ -51,10 +51,61 @@
- runlevel options
+ runlevel
+ options
+
+ Overview
+
+ "Runlevels" are an obsolete way to start and stop groups of
+ services used in SysV init. systemd provides a compatibility layer
+ that maps runlevels to targets, and associated binaries like
+ runlevel. Nevertheless, only one runlevel can
+ be "active" at a given time, while systemd can activate multiple
+ targets concurrently, so the mapping to runlevels is confusing
+ and only approximate. Runlevels should not be used in new code,
+ and are mostly useful as a shorthand way to refer the matching
+ systemd targets in kernel boot parameters.
+
+
+
+
Description
@@ -129,18 +180,11 @@
-
- Notes
-
- This is a legacy command available for compatibility only.
- It should not be used anymore, as the concept of runlevels is
- obsolete.
-
-
See Alsosystemd1,
+ systemd.target5,
systemctl1