Merge with 1.0

CHANGES

@@ -112,6 +112,28 @@ Features added
 Release 1.0.8 (in development)
 ==============================
 
+* #677: Fix parsing of multiple signatures in C++ domain.
+
+* #637: Ignore Emacs lock files when looking for source files.
+
+* #544: Allow .pyw extension for importable modules in autodoc.
+
+* #700: Use ``$(MAKE)`` in quickstart-generated Makefiles.
+
+* #734: Make sidebar search box width consistent in browsers.
+
+* #644: Fix spacing of centered figures in HTML output.
+
+* #767: Safely encode SphinxError messages when printing them to
+  sys.stderr.
+
+* #611: Fix LaTeX output error with a document with no sections but
+  a link target.
+
+* Correctly treat built-in method descriptors as methods in autodoc.
+
+* #706: Stop monkeypatching the Python textwrap module.
+
 * #657: viewcode now works correctly with source files that have
   non-ASCII encoding.
 

sphinx/domains/cpp.py

@@ -125,7 +125,7 @@ class DefExpr(object):
             return False
         try:
             for key, value in self.__dict__.iteritems():
-                if value != getattr(other, value):
+                if value != getattr(other, key):
                     return False
         except AttributeError:
             return False

tests/root/objects.txt

@@ -169,6 +169,4 @@ CPP domain
 .. cpp:class:: n::Array<T,d>
 
    .. cpp:function:: T& operator[]( unsigned j )
-
-   .. cpp:function:: const T& operator[]( unsigned j ) const
-
+                     const T& operator[]( unsigned j ) const