From 63a3f188b84613f663dcd035e7662ae1668fb5c2 Mon Sep 17 00:00:00 2001
From: Marshall Clow <marshall@idio.com>
Date: Fri, 2 Jul 2010 15:37:14 +0000
Subject: [PATCH] Merged changes for #2981, #4166, and #4377 to release branch

[SVN r63523]
---
 doc/v2/args.html                      | 2 +-
 doc/v2/return_internal_reference.html | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/v2/args.html b/doc/v2/args.html
index 561ba346..e04720b7 100644
--- a/doc/v2/args.html
+++ b/doc/v2/args.html
@@ -101,7 +101,7 @@ namespace boost { namespace python
         struct arg 
         {
           template &lt;class T&gt;
-                  arg &amp;perator = (T const &amp;value);
+                  arg &amp;operator = (T const &amp;value);
           explicit arg (char const *name){elements[0].name = name;}
         };
 
diff --git a/doc/v2/return_internal_reference.html b/doc/v2/return_internal_reference.html
index cbdde307..87c33f85 100644
--- a/doc/v2/return_internal_reference.html
+++ b/doc/v2/return_internal_reference.html
@@ -167,12 +167,13 @@ PyObject* postcall(PyObject* args, PyObject* result);
 
 class Bar
 {
+ public:
    Bar(int x) : x(x) {}
    int get_x() const { return x; }
    void set_x(int x) { this-&gt;x = x; }
  private:
    int x;
-}
+};
 
 class Foo
 {
@@ -189,7 +190,7 @@ class Foo
 using namespace boost::python;
 BOOST_PYTHON_MODULE(internal_refs)
 {
-   class_&lt;Bar&gt;("Bar")
+   class_&lt;Bar&gt;("Bar", init&lt;int&gt;())
       .def("get_x", &amp;Bar::get_x)
       .def("set_x", &amp;Bar::set_x)
       ;