From 5faca867c4eb7c1e4cec930d8a922115a13fd7ce Mon Sep 17 00:00:00 2001
From: Jan-Philipp Litza <janphilipp@litza.de>
Date: Sat, 21 Mar 2015 13:53:05 +0100
Subject: [PATCH] Document changes to hostname_prefix field of site.conf

---
 docs/releases/v2015.1.rst   | 30 ++++++++++++++++++++++++++++++
 docs/site-example/site.conf |  4 ++--
 2 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 docs/releases/v2015.1.rst

diff --git a/docs/releases/v2015.1.rst b/docs/releases/v2015.1.rst
new file mode 100644
index 00000000..8ce3db0f
--- /dev/null
+++ b/docs/releases/v2015.1.rst
@@ -0,0 +1,30 @@
+Gluon 2015.1 (in development)
+=============================
+
+Added (and removed) hardware support
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+New features
+~~~~~~~~~~~~
+
+
+Bugfixes
+~~~~~~~~
+
+
+Site changes
+~~~~~~~~~~~~
+* ``site.conf``
+
+  - ``hostname_prefix`` is now optional, and is concatenated directly with the
+    generated node ID, in particular no hyphen is inserted anymore. If you want
+    to keep the old behaviour, you have to append the hyphen to the
+    ``hostname_prefix`` field of your ``site.conf``.
+
+Internals
+~~~~~~~~~
+
+
+Known Issues
+~~~~~~~~~~~~
diff --git a/docs/site-example/site.conf b/docs/site-example/site.conf
index ca691342..48e651e9 100644
--- a/docs/site-example/site.conf
+++ b/docs/site-example/site.conf
@@ -6,8 +6,8 @@
 -- This configuration will not work as it. You're required to make
 -- community specific changes to it!
 {
-  -- Used for generated hostnames, e.g. freifunk-abcdef123456.
-  hostname_prefix = 'freifunk',
+  -- Used for generated hostnames, e.g. freifunk-abcdef123456. (optional)
+  -- hostname_prefix = 'freifunk-',
 
   -- Name of the community.
   site_name = 'Freifunk Entenhausen',