Merge branch 'master' into t

* master:
  lib/zodb: Fix typos
  lib/zodb: Try to clarify zconn_at intent
  bigfile/bench_1filezodb: Fix thinko when importing pygolang

lib/zodb.py

@@ -140,6 +140,9 @@ def _deactivate_bucket(bucket):
 
 
 # zconn_at returns tid as of which ZODB connection is viewing the database.
+#
+# In other words zconn_at returns database state corresponding to database view
+# of the connection.
 def zconn_at(zconn): # -> tid
     assert isinstance(zconn, ZODB.Connection.Connection)
     if zconn.opened is None: # zconn must be in "opened" state
@@ -151,7 +154,7 @@ def zconn_at(zconn): # -> tid
     # or DB wraps raw storage with MVCCAdapter.
     #
     # MVCCAdapter in turn uses either MVCCAdapterInstance (current) or
-    # HistoricalStorageAdapter, or UndoAdapterInstance. Retriving zconn.at from those:
+    # HistoricalStorageAdapter, or UndoAdapterInstance. Retrieving zconn.at from those:
     #
     # MVCCAdapterInstance
     #     ._start
@@ -161,7 +164,7 @@ def zconn_at(zconn): # -> tid
     #
     # UndoAdapterInstance
     #     # no way to retrieve `at`, but .undo_instance() through which
-    #     # UndoAdapterInstance is returnerd, is not used anywhere.
+    #     # UndoAdapterInstance is returned, is not used anywhere.
     #
     # For the reference: FileStorage, ZEO and NEO do not provide IMVCCStorage, thus
     # for them we can rely on MVCCAdapterInstance.