From 0abf9d2b124cb2f57116ff21dd1d0f16e51a08ba Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Sat, 5 Aug 2017 12:05:38 +0100
Subject: [PATCH 1/2] Document timezone changes in release notes

---
 nixos/doc/manual/release-notes/rl-1709.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index 2046081cc2f0..10a365496698 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -187,6 +187,17 @@ rmdir /var/lib/ipfs/.ipfs
       have therefore been removed.
     </para>
   </listitem>
+  <listitem>
+    <para>
+      The <option>time.timeZone</option> option now allows the value
+      <literal>null</literal> in addition to timezone strings, which sets the
+      timezone to UTC by default and allows changing it imperatively using
+      <command>timedatectl set-timezone</command>. This is additionally now the
+      default value for the option, which means that systems where the option
+      has not been set explicitly will continue to use UTC but allow imperative
+      timezone adjustments now.
+    </para>
+  </listitem>
 
 </itemizedlist>
 

From 0f4179aed20358d7f46137417ac2bc75cb53fd08 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 6 Aug 2017 15:16:57 +0200
Subject: [PATCH 2/2] fixup! reword

---
 nixos/doc/manual/release-notes/rl-1709.xml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index 10a365496698..a32f9963d1c5 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -190,12 +190,10 @@ rmdir /var/lib/ipfs/.ipfs
   <listitem>
     <para>
       The <option>time.timeZone</option> option now allows the value
-      <literal>null</literal> in addition to timezone strings, which sets the
-      timezone to UTC by default and allows changing it imperatively using
-      <command>timedatectl set-timezone</command>. This is additionally now the
-      default value for the option, which means that systems where the option
-      has not been set explicitly will continue to use UTC but allow imperative
-      timezone adjustments now.
+      <literal>null</literal> in addition to timezone strings. This value
+      allows changing the timezone of a system imperatively using
+      <command>timedatectl set-timezone</command>. The default timezone
+      is still UTC.
     </para>
   </listitem>