From: Florian Forster <octo@noris.net>
Date: Wed, 6 Oct 2010 08:11:10 +0000 (+0200)
Subject: Merge remote branch 'trenkel/collectd-4.10' into collectd-4.10
X-Git-Tag: collectd-4.10.2~4
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=72c467f5e8be1a24976d0808a8bdcaa85c6ef9d9;hp=2e4b4e1aaea45c4e1df80c23a549ca7af8871f35;p=collectd.git

Merge remote branch 'trenkel/collectd-4.10' into collectd-4.10
---

diff --git a/src/collectd-python.pod b/src/collectd-python.pod
index b9408a3d..81a78e7f 100644
--- a/src/collectd-python.pod
+++ b/src/collectd-python.pod
@@ -693,14 +693,8 @@ dispatched by the python plugin after upgrades.
 
 =item
 
-This plugin is not compatible with python3. Trying to compile it with python3
-will fail because of the ways string, unicode and bytearray behavior was
-changed.
-
-=item
-
 Not all aspects of the collectd API are accessible from python. This includes
-but is not limited to meta-data, filters and data sets.
+but is not limited to filters and data sets.
 
 =back