From dd49d1d4bbdbef4e68d9776cf07207f58f7884c1 Mon Sep 17 00:00:00 2001
From: Ross Lawley <ross.lawley@gmail.com>
Date: Wed, 24 Aug 2011 13:37:20 +0100
Subject: [PATCH] Added choices note to upgrade docs

---
 docs/upgrade.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/upgrade.rst b/docs/upgrade.rst
index ef44b96a..7187adcf 100644
--- a/docs/upgrade.rst
+++ b/docs/upgrade.rst
@@ -7,6 +7,12 @@ Upgrading
 
 There have been the following backwards incompatibilities from 0.4 to 0.5:
 
+# Choice options:
+
+Are now expected to be an iterable of tuples, with  the first element in each
+tuple being the actual value to be stored. The second element is the
+human-readable name for the option.
+
 # PyMongo / MongoDB
 
 map reduce now requires pymongo 1.11+ More methods now use map_reduce as db.eval