From 7c04ad2da1cf08ebf53b9aa9671c8c1dc9577135 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 19 Apr 2013 01:11:38 +0200 Subject: build-sys: run 'make update-man-list' --- Makefile-man.am | 5 +++++ NEWS | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile-man.am b/Makefile-man.am index 10779ddbaf..9786fa1119 100644 --- a/Makefile-man.am +++ b/Makefile-man.am @@ -131,6 +131,7 @@ MANPAGES_ALIAS += \ man/sd_is_socket_inet.3 \ man/sd_is_socket_unix.3 \ man/sd_journal.3 \ + man/sd_journal_add_conjunction.3 \ man/sd_journal_add_disjunction.3 \ man/sd_journal_close.3 \ man/sd_journal_enumerate_data.3 \ @@ -227,6 +228,7 @@ man/sd_is_socket.3: man/sd_is_fifo.3 man/sd_is_socket_inet.3: man/sd_is_fifo.3 man/sd_is_socket_unix.3: man/sd_is_fifo.3 man/sd_journal.3: man/sd_journal_open.3 +man/sd_journal_add_conjunction.3: man/sd_journal_add_match.3 man/sd_journal_add_disjunction.3: man/sd_journal_add_match.3 man/sd_journal_close.3: man/sd_journal_open.3 man/sd_journal_enumerate_data.3: man/sd_journal_get_data.3 @@ -395,6 +397,9 @@ man/sd_is_socket_unix.html: man/sd_is_fifo.html man/sd_journal.html: man/sd_journal_open.html $(html-alias) +man/sd_journal_add_conjunction.html: man/sd_journal_add_match.html + $(html-alias) + man/sd_journal_add_disjunction.html: man/sd_journal_add_match.html $(html-alias) diff --git a/NEWS b/NEWS index e8b7b392c5..2b46246576 100644 --- a/NEWS +++ b/NEWS @@ -32,7 +32,7 @@ CHANGES WITH 202: services, user processes and containers/virtual machines. This new cgroup hierarchy is also useful to stick stable names to specific container instances, which can be - recognized later on this way (this name may be controlled + recognized later this way (this name may be controlled via systemd-nspawn's new -M switch). libsystemd-login also gained a new call sd_pid_get_machine_name() to retrieve the name of the container/VM a specific process belongs to. @@ -49,7 +49,7 @@ CHANGES WITH 202: * The cryptsetup logic now understands the "luks.key=" kernel command line switch for specifying a file to read the - decryption key from. Also, if a configured keyfile is now + decryption key from. Also, if a configured key file is not found the tool will now automatically fall back to prompting the user. -- cgit v1.2.3-54-g00ecf