Removes check for conflicts from NetworkDisconnect

[ganeti-local] / NEWS

diff --git a/NEWS b/NEWS
index df0c51e..352a2a8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -23,7 +23,7 @@ Version 2.7.0 beta1
   is protected using SSL/X.509 certificates, but as a design principle
   Ganeti does not permit arbitrary paths to be passed.
 - The parsing of the variants file for OSes (see
-  :manpage:`ganeti-os-interface(8)` has been slightly changed: now empty
+  :manpage:`ganeti-os-interface(7)`) has been slightly changed: now empty
   lines and comment lines (starting with ``#``) are ignored for better
   readability.
 - The ``setup-ssh`` tool added in Ganeti 2.2 has been replaced and is no
@@ -52,6 +52,10 @@ Version 2.7.0 beta1
   allocate the instance, the temporary error code
   :pyeval:`errors.ECODE_TEMP_NORES` is returned. The operation can be
   retried thereafter, with or without opportunistic locking.
+- Man pages can now be included when the documentation is built, in
+  which case the output is in ``doc/man-html``. The configure-time
+  option is ``--enable-manpages-in-doc``. Sphinx 1.0 or higher is
+  required.
 
 
 Version 2.6.2
@@ -703,7 +707,7 @@ New features
 - Instance migration can fall back to failover if instance is not
   running.
 - Filters can be used when listing nodes, instances, groups and locks;
-  see *ganeti(7)* manpage.
+  see :manpage:`ganeti(7)` manpage.
 - Added post-execution status as variables to :doc:`hooks <hooks>`
   environment.
 - Instance tags are exported/imported together with the instance.