From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 15 Sep 2010 11:25:22 +0000 (+0000)
Subject: Blocked revisions 84827-84829 via svnmerge
X-Git-Tag: v2.7.1rc1~279
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f81eef11d691e3c7febc64f154cfa06ab78286ca;p=python

Blocked revisions 84827-84829 via svnmerge

........
  r84827 | antoine.pitrou | 2010-09-15 11:58:26 +0200 (mer., 15 sept. 2010) | 3 lines

  Add a glossary entry for file objects.
........
  r84828 | antoine.pitrou | 2010-09-15 12:08:31 +0200 (mer., 15 sept. 2010) | 3 lines

  Update file-related information in the FAQ.
........
  r84829 | antoine.pitrou | 2010-09-15 13:11:28 +0200 (mer., 15 sept. 2010) | 3 lines

  Add cross-references to the glossary entry for file objects.
........
---