[systemd-commits] 2 commits - configure.ac man/journalctl.xml

[Zbigniew Jędrzejewski-Szmek]

 configure.ac       |    2 +-
 man/journalctl.xml |   17 +++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

New commits:
commit 59bb9d9a14889bee001706a32a518fe0a5009048
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Tue Oct 23 15:35:34 2012 +0200

    build-sys: add check for microhttpd version

diff --git a/configure.ac b/configure.ac
index 7a3ee3c..ad90605 100644
--- a/configure.ac
+++ b/configure.ac
@@ -478,7 +478,7 @@ AM_CONDITIONAL(HAVE_QRENCODE, [test "$have_qrencode" = "yes"])
 have_microhttpd=no
 AC_ARG_ENABLE(microhttpd, AS_HELP_STRING([--disable-microhttpd], [disable microhttpd support]))
 if test "x$enable_microhttpd" != "xno"; then
-        PKG_CHECK_MODULES(MICROHTTPD, [ libmicrohttpd ],
+        PKG_CHECK_MODULES(MICROHTTPD, [libmicrohttpd >= 0.9.5],
                 [AC_DEFINE(HAVE_MICROHTTPD, 1, [Define if microhttpd is available]) have_microhttpd=yes], have_microhttpd=no)
         if test "x$have_microhttpd" = xno -a "x$enable_microhttpd" = xyes; then
                 AC_MSG_ERROR([*** microhttpd support requested but libraries not found])

commit 2eb8e90ff9380fe38b9539a3fd5cf25b8d880f22
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Tue Oct 23 11:10:51 2012 +0200

    man: reword journalctl -n description

diff --git a/man/journalctl.xml b/man/journalctl.xml
index bcf50cb..9bc0153 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -159,16 +159,13 @@
                                 <term><option>--lines=</option></term>
                                 <term><option>-n</option></term>
 
-                                <listitem><para>Controls the number of
-                                journal lines to show, counting from
-                                the most recent ones. The argument is
-                                optional, and if specified is a
-                                positive integer. If not specified and
-                                in follow mode defaults to 10. If this
-                                option is not passed and follow mode
-                                is not enabled, how many lines are
-                                shown is not
-                                limited.</para></listitem>
+                                <listitem><para>Show the most recent
+                                journal events and limit the number of
+                                events shown. If
+                                <option>--follow</option> is used,
+                                this option is implied. The argument,
+                                a positive integer, is optional, and
+                                defaults to 10. </para></listitem>
                         </varlistentry>
 
                         <varlistentry>