[systemd-commits] 4 commits - man/daemon.xml man/logind.conf.xml man/sd_bus_error.xml man/sd_bus_message_append_array.xml man/sd_bus_message_append_basic.xml man/sd_bus_message_append_string_memfd.xml man/sd_bus_message_append_strv.xml man/sd_bus_message_append.xml man/sd_bus_message_get_cookie.xml man/sd_bus_negotiate_fds.xml man/sd_bus_open_user.xml man/sd_bus_path_encode.xml man/sd_bus_request_name.xml man/sd_event_add_time.xml man/sd_event_new.xml man/sd_get_seats.xml man/sd_id128_get_machine.xml man/sd_id128_randomize.xml man/sd_id128_to_string.xml man/sd_is_fifo.xml man/sd_journal_add_match.xml man/sd_journal_get_catalog.xml man/sd_journal_get_cursor.xml man/sd_journal_get_cutoff_realtime_usec.xml man/sd_journal_get_data.xml man/sd_journal_get_fd.xml man/sd_journal_get_realtime_usec.xml man/sd_journal_get_usage.xml man/sd_journal_next.xml man/sd_journal_open.xml man/sd_journal_print.xml man/sd_journal_query_unique.xml man/sd_journal_seek_head.xml man/sd_journal_stream_fd.xml man/sd_logi n_monitor_new.xml man/sd_pid_get_session.xml man/sd_seat_get_active.xml man/sd_session_is_active.xml man/sd_uid_get_state.xml man/systemctl.xml man/systemd.exec.xml man/systemd-gpt-auto-generator.xml man/systemd-journal-remote.xml man/systemd.link.xml man/systemd-networkd-wait-online.service.xml man/systemd.network.xml man/systemd-nspawn.xml man/systemd-run.xml man/systemd.socket.xml man/systemd.timer.xml man/systemd.unit.xml man/tmpfiles.d.xml NEWS README src/core
Zbigniew Jędrzejewski-Szmek
zbyszek at kemper.freedesktop.org
Wed May 7 17:15:44 PDT 2014
NEWS | 40 +++++++++++-----------
README | 2 -
man/daemon.xml | 4 +-
man/logind.conf.xml | 4 +-
man/sd_bus_error.xml | 4 +-
man/sd_bus_message_append.xml | 2 -
man/sd_bus_message_append_array.xml | 22 ++++++------
man/sd_bus_message_append_basic.xml | 4 +-
man/sd_bus_message_append_string_memfd.xml | 22 ++++++------
man/sd_bus_message_append_strv.xml | 12 +++---
man/sd_bus_message_get_cookie.xml | 8 ++--
man/sd_bus_negotiate_fds.xml | 22 ++++++------
man/sd_bus_open_user.xml | 4 +-
man/sd_bus_path_encode.xml | 20 +++++------
man/sd_bus_request_name.xml | 4 +-
man/sd_event_add_time.xml | 10 ++---
man/sd_event_new.xml | 18 +++++-----
man/sd_get_seats.xml | 8 ++--
man/sd_id128_get_machine.xml | 4 +-
man/sd_id128_randomize.xml | 2 -
man/sd_id128_to_string.xml | 4 +-
man/sd_is_fifo.xml | 2 -
man/sd_journal_add_match.xml | 10 ++---
man/sd_journal_get_catalog.xml | 6 +--
man/sd_journal_get_cursor.xml | 8 ++--
man/sd_journal_get_cutoff_realtime_usec.xml | 12 +++---
man/sd_journal_get_data.xml | 26 +++++++-------
man/sd_journal_get_fd.xml | 14 +++----
man/sd_journal_get_realtime_usec.xml | 10 ++---
man/sd_journal_get_usage.xml | 4 +-
man/sd_journal_next.xml | 12 +++---
man/sd_journal_open.xml | 16 ++++-----
man/sd_journal_print.xml | 8 ++--
man/sd_journal_query_unique.xml | 16 ++++-----
man/sd_journal_seek_head.xml | 12 +++---
man/sd_journal_stream_fd.xml | 2 -
man/sd_login_monitor_new.xml | 18 +++++-----
man/sd_pid_get_session.xml | 24 ++++++-------
man/sd_seat_get_active.xml | 20 +++++------
man/sd_session_is_active.xml | 48 +++++++++++++--------------
man/sd_uid_get_state.xml | 8 ++--
man/systemctl.xml | 10 ++---
man/systemd-gpt-auto-generator.xml | 14 +++----
man/systemd-journal-remote.xml | 28 +++++++--------
man/systemd-networkd-wait-online.service.xml | 4 +-
man/systemd-nspawn.xml | 6 +--
man/systemd-run.xml | 6 +--
man/systemd.exec.xml | 20 +++++------
man/systemd.link.xml | 4 +-
man/systemd.network.xml | 2 -
man/systemd.socket.xml | 2 -
man/systemd.timer.xml | 2 -
man/systemd.unit.xml | 2 -
man/tmpfiles.d.xml | 2 -
src/core/unit-printf.c | 2 -
55 files changed, 300 insertions(+), 300 deletions(-)
New commits:
commit 3b3d7d069d10d53336dbada1c67f739e3492b218
Author: Jan Engelhardt <jengelh at inai.de>
Date: Thu May 8 01:28:46 2014 +0200
doc: balance C indirections in function prototypes
Shift the asterisks in the documentation's prototypes such that they
are consistent among each other. Use the right side to match what is
used in source code.
Addendum to commit v209~82.
diff --git a/man/sd_bus_message_get_cookie.xml b/man/sd_bus_message_get_cookie.xml
index 5e25263..c761e56 100644
--- a/man/sd_bus_message_get_cookie.xml
+++ b/man/sd_bus_message_get_cookie.xml
@@ -54,14 +54,14 @@
<funcprototype>
<funcdef>int <function>sd_bus_message_get_cookie</function></funcdef>
- <paramdef>sd_bus_message* <parameter>message</parameter></paramdef>
- <paramdef>uint64_t* <parameter>cookie</parameter></paramdef>
+ <paramdef>sd_bus_message *<parameter>message</parameter></paramdef>
+ <paramdef>uint64_t *<parameter>cookie</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_bus_message_get_reply_cookie</function></funcdef>
- <paramdef>sd_bus_message* <parameter>message</parameter></paramdef>
- <paramdef>uint64_t* <parameter>cookie</parameter></paramdef>
+ <paramdef>sd_bus_message *<parameter>message</parameter></paramdef>
+ <paramdef>uint64_t *<parameter>cookie</parameter></paramdef>
</funcprototype>
</funcsynopsis>
</refsynopsisdiv>
diff --git a/man/sd_bus_request_name.xml b/man/sd_bus_request_name.xml
index 9003f9f..e3a9266 100644
--- a/man/sd_bus_request_name.xml
+++ b/man/sd_bus_request_name.xml
@@ -54,14 +54,14 @@
<funcprototype>
<funcdef>int <function>sd_bus_request_name</function></funcdef>
- <paramdef>sd_bus* <parameter>bus</parameter></paramdef>
+ <paramdef>sd_bus *<parameter>bus</parameter></paramdef>
<paramdef>const char *<parameter>name</parameter></paramdef>
<paramdef>uint64_t <parameter>flags</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_bus_release_name</function></funcdef>
- <paramdef>sd_bus* <parameter>bus</parameter></paramdef>
+ <paramdef>sd_bus *<parameter>bus</parameter></paramdef>
<paramdef>const char *<parameter>name</parameter></paramdef>
</funcprototype>
</funcsynopsis>
diff --git a/man/sd_event_add_time.xml b/man/sd_event_add_time.xml
index 983e486..dc25784 100644
--- a/man/sd_event_add_time.xml
+++ b/man/sd_event_add_time.xml
@@ -65,13 +65,13 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<paramdef>uint64_t <parameter>usec</parameter></paramdef>
<paramdef>uint64_t <parameter>accuracy</parameter></paramdef>
<paramdef>sd_event_time_handler_t <parameter>handler</parameter></paramdef>
- <paramdef>void* <parameter>userdata</parameter></paramdef>
+ <paramdef>void *<parameter>userdata</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_event_source_get_time</function></funcdef>
<paramdef>sd_event_source *<parameter>source</parameter></paramdef>
- <paramdef>usec_t* <parameter>usec</parameter></paramdef>
+ <paramdef>usec_t *<parameter>usec</parameter></paramdef>
</funcprototype>
<funcprototype>
diff --git a/man/sd_get_seats.xml b/man/sd_get_seats.xml
index 0fc8243..a49dde8 100644
--- a/man/sd_get_seats.xml
+++ b/man/sd_get_seats.xml
@@ -56,22 +56,22 @@
<funcprototype>
<funcdef>int <function>sd_get_seats</function></funcdef>
- <paramdef>char*** <parameter>seats</parameter></paramdef>
+ <paramdef>char ***<parameter>seats</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_get_sessions</function></funcdef>
- <paramdef>char*** <parameter>sessions</parameter></paramdef>
+ <paramdef>char ***<parameter>sessions</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_get_uids</function></funcdef>
- <paramdef>uid_t** <parameter>users</parameter></paramdef>
+ <paramdef>uid_t **<parameter>users</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_get_machine_names</function></funcdef>
- <paramdef>char*** <parameter>machines</parameter></paramdef>
+ <paramdef>char ***<parameter>machines</parameter></paramdef>
</funcprototype>
</funcsynopsis>
diff --git a/man/sd_id128_get_machine.xml b/man/sd_id128_get_machine.xml
index cce3979..164fcb7 100644
--- a/man/sd_id128_get_machine.xml
+++ b/man/sd_id128_get_machine.xml
@@ -54,12 +54,12 @@
<funcprototype>
<funcdef>int <function>sd_id128_get_machine</function></funcdef>
- <paramdef>sd_id128_t* <parameter>ret</parameter></paramdef>
+ <paramdef>sd_id128_t *<parameter>ret</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_id128_get_boot</function></funcdef>
- <paramdef>sd_id128_t* <parameter>ret</parameter></paramdef>
+ <paramdef>sd_id128_t *<parameter>ret</parameter></paramdef>
</funcprototype>
</funcsynopsis>
diff --git a/man/sd_id128_randomize.xml b/man/sd_id128_randomize.xml
index 7e8c646..e345004 100644
--- a/man/sd_id128_randomize.xml
+++ b/man/sd_id128_randomize.xml
@@ -53,7 +53,7 @@
<funcprototype>
<funcdef>int <function>sd_id128_randomize</function></funcdef>
- <paramdef>sd_id128_t* <parameter>ret</parameter></paramdef>
+ <paramdef>sd_id128_t *<parameter>ret</parameter></paramdef>
</funcprototype>
</funcsynopsis>
diff --git a/man/sd_id128_to_string.xml b/man/sd_id128_to_string.xml
index 72a67dc..23e2bed 100644
--- a/man/sd_id128_to_string.xml
+++ b/man/sd_id128_to_string.xml
@@ -53,13 +53,13 @@
<funcsynopsisinfo>#include <systemd/sd-id128.h></funcsynopsisinfo>
<funcprototype>
- <funcdef>char* <function>sd_id128_to_string</function></funcdef>
+ <funcdef>char *<function>sd_id128_to_string</function></funcdef>
<paramdef>sd_id128_t <parameter>id</parameter>, char <parameter>s</parameter>[33]</paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_id128_from_string</function></funcdef>
- <paramdef>const char* <parameter>s</parameter>, sd_id128_t* <parameter>ret</parameter></paramdef>
+ <paramdef>const char *<parameter>s</parameter>, sd_id128_t *<parameter>ret</parameter></paramdef>
</funcprototype>
</funcsynopsis>
diff --git a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml
index bb851d1..17ecca8 100644
--- a/man/sd_is_fifo.xml
+++ b/man/sd_is_fifo.xml
@@ -85,7 +85,7 @@
<paramdef>int <parameter>fd</parameter></paramdef>
<paramdef>int <parameter>type</parameter></paramdef>
<paramdef>int <parameter>listening</parameter></paramdef>
- <paramdef>const char* <parameter>path</parameter></paramdef>
+ <paramdef>const char *<parameter>path</parameter></paramdef>
<paramdef>size_t <parameter>length</parameter></paramdef>
</funcprototype>
diff --git a/man/sd_journal_add_match.xml b/man/sd_journal_add_match.xml
index d776b14..2daca16 100644
--- a/man/sd_journal_add_match.xml
+++ b/man/sd_journal_add_match.xml
@@ -56,24 +56,24 @@
<funcprototype>
<funcdef>int <function>sd_journal_add_match</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
- <paramdef>const void* <parameter>data</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
+ <paramdef>const void *<parameter>data</parameter></paramdef>
<paramdef>size_t <parameter>size</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_journal_add_disjunction</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_journal_add_conjunction</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>void <function>sd_journal_flush_matches</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
</funcprototype>
</funcsynopsis>
</refsynopsisdiv>
diff --git a/man/sd_journal_get_catalog.xml b/man/sd_journal_get_catalog.xml
index 2495648..f848150 100644
--- a/man/sd_journal_get_catalog.xml
+++ b/man/sd_journal_get_catalog.xml
@@ -54,14 +54,14 @@
<funcprototype>
<funcdef>int <function>sd_journal_get_catalog</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
- <paramdef>char** <parameter>ret</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
+ <paramdef>char **<parameter>ret</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_journal_get_catalog_for_message_id</function></funcdef>
<paramdef>sd_id128_t <parameter>id</parameter></paramdef>
- <paramdef>char** <parameter>ret</parameter></paramdef>
+ <paramdef>char **<parameter>ret</parameter></paramdef>
</funcprototype>
diff --git a/man/sd_journal_get_cursor.xml b/man/sd_journal_get_cursor.xml
index 4410d6e..015c140 100644
--- a/man/sd_journal_get_cursor.xml
+++ b/man/sd_journal_get_cursor.xml
@@ -54,14 +54,14 @@
<funcprototype>
<funcdef>int <function>sd_journal_get_cursor</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
- <paramdef>char ** <parameter>cursor</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
+ <paramdef>char **<parameter>cursor</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_journal_test_cursor</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
- <paramdef>const char * <parameter>cursor</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
+ <paramdef>const char *<parameter>cursor</parameter></paramdef>
</funcprototype>
</funcsynopsis>
diff --git a/man/sd_journal_get_cutoff_realtime_usec.xml b/man/sd_journal_get_cutoff_realtime_usec.xml
index d32ab01..6df4b26 100644
--- a/man/sd_journal_get_cutoff_realtime_usec.xml
+++ b/man/sd_journal_get_cutoff_realtime_usec.xml
@@ -54,17 +54,17 @@
<funcprototype>
<funcdef>int <function>sd_journal_get_cutoff_realtime_usec</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
- <paramdef>uint64_t* <parameter>from</parameter></paramdef>
- <paramdef>uint64_t* <parameter>to</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
+ <paramdef>uint64_t *<parameter>from</parameter></paramdef>
+ <paramdef>uint64_t *<parameter>to</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_journal_get_cutoff_monotonic_usec</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
<paramdef>sd_id128_t <parameter>boot_id</parameter></paramdef>
- <paramdef>uint64_t* <parameter>from</parameter></paramdef>
- <paramdef>uint64_t* <parameter>to</parameter></paramdef>
+ <paramdef>uint64_t *<parameter>from</parameter></paramdef>
+ <paramdef>uint64_t *<parameter>to</parameter></paramdef>
</funcprototype>
</funcsynopsis>
diff --git a/man/sd_journal_get_data.xml b/man/sd_journal_get_data.xml
index c01db4e..343b680 100644
--- a/man/sd_journal_get_data.xml
+++ b/man/sd_journal_get_data.xml
@@ -58,41 +58,41 @@
<funcprototype>
<funcdef>int <function>sd_journal_get_data</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
- <paramdef>const char* <parameter>field</parameter></paramdef>
- <paramdef>const void** <parameter>data</parameter></paramdef>
- <paramdef>size_t* <parameter>length</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
+ <paramdef>const char *<parameter>field</parameter></paramdef>
+ <paramdef>const void **<parameter>data</parameter></paramdef>
+ <paramdef>size_t *<parameter>length</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_journal_enumerate_data</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
- <paramdef>const void** <parameter>data</parameter></paramdef>
- <paramdef>size_t* <parameter>length</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
+ <paramdef>const void **<parameter>data</parameter></paramdef>
+ <paramdef>size_t *<parameter>length</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>void <function>sd_journal_restart_data</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef><function>SD_JOURNAL_FOREACH_DATA</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
- <paramdef>const void* <parameter>data</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
+ <paramdef>const void *<parameter>data</parameter></paramdef>
<paramdef>size_t <parameter>length</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_journal_set_data_threshold</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
<paramdef>size_t <parameter>sz</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_journal_get_data_threshold</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
- <paramdef>size_t* <parameter>sz</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
+ <paramdef>size_t *<parameter>sz</parameter></paramdef>
</funcprototype>
</funcsynopsis>
</refsynopsisdiv>
diff --git a/man/sd_journal_get_fd.xml b/man/sd_journal_get_fd.xml
index 16aeea2..809f00b 100644
--- a/man/sd_journal_get_fd.xml
+++ b/man/sd_journal_get_fd.xml
@@ -62,34 +62,34 @@
<funcprototype>
<funcdef>int <function>sd_journal_get_fd</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_journal_get_events</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_journal_get_timeout</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
- <paramdef>uint64_t* <parameter>timeout_usec</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
+ <paramdef>uint64_t *<parameter>timeout_usec</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_journal_process</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_journal_wait</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
<paramdef>uint64_t <parameter>timeout_usec</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_journal_reliable_fd</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
</funcprototype>
</funcsynopsis>
diff --git a/man/sd_journal_get_realtime_usec.xml b/man/sd_journal_get_realtime_usec.xml
index a9e6f07..0912c56 100644
--- a/man/sd_journal_get_realtime_usec.xml
+++ b/man/sd_journal_get_realtime_usec.xml
@@ -54,15 +54,15 @@
<funcprototype>
<funcdef>int <function>sd_journal_get_realtime_usec</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
- <paramdef>uint64_t* <parameter>usec</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
+ <paramdef>uint64_t *<parameter>usec</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_journal_get_monotonic_usec</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
- <paramdef>uint64_t* <parameter>usec</parameter></paramdef>
- <paramdef>sd_id128_t* <parameter>boot_id</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
+ <paramdef>uint64_t *<parameter>usec</parameter></paramdef>
+ <paramdef>sd_id128_t *<parameter>boot_id</parameter></paramdef>
</funcprototype>
</funcsynopsis>
diff --git a/man/sd_journal_get_usage.xml b/man/sd_journal_get_usage.xml
index e677b5f..5119fba 100644
--- a/man/sd_journal_get_usage.xml
+++ b/man/sd_journal_get_usage.xml
@@ -53,8 +53,8 @@
<funcprototype>
<funcdef>int <function>sd_journal_get_usage</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
- <paramdef>uint64_t* <parameter>bytes</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
+ <paramdef>uint64_t *<parameter>bytes</parameter></paramdef>
</funcprototype>
</funcsynopsis>
diff --git a/man/sd_journal_next.xml b/man/sd_journal_next.xml
index d3a7183..0216d6e 100644
--- a/man/sd_journal_next.xml
+++ b/man/sd_journal_next.xml
@@ -58,34 +58,34 @@
<funcprototype>
<funcdef>int <function>sd_journal_next</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_journal_previous</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_journal_next_skip</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
<paramdef>uint64_t <parameter>skip</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_journal_previous_skip</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
<paramdef>uint64_t <parameter>skip</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef><function>SD_JOURNAL_FOREACH</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef><function>SD_JOURNAL_FOREACH_BACKWARDS</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
</funcprototype>
</funcsynopsis>
</refsynopsisdiv>
diff --git a/man/sd_journal_open.xml b/man/sd_journal_open.xml
index 3fc0d0c..3d8a23d 100644
--- a/man/sd_journal_open.xml
+++ b/man/sd_journal_open.xml
@@ -62,34 +62,34 @@
<funcprototype>
<funcdef>int <function>sd_journal_open</function></funcdef>
- <paramdef>sd_journal** <parameter>ret</parameter></paramdef>
+ <paramdef>sd_journal **<parameter>ret</parameter></paramdef>
<paramdef>int <parameter>flags</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_journal_open_directory</function></funcdef>
- <paramdef>sd_journal** <parameter>ret</parameter></paramdef>
- <paramdef>const char* <parameter>path</parameter></paramdef>
+ <paramdef>sd_journal **<parameter>ret</parameter></paramdef>
+ <paramdef>const char *<parameter>path</parameter></paramdef>
<paramdef>int <parameter>flags</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_journal_open_files</function></funcdef>
- <paramdef>sd_journal** <parameter>ret</parameter></paramdef>
- <paramdef>const char** <parameter>paths</parameter></paramdef>
+ <paramdef>sd_journal **<parameter>ret</parameter></paramdef>
+ <paramdef>const char **<parameter>paths</parameter></paramdef>
<paramdef>int <parameter>flags</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_journal_open_container</function></funcdef>
- <paramdef>sd_journal** <parameter>ret</parameter></paramdef>
- <paramdef>const char* <parameter>machine</parameter></paramdef>
+ <paramdef>sd_journal **<parameter>ret</parameter></paramdef>
+ <paramdef>const char *<parameter>machine</parameter></paramdef>
<paramdef>int <parameter>flags</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>void <function>sd_journal_close</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
</funcprototype>
</funcsynopsis>
</refsynopsisdiv>
diff --git a/man/sd_journal_print.xml b/man/sd_journal_print.xml
index c6f204b..b636bcf 100644
--- a/man/sd_journal_print.xml
+++ b/man/sd_journal_print.xml
@@ -59,20 +59,20 @@
<funcprototype>
<funcdef>int <function>sd_journal_print</function></funcdef>
<paramdef>int <parameter>priority</parameter></paramdef>
- <paramdef>const char* <parameter>format</parameter></paramdef>
+ <paramdef>const char *<parameter>format</parameter></paramdef>
<paramdef>...</paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_journal_printv</function></funcdef>
<paramdef>int <parameter>priority</parameter></paramdef>
- <paramdef>const char* <parameter>format</parameter></paramdef>
+ <paramdef>const char *<parameter>format</parameter></paramdef>
<paramdef>va_list <parameter>ap</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_journal_send</function></funcdef>
- <paramdef>const char* <parameter>format</parameter></paramdef>
+ <paramdef>const char *<parameter>format</parameter></paramdef>
<paramdef>...</paramdef>
</funcprototype>
@@ -84,7 +84,7 @@
<funcprototype>
<funcdef>int <function>sd_journal_perror</function></funcdef>
- <paramdef>const char* <parameter>message</parameter></paramdef>
+ <paramdef>const char *<parameter>message</parameter></paramdef>
</funcprototype>
</funcsynopsis>
diff --git a/man/sd_journal_query_unique.xml b/man/sd_journal_query_unique.xml
index 6f489bb..250c7a9 100644
--- a/man/sd_journal_query_unique.xml
+++ b/man/sd_journal_query_unique.xml
@@ -56,26 +56,26 @@
<funcprototype>
<funcdef>int <function>sd_journal_query_unique</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
- <paramdef>const char* <parameter>field</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
+ <paramdef>const char *<parameter>field</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_journal_enumerate_unique</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
- <paramdef>const void** <parameter>data</parameter></paramdef>
- <paramdef>size_t* <parameter>length</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
+ <paramdef>const void **<parameter>data</parameter></paramdef>
+ <paramdef>size_t *<parameter>length</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>void <function>sd_journal_restart_unique</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef><function>SD_JOURNAL_FOREACH_UNIQUE</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
- <paramdef>const void* <parameter>data</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
+ <paramdef>const void *<parameter>data</parameter></paramdef>
<paramdef>size_t <parameter>length</parameter></paramdef>
</funcprototype>
diff --git a/man/sd_journal_seek_head.xml b/man/sd_journal_seek_head.xml
index 9ee14e4..284479a 100644
--- a/man/sd_journal_seek_head.xml
+++ b/man/sd_journal_seek_head.xml
@@ -58,31 +58,31 @@
<funcprototype>
<funcdef>int <function>sd_journal_seek_head</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_journal_seek_tail</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_journal_seek_monotonic_usec</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
<paramdef>sd_id128_t <parameter>boot_id</parameter></paramdef>
<paramdef>uint64_t <parameter>usec</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_journal_seek_realtime_usec</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
<paramdef>uint64_t <parameter>usec</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_journal_seek_cursor</function></funcdef>
- <paramdef>sd_journal* <parameter>j</parameter></paramdef>
- <paramdef>const char * <parameter>cursor</parameter></paramdef>
+ <paramdef>sd_journal *<parameter>j</parameter></paramdef>
+ <paramdef>const char *<parameter>cursor</parameter></paramdef>
</funcprototype>
</funcsynopsis>
</refsynopsisdiv>
diff --git a/man/sd_journal_stream_fd.xml b/man/sd_journal_stream_fd.xml
index e7bd661..2cfaa87 100644
--- a/man/sd_journal_stream_fd.xml
+++ b/man/sd_journal_stream_fd.xml
@@ -53,7 +53,7 @@
<funcprototype>
<funcdef>int <function>sd_journal_stream_fd</function></funcdef>
- <paramdef>const char* <parameter>identifier</parameter></paramdef>
+ <paramdef>const char *<parameter>identifier</parameter></paramdef>
<paramdef>int <parameter>priority</parameter></paramdef>
<paramdef>int <parameter>level_prefix</parameter></paramdef>
</funcprototype>
diff --git a/man/sd_login_monitor_new.xml b/man/sd_login_monitor_new.xml
index aca7087..4d9e76d 100644
--- a/man/sd_login_monitor_new.xml
+++ b/man/sd_login_monitor_new.xml
@@ -59,34 +59,34 @@
<funcprototype>
<funcdef>int <function>sd_login_monitor_new</function></funcdef>
- <paramdef>const char* <parameter>category</parameter></paramdef>
- <paramdef>sd_login_monitor** <parameter>ret</parameter></paramdef>
+ <paramdef>const char *<parameter>category</parameter></paramdef>
+ <paramdef>sd_login_monitor **<parameter>ret</parameter></paramdef>
</funcprototype>
<funcprototype>
- <funcdef>sd_login_monitor* <function>sd_login_monitor_unref</function></funcdef>
- <paramdef>sd_login_monitor* <parameter>m</parameter></paramdef>
+ <funcdef>sd_login_monitor *<function>sd_login_monitor_unref</function></funcdef>
+ <paramdef>sd_login_monitor *<parameter>m</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_login_monitor_flush</function></funcdef>
- <paramdef>sd_login_monitor* <parameter>m</parameter></paramdef>
+ <paramdef>sd_login_monitor *<parameter>m</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_login_monitor_get_fd</function></funcdef>
- <paramdef>sd_login_monitor* <parameter>m</parameter></paramdef>
+ <paramdef>sd_login_monitor *<parameter>m</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_login_monitor_get_events</function></funcdef>
- <paramdef>sd_login_monitor* <parameter>m</parameter></paramdef>
+ <paramdef>sd_login_monitor *<parameter>m</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_login_monitor_get_timeout</function></funcdef>
- <paramdef>sd_login_monitor* <parameter>m</parameter></paramdef>
- <paramdef>uint64_t* <parameter>timeout_usec</parameter></paramdef>
+ <paramdef>sd_login_monitor *<parameter>m</parameter></paramdef>
+ <paramdef>uint64_t *<parameter>timeout_usec</parameter></paramdef>
</funcprototype>
</funcsynopsis>
diff --git a/man/sd_pid_get_session.xml b/man/sd_pid_get_session.xml
index a8266e0..933138d 100644
--- a/man/sd_pid_get_session.xml
+++ b/man/sd_pid_get_session.xml
@@ -67,73 +67,73 @@
<funcprototype>
<funcdef>int <function>sd_pid_get_session</function></funcdef>
<paramdef>pid_t <parameter>pid</parameter></paramdef>
- <paramdef>char** <parameter>session</parameter></paramdef>
+ <paramdef>char **<parameter>session</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_pid_get_unit</function></funcdef>
<paramdef>pid_t <parameter>pid</parameter></paramdef>
- <paramdef>char** <parameter>unit</parameter></paramdef>
+ <paramdef>char **<parameter>unit</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_pid_get_user_unit</function></funcdef>
<paramdef>pid_t <parameter>pid</parameter></paramdef>
- <paramdef>char** <parameter>unit</parameter></paramdef>
+ <paramdef>char **<parameter>unit</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_pid_get_owner_uid</function></funcdef>
<paramdef>pid_t <parameter>pid</parameter></paramdef>
- <paramdef>uid_t* <parameter>uid</parameter></paramdef>
+ <paramdef>uid_t *<parameter>uid</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_pid_get_machine_name</function></funcdef>
<paramdef>pid_t <parameter>pid</parameter></paramdef>
- <paramdef>char** <parameter>name</parameter></paramdef>
+ <paramdef>char **<parameter>name</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_pid_get_slice</function></funcdef>
<paramdef>pid_t <parameter>pid</parameter></paramdef>
- <paramdef>char** <parameter>slice</parameter></paramdef>
+ <paramdef>char **<parameter>slice</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_peer_get_session</function></funcdef>
<paramdef>int <parameter>fd</parameter></paramdef>
- <paramdef>char** <parameter>session</parameter></paramdef>
+ <paramdef>char **<parameter>session</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_peer_get_unit</function></funcdef>
<paramdef>int <parameter>fd</parameter></paramdef>
- <paramdef>char** <parameter>unit</parameter></paramdef>
+ <paramdef>char **<parameter>unit</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_peer_get_user_unit</function></funcdef>
<paramdef>int <parameter>fd</parameter></paramdef>
- <paramdef>char** <parameter>unit</parameter></paramdef>
+ <paramdef>char **<parameter>unit</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_peer_get_owner_uid</function></funcdef>
<paramdef>int <parameter>fd</parameter></paramdef>
- <paramdef>uid_t* <parameter>uid</parameter></paramdef>
+ <paramdef>uid_t *<parameter>uid</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_peer_get_machine_name</function></funcdef>
<paramdef>int <parameter>fd</parameter></paramdef>
- <paramdef>char** <parameter>name</parameter></paramdef>
+ <paramdef>char **<parameter>name</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_peer_get_slice</function></funcdef>
<paramdef>int <parameter>fd</parameter></paramdef>
- <paramdef>char** <parameter>slice</parameter></paramdef>
+ <paramdef>char **<parameter>slice</parameter></paramdef>
</funcprototype>
</funcsynopsis>
</refsynopsisdiv>
diff --git a/man/sd_seat_get_active.xml b/man/sd_seat_get_active.xml
index f2550dd..ba6cfeb 100644
--- a/man/sd_seat_get_active.xml
+++ b/man/sd_seat_get_active.xml
@@ -57,32 +57,32 @@
<funcprototype>
<funcdef>int <function>sd_seat_get_active</function></funcdef>
- <paramdef>const char* <parameter>seat</parameter></paramdef>
- <paramdef>char** <parameter>session</parameter></paramdef>
- <paramdef>uid_t* <parameter>uid</parameter></paramdef>
+ <paramdef>const char *<parameter>seat</parameter></paramdef>
+ <paramdef>char **<parameter>session</parameter></paramdef>
+ <paramdef>uid_t *<parameter>uid</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_seat_get_sessions</function></funcdef>
- <paramdef>const char* <parameter>seat</parameter></paramdef>
- <paramdef>char*** <parameter>sessions</parameter></paramdef>
- <paramdef>uid_t** <parameter>uid</parameter></paramdef>
- <paramdef>unsigned int* <parameter>n_uids</parameter></paramdef>
+ <paramdef>const char *<parameter>seat</parameter></paramdef>
+ <paramdef>char ***<parameter>sessions</parameter></paramdef>
+ <paramdef>uid_t **<parameter>uid</parameter></paramdef>
+ <paramdef>unsigned int *<parameter>n_uids</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_seat_can_multi_session</function></funcdef>
- <paramdef>const char* <parameter>seat</parameter></paramdef>
+ <paramdef>const char *<parameter>seat</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_seat_can_tty</function></funcdef>
- <paramdef>const char* <parameter>seat</parameter></paramdef>
+ <paramdef>const char *<parameter>seat</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_seat_can_graphical</function></funcdef>
- <paramdef>const char* <parameter>seat</parameter></paramdef>
+ <paramdef>const char *<parameter>seat</parameter></paramdef>
</funcprototype>
</funcsynopsis>
</refsynopsisdiv>
diff --git a/man/sd_session_is_active.xml b/man/sd_session_is_active.xml
index 31a6119..407354a 100644
--- a/man/sd_session_is_active.xml
+++ b/man/sd_session_is_active.xml
@@ -65,78 +65,78 @@
<funcprototype>
<funcdef>int <function>sd_session_is_active</function></funcdef>
- <paramdef>const char* <parameter>session</parameter></paramdef>
+ <paramdef>const char *<parameter>session</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_session_is_remote</function></funcdef>
- <paramdef>const char* <parameter>session</parameter></paramdef>
+ <paramdef>const char *<parameter>session</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_session_get_state</function></funcdef>
- <paramdef>const char* <parameter>session</parameter></paramdef>
- <paramdef>char** <parameter>state</parameter></paramdef>
+ <paramdef>const char *<parameter>session</parameter></paramdef>
+ <paramdef>char **<parameter>state</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_session_get_uid</function></funcdef>
- <paramdef>const char* <parameter>session</parameter></paramdef>
- <paramdef>uid_t* <parameter>uid</parameter></paramdef>
+ <paramdef>const char *<parameter>session</parameter></paramdef>
+ <paramdef>uid_t *<parameter>uid</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_session_get_seat</function></funcdef>
- <paramdef>const char* <parameter>session</parameter></paramdef>
- <paramdef>char** <parameter>seat</parameter></paramdef>
+ <paramdef>const char *<parameter>session</parameter></paramdef>
+ <paramdef>char **<parameter>seat</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_session_get_service</function></funcdef>
- <paramdef>const char* <parameter>session</parameter></paramdef>
- <paramdef>char** <parameter>service</parameter></paramdef>
+ <paramdef>const char *<parameter>session</parameter></paramdef>
+ <paramdef>char **<parameter>service</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_session_get_type</function></funcdef>
- <paramdef>const char* <parameter>session</parameter></paramdef>
- <paramdef>char** <parameter>type</parameter></paramdef>
+ <paramdef>const char *<parameter>session</parameter></paramdef>
+ <paramdef>char **<parameter>type</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_session_get_class</function></funcdef>
- <paramdef>const char* <parameter>session</parameter></paramdef>
- <paramdef>char** <parameter>class</parameter></paramdef>
+ <paramdef>const char *<parameter>session</parameter></paramdef>
+ <paramdef>char **<parameter>class</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_session_get_display</function></funcdef>
- <paramdef>const char* <parameter>session</parameter></paramdef>
- <paramdef>char** <parameter>display</parameter></paramdef>
+ <paramdef>const char *<parameter>session</parameter></paramdef>
+ <paramdef>char **<parameter>display</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_session_get_remote_host</function></funcdef>
- <paramdef>const char* <parameter>session</parameter></paramdef>
- <paramdef>char** <parameter>remote_host</parameter></paramdef>
+ <paramdef>const char *<parameter>session</parameter></paramdef>
+ <paramdef>char **<parameter>remote_host</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_session_get_remote_user</function></funcdef>
- <paramdef>const char* <parameter>session</parameter></paramdef>
- <paramdef>char** <parameter>remote_user</parameter></paramdef>
+ <paramdef>const char *<parameter>session</parameter></paramdef>
+ <paramdef>char **<parameter>remote_user</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_session_get_tty</function></funcdef>
- <paramdef>const char* <parameter>session</parameter></paramdef>
- <paramdef>char** <parameter>tty</parameter></paramdef>
+ <paramdef>const char *<parameter>session</parameter></paramdef>
+ <paramdef>char **<parameter>tty</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_session_get_vt</function></funcdef>
- <paramdef>const char* <parameter>session</parameter></paramdef>
- <paramdef>unsigned int* <parameter>vt</parameter></paramdef>
+ <paramdef>const char *<parameter>session</parameter></paramdef>
+ <paramdef>unsigned int *<parameter>vt</parameter></paramdef>
</funcprototype>
</funcsynopsis>
</refsynopsisdiv>
diff --git a/man/sd_uid_get_state.xml b/man/sd_uid_get_state.xml
index f2899ee..01ad0ab 100644
--- a/man/sd_uid_get_state.xml
+++ b/man/sd_uid_get_state.xml
@@ -57,28 +57,28 @@
<funcprototype>
<funcdef>int <function>sd_uid_get_state</function></funcdef>
<paramdef>uid_t <parameter>uid</parameter></paramdef>
- <paramdef>char** <parameter>state</parameter></paramdef>
+ <paramdef>char **<parameter>state</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_uid_is_on_seat</function></funcdef>
<paramdef>uid_t <parameter>uid</parameter></paramdef>
<paramdef>int <parameter>require_active</parameter></paramdef>
- <paramdef>const char* <parameter>seat</parameter></paramdef>
+ <paramdef>const char *<parameter>seat</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_uid_get_sessions</function></funcdef>
<paramdef>uid_t <parameter>uid</parameter></paramdef>
<paramdef>int <parameter>require_active</parameter></paramdef>
- <paramdef>char*** <parameter>sessions</parameter></paramdef>
+ <paramdef>char ***<parameter>sessions</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>sd_uid_get_seats</function></funcdef>
<paramdef>uid_t <parameter>uid</parameter></paramdef>
<paramdef>int <parameter>require_active</parameter></paramdef>
- <paramdef>char*** <parameter>seats</parameter></paramdef>
+ <paramdef>char ***<parameter>seats</parameter></paramdef>
</funcprototype>
</funcsynopsis>
</refsynopsisdiv>
commit 6667311dc3d22ad0c2f6a3085654ec00aa89d212
Author: Jan Engelhardt <jengelh at inai.de>
Date: Thu May 8 01:28:47 2014 +0200
doc: write out stdin/stdout file descriptors
"When refering to code, STDOUT/STDOUT/STDERR are replaced with
stdin/stdout/stderr, and in other places they are replaced with
normal phrases like standard output, etc."
Addendum to commit v209~127.
diff --git a/man/daemon.xml b/man/daemon.xml
index ab58d08..b1f43f5 100644
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -74,8 +74,8 @@
<orderedlist>
<listitem><para>Close all open file
- descriptors except stdin, stdout,
- stderr (i.e. the first three file
+ descriptors except standard input, output,
+ and error (i.e. the first three file
descriptors 0, 1, 2). This ensures
that no accidentally passed file
descriptor stays around in the daemon
commit b8bde11658366290521e3d03316378b482600323
Author: Jan Engelhardt <jengelh at inai.de>
Date: Thu May 8 01:28:45 2014 +0200
doc: comma placement corrections and word order
Set commas where there should be some.
Some improvements to word order.
diff --git a/NEWS b/NEWS
index 1b548f5..f90d7f8 100644
--- a/NEWS
+++ b/NEWS
@@ -60,9 +60,9 @@ CHANGES WITH 212:
users who are logged out cannot continue to consume IPC
resources. This covers SysV memory, semaphores and message
queues as well as POSIX shared memory and message
- queues. Traditionally SysV and POSIX IPC had no life-cycle
- limits, with this functionality this is corrected. This may
- be turned off using the RemoveIPC= switch of logind.conf.
+ queues. Traditionally, SysV and POSIX IPC had no life-cycle
+ limits. With this functionality, that is corrected. This may
+ be turned off by using the RemoveIPC= switch of logind.conf.
* The systemd-machine-id-setup and tmpfiles tools gained a
--root= switch to operate on a specific root directory,
@@ -95,7 +95,7 @@ CHANGES WITH 212:
this is appropriate.
* systemd-udevd will now run in a disassociated mount
- namespace. To mount directories from udev rules make sure to
+ namespace. To mount directories from udev rules, make sure to
pull in mount units via SYSTEMD_WANTS properties.
* The kdbus support gained support for uploading policy into
@@ -118,12 +118,12 @@ CHANGES WITH 212:
DefaultTimerAccuracySec= has been added that controls the
default AccuracySec= setting of .timer units.
- * Timer units gained a new WakeSystem= switch. If enabled
+ * Timer units gained a new WakeSystem= switch. If enabled,
timers configured this way will cause the system to resume
from system suspend (if the system supports that, which most
do these days).
- * Timer units gained a new Persistent= switch. If enabled
+ * Timer units gained a new Persistent= switch. If enabled,
timers configured this way will save to disk when they have
been last triggered. This information is then used on next
reboot to possible execute overdue timer events, that
@@ -181,12 +181,12 @@ CHANGES WITH 211:
* systemd-gpt-auto-generator is now able to discover /srv and
root partitions in addition to /home and swap partitions. It
also supports LUKS-encrypted partitions now. With this in
- place automatic discovery of partitions to mount following
+ place, automatic discovery of partitions to mount following
the Discoverable Partitions Specification
(http://www.freedesktop.org/wiki/Specifications/DiscoverablePartitionsSpec)
is now a lot more complete. This allows booting without
/etc/fstab and without root= on the kernel command line on
- appropriately prepared systems.
+ systems prepared appropriately.
* systemd-nspawn gained a new --image= switch which allows
booting up disk images and Linux installations on any block
@@ -291,11 +291,11 @@ CHANGES WITH 210:
* logind is now a lot more aggressive when suspending the
machine due to a closed laptop lid. Instead of acting only
- on the lid close action it will continuously watch the lid
+ on the lid close action, it will continuously watch the lid
status and act on it. This is useful for laptops where the
power button is on the outside of the chassis so that it can
be reached without opening the lid (such as the Lenovo
- Yoga). On those machines logind will now immediately
+ Yoga). On those machines, logind will now immediately
re-suspend the machine if the power button has been
accidentally pressed while the laptop was suspended and in a
backpack or similar.
@@ -332,7 +332,7 @@ CHANGES WITH 210:
* The DeviceAllow= setting in unit files now supports a syntax
to whitelist an entire group of devices node majors at once,
based on the /proc/devices listing. For example, with the
- string "char-pts" it is now possible to whitelist all
+ string "char-pts", it is now possible to whitelist all
current and future pseudo-TTYs at once.
* sd-event learned a new "post" event source. Event sources of
@@ -346,20 +346,20 @@ CHANGES WITH 210:
enabled/disabled using systemctl. It still is enabled by
default however.
- * When creating a veth interface pair with systemd-nspawn the
+ * When creating a veth interface pair with systemd-nspawn, the
host side will now be prefixed with "vb-" if
--network-bridge= is used, and with "ve-" if --network-veth
- is used. This way it is easy to distinguish these cases on
+ is used. This way, it is easy to distinguish these cases on
the host, for example to apply different configuration to
them with systemd-networkd.
* The compatibility libraries for libsystemd-journal.so,
libsystem-id128.so, libsystemd-login.so and
libsystemd-daemon.so do not make use of IFUNC
- anymore. Instead we now build libsystemd.so multiple times
+ anymore. Instead, we now build libsystemd.so multiple times
under these alternative names. This means that the footprint
is drastically increased, but given that these are
- transitional compatibility libraries this should not matter
+ transitional compatibility libraries, this should not matter
much. This change has been made necessary to support the ARM
platform for these compatibility libraries, as the ARM
toolchain is not really at the same level as the toolchain
@@ -770,8 +770,8 @@ CHANGES WITH 209:
* systemd-nspawn gained a new --personality= switch for
setting the kernel personality for the container. This is
useful when running a 32-bit container on a 64-bit host. A
- similar option Personality= is now also available in service
- units.
+ similar option Personality= is now also available for service
+ units to use.
* logind will now also track a "Desktop" identifier for each
session which encodes the desktop environment of it. This is
@@ -795,8 +795,8 @@ CHANGES WITH 209:
* For usage together with SystemCallFilter=, a new
SystemCallErrorNumber= setting has been introduced that
- allows configuration of a system error number to return on
- filtered system calls, instead of immediately killing the
+ allows configuration of a system error number to be returned
+ on filtered system calls, instead of immediately killing the
process. Also, SystemCallArchitectures= has been added to
limit access to system calls of a particular architecture
(in order to turn off support for unused secondary
diff --git a/README b/README
index ef8c620..4358cd7 100644
--- a/README
+++ b/README
@@ -200,7 +200,7 @@ WARNINGS:
supported anymore by the basic set of Linux OS components.
systemd requires that the /run mount point exists. systemd also
- requires that /var/run is a a symlink → /run.
+ requires that /var/run is a a symlink to /run.
For more information on this issue consult
http://freedesktop.org/wiki/Software/systemd/separate-usr-is-broken
diff --git a/man/logind.conf.xml b/man/logind.conf.xml
index 9914091..1293e71 100644
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@@ -312,7 +312,7 @@
physical RAM. Defaults to 10%. Note
that this size is a safety limit
only. As each runtime directory is a
- tmpfs file system it will only consume
+ tmpfs file system, it will only consume
as much memory as it is filled up
to.</para></listitem>
</varlistentry>
@@ -324,7 +324,7 @@
System V and POSIX IPC objects
belonging to the user shall be removed
when she or he fully logs out. Takes a
- boolean argument. If enabled the user
+ boolean argument. If enabled, the user
may not consume IPC resources after
the last of his sessions
terminated. This covers System V
diff --git a/man/sd_bus_error.xml b/man/sd_bus_error.xml
index 68f1d7b..9be4747 100644
--- a/man/sd_bus_error.xml
+++ b/man/sd_bus_error.xml
@@ -232,8 +232,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<title>Description</title>
<para>The <structname>sd_bus_error</structname> structure carries
- information for a <filename>sd-bus</filename> error.
- Functions described below can be used to set and query fields in
+ information for a <filename>sd-bus</filename> error. The
+ functions described below can be used to set and query fields in
this structure. The <structfield>name</structfield> field contains a
short identifier of an error. It should follow the rules for error
names described in the D-Bus specification, subsection <ulink
diff --git a/man/sd_bus_message_append.xml b/man/sd_bus_message_append.xml
index 2a1e95a..b14a6c9 100644
--- a/man/sd_bus_message_append.xml
+++ b/man/sd_bus_message_append.xml
@@ -65,7 +65,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<refsect1>
<title>Description</title>
- <para>Function <function>sd_bus_message_append</function> appends
+ <para>The <function>sd_bus_message_append</function> function appends
a sequence of items to message <parameter>m</parameter>. The
format string <parameter>types</parameter> describes the types of
arguments that follow.</para>
diff --git a/man/sd_bus_message_append_array.xml b/man/sd_bus_message_append_array.xml
index fe84671..455e1bb 100644
--- a/man/sd_bus_message_append_array.xml
+++ b/man/sd_bus_message_append_array.xml
@@ -91,7 +91,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<refsect1>
<title>Description</title>
- <para>Function <function>sd_bus_message_append_array</function>
+ <para>The <function>sd_bus_message_append_array</function> functionc
appends items to message <parameter>m</parameter> as the single
array. A container will be opened, items appended, and the
container closed. Parameter <parameter>type</parameter> determines
@@ -116,19 +116,19 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
into the memory area containing the message and may be changed
after this call.</para>
- <para>Function
- <function>sd_bus_message_append_array_memfd</function> appends
+ <para>The
+ <function>sd_bus_message_append_array_memfd</function> function appends
items to message <parameter>m</parameter>, similarly to
<function>sd_bus_message_append_array</function>. Contents of the
memory file descriptor <parameter>memfd</parameter> are used as
the contents of the array. Their size must be a multiple of the
size of the type <parameter>type</parameter>.</para>
- <para>Descriptor <parameter>memfd</parameter> will be sealed
- and cannot be modified after this call.</para>
+ <para>The descriptor specified with <parameter>memfd</parameter>
+ will be sealed and cannot be modified after this call.</para>
- <para>Function
- <function>sd_bus_message_append_array_iovec</function> appends
+ <para>The
+ <function>sd_bus_message_append_array_iovec</function> function appends
items to message <parameter>m</parameter>, similarly to
<function>sd_bus_message_append_array</function>. Contents of the
iovec <parameter>iov</parameter> are used as the contents of the
@@ -136,7 +136,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
sum of <structfield>iov_len</structfield> fields) must be a multiple
of the size of the type <parameter>type</parameter>.</para>
- <para>Pointer <parameter>iov</parameter> must point to
+ <para>The <parameter>iov</parameter> argument must point to
<parameter>n</parameter> <structname>struct iovec</structname>
structures. Each structure may have the
<structname>iov_base</structname> field set, in which case the
@@ -146,8 +146,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
memory pointed at by <parameter>iov</parameter> may be changed
after this call.</para>
- <para>Function
- <function>sd_bus_message_append_array_space</function> appends
+ <para>The
+ <function>sd_bus_message_append_array_space</function> function appends
space for an array of items to message <parameter>m</parameter>.
It behaves the same as
<function>sd_bus_message_append_array</function>, but instead
@@ -159,7 +159,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<refsect1>
<title>Return Value</title>
- <para>On success, those calls return 0 or a positive integer. On
+ <para>On success, these calls return 0 or a positive integer. On
failure, they returns a negative errno-style error code.</para>
</refsect1>
diff --git a/man/sd_bus_message_append_basic.xml b/man/sd_bus_message_append_basic.xml
index a8e91f9..68e1191 100644
--- a/man/sd_bus_message_append_basic.xml
+++ b/man/sd_bus_message_append_basic.xml
@@ -198,7 +198,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
character sequence. As a special case, a <constant>NULL</constant>
pointer is interpreted as an empty string. The string should be
valid Unicode string encoded as UTF-8. In case of the two latter
- types, additionally the requirements for a D-Bus object path or
+ types, the additional requirements for a D-Bus object path or
type signature should be satisfied. Those requirements should be
verified by the recepient of the message.
</para>
@@ -257,7 +257,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<refsect1>
<title>Notes</title>
- <para><function>sd_bus_append_basic()</function> function
+ <para>The <function>sd_bus_append_basic()</function> function
described here is available as a shared library, which can be
compiled and linked to with the
<constant>libsystemd</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
diff --git a/man/sd_bus_message_append_string_memfd.xml b/man/sd_bus_message_append_string_memfd.xml
index bf185ef..b44c482 100644
--- a/man/sd_bus_message_append_string_memfd.xml
+++ b/man/sd_bus_message_append_string_memfd.xml
@@ -80,27 +80,27 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<refsect1>
<title>Description</title>
- <para>Functions
+ <para>The functions
<function>sd_bus_message_append_string_memfd</function> and
<function>sd_bus_message_append_string_iovec</function> can be
used to append a single string (item of type <literal>s</literal>)
to message <parameter>m</parameter>.</para>
<para>In case of
- <function>sd_bus_message_append_string_memfd</function> the
+ <function>sd_bus_message_append_string_memfd</function>, the
contents of <parameter>memfd</parameter> are the string. They must
satisfy the same constraints as described for the
<literal>s</literal> type in
<citerefentry><refentrytitle>sd_bus_message_append_basic</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para>
<para>In case of
- <function>sd_bus_message_append_string_iovec</function> the
+ <function>sd_bus_message_append_string_iovec</function>, the
payload of <parameter>iov</parameter> is the string. It must
satisfy the same constraints as described for the
<literal>s</literal> type in
<citerefentry><refentrytitle>sd_bus_message_append_basic</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para>
- <para>Pointer <parameter>iov</parameter> must point to
+ <para>The <parameter>iov</parameter> argument must point to
<parameter>n</parameter> <structname>struct iovec</structname>
structures. Each structure may have the
<structname>iov_base</structname> field set, in which case the
@@ -110,10 +110,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
memory pointed at by <parameter>iov</parameter> may be changed
after this call.</para>
- <para>Function
- <function>sd_bus_message_append_string_space</function> appends
- space for a string to message <parameter>m</parameter>. If behaves
- similarly to <function>sd_bus_message_append_basic</function> with
+ <para>The
+ <function>sd_bus_message_append_string_space</function> function appends
+ space for a string to message <parameter>m</parameter>. It behaves
+ similar to <function>sd_bus_message_append_basic</function> with
type <literal>s</literal>, but instead of copying a string into
the message, it returns a pointer to the destination area to
the caller in pointer <parameter>p</parameter>. Space for the string
@@ -133,7 +133,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<refsect1>
<title>Notes</title>
- <para>Functions described here are available as a shared library,
+ <para>The functions described here are available as a shared library,
which can be compiled and linked to with the
<constant>libsystemd</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
file.</para>
diff --git a/man/sd_bus_message_append_strv.xml b/man/sd_bus_message_append_strv.xml
index 4fb1390..a4e8350 100644
--- a/man/sd_bus_message_append_strv.xml
+++ b/man/sd_bus_message_append_strv.xml
@@ -64,10 +64,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<refsect1>
<title>Description</title>
- <para>Function <function>sd_bus_message_append</function> can be
+ <para>The <function>sd_bus_message_append</function> function can be
used to append an array of strings to message
- <parameter>m</parameter>. Parameter <parameter>l</parameter>
- points to a <constant>NULL</constant>-terminated array of pointers
+ <parameter>m</parameter>. The parameter <parameter>l</parameter>
+ shall point to a <constant>NULL</constant>-terminated array of pointers
to <constant>NUL</constant>-terminated strings. Each string must
satisfy the same constraints as described for the
<literal>s</literal> type in
@@ -94,7 +94,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<refsect1>
<title>Notes</title>
- <para><function>sd_bus_append_append_strv()</function> function
+ <para>The <function>sd_bus_append_append_strv()</function> function
described here is available as a shared library, which can be
compiled and linked to with the
<constant>libsystemd</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
diff --git a/man/sd_bus_negotiate_fds.xml b/man/sd_bus_negotiate_fds.xml
index c206194..09563f8 100644
--- a/man/sd_bus_negotiate_fds.xml
+++ b/man/sd_bus_negotiate_fds.xml
@@ -79,35 +79,35 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<para><function>sd_bus_negotiate_fds()</function> controls whether
file descriptor passing shall be negotiated for the specified bus
- connection. Takes a bus object and a boolean, which when true
- enables file descriptor passing, and when false disables it. Note
+ connection. It takes a bus object and a boolean, which, when true,
+ enables file descriptor passing, and, when false, disables it. Note
that not all transports and servers support file descriptor
passing. To find out whether file descriptor passing is available
- after negotiation use
+ after negotiation, use
<citerefentry><refentrytitle>sd_bus_can_send</refentrytitle><manvolnum>3</manvolnum></citerefentry>
and pass <constant>SD_BUS_TYPE_UNIX_FD</constant>. Note that file
descriptor passing is always enabled for both sending and
receiving or for neither, but never only in one direction. By
- default file descriptor passing is negotiated for all
+ default, file descriptor passing is negotiated for all
connections.</para>
- <para>Note that when bus activation is used it is highly
+ <para>Note that when bus activation is used, it is highly
recommended to set the <option>AcceptFileDescriptors=</option>
setting in the <filename>.busname</filename> unit file to the same
setting as negotiated by the program ultimately activated. By
- default file descriptor passing is enabled for both.</para>
+ default, file descriptor passing is enabled for both.</para>
<para><function>sd_bus_negotiate_timestamps()</function> controls
whether implicit sender timestamps shall be attached automatically
- to all incoming messages. Takes a bus object and a boolean, which
- when true enables timestamping, and when false disables it. If
+ to all incoming messages. Takes a bus object and a boolean, which,
+ when true, enables timestamping, and, when false, disables it. If
this is disabled,
<citerefentry><refentrytitle>sd_bus_message_get_monotonic_usec</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
<citerefentry><refentrytitle>sd_bus_message_get_realtime_usec</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
<citerefentry><refentrytitle>sd_bus_message_get_seqno</refentrytitle><manvolnum>3</manvolnum></citerefentry>
fail with <constant>-ENODATA</constant> on incoming messages. Note
that not all transports support timestamping of messages. On local
- transports the timestamping is applied by the kernel and cannot be
+ transports, the timestamping is applied by the kernel and cannot be
manipulated by userspace.</para>
<para><function>sd_bus_negotiate_creds()</function> controls
@@ -119,9 +119,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
fails with <constant>-ENODATA</constant> on incoming
messages. Note that not all transports support attaching sender
credentials to messages, or do not support all types of sender
- credential parameters. On local transports the sender credentials
+ credential parameters. On local transports, the sender credentials
are attached by the kernel and cannot be manipulated by
- userspace. By default no sender credentials are attached.</para>
+ userspace. By default, no sender credentials are attached.</para>
<para>These functions may be called only before the connection has
been started with
diff --git a/man/sd_bus_path_encode.xml b/man/sd_bus_path_encode.xml
index 7e11906..5849127 100644
--- a/man/sd_bus_path_encode.xml
+++ b/man/sd_bus_path_encode.xml
@@ -82,16 +82,16 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
prefix and an external identifier string as arguments, plus a
place to store the returned bus path string. The bus path prefix
must be a valid bus path, starting with a slash
- <literal>/</literal>, but not ending in one. The external
- identifier string may be in any format, may be the empty string
- and no restrictions on the charset are made - however it must
+ <literal>/</literal>, and not ending in one. The external
+ identifier string may be in any format, may be the empty string,
+ and has no restrictions on the charset — however, it must
always be <constant>NUL</constant>-terminated. The returned string
will be the concatenation of the bus path prefix plus an escaped
version of the external identifier string. This operation may be
reversed with <function>sd_bus_decode()</function>. It is
- recommended to only use external identifiers here that generally
+ recommended to only use external identifiers that generally
require little escaping to be turned into valid bus path
- identifiers (for example by sticking to a 7-bit ASCII character
+ identifiers (for example, by sticking to a 7-bit ASCII character
set), in order to ensure the resulting bus path is still short and
easily processed.</para>
@@ -101,12 +101,12 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
takes a bus path and a prefix string, plus a place to store the
returned external identifier string. If the bus path does not
start with the specified prefix, 0 is returned and the returned
- string is set to <constant>NULL</constant>. Otherwise the
+ string is set to <constant>NULL</constant>. Otherwise, the
string following the prefix is unescaped and returned in the
external identifier string.</para>
<para>The escaping used will replace all characters which are
- invalid in a bus object path by <literal>_</literal> followed by a
+ invalid in a bus object path by <literal>_</literal>, followed by a
hexadecimal value. As a special case, the empty string will be
replaced by a lone <literal>_</literal>.</para>
</refsect1>
@@ -118,8 +118,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
returns positive or 0, and a valid bus path in the return
argument. On success, <function>sd_bus_path_decode()</function>
returns a positive value if the prefixed matched, or 0 if it
- did not. If the prefix matched the external identifier is returned
- in the return parameter. If it did not match NULL is returned in
+ did not. If the prefix matched, the external identifier is returned
+ in the return parameter. If it did not match, NULL is returned in
the return parameter. On failure, a negative errno-style error
number is returned by either function. The returned strings must
be
diff --git a/man/sd_event_add_time.xml b/man/sd_event_add_time.xml
index 9af8bb9..983e486 100644
--- a/man/sd_event_add_time.xml
+++ b/man/sd_event_add_time.xml
@@ -121,7 +121,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
accuracy value in microseconds specifying a time the timer event
may be delayed. Specify 0 for selecting the default accuracy
(250ms). Specify 1 for most accurate timers. Consider specifying
- 60000000 or larger (1h) for long running events that may be
+ 60000000 or larger (1h) for long-running events that may be
delayed substantially. Picking higher accuracy values allows the
system to coalesce timer events more aggressively, thus improving
power efficiency. The <parameter>handler</parameter> shall
@@ -132,10 +132,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
actually have been called at a slightly later time, subject to the
specified accuracy value, the kernel timer slack (see
<citerefentry><refentrytitle>prctl</refentrytitle><manvolnum>2</manvolnum></citerefentry>)
- and additional scheduling latencies. By default the timer will
+ and additional scheduling latencies. By default, the timer will
elapse once (SD_EVENT_ONESHOT), but this may be changed with
<citerefentry><refentrytitle>sd_event_source_set_enabled</refentrytitle><manvolnum>3</manvolnum></citerefentry>. If
- the handler function returns a negative error code it will be
+ the handler function returns a negative error code, it will be
disabled after the invocation, even if SD_EVENT_ON mode is set.
</para>
diff --git a/man/sd_event_new.xml b/man/sd_event_new.xml
index f25631f..35e58ea 100644
--- a/man/sd_event_new.xml
+++ b/man/sd_event_new.xml
@@ -83,24 +83,24 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<para><function>sd_event_new()</function> allocates a new event
loop object. The event loop object is returned in the
- <parameter>event</parameter> parameter. After use drop
+ <parameter>event</parameter> parameter. After use, drop
the returned reference with
<function>sd_event_unref()</function>. When the last reference is
- dropped the event loop is freed.</para>
+ dropped, the event loop is freed.</para>
<para><function>sd_event_default()</function> acquires a reference
to the default event loop object of the calling thread, possibly
allocating a new object if no default event loop object has been
- allocated yet for the thread. After use drop the returned
+ allocated yet for the thread. After use, drop the returned
reference with <function>sd_event_unref()</function>. When the
- last reference is dropped the event loop is freed. If this
+ last reference is dropped, the event loop is freed. If this
function is called while the object returned from a previous call
from the same thread is still referenced, the same object is
returned again, but the reference is increased by one. It is
recommended to use this call instead of
<function>sd_event_new()</function> in order to share event loop
objects between various components that are dispatched in the same
- thread. All threads either have no or one default event loops
+ thread. All threads either have exactly zero or one default event loop
associated, but never more.</para>
<para><function>sd_event_ref()</function> increases the reference
@@ -108,13 +108,13 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<para><function>sd_event_unref()</function> decreases the
reference counter of the specified event loop object by one. If
- the counter hits zero the event loop object is freed. Note that it
+ the counter hits zero, the event loop object is freed. Note that it
is freed regardless of whether it is the default event loop object for a
thread or not. This means that allocating an event loop with
- <function>sd_event_default()</function>, then releasing it and
+ <function>sd_event_default()</function>, then releasing it, and
then acquiring a new one with
<function>sd_event_default()</function> will result in two
- distinct objects. Note that in order to free an event loop object
+ distinct objects. Note that, in order to free an event loop object,
all remaining event sources of the event loop also need to be
freed as they each keep a reference to it.</para>
</refsect1>
diff --git a/man/systemctl.xml b/man/systemctl.xml
index 28a7cca..181de4f 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -385,17 +385,17 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
control processes. Note that there is only one control
process per unit at a time, as only one state change is
executed at a time. For services of type
- <varname>Type=forking</varname> the initial process started
+ <varname>Type=forking</varname>, the initial process started
by the manager for <varname>ExecStart=</varname> is a
control process, while the process ultimately forked off by
that one is then considered the main process of the unit (if
it can be determined). This is different for service units
of other types, where the process forked off by the manager
for <varname>ExecStart=</varname> is always the main process
- itself. A service unit consists of no or one main process,
- no or one control process plus any number of additional
+ itself. A service unit consists of zero or one main process,
+ zero or one control process plus any number of additional
processes. Not all unit types manage processes of these
- types however. For example for mount units control processes
+ types however. For example, for mount units, control processes
are defined (which are the invocations of
<filename>/usr/bin/mount</filename> and
<filename>/usr/bin/umount</filename>), but no main process
@@ -724,7 +724,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
<para>Show terse runtime status information about one or
more units, followed by most recent log data from the
journal. If no units are specified, show system status. If
- combined with <option>--all</option> also show the status of
+ combined with <option>--all</option>, also show the status of
all units (subject to limitations specified with
<option>-t</option>). If a PID is passed, show information
about the unit the process belongs to.</para>
diff --git a/man/systemd-gpt-auto-generator.xml b/man/systemd-gpt-auto-generator.xml
index 41b83dd..68fe270 100644
--- a/man/systemd-gpt-auto-generator.xml
+++ b/man/systemd-gpt-auto-generator.xml
@@ -106,22 +106,22 @@
<row>
<entry>44479540-f297-41b2-9af7-d131d5f0458a</entry>
<entry><filename>Root Partition (x86)</filename></entry>
- <entry>On 32-bit x86 systems the first x86 root partition on the disk the EFI ESP is located on is mounted to the root directory <filename>/</filename>.</entry>
+ <entry>On 32-bit x86 systems, the first x86 root partition on the disk the EFI ESP is located on is mounted to the root directory <filename>/</filename>.</entry>
</row>
<row>
<entry>4f68bce3-e8cd-4db1-96e7-fbcaf984b709</entry>
<entry><filename>Root Partition (x86-64)</filename></entry>
- <entry>On 64-bit x86 systems the first x86-64 root partition on the disk the EFI ESP is located on is mounted to the root directory <filename>/</filename>.</entry>
+ <entry>On 64-bit x86 systems, the first x86-64 root partition on the disk the EFI ESP is located on is mounted to the root directory <filename>/</filename>.</entry>
</row>
<row>
<entry>69dad710-2ce4-4e3c-b16c-21a1d49abed3</entry>
<entry><filename>Root Partition (32-bit ARM)</filename></entry>
- <entry>On 32-bit ARM systems the first ARM root partition on the disk the EFI ESP is located on is mounted to the root directory <filename>/</filename>.</entry>
+ <entry>On 32-bit ARM systems, the first ARM root partition on the disk the EFI ESP is located on is mounted to the root directory <filename>/</filename>.</entry>
</row>
<row>
<entry>b921b045-1df0-41c3-af44-4c6f280d3fae</entry>
<entry><filename>Root Partition (64-bit ARM)</filename></entry>
- <entry>On 64-bit ARM systems the first ARM root partition on the disk the EFI ESP is located on is mounted to the root directory <filename>/</filename>.</entry>
+ <entry>On 64-bit ARM systems, the first ARM root partition on the disk the EFI ESP is located on is mounted to the root directory <filename>/</filename>.</entry>
</row>
<row>
<entry>933ac7e1-2eb4-4f13-b844-0e14e2aef915</entry>
@@ -158,7 +158,7 @@
<filename>/boot</filename> if not otherwise mounted.</para>
<para>When using this generator in conjunction with
- btrfs file systems make sure to set the correct
+ btrfs file systems, make sure to set the correct
default subvolumes on them, using <command>btrfs
subvolume set-default</command>.</para>
diff --git a/man/systemd-journal-remote.xml b/man/systemd-journal-remote.xml
index 1f0d93e..972c322 100644
--- a/man/systemd-journal-remote.xml
+++ b/man/systemd-journal-remote.xml
@@ -86,7 +86,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<command>systemd-journal-remote</command> can read more than one
event stream at a time. They will be interleaved in the output
file. In case of "active" connections, each "source" is one
- stream, and in case of "passive" connections each connection can
+ stream, and in case of "passive" connections, each connection can
result in a separate stream. Sockets can be configured in
"accept" mode (i.e. only one connection), or "listen" mode (i.e.
multiple connections, each resulting in a stream).
@@ -153,7 +153,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<varname>$LISTEN_FDS</varname>/<varname>$LISTEN_PID</varname>.
In the second case, an HTTP or HTTPS server will be spawned on
this port, respectively for <option>--listen-http</option> and
- <option>--listen-https</option>. Currenntly Only POST requests
+ <option>--listen-https</option>. Currenntly, only POST requests
to <filename>/upload</filename> with <literal>Content-Type:
application/vnd.fdo.journal</literal> are supported.</para>
</listitem>
@@ -171,7 +171,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<option>--listen-http=-<replaceable>n</replaceable></option>
or
<option>--listen-https=-<replaceable>n</replaceable></option>
- above. In this later case, an HTTP or HTTPS server will be
+ above. In the latter case, an HTTP or HTTPS server will be
spawned using this descriptor and connections must be made
over the HTTP protocol.</para>
</listitem>
@@ -193,8 +193,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<listitem><para>Will write to this journal. The filename must
end with <filename>.journal</filename>. The file will be
- created if it does not exist. When necessary (journal file
- full, or corrupted) the file will be renamed following normal
+ created if it does not exist. If necessary (journal file
+ full, or corrupted), the file will be renamed following normal
journald rules and a new journal file will be created in its
stead.</para></listitem>
</varlistentry>
@@ -203,15 +203,15 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<term><option>--output=<replaceable>DIR</replaceable></option></term>
<listitem><para>Will create journal files underneath directory
- <replaceable>DIR</replaceable>. The directory must exist. When
- necessary (journal files over size, or corrupted) journal
+ <replaceable>DIR</replaceable>. The directory must exist. If
+ necessary (journal files over size, or corrupted), journal
files will be rotated following normal journald rules. Names
of files underneath <replaceable>DIR</replaceable> will be
generated using the rules described below.</para></listitem>
</varlistentry>
</variablelist>
- <para>If <option>--output=</option> is not used, output directory
+ <para>If <option>--output=</option> is not used, the output directory
<filename>/var/log/journal/<replaceable>machine-id</replaceable>/</filename>
will be used, where <replaceable>machine-id</replaceable> is the
identifier of the current system (see
@@ -223,7 +223,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
based on what passive and active sources are specified. It is
recommended to give a full output filename.</para>
- <para>In case of "active" sources, if the hostname is known it
+ <para>In case of "active" sources, if the hostname is known, it
will be used in the <replaceable>variable</replaceable> part.
Otherwise, local address and port number will be used, or
<literal>stdin</literal> for events passed over standard
@@ -272,7 +272,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<varlistentry>
<term><option>--getter=<replaceable>PROG --option1 --option2</replaceable></option></term>
- <listitem><para>Program to invoke to retrieve data. Journal
+ <listitem><para>Program to invoke to retrieve data. The journal
event stream must be generated on standard output.</para>
<para>Examples:</para>
diff --git a/man/systemd-networkd-wait-online.service.xml b/man/systemd-networkd-wait-online.service.xml
index 1d368a2..3083588 100644
--- a/man/systemd-networkd-wait-online.service.xml
+++ b/man/systemd-networkd-wait-online.service.xml
@@ -58,8 +58,8 @@
<para><command>systemd-networkd-wait-online</command> is a
one-shot system service that waits for the network to be configured.
- By default it will wait for all links it is aware of that are managed by
- <citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+ By default, it will wait for all links it is aware of and which are managed by
+ <citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
to be fully configured or failed, and for at least one link to gain a
carrier.</para>
</refsect1>
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 1ad8e6e..ccd3436 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -358,7 +358,7 @@
<option>--network-bridge=</option>
implies
<option>--network-veth</option>. If
- this option is used the host side of
+ this option is used, the host side of
the Ethernet link will use the
<literal>vb-</literal> prefix instead
of <literal>ve-</literal>.</para></listitem>
@@ -601,7 +601,7 @@
<literal>x86-64</literal> are
supported. This is useful when running
a 32-bit container on a 64-bit
- host. If this setting is not used
+ host. If this setting is not used,
the personality reported in the
container is the same as the one
reported on the
diff --git a/man/systemd-run.xml b/man/systemd-run.xml
index 9ca17df..e3c006a 100644
--- a/man/systemd-run.xml
+++ b/man/systemd-run.xml
@@ -123,7 +123,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<listitem><para>Provide a description for the service or scope
unit. If not specified, the command itself will be used as a
- description. See <varname>Description=</varname> in
+ description. See <varname>Description=</varname> in
<citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
</para></listitem>
</varlistentry>
@@ -244,7 +244,7 @@ Sep 08 07:37:21 bupkis env[19948]: BOOT_IMAGE=/vmlinuz-3.11.0-0.rc5.git6.2.fc20.
<para>The following command invokes the
<citerefentry><refentrytitle>updatedb</refentrytitle><manvolnum>8</manvolnum></citerefentry>
- tool but lowers the block IO weight for it to 10. See
+ tool, but lowers the block IO weight for it to 10. See
<citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>
for more information on the <varname>BlockIOWeight=</varname>
property.</para>
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index f794894..22f0768 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -845,7 +845,7 @@
processes via
<filename>/tmp</filename> or
<filename>/var/tmp</filename>
- impossible. If this is enabled all
+ impossible. If this is enabled, all
temporary files created by a service
in these directories will be removed
after the service is stopped. Defaults
@@ -1208,18 +1208,18 @@
correctly on x86-64). If running in user
mode and this option is used,
<varname>NoNewPrivileges=yes</varname>
- is implied. By default no
+ is implied. By default, no
restriction applies, all address
families are accessible to
processes. If assigned the empty
- string any previous list changes are
+ string, any previous list changes are
undone.</para>
<para>Use this option to limit
exposure of processes to remote
systems, in particular via exotic
network protocols. Note that in most
- cases the local
+ cases, the local
<constant>AF_UNIX</constant> address
family should be included in the
configured whitelist as it is
@@ -1240,7 +1240,7 @@
<constant>x86</constant> and
<constant>x86-64</constant>. This is
useful when running 32-bit services on
- a 64-bit host system. If not specified
+ a 64-bit host system. If not specified,
the personality is left unmodified and
thus reflects the personality of the
host system's
@@ -1252,14 +1252,14 @@
<term><varname>RuntimeDirectoryMode=</varname></term>
<listitem><para>Takes a list of
- directory names. If set one or more
+ directory names. If set, one or more
directories by the specified names
will be created below
<filename>/run</filename> (for system
services) or below
<varname>$XDG_RUNTIME_DIR</varname>
(for user services) when the unit is
- started and removed when the unit is
+ started, and removed when the unit is
stopped. The directories will have the
access mode specified in
<varname>RuntimeDirectoryMode=</varname>,
diff --git a/man/systemd.link.xml b/man/systemd.link.xml
index 1bee07c..f73182a 100644
--- a/man/systemd.link.xml
+++ b/man/systemd.link.xml
@@ -101,7 +101,7 @@
<listitem>
<para>The driver currently bound to the device,
as exposed by the udev property <literal>DRIVER</literal>
- of its parent device, or if that is not set the
+ of its parent device, or if that is not set, the
driver as exposed by <literal>ethtool -i</literal>
of the device itself.</para>
</listitem>
diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index c4e5055..efe6ce7 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -299,7 +299,7 @@
<term><varname>Destination=</varname></term>
<listitem>
<para>The destination prefix of the route. Possibly followed by a slash and the
- prefixlength, if ommitted a full-length host route is assumed.</para>
+ prefixlength. If ommitted, a full-length host route is assumed.</para>
</listitem>
</varlistentry>
</variablelist>
diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml
index 44f55e0..d82b9bd 100644
--- a/man/systemd.timer.xml
+++ b/man/systemd.timer.xml
@@ -274,7 +274,7 @@
<term><varname>WakeSystem=</varname></term>
<listitem><para>Takes a boolean
- argument. If true an elapsing timer
+ argument. If true, an elapsing timer
will cause the system to resume from
suspend, should it be suspended and if
the system supports this. Note that
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 30b6ea1..157530b 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -1019,7 +1019,7 @@
case the kernel command line is
searched for the word appearing as is,
or as left hand side of an
- assignment. In the latter case the
+ assignment. In the latter case, the
exact assignment is looked for with
right and left hand side
matching.</para>
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index 343fad1..e54f1ba 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -73,7 +73,7 @@
<para>System daemons frequently require private
runtime directories below <filename>/run</filename> to
- place communication sockets and similar in. For these
+ place communication sockets and similar in. For these,
consider declaring them in their unit files using
<varname>RuntimeDirectory=</varname>
(see <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details),
commit dca348bcbb462305864526c587495a14a76bfcde
Author: Jan Engelhardt <jengelh at inai.de>
Date: Thu May 8 01:28:44 2014 +0200
doc: corrections to words and forms
This patch exchange words which are inappropriate for a situation,
deletes duplicated words, and adds particles where needed.
diff --git a/NEWS b/NEWS
index ac2cf41..1b548f5 100644
--- a/NEWS
+++ b/NEWS
@@ -2348,7 +2348,7 @@ CHANGES WITH 190:
dir: %_presetdir.
* journald will now warn if it ca not forward a message to the
- syslog daemon because it's socket is full.
+ syslog daemon because its socket is full.
* timedated will no longer write or process /etc/timezone,
except on Debian. As we do not support late mounted /usr
diff --git a/man/sd_bus_message_append_string_memfd.xml b/man/sd_bus_message_append_string_memfd.xml
index a9b8924..bf185ef 100644
--- a/man/sd_bus_message_append_string_memfd.xml
+++ b/man/sd_bus_message_append_string_memfd.xml
@@ -115,8 +115,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
space for a string to message <parameter>m</parameter>. If behaves
similarly to <function>sd_bus_message_append_basic</function> with
type <literal>s</literal>, but instead of copying a string into
- the the message, it returns a pointer to the destination area to
- the caller in pointer <parameter>p</parameter>. Space for string
+ the message, it returns a pointer to the destination area to
+ the caller in pointer <parameter>p</parameter>. Space for the string
of length <parameter>size</parameter> plus the terminating
<constant>NUL</constant> is allocated.</para>
</refsect1>
diff --git a/man/sd_bus_message_append_strv.xml b/man/sd_bus_message_append_strv.xml
index 048bbca..4fb1390 100644
--- a/man/sd_bus_message_append_strv.xml
+++ b/man/sd_bus_message_append_strv.xml
@@ -77,8 +77,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<para>The memory pointed at by <parameter>p</parameter> and the
contents of the strings themselves are copied into the memory area
containing the message and may be changed after this call. Note
- that the signature of <parameter>l</parameter> parameter is be
- treated as <type>const char* const*</type>, and the the contents
+ that the signature of <parameter>l</parameter> parameter is to be
+ treated as <type>const char *const *</type>, and the contents
will not be modified.</para>
</refsect1>
diff --git a/man/sd_bus_open_user.xml b/man/sd_bus_open_user.xml
index 7fa1be6..740977e 100644
--- a/man/sd_bus_open_user.xml
+++ b/man/sd_bus_open_user.xml
@@ -96,13 +96,13 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<title>Description</title>
<para><function>sd_bus_open_user()</function> creates a new bus
- object and opens a connection to the the user bus.
+ object and opens a connection to the user bus.
<function>sd_bus_open_system()</function> does the same, but
connects to the system bus.</para>
<para>If the <varname>$DBUS_SESSION_BUS_ADDRESS</varname> environment
variable is set
- (c.f. <citerefentry><refentrytitle>environ</refentrytitle><manvolnum>7</manvolnum></citerefentry>),
+ (cf. <citerefentry><refentrytitle>environ</refentrytitle><manvolnum>7</manvolnum></citerefentry>),
it will be used as the address of the user bus. This variable can
contain multiple addresses separated by <literal>;</literal>. If
this variable is not set, a suitable default for the default user
diff --git a/man/sd_bus_path_encode.xml b/man/sd_bus_path_encode.xml
index 7cb8e77..7e11906 100644
--- a/man/sd_bus_path_encode.xml
+++ b/man/sd_bus_path_encode.xml
@@ -101,11 +101,11 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
takes a bus path and a prefix string, plus a place to store the
returned external identifier string. If the bus path does not
start with the specified prefix, 0 is returned and the returned
- string is set to <constant>NULL</constant>. Otherwise the the
+ string is set to <constant>NULL</constant>. Otherwise the
string following the prefix is unescaped and returned in the
external identifier string.</para>
- <para>The escaping used will will replace all characters which are
+ <para>The escaping used will replace all characters which are
invalid in a bus object path by <literal>_</literal> followed by a
hexadecimal value. As a special case, the empty string will be
replaced by a lone <literal>_</literal>.</para>
diff --git a/man/sd_event_new.xml b/man/sd_event_new.xml
index 6545cde..f25631f 100644
--- a/man/sd_event_new.xml
+++ b/man/sd_event_new.xml
@@ -109,7 +109,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<para><function>sd_event_unref()</function> decreases the
reference counter of the specified event loop object by one. If
the counter hits zero the event loop object is freed. Note that it
- is freed regardless if it is the default event loop object of a
+ is freed regardless of whether it is the default event loop object for a
thread or not. This means that allocating an event loop with
<function>sd_event_default()</function>, then releasing it and
then acquiring a new one with
diff --git a/man/systemctl.xml b/man/systemctl.xml
index 94f2380..28a7cca 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -724,7 +724,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
<para>Show terse runtime status information about one or
more units, followed by most recent log data from the
journal. If no units are specified, show system status. If
- combined with <option>--all</option> also shows status of
+ combined with <option>--all</option> also show the status of
all units (subject to limitations specified with
<option>-t</option>). If a PID is passed, show information
about the unit the process belongs to.</para>
diff --git a/man/systemd-gpt-auto-generator.xml b/man/systemd-gpt-auto-generator.xml
index 32e1183..41b83dd 100644
--- a/man/systemd-gpt-auto-generator.xml
+++ b/man/systemd-gpt-auto-generator.xml
@@ -60,7 +60,7 @@
is a unit generator that automatically discovers root,
<filename>/home</filename>, <filename>/srv</filename>
and swap partitions and creates mount and swap units
- for them, based on the the partition type GUIDs of
+ for them, based on the partition type GUIDs of
GUID partition tables (GPT). It implements the <ulink
url="http://www.freedesktop.org/wiki/Specifications/DiscoverablePartitionsSpec/">Discoverable
Partitions Specification</ulink>. Note that this
@@ -75,7 +75,7 @@
Partition (ESP) is located on. It will only look for
the other partitions on the same physical disk the
root file system is located on. These partitions will
- not be search on systems where the root file system is
+ not be searched on systems where the root file system is
distributed on multiple disks, for example via btrfs
RAID.</para>
diff --git a/man/systemd-journal-remote.xml b/man/systemd-journal-remote.xml
index 40bef05..1f0d93e 100644
--- a/man/systemd-journal-remote.xml
+++ b/man/systemd-journal-remote.xml
@@ -79,7 +79,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
(<command>systemd-journal-remote</command> requests and pulls
the data), or "passive"
(<command>systemd-journal-remote</command> waits for a
- connection and than receives events pushed by the other side).
+ connection and then receives events pushed by the other side).
</para>
<para>
@@ -131,7 +131,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<term><option>--listen-raw=<replaceable>ADDRESS</replaceable></option></term>
<listitem><para><replaceable>ADDRESS</replaceable> must be an
- address suitable for <option>ListenStream=</option> (c.f.
+ address suitable for <option>ListenStream=</option> (cf.
<citerefentry><refentrytitle>systemd.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry>).
<command>systemd-journal-remote</command> will listen on this
socket for connections. Each connection is expected to be a
@@ -195,8 +195,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
end with <filename>.journal</filename>. The file will be
created if it does not exist. When necessary (journal file
full, or corrupted) the file will be renamed following normal
- journald rules and a new journal file will be created in it's
- stead. </para></listitem>
+ journald rules and a new journal file will be created in its
+ stead.</para></listitem>
</varlistentry>
<varlistentry>
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 1894616..1ad8e6e 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -340,7 +340,7 @@
container's name (as specified with
<option>--machine=</option>), prefixed
with <literal>ve-</literal>. The
- container side of the the Ethernet
+ container side of the Ethernet
link will be named
<literal>host0</literal>. Note that
<option>--network-veth</option>
diff --git a/man/systemd-run.xml b/man/systemd-run.xml
index 8bb587c..9ca17df 100644
--- a/man/systemd-run.xml
+++ b/man/systemd-run.xml
@@ -121,7 +121,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<varlistentry>
<term><option>--description=</option></term>
- <listitem><para>Provide description for the service or scope
+ <listitem><para>Provide a description for the service or scope
unit. If not specified, the command itself will be used as a
description. See <varname>Description=</varname> in
<citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index d206d4f..f794894 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -341,7 +341,7 @@
<para>The files listed with this
directive will be read shortly before
the process is executed (more
- specifically, this means after all
+ specifically, after all
processes from a previous unit state
terminated. This means you can
generate these files in one unit
@@ -1022,7 +1022,7 @@
<varlistentry>
<term><varname>AppArmorProfile=</varname></term>
- <listitem><para>Take a profile name as argument.
+ <listitem><para>Takes a profile name as argument.
The process executed by the unit will switch to
this profile when started. Profiles must already
be loaded in the kernel, or the unit will fail.
@@ -1427,7 +1427,7 @@
<varname>systemd.setenv=</varname> (see
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>). Additional
variables may also be set through PAM,
- c.f. <citerefentry><refentrytitle>pam_env</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
+ cf. <citerefentry><refentrytitle>pam_env</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
</refsect1>
<refsect1>
diff --git a/man/systemd.link.xml b/man/systemd.link.xml
index 2f5de23..1bee07c 100644
--- a/man/systemd.link.xml
+++ b/man/systemd.link.xml
@@ -186,7 +186,7 @@
<listitem>
<para>If the hardware has a persistent
MAC address, as most hardware should,
- and this is used by the kernel, nothing
+ and if it is used by the kernel, nothing
is done. Otherwise, a new MAC address
is generated which is guaranteed to be
the same on every boot for the given
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index d645de4..c0d7906 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -571,7 +571,7 @@
<varlistentry>
<term><varname>PipeSize=</varname></term>
- <listitem><para>Takes an size in
+ <listitem><para>Takes a size in
bytes. Controls the pipe buffer size
of FIFOs configured in this socket
unit. See
diff --git a/src/core/unit-printf.c b/src/core/unit-printf.c
index 4e18afa..d16d856 100644
--- a/src/core/unit-printf.c
+++ b/src/core/unit-printf.c
@@ -369,7 +369,7 @@ int unit_full_printf(Unit *u, const char *format, char **ret) {
/* This is similar to unit_name_printf() but also supports
* unescaping. Also, adds a couple of additional codes:
*
- * %f the the instance if set, otherwise the id
+ * %f the instance if set, otherwise the id
* %c cgroup path of unit
* %r where units in this slice are placed in the cgroup tree
* %R the root of this systemd's instance tree
More information about the systemd-commits
mailing list