From: Georg Brandl <georg@python.org>
Date: Fri, 26 May 2006 20:16:26 +0000 (+0000)
Subject: Patch #1492218: document None being a constant.
X-Git-Tag: v2.4.4c1~214
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b51b379d101357d9e592794f28e73ee7d831fa2;p=thirdparty%2FPython%2Fcpython.git

Patch #1492218: document None being a constant.
---

diff --git a/Doc/ref/ref2.tex b/Doc/ref/ref2.tex
index 5971dab4bcda..5d5aabd8a7f4 100644
--- a/Doc/ref/ref2.tex
+++ b/Doc/ref/ref2.tex
@@ -322,8 +322,12 @@ Note that although the identifier \code{as} can be used as part of the
 syntax of \keyword{import} statements, it is not currently a reserved
 word.
 
-In some future version of Python, the identifiers \code{as} and
-\code{None} will both become keywords.
+In Python 2.6, the identifier \code{as} will become a keyword.
+
+\versionchanged[\constant{None} became a constant and is now
+recognized by the compiler as a name for the builtin object
+\constant{None}.  Although it is not a keyword, you cannot assign
+a different object to it]{2.4}
 
 
 \subsection{Reserved classes of identifiers\label{id-classes}}