- Add 'as' and 'with' as new keywords in 2.5.

- Regenerate keyword lists with reswords.py.

Doc/ref/ref2.tex

@@ -308,23 +308,27 @@ identifiers.  They must be spelled exactly as written here:%
 \index{reserved word}
 
 \begin{verbatim}
-and       del       for       is        raise    
-assert    elif      from      lambda    return   
-break     else      global    not       try      
-class     except    if        or        while    
-continue  exec      import    pass      yield    
-def       finally   in        print              
+and       del       from      not       while    
+as        elif      global    or        with     
+assert    else      if        pass      yield    
+break     except    import    print              
+class     exec      in        raise              
+continue  finally   is        return             
+def       for       lambda    try 
 \end{verbatim}
 
 % 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.
+word by default.}
 
-In some future version of Python, the identifiers \code{as} and
-\code{None} will both become keywords.
+\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}
 
+In some future version of Python, the identifier \code{None} will
+become a keyword.
 
 \subsection{Reserved classes of identifiers\label{id-classes}}