Merge latest master into doxygen branch.

Examples/php/reference/example.h

@@ -4,8 +4,8 @@ class Vector {
 private:
   double x,y,z;
 public:
-  Vector() : x(0), y(0), z(0) { };
-  Vector(double x, double y, double z) : x(x), y(y), z(z) { };
+  Vector() : x(0), y(0), z(0) { }
+  Vector(double x, double y, double z) : x(x), y(y), z(z) { }
   friend Vector operator+(const Vector &a, const Vector &b);
   char *as_string();
 };
@@ -20,7 +20,3 @@ public:
   Vector &operator[](int);
   int size();
 };
-
-
-
-  

Examples/php/reference/example.i

@@ -1,10 +1,6 @@
 /* File : example.i */
 
-/* This example has nothing to do with references but the name is used by all
- * the other languages so it's hard to rename to something more meaningful.
- *
- * Mostly it shows how to use %extend.
- */
+/* This file has a few "typical" uses of C++ references. */
 
 %module example
 
@@ -33,8 +29,8 @@ public:
   VectorArray(int maxsize);
   ~VectorArray();
   int size();
-  
- /*  This wrapper provides an alternative to the [] operator */
+
+  /* This wrapper provides an alternative to the [] operator */
   %extend {
     Vector &get(int index) {
       printf("VectorArray extended get: %p %d\n", (void *)$self, index);