From 27e621a60e35d781883a0bf62d53549289a62053 Mon Sep 17 00:00:00 2001
From: Rodney Lorrimar <rlorrimar@ccg.murdoch.edu.au>
Date: Thu, 26 Nov 2015 21:43:11 +0000
Subject: release-notes: add longview as a new service

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

(limited to 'nixos/doc')

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index 97ac03a770f6..bed47a63a952 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -26,6 +26,13 @@ nixos.path = ./nixpkgs-unstable-2015-12-06/nixos;
 
 </itemizedlist>
 
+<para>The following new services were added since the last release:
+
+  <itemizedlist>
+    <listitem><para><literal>services/monitoring/longview.nix</literal></para></listitem>
+  </itemizedlist>
+</para>
+
 <para>When upgrading from a previous release, please be aware of the
 following incompatible changes:</para>
 
-- 
cgit 1.4.1


From 8d62b2b8fa9a2b4171ad3bab1f665cf1917cd1d4 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sun, 29 Nov 2015 13:50:55 +0100
Subject: nixos/release notes: explain removal of tidy-html5

This belongs to 81b9cc6f54.
---
 nixos/doc/manual/release-notes/rl-unstable.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'nixos/doc')

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index bed47a63a952..c9b31afdfcf8 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -96,6 +96,14 @@ nginx.override {
     </para>
   </listitem>
 
+  <listitem>
+    <para><literal>tidy-html5</literal> package is removed.
+    Upstream only provided <literal>(lib)tidy5</literal> during development,
+    and now they went back to <literal>(lib)tidy</literal> to work as a drop-in
+    replacement of the original package that has been unmaintained for years.
+    You can (still) use the <literal>html-tidy</literal> package, which got updated
+    to a stable release from this new upstream.</para>
+  </listitem>
 </itemizedlist>
 
 </section>
-- 
cgit 1.4.1