diff --git a/README.txt b/README.txt
index 06ad535d048aec24b63734b53ef120e05a420468..8e9dd06781883e72b20fc49fed367bbcf1c856bb 100644
--- a/README.txt
+++ b/README.txt
@@ -2,14 +2,6 @@ Protocol Buffers - Google's data interchange format
Copyright 2008 Google Inc.
http://code.google.com/apis/protocolbuffers/
-BETA WARNING
-============
-
-This package is a beta. This means that API may change in an
-incompatible way in the future (however, the wire format will *not*
-change). It's unlikely that any big changes will be made, but we can
-make no promises. Expect a non-beta release in late August 2008.
-
C++ Installation - Unix
=======================
@@ -59,6 +51,20 @@ If you are using Micosoft Visual C++, see vsprojects/readme.txt.
If you are using Cygwin or MinGW, follow the Unix installation
instructions, above.
+Binary Compatibility Warning
+============================
+
+Due to the nature of C++, it is unlikely that any two versions of the
+Protocol Buffers C++ runtime libraries will have compatible ABIs.
+That is, if you linked an executable against an older version of
+libprotobuf, it is unlikely to work with a newer version without
+re-compiling. This problem, when it occurs, will normally be detected
+immediately on startup of your app. Still, you may want to consider
+using static linkage. You can configure this package to install
+static libraries only using:
+
+ ./configure --disable-shared
+
Java and Python Installation
============================
diff --git a/configure.ac b/configure.ac
index 6dca16331cc418c5d954e09ea560f3d5be8e9265..f23b253259ea7a1e63ddf98fb24fdd6755063c0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_PREREQ(2.59)
# * java/pom.xml
# * python/setup.py
# * src/google/protobuf/stubs/common.h
-AC_INIT(protobuf, 2.0.1-SNAPSHOT, protobuf@googlegroups.com)
+AC_INIT(protobuf, 2.0.1, protobuf@googlegroups.com)
AC_CONFIG_SRCDIR(src/google/protobuf/message.cc)
AM_CONFIG_HEADER(config.h)
diff --git a/java/pom.xml b/java/pom.xml
index 1bb26b2ed5932a1c64558bb0bb8e864958a75771..82f45bdc4aae73cc4f8292d3a27b5f87ec09bbd5 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -3,17 +3,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <!-- This is commented until the parent can be deployed to a repository. -->
- <!--
- <parent>
- <groupId>com</groupId>
+ <parent>
+ <groupId>com.google</groupId>
<artifactId>google</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- -->
+ <version>1</version>
+ </parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1</version>
<packaging>jar</packaging>
<name>Protocol Buffer Java API</name>
<description>
diff --git a/python/README.txt b/python/README.txt
index 4f68d506fd865e37f12f9ed5f1845dc406d01248..96f1a734c1e10b2fd6d8d20ad0bec7ef86e25e0a 100644
--- a/python/README.txt
+++ b/python/README.txt
@@ -15,6 +15,14 @@ Python part of the code. In this case, you will need to obtain the
Protocol Compiler from some other source before you can use this
package.
+Development Warning
+===================
+
+The Python implementation of Protocol Buffers is not as mature as the C++
+and Java implementations. It may be more buggy, and it is known to be
+pretty slow at this time. If you would like to help fix these issues,
+join the Protocol Buffers discussion list and let us know!
+
Installation
============
diff --git a/python/setup.py b/python/setup.py
index e109ee75fe68e5c2d770d7c9bceb7d46775af303..638ee2775eae2f9fdfe389c6d7ebcb2d3e1637dc 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -97,7 +97,7 @@ if __name__ == '__main__':
generate_proto("../src/google/protobuf/descriptor.proto")
setup(name = 'protobuf',
- version = '2.0.1-SNAPSHOT',
+ version = '2.0.1',
packages = [ 'google' ],
namespace_packages = [ 'google' ],
test_suite = 'setup.MakeTestSuite',
diff --git a/src/google/protobuf/compiler/command_line_interface.h b/src/google/protobuf/compiler/command_line_interface.h
index 9185e47aef79a77d668b0ce76254a697ff22d581..d7be531709ca7f49b81f4893fa4c0d01d688086d 100644
--- a/src/google/protobuf/compiler/command_line_interface.h
+++ b/src/google/protobuf/compiler/command_line_interface.h
@@ -67,7 +67,7 @@ class DiskSourceTree; // importer.h
// }
//
// The compiler is invoked with syntax like:
-// protoc --cpp_out=outdir --foo_out=outdir --proto_path=src foo.proto
+// protoc --cpp_out=outdir --foo_out=outdir --proto_path=src src/foo.proto
//
// For a full description of the command-line syntax, invoke it with --help.
class LIBPROTOC_EXPORT CommandLineInterface {
diff --git a/src/google/protobuf/message.h b/src/google/protobuf/message.h
index 1a297b125ef1248278693277ffe77e47e1799fe2..09b5defbe81f68e5ae3856923639a6e732e213f4 100644
--- a/src/google/protobuf/message.h
+++ b/src/google/protobuf/message.h
@@ -393,12 +393,6 @@ class LIBPROTOBUF_EXPORT Message {
// objects on-demand, on the other hand, would be expensive and prone to
// memory leaks. So, instead we ended up with this flat interface.
//
-// WARNING: This class is currently in the process of being converted from
-// a per-instance object to a per-class object. You'll notice that there
-// are two sets of methods below: ones that take a Message pointer or
-// reference as a parameter, and ones that don't. The former ones are the
-// new interface; the latter ones will go away soon.
-//
// TODO(kenton): Create a utility class which callers can use to read and
// write fields from a Reflection without paying attention to the type.
class LIBPROTOBUF_EXPORT Reflection {