Merge branch 'master' into fix/237

CHANGES.rst

@@ -1,7 +1,7 @@
 Changelog
 =========
 
-3.11.7 (unreleased)
+3.11.8 (unreleased)
 -------------------
 
 Breaking changes:
@@ -10,12 +10,22 @@ Breaking changes:
 
 New features:
 
-- added vUTCOffset.ignore_exceptions to allow surpressing of failed TZOFFSET
-  parsing (for now this ignores the check for offsets > 24h) [geier]
+- *add item here*
 
 Bug fixes:
 
 - Fix non-ASCII TZID and TZNAME parameter handling #237 [clivest]
+- Wiki: update install instruction
+- *add item here*
+
+
+3.11.7 (2017-08-27)
+-------------------
+
+New features:
+
+- added vUTCOffset.ignore_exceptions to allow surpressing of failed TZOFFSET
+  parsing (for now this ignores the check for offsets > 24h) [geier]
 
 
 3.11.6 (2017-08-04)

docs/install.rst

@@ -3,7 +3,7 @@ Installing iCalendar
 
 To install the icalendar package, use::
 
-  python setup.py install
+  pip install icalendar
 
 If installation is successful, you will be able to import the iCalendar
 package, like this::

src/icalendar/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = '3.11.7.dev0'
+__version__ = '3.11.8.dev0'
 
 from icalendar.cal import (
     Calendar,