[systemd-commits] 4 commits - Makefile.am man/sd_journal_get_fd.xml man/sd_journal_print.xml man/sd_journal_stream_fd.xml src/core

[Lennart Poettering]

 Makefile.am                  |    9 ++++++++-
 man/sd_journal_get_fd.xml    |    4 ++--
 man/sd_journal_print.xml     |    6 +++---
 man/sd_journal_stream_fd.xml |    1 +
 src/core/shutdown.c          |    1 +
 5 files changed, 15 insertions(+), 6 deletions(-)

New commits:
commit 39d6464ce3ae529eabba68e7dc57259b7d4ee8ac
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Jul 13 21:54:28 2012 +0200

    shutdown: add missing include

diff --git a/src/core/shutdown.c b/src/core/shutdown.c
index 1290d80..1c2bf37 100644
--- a/src/core/shutdown.c
+++ b/src/core/shutdown.c
@@ -44,6 +44,7 @@
 #include "mkdir.h"
 #include "virt.h"
 #include "watchdog.h"
+#include "killall.h"
 
 #define FINALIZE_ATTEMPTS 50
 

commit 19125c205aa6084c225b5c11cc6dcbe18c6dbcc0
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Jul 13 21:54:19 2012 +0200

    man: fix various typos

diff --git a/man/sd_journal_get_fd.xml b/man/sd_journal_get_fd.xml
index f4db2a3..6c2660c 100644
--- a/man/sd_journal_get_fd.xml
+++ b/man/sd_journal_get_fd.xml
@@ -44,8 +44,8 @@
 
         <refnamediv>
                 <refname>sd_journal_get_fd</refname>
-                <refname>sd_journal_get_process</refname>
-                <refname>sd_journal_get_wait</refname>
+                <refname>sd_journal_process</refname>
+                <refname>sd_journal_wait</refname>
                 <refpurpose>Journal change notification
                 interface</refpurpose>
         </refnamediv>
diff --git a/man/sd_journal_print.xml b/man/sd_journal_print.xml
index 71551f7..65694a2 100644
--- a/man/sd_journal_print.xml
+++ b/man/sd_journal_print.xml
@@ -122,7 +122,7 @@
                 used to submit structured log entries to the system
                 journal. It takes a series of format strings, each
                 immediately followed by their associated parameters,
-                terminated by a NULL. The strings passed should be of
+                terminated by NULL. The strings passed should be of
                 the format <literal>VARIABLE=value</literal>. The
                 variable name must be in uppercase and consist only
                 of characters, numbers and underscores, and may not
@@ -150,7 +150,7 @@
                 journal where that is necessary.</para>
 
                 <para>Note that <function>sd_journal_send()</function>
-                is a wapper around
+                is a wrapper around
                 <function>sd_journal_sendv()</function> to make it
                 easier to use when only text strings shall be
                 submitted. Also, the following two calls are
@@ -171,7 +171,7 @@ sd_journal_send("MESSAGE=Hello World, this is PID %lu!", (unsigned long) getpid(
 
                 <para><citerefentry><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>
                 and and <function>sd_journal_print()</function> may
-                mostly be used interchangably
+                largely be used interchangably
                 functionality-wise. However, note that log messages
                 logged via the former take a different path to the
                 journal server than the later, and hence global
diff --git a/man/sd_journal_stream_fd.xml b/man/sd_journal_stream_fd.xml
index 917ab4f..662c7bb 100644
--- a/man/sd_journal_stream_fd.xml
+++ b/man/sd_journal_stream_fd.xml
@@ -149,6 +149,7 @@ int main(int argc, char *argv[]) {
         fprintf(log, "Hello World!\n");
         fprintf(log, SD_WARNING "This is a warning!\n");
         fclose(log);
+        return 0;
 }</programlisting>
 
         </refsect1>

commit e362b3725a70102aedfda5f2f3f3cbce21e6feaf
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Jul 13 21:54:03 2012 +0200

    man: suppress man page dates/authors in generated pages

diff --git a/Makefile.am b/Makefile.am
index 41babe5..73d6034 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3310,7 +3310,10 @@ if HAVE_XSLTPROC
 XSLTPROC_FLAGS = \
 	--nonet \
 	--stringparam man.output.quietly 1 \
-	--stringparam funcsynopsis.style ansi
+	--stringparam funcsynopsis.style ansi \
+	--stringparam man.th.extra1.suppress 1 \
+	--stringparam man.authors.section.enabled 0 \
+	--stringparam man.copyright.section.enabled 0
 
 XSLTPROC_PROCESS_MAN = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \

commit 24fb2ddc127d6cde31968672897fe9c034af168e
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Jul 13 21:53:44 2012 +0200

    build-sys: clean man pages when building them

diff --git a/Makefile.am b/Makefile.am
index bbe9b46..41babe5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -626,6 +626,10 @@ man_MANS = \
 
 noinst_DATA = \
 	${XML_FILES:.xml=.html}
+
+CLEANFILES += \
+	$(MANPAGES) \
+	$(MANPAGES_ALIAS)
 endif
 
 EXTRA_DIST += \