From af3b081e27280ba1f2c2f8ffda22e36902c88135 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Fri, 28 Nov 2014 19:16:57 +0100
Subject: [PATCH] Update debian problems in response to #140

---
 docs/problems.rst | 22 ++++++++++++++++------
 docs/tutorial.rst |  2 ++
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/docs/problems.rst b/docs/problems.rst
index aa15ffb..e2f77d9 100644
--- a/docs/problems.rst
+++ b/docs/problems.rst
@@ -6,6 +6,7 @@ For any unanswered questions or problems, `open an issue on GitHub
 <https://github.com/untitaker/vdirsyncer/issues/new>`_ or `contact me directly
 <https://unterwaditzer.net>`_.
 
+
 Error messages
 --------------
 
@@ -17,15 +18,24 @@ Error messages
 
       verify = /usr/share/ca-certificates/cacert.org/cacert.org_root.crt
 
-- **ImportError: No module named packages.urllib3.poolmanager**
 
-  This happens if the requests package was installed via Debian's package
-  manager, see :gh:`82`. You have two options for solving this problem:
+.. _debian-urllib3:
 
-  - Upgrade your installation of the Debian requests package to at least
-    version ``2.4.3-1``.
+Requests-related ImportErrors on Debian-based distributions
+-----------------------------------------------------------
 
-  - Install vdirsyncer in a virtualenv, see :ref:`manual-installation`.
+    ImportError: No module named packages.urllib3.poolmanager
+
+    ImportError: cannot import name iter_field_objects
+
+Debian has had its problems in the past with the Python requests package, see
+:gh:`82` and :gh:`140`. You have two options for solving this problem:
+
+- Upgrade your installation of the Debian requests package to at least version
+  ``2.4.3-1``.
+
+- If this doesn't help, install vdirsyncer in a virtualenv, see
+  :ref:`manual-installation`.
 
 
 .. _manual-installation:
diff --git a/docs/tutorial.rst b/docs/tutorial.rst
index fdbdeee..24e6bbd 100644
--- a/docs/tutorial.rst
+++ b/docs/tutorial.rst
@@ -10,6 +10,8 @@ your distribution:
 
 - `AUR package for ArchLinux <https://aur.archlinux.org/packages/vdirsyncer>`_
 - `pkgsrc <http://pkgsrc.se/time/py-vdirsyncer>`_
+- Debian and Ubuntu don't have packages, but make a manual installation
+  especially hard. See :ref:`debian-urllib3`.
 
 If there is no package for your distribution, you'll need to :ref:`install
 vdirsyncer manually <manual-installation>`. There is an easy command to