merge with 3.2

Doc/includes/sqlite3/ctx_manager.py

@@ -8,7 +8,7 @@ with con:
     con.execute("insert into person(firstname) values (?)", ("Joe",))
 
 # con.rollback() is called after the with block finishes with an exception, the
-# exception is still raised and must be catched
+# exception is still raised and must be caught
 try:
     with con:
         con.execute("insert into person(firstname) values (?)", ("Joe",))