[systemd-commits] 2 commits - man/udevadm.xml src/journal

[Lennart Poettering]

 man/udevadm.xml          |    2 +-
 src/journal/journalctl.c |    7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 7e505069d2eac61406cb0e7a9e5ef54a3c1ec38d
Author: Ferenc Wágner <wferi at niif.hu>
Date:   Mon Oct 15 19:38:21 2012 +0200

    man: Fix typo in udevadm documentation

diff --git a/man/udevadm.xml b/man/udevadm.xml
index b46a5f5..accf701 100644
--- a/man/udevadm.xml
+++ b/man/udevadm.xml
@@ -363,7 +363,7 @@
         <varlistentry>
           <term><option>--timeout=</option><replaceable>seconds</replaceable></term>
           <listitem>
-            <para>The maximum number seconds to wait for a reply from systemd-udevd.</para>
+            <para>The maximum number of seconds to wait for a reply from systemd-udevd.</para>
           </listitem>
         </varlistentry>
         <varlistentry>

commit 9048b11f8b0173a3fbbbf6ce2716abba05d202ed
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Oct 16 01:09:09 2012 +0200

    journalctl: harmonise in-stream comments
    
    From now on, always use ANSI-SQL-style comments in log streams, i.e.
    prefix with --. We also suffix things with this, just to be nice...

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 9fbc9a3..0498f29 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -915,9 +915,10 @@ int main(int argc, char *argv[]) {
 
                 if (r > 0) {
                         if (arg_follow)
-                                printf("---- Logs begin at %s.\n", format_timestamp(start_buf, sizeof(start_buf), start));
+                                printf("-- Logs begin at %s. --\n",
+                                       format_timestamp(start_buf, sizeof(start_buf), start));
                         else
-                                printf("---- Logs begin at %s, end at %s.\n",
+                                printf("-- Logs begin at %s, end at %s. --\n",
                                        format_timestamp(start_buf, sizeof(start_buf), start),
                                        format_timestamp(end_buf, sizeof(end_buf), end));
                 }
@@ -955,7 +956,7 @@ int main(int argc, char *argv[]) {
                                 if (r >= 0) {
                                         if (previous_boot_id_valid &&
                                             !sd_id128_equal(boot_id, previous_boot_id))
-                                                printf(ANSI_HIGHLIGHT_ON "---- Reboot ----" ANSI_HIGHLIGHT_OFF "\n");
+                                                printf(ANSI_HIGHLIGHT_ON "-- Reboot --" ANSI_HIGHLIGHT_OFF "\n");
 
                                         previous_boot_id = boot_id;
                                         previous_boot_id_valid = true;