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

[Zbigniew Jędrzejewski-Szmek]

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

New commits:
commit 699b7227a2faeb9818e90e90837794aef18f9bef
Author: Philippe De Swert <philippedeswert at gmail.com>
Date:   Wed Dec 31 18:02:12 2014 +0200

    build-sys: fix build issue with machines.target
    
    When doing "make clean" the unit/machines.target file gets deleted.
    This causes a build error later on when trying to rebuild systemd.
    
    V2: The file probably belongs to dist_systemunit_DATA

diff --git a/Makefile.am b/Makefile.am
index 28d2e4b..5f80306 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -506,7 +506,8 @@ dist_systemunit_DATA = \
 	units/systemd-udevd-control.socket \
 	units/systemd-udevd-kernel.socket \
 	units/system-update.target \
-	units/initrd-switch-root.target
+	units/initrd-switch-root.target \
+	units/machines.target
 
 if ENABLE_KDBUS
 dist_systemunit_DATA += \
@@ -549,7 +550,6 @@ nodist_systemunit_DATA = \
 	units/initrd-udevadm-cleanup-db.service \
 	units/initrd-switch-root.service \
 	units/systemd-nspawn at .service \
-	units/machines.target \
 	units/systemd-update-done.service
 
 if HAVE_UTMP

commit a780d4cb1cc1443904271ae35bd4291639c7eb87
Author: Chris Atkinson <cwa at pipeline.com>
Date:   Wed Dec 31 21:59:16 2014 -0500

    man: Clarify effect when both calendar day and date are listed in timer
    
    See bug 87859 (https://bugs.freedesktop.org/show_bug.cgi?id=87859). Bug
    reporter found the language describing the effect of specifying both a
    day and date unclear; hopefully the attached patch will clarify and
    allow the bug to be closed.

diff --git a/man/systemd.time.xml b/man/systemd.time.xml
index f35ccd7..2e64089 100644
--- a/man/systemd.time.xml
+++ b/man/systemd.time.xml
@@ -213,8 +213,8 @@
                 <programlisting>Thu,Fri 2012-*-1,5 11:12:13</programlisting>
 
                 <para>The above refers to 11:12:13 of the first or
-                fifth day of any month of the year 2012, given that it
-                is a Thursday or Friday.</para>
+                fifth day of any month of the year 2012, but only if that
+                day is a Thursday or Friday.</para>
 
                 <para>The weekday specification is optional. If
                 specified, it should consist of one or more English