[systemd-commits] 2 commits - Makefile.am man/systemd.unit.xml

[Zbigniew Jędrzejewski-Szmek]

 Makefile.am          |    2 +-
 man/systemd.unit.xml |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0a498f163ab371ca34b4fe2c1ec8a67e2bb83fe8
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Sat Jun 7 16:37:50 2014 -0400

    man: fix typo

diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index b337bb4..61be6d2 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -1181,7 +1181,7 @@
                                 useful for implementation of generator
                                 tools that convert configuration from
                                 an external configuration file format
-                                into native unit files. Thus
+                                into native unit files. This
                                 functionality should not be used in
                                 normal units.</para></listitem>
                         </varlistentry>

commit fe582db94bac3743b87d67d880497fe40b06dd2f
Author: Ronny Chevalier <chevalier.ronny at gmail.com>
Date:   Tue Jun 17 19:26:14 2014 +0200

    build-sys: add missing backslash

diff --git a/Makefile.am b/Makefile.am
index 0213c38..e428141 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3537,7 +3537,7 @@ libsystemd_journal_internal_la_SOURCES = \
 	src/journal/mmap-cache.h
 
 # using _CFLAGS = in the conditional below would suppress AM_CFLAGS
-libsystemd_journal_internal_la_CFLAGS =
+libsystemd_journal_internal_la_CFLAGS = \
 	$(AM_CFLAGS)
 
 libsystemd_journal_internal_la_LIBADD =