2.0.1 release.

2 files changed, 1 insertions, 7 deletions

diff --git a/src/google/protobuf/compiler/command_line_interface.h b/src/google/protobuf/compiler/command_line_interface.h
index 9185e47a..d7be5317 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 1a297b12..09b5defb 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 {