diff --git a/Doc/Makefile b/Doc/Makefile
index ee1023c..db88c2c 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -61,7 +61,7 @@
 
 # This is the *documentation* release, and is used to construct the file
 # names of the downloadable tarballs.
-RELEASE=1.6a2
+RELEASE=2.0b1
 
 
 # These must be declared phony since there
diff --git a/Doc/lib/libascii.tex b/Doc/lib/libascii.tex
index afb3595..d71aa2e 100644
--- a/Doc/lib/libascii.tex
+++ b/Doc/lib/libascii.tex
@@ -7,7 +7,7 @@
 \moduleauthor{Eric S. Raymond}{esr@thyrsus.com}
 \sectionauthor{Eric S. Raymond}{esr@thyrsus.com}
 
-\versionadded{1.6}
+\versionadded{2.0}
 
 The \module{curses.ascii} module supplies name constants for
 \ASCII{} characters and functions to test membership in various
diff --git a/Doc/lib/libatexit.tex b/Doc/lib/libatexit.tex
index 077df55..df0cdd4 100644
--- a/Doc/lib/libatexit.tex
+++ b/Doc/lib/libatexit.tex
@@ -6,7 +6,7 @@
 \sectionauthor{Skip Montanaro}{skip@mojam.com}
 \modulesynopsis{Register and execute cleanup functions.}
 
-\versionadded{1.6}
+\versionadded{2.0}
 
 The \module{atexit} module defines a single function to register
 cleanup functions.  Functions thus registered are automatically
diff --git a/Doc/lib/libexcs.tex b/Doc/lib/libexcs.tex
index 4d5ab85..98793a2 100644
--- a/Doc/lib/libexcs.tex
+++ b/Doc/lib/libexcs.tex
@@ -298,13 +298,13 @@
   Raised when a reference is made to a local variable in a function or
   method, but no value has been bound to that variable.  This is a
   subclass of \exception{NameError}.
-\versionadded{1.6}
+\versionadded{2.0}
 \end{excdesc}
 
 \begin{excdesc}{UnicodeError}
   Raised when a Unicode-related encoding or decoding error occurs.  It
   is a subclass of \exception{ValueError}.
-\versionadded{1.6}
+\versionadded{2.0}
 \end{excdesc}
 
 \begin{excdesc}{ValueError}
@@ -321,7 +321,7 @@
   return values of the \cfunction{GetLastError()} and
   \cfunction{FormatMessage()} functions from the Windows Platform API.
   This is a subclass of \exception{OSError}.
-\versionadded{1.6}
+\versionadded{2.0}
 \end{excdesc}
 
 \begin{excdesc}{ZeroDivisionError}
diff --git a/Doc/lib/libfuncs.tex b/Doc/lib/libfuncs.tex
index 3e6e3cb..91afe4f 100644
--- a/Doc/lib/libfuncs.tex
+++ b/Doc/lib/libfuncs.tex
@@ -669,7 +669,7 @@
 \code{u'a'}.  This is the inverse of \function{ord()} for Unicode
 strings.  The argument must be in the range [0..65535], inclusive.
 \exception{ValueError} is raised otherwise.
-\versionadded{1.6}
+\versionadded{2.0}
 \end{funcdesc}
 
 \begin{funcdesc}{unicode}{string\optional{, encoding='utf-8'\optional{, errors='strict'}}}
@@ -677,7 +677,7 @@
 handling is done according to \var{errors}.  The default behavior is
 to decode UTF-8 in strict mode, meaning that encoding errors raise
 \exception{ValueError}.
-\versionadded{1.6}
+\versionadded{2.0}
 \end{funcdesc}
 
 \begin{funcdesc}{vars}{\optional{object}}
diff --git a/Doc/lib/libos.tex b/Doc/lib/libos.tex
index c506a05..55db0e1 100644
--- a/Doc/lib/libos.tex
+++ b/Doc/lib/libos.tex
@@ -716,7 +716,7 @@
 times are set to the current time.  Otherwise, \var{times} must be a
 2-tuple of numbers, of the form \code{(\var{atime}, \var{mtime})}
 which is used to set the access and modified times, respectively.
-\versionchanged[added support for \code{None} for \var{times}]{1.6}
+\versionchanged[added support for \code{None} for \var{times}]{2.0}
 Availability: Macintosh, \UNIX{}, Windows.
 \end{funcdesc}
 
diff --git a/Doc/lib/libstdtypes.tex b/Doc/lib/libstdtypes.tex
index f4c0c8a..8b6db8f 100644
--- a/Doc/lib/libstdtypes.tex
+++ b/Doc/lib/libstdtypes.tex
@@ -496,7 +496,7 @@
 \begin{description}
 \item[(1)] The C implementation of Python has historically accepted
   multiple parameters and implicitly joined them into a tuple; this
-  will no longer work in Python 1.6.  Use of this misfeature has been
+  no longer works in Python 2.0.  Use of this misfeature has been
   deprecated since Python 1.4.
 
 \item[(2)] Raises an exception when \var{x} is not a list object.  The 
diff --git a/Doc/lib/libsys.tex b/Doc/lib/libsys.tex
index 9b4f906..54f9493 100644
--- a/Doc/lib/libsys.tex
+++ b/Doc/lib/libsys.tex
@@ -334,9 +334,9 @@
 \var{serial}.  All values except \var{releaselevel} are integers; the
 release level is \code{'alpha'}, \code{'beta'},
 \code{'candidate'}, or \code{'final'}.  The \code{version_info} value
-corresponding to the Python version 1.6 is
-\code{(1, 6, 0, 'final', 0)}.
-\versionadded{1.6}
+corresponding to the Python version 2.0 is
+\code{(2, 0, 0, 'final', 0)}.
+\versionadded{2.0}
 \end{datadesc}
 
 \begin{datadesc}{winver}
diff --git a/Doc/lib/libtempfile.tex b/Doc/lib/libtempfile.tex
index d1bc011..b3e528b 100644
--- a/Doc/lib/libtempfile.tex
+++ b/Doc/lib/libtempfile.tex
@@ -63,7 +63,7 @@
 \end{funcdesc}
 
 \begin{datadesc}{template}
-\deprecated{1.6}{Use \function{gettempprefix()} instead.}
+\deprecated{2.0}{Use \function{gettempprefix()} instead.}
 When set to a value other than \code{None}, this variable defines the
 prefix of the final component of the filenames returned by
 \function{mktemp()}.  A string of decimal digits is added to generate
diff --git a/Doc/lib/libundoc.tex b/Doc/lib/libundoc.tex
index fac635a..28be620 100644
--- a/Doc/lib/libundoc.tex
+++ b/Doc/lib/libundoc.tex
@@ -40,7 +40,7 @@
 \begin{description}
 \item[\module{dircmp}]
 --- Class to build directory diff tools on (may become a demo or tool).
-\deprecated{1.6}{The \refmodule{filecmp} module will replace
+\deprecated{2.0}{The \refmodule{filecmp} module will replace
 \module{dircmp}.}
 
 \item[\module{bdb}]
diff --git a/Doc/tut/tut.tex b/Doc/tut/tut.tex
index bdb5556..acccd16 100644
--- a/Doc/tut/tut.tex
+++ b/Doc/tut/tut.tex
@@ -737,7 +737,7 @@
 \subsection{Unicode Strings \label{unicodeStrings}}
 \sectionauthor{Marc-Andre Lemburg}{mal@lemburg.com}
 
-Starting with Python 1.6 a new data type for storing text data is
+Starting with Python 2.0 a new data type for storing text data is
 available to the programmer: the Unicode object. It can be used to
 store and manipulate Unicode data (see \url{http://www.unicode.org})
 and intergrates well with the existing string objects providing