From: Georg Brandl <georg@python.org>
Date: Fri, 26 May 2006 20:14:47 +0000 (+0000)
Subject: Patch #1492218: document None being a constant.
X-Git-Tag: v2.5b1~431
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a89dbec2576903ab1e95a365df1fccba38c8cb52;p=python

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

diff --git a/Doc/ref/ref2.tex b/Doc/ref/ref2.tex
index acce768405..2ed8a5d6ad 100644
--- a/Doc/ref/ref2.tex
+++ b/Doc/ref/ref2.tex
@@ -319,16 +319,18 @@ def       for       lambda    try
 
 % When adding keywords, use reswords.py for reformatting
 
-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 by default.)
+\versionchanged[\constant{None} became a constant and is now
+recognized by the compiler as a name for the built-in object
+\constant{None}.  Although it is not a keyword, you cannot assign
+a different object to it]{2.4}
 
 \versionchanged[Both \keyword{as} and \keyword{with} are only recognized
-when the \code{with_statement} feature has been enabled.  It will always
-be enabled in Python 2.6. See section~\ref{with} for details]{2.5}
+when the \code{with_statement} future feature has been enabled.
+It will always be enabled in Python 2.6.  See section~\ref{with} for
+details.  Note that using \keyword{as} and \keyword{with} as identifiers
+will always issue a warning, even when the \code{with_statement} future
+directive is not in effect]{2.5}
 
-In some future version of Python, the identifier \code{None} will
-become a keyword.
 
 \subsection{Reserved classes of identifiers\label{id-classes}}