Various cleanups in the syncing with gnulib

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1581 f882894a-f735-0410-b71e-b25c423dba1c

1 files changed, 4 insertions, 14 deletions

diff --git a/doc/developer-guidelines.sgml b/doc/developer-guidelines.sgml
index 21b85c37..44fca243 100644
--- a/doc/developer-guidelines.sgml
+++ b/doc/developer-guidelines.sgml
@@ -743,23 +743,13 @@ setup the tests. Run "make test" to run all the tests.
         </section>
 
         <section><title>CVS comments</title>
-        <para>When adding CVS comments at commit time, you can use the following prefixes:
-        <variablelist>
-          <varlistentry><term>- comment</term>
-          <listitem>
-            <para>for a comment that can be removed from the Changelog</para>
-          </listitem>
-          </varlistentry>
-          <varlistentry><term>* comment</term>
-          <listitem>
-            <para>for an important amendment to be included into a features list</para>
-          </listitem>
-          </varlistentry>
-        </variablelist>
-        </para>
         <para>If the change is due to a contribution, please quote the contributor's name 
         and, if applicable, add the SourceForge Tracker number. Don't forget to 
 update the THANKS.in file.</para>
+        <para>If you have a change that is useful for noting in the next release, please
+        update the NEWS file.</para>
+        <para>All CVS commit comments will be written to a ChangeLog at release time.
+        </para>
         </section>
 
         <section id="translationsdevelopers"><title>Translations for developers</title>