From d014088c95dc65a1cfa6f4f4ef4384c7876d5970 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 9 Mar 2016 12:21:52 +0100
Subject: nixos/doc: adding line about the change in service.syncthing

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

(limited to 'nixos/doc')

diff --git a/nixos/doc/manual/release-notes/rl-1603.xml b/nixos/doc/manual/release-notes/rl-1603.xml
index 0ede1a9ce8ed..83057a44d0ae 100644
--- a/nixos/doc/manual/release-notes/rl-1603.xml
+++ b/nixos/doc/manual/release-notes/rl-1603.xml
@@ -247,6 +247,21 @@ $TTL 1800
     </programlisting>
   </listitem>
 
+  <listitem>
+    <para>
+    <literal>service.syncthing.dataDir</literal> options now has to point
+    to exact folder where syncthing is writing to. Example configuration should
+    loook something like:
+    </para>
+    <programlisting>
+services.syncthing = {
+    enable = true;
+    dataDir = "/home/somebody/.syncthing";
+    user = "somebody";
+};
+    </programlisting>
+  </listitem>
+
 </itemizedlist>
 
 
-- 
cgit 1.4.1


From 9a2ee42f52002b54ee568a94bbd64d43010a5f3b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 18 Mar 2016 12:00:39 +0100
Subject: Document the fact that the firewall allows pings by default in
 rl-1603.xml.

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

(limited to 'nixos/doc')

diff --git a/nixos/doc/manual/release-notes/rl-1603.xml b/nixos/doc/manual/release-notes/rl-1603.xml
index 83057a44d0ae..350025da7b00 100644
--- a/nixos/doc/manual/release-notes/rl-1603.xml
+++ b/nixos/doc/manual/release-notes/rl-1603.xml
@@ -262,6 +262,18 @@ services.syncthing = {
     </programlisting>
   </listitem>
 
+  <listitem>
+    <para>
+      <literal>networking.firewall.allowPing</literal> is now enabled by
+      default. Users are encourarged to configure an approiate rate limit for
+      their machines using the Kernel interface at
+      <filename>/proc/sys/net/ipv4/icmp_ratelimit</filename> and
+      <filename>/proc/sys/net/ipv6/icmp/ratelimit</filename> or using the
+      firewall itself, i.e. by setting the NixOS option
+      <literal>networking.firewall.pingLimit</literal>.
+    </para>
+  </listitem>
+
 </itemizedlist>
 
 
-- 
cgit 1.4.1


From 8ddfab0cf2c52037c01dc0dec2c667bc1b512f52 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 19 Mar 2016 17:16:59 +0100
Subject: nixos/manpages: enable linebreaking after slashes

Allow linbreaks after slashes in long URLs. The option used
is documented at

   http://docbook.sourceforge.net/release/xsl/current/doc/manpages/man.break.after.slash.html

This commit fixes #4538.
---
 nixos/doc/manual/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'nixos/doc')

diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index 4ce6ea1c1118..746ddc071b6a 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -187,6 +187,7 @@ in rec {
         --param man.output.in.separate.dir 1 \
         --param man.output.base.dir "'$out/share/man/'" \
         --param man.endnotes.are.numbered 0 \
+        --param man.break.after.slash 1 \
         ${docbook5_xsl}/xml/xsl/docbook/manpages/docbook.xsl \
         ./man-pages.xml
     '';
-- 
cgit 1.4.1


From d9b98b6b50261cd768bc595d68c91448d36b8692 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Tue, 29 Mar 2016 16:32:50 +0200
Subject: manual rl-16.03: document broadcom issue #12595

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

(limited to 'nixos/doc')

diff --git a/nixos/doc/manual/release-notes/rl-1603.xml b/nixos/doc/manual/release-notes/rl-1603.xml
index 350025da7b00..476540641639 100644
--- a/nixos/doc/manual/release-notes/rl-1603.xml
+++ b/nixos/doc/manual/release-notes/rl-1603.xml
@@ -274,6 +274,20 @@ services.syncthing = {
     </para>
   </listitem>
 
+  <listitem>
+    <para>
+      Systems with some broadcom cards used to result into a generated config
+      that is no longer accepted. If you get errors like
+      <screen>error: path ‘/nix/store/*-broadcom-sta-*’ does not exist and cannot be created</screen>
+      you should either re-run <command>nixos-generate-config</command> or manually replace
+      <literal>"${config.boot.kernelPackages.broadcom_sta}"</literal>
+      by
+      <literal>config.boot.kernelPackages.broadcom_sta</literal>
+      in your <filename>/etc/nixos/hardware-configuration.nix</filename>.
+      More discussion is on <link xlink:href="https://github.com/NixOS/nixpkgs/pull/12595">
+      the github issue</link>.
+    </para>
+  </listitem>
 </itemizedlist>
 
 
-- 
cgit 1.4.1