From: Florian Forster <octo@collectd.org>
Date: Fri, 22 Jan 2016 09:33:17 +0000 (+0100)
Subject: ChangeLog: Fix mangled entries.
X-Git-Tag: collectd-5.5.1~2
X-Git-Url: https://git.tokkee.org/?p=collectd.git;a=commitdiff_plain;h=2750679e88aa89e573d543edfbc89df09579fe45

ChangeLog: Fix mangled entries.
---

diff --git a/ChangeLog b/ChangeLog
index 6827717a..48dc6ca3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,7 +21,8 @@
 	  added. Thanks to Wojtek Bocer and Ruben Kerkhof.
 	* Documentation: The CollectdInternalStats documentation has been
 	  improved. Thanks to Yves Mettier and Florian Forster.
-	* Battery plugin: A missing Marc Fournier. #1338
+	* Battery plugin: A missing Type has been added. Thanks to Marc
+	  Fournier. #1338
 	* Bind plugin: An off-by-one error has been fixed: an index was checked
 	  against a wrong variable, which may lead to an out-of-bounds read.
 	  Thanks to Michal Humpula. #1123
@@ -39,7 +40,8 @@
 	  fixed. Thanks to Vincent Bernat. #1190
 	* Log Logstash plugin: The timestamp is now ISO 8601 compliant. Thanks
 	  to Marc Fournier. #1132
-	* memcached plugin: The Florian Forster. #1356
+	* memcached plugin: The Type of the listen-disabled metric was fixed.
+	  Thanks to Florian Forster. #1356
 	* MySQL plugin: The Type used by Innodb_buffer_pool_pages_flushed was
 	  fixed. Thanks to Marek Becka. #1085
 	* OpenLDAP plugin: A crash when using LDAPI (LDAP-over-IPC) got fixed.
diff --git a/contrib/wiki2changelog.pl b/contrib/wiki2changelog.pl
index b8fc965b..e6affa5d 100755
--- a/contrib/wiki2changelog.pl
+++ b/contrib/wiki2changelog.pl
@@ -64,8 +64,8 @@ while (<>)
 
 	$line =~ s#\{\{Plugin\|([^}]+)\}\}#$1 plugin#g;
 	$line =~ s@\{\{Issue\|([^}]+)\}\}@#$1@g;
-	$line =~ s#\[\[[^|]+\|([^\]]+)\]\]#$1#g;
-	$line =~ s#\[\[([^|]+)\]\]#$1#g;
+	$line =~ s#\[\[[^|\]]+\|([^\]]+)\]\]#$1#g;
+	$line =~ s#\[\[([^|\]]+)\]\]#$1#g;
 
 	$line =~ s#'''(.*?)'''#*$1*#g;
 	$line =~ s#''(.*?)''#$1#g;