summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am38
-rw-r--r--man/sd-daemon.xml8
-rw-r--r--man/sd_journal_open.xml6
-rw-r--r--man/sd_journal_print.xml1
-rw-r--r--man/sd_listen_fds.xml1
-rw-r--r--man/sd_login_monitor_new.xml1
6 files changed, 53 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 3dda9b85f7..a5cd5fa53e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -551,8 +551,13 @@ MANPAGES_ALIAS = \
man/sd_journal_printv.3 \
man/sd_journal_send.3 \
man/sd_journal_sendv.3 \
+ man/SD_JOURNAL_SUPPRESS_LOCATION.3 \
man/sd_journal_open_directory.3 \
man/sd_journal_close.3 \
+ man/sd_journal.3 \
+ man/SD_JOURNAL_RUNTIME_ONLY.3 \
+ man/SD_JOURNAL_SYSTEM_ONLY.3 \
+ man/SD_JOURNAL_LOCAL_ONLY.3 \
man/sd_journal_previous.3 \
man/sd_journal_next_skip.3 \
man/sd_journal_previous_skip.3 \
@@ -565,6 +570,9 @@ MANPAGES_ALIAS = \
man/sd_journal_get_cutoff_monotonic_usec.3 \
man/sd_journal_process.3 \
man/sd_journal_wait.3 \
+ man/SD_JOURNAL_NOP.3 \
+ man/SD_JOURNAL_APPEND.3 \
+ man/SD_JOURNAL_INVALIDATE.3 \
man/sd_journal_add_disjunction.3 \
man/sd_journal_flush_matches.3 \
man/sd_journal_seek_tail.3 \
@@ -609,8 +617,13 @@ man/sd_id128_get_boot.3: man/sd_id128_get_machine.3
man/sd_journal_printv.3: man/sd_journal_print.3
man/sd_journal_send.3: man/sd_journal_print.3
man/sd_journal_sendv.3: man/sd_journal_print.3
+man/SD_JOURNAL_SUPPRESS_LOCATION.3: man/sd_journal_print.3
man/sd_journal_open_directory.3: man/sd_journal_open.3
man/sd_journal_close.3: man/sd_journal_open.3
+man/sd_journal.3: man/sd_journal_open.3
+man/SD_JOURNAL_RUNTIME_ONLY.3: man/sd_journal_open.3
+man/SD_JOURNAL_SYSTEM_ONLY.3: man/sd_journal_open.3
+man/SD_JOURNAL_LOCAL_ONLY.3: man/sd_journal_open.3
man/sd_journal_previous.3: man/sd_journal_next.3
man/sd_journal_next_skip.3: man/sd_journal_next.3
man/sd_journal_previous_skip.3: man/sd_journal_next.3
@@ -623,6 +636,9 @@ man/sd_journal_get_monotonic_usec.3: man/sd_journal_get_realtime_usec.3
man/sd_journal_get_cutoff_monotonic_usec.3: man/sd_journal_get_cutoff_realtime_usec.3
man/sd_journal_process.3: man/sd_journal_get_fd.3
man/sd_journal_wait.3: man/sd_journal_get_fd.3
+man/SD_JOURNAL_NOP.3: man/sd_journal_get_fd.3
+man/SD_JOURNAL_APPEND.3: man/sd_journal_get_fd.3
+man/SD_JOURNAL_INVALIDATE.3: man/sd_journal_get_fd.3
man/sd_journal_add_disjunction.3: man/sd_journal_add_match.3
man/sd_journal_flush_matches.3: man/sd_journal_add_match.3
man/sd_journal_seek_tail.3: man/sd_journal_seek_head.3
@@ -1479,13 +1495,31 @@ MANPAGES_ALIAS += \
man/sd_is_socket_unix.3 \
man/sd_is_socket_inet.3 \
man/sd_is_mq.3 \
- man/sd_notifyf.3
+ man/sd_notifyf.3 \
+ man/SD_LISTEN_FDS_START.3 \
+ man/SD_EMERG.3 \
+ man/SD_ALERT.3 \
+ man/SD_CRIT.3 \
+ man/SD_ERR.3 \
+ man/SD_WARNING.3 \
+ man/SD_NOTICE.3 \
+ man/SD_INFO.3 \
+ man/SD_DEBUG.3
man/sd_is_socket.3: man/sd_is_fifo.3
man/sd_is_socket_unix.3: man/sd_is_fifo.3
man/sd_is_socket_inet.3: man/sd_is_fifo.3
man/sd_is_mq.3: man/sd_is_fifo.3
man/sd_notifyf.3: man/sd_notify.3
+man/SD_LISTEN_FDS_START.3: man/sd_listen_fds.3
+man/SD_EMERG.3: man/sd-daemon.3
+man/SD_ALERT.3: man/sd-daemon.3
+man/SD_CRIT.3: man/sd-daemon.3
+man/SD_ERR.3: man/sd-daemon.3
+man/SD_WARNING.3: man/sd-daemon.3
+man/SD_NOTICE.3: man/sd-daemon.3
+man/SD_INFO.3: man/sd-daemon.3
+man/SD_DEBUG.3: man/sd-daemon.3
EXTRA_DIST += \
src/libsystemd-daemon/libsystemd-daemon.pc.in \
@@ -3179,6 +3213,7 @@ MANPAGES_ALIAS += \
man/sd_login_monitor_unref.3 \
man/sd_login_monitor_flush.3 \
man/sd_login_monitor_get_fd.3 \
+ man/sd_login_monitor.3 \
man/sd_session_get_uid.3 \
man/sd_session_get_seat.3 \
man/sd_session_get_service.3 \
@@ -3200,6 +3235,7 @@ man/systemd-logind.8: man/systemd-logind.service.8
man/sd_login_monitor_unref.3: man/sd_login_monitor_new.3
man/sd_login_monitor_flush.3: man/sd_login_monitor_new.3
man/sd_login_monitor_get_fd.3: man/sd_login_monitor_new.3
+man/sd_login_monitor.3: man/sd_login_monitor_new.3
man/sd_session_get_uid.3: man/sd_session_is_active.3
man/sd_session_get_seat.3: man/sd_session_is_active.3
man/sd_session_get_service.3: man/sd_session_is_active.3
diff --git a/man/sd-daemon.xml b/man/sd-daemon.xml
index e29e2fc342..30a1b92601 100644
--- a/man/sd-daemon.xml
+++ b/man/sd-daemon.xml
@@ -44,6 +44,14 @@
<refnamediv>
<refname>sd-daemon</refname>
+ <refname>SD_EMERG</refname>
+ <refname>SD_ALERT</refname>
+ <refname>SD_CRIT</refname>
+ <refname>SD_ERR</refname>
+ <refname>SD_WARNING</refname>
+ <refname>SD_NOTICE</refname>
+ <refname>SD_INFO</refname>
+ <refname>SD_DEBUG</refname>
<refpurpose>Reference implementation of APIs for
new-style daemons</refpurpose>
</refnamediv>
diff --git a/man/sd_journal_open.xml b/man/sd_journal_open.xml
index 5285fe6bc1..ffd9a2c481 100644
--- a/man/sd_journal_open.xml
+++ b/man/sd_journal_open.xml
@@ -46,6 +46,10 @@
<refname>sd_journal_open</refname>
<refname>sd_journal_open_directory</refname>
<refname>sd_journal_close</refname>
+ <refname>sd_journal</refname>
+ <refname>SD_JOURNAL_LOCAL_ONLY</refname>
+ <refname>SD_JOURNAL_RUNTIME_ONLY</refname>
+ <refname>SD_JOURNAL_SYSTEM_ONLY</refname>
<refpurpose>Open the system journal for reading</refpurpose>
</refnamediv>
@@ -81,7 +85,7 @@
files automatically and interleave them automatically
when reading. As first argument it takes a pointer to
a <literal>sd_journal</literal> pointer, which on
- success will contain journal context afterwards. The
+ success will contain journal context object afterwards. The
second argument is a flags field, which may consist of
the following flags ORed together:
<literal>SD_JOURNAL_LOCAL_ONLY</literal> makes sure
diff --git a/man/sd_journal_print.xml b/man/sd_journal_print.xml
index 65694a2e30..05c1ebea77 100644
--- a/man/sd_journal_print.xml
+++ b/man/sd_journal_print.xml
@@ -47,6 +47,7 @@
<refname>sd_journal_printv</refname>
<refname>sd_journal_send</refname>
<refname>sd_journal_sendv</refname>
+ <refname>SD_JOURNAL_SUPPRESS_LOCATION</refname>
<refpurpose>Submit log entries to the journal</refpurpose>
</refnamediv>
diff --git a/man/sd_listen_fds.xml b/man/sd_listen_fds.xml
index 003c1b51ea..5e906870c7 100644
--- a/man/sd_listen_fds.xml
+++ b/man/sd_listen_fds.xml
@@ -44,6 +44,7 @@
<refnamediv>
<refname>sd_listen_fds</refname>
+ <refname>SD_LISTEN_FDS_START</refname>
<refpurpose>Check for file descriptors passed by the init system.</refpurpose>
</refnamediv>
diff --git a/man/sd_login_monitor_new.xml b/man/sd_login_monitor_new.xml
index 102d943f96..ce17159541 100644
--- a/man/sd_login_monitor_new.xml
+++ b/man/sd_login_monitor_new.xml
@@ -47,6 +47,7 @@
<refname>sd_login_monitor_unref</refname>
<refname>sd_login_monitor_flush</refname>
<refname>sd_login_monitor_get_fd</refname>
+ <refname>sd_login_monitor</refname>
<refpurpose>Monitor login sessions, seats and users</refpurpose>
</refnamediv>