Merge branch 'master' of git+ssh://github.com/swig/swig

* 'master' of git+ssh://github.com/swig/swig:
  [Python] Fix some errors in the documentation for -threads
  Fixed typo in Perl5 docs.
  Update PHP testsuite for vadz's new cars
  [php] Whitespace improvements in generated C/C++ code
  Fix hardcoded _v in PHP typecheck typemaps

Doc/Manual/Contents.html

@@ -1813,7 +1813,7 @@
 <li><a href="Ocaml.html#Ocaml_nn25">Director Usage Example</a>
 <li><a href="Ocaml.html#Ocaml_nn26">Creating director objects</a>
 <li><a href="Ocaml.html#Ocaml_nn27">Typemaps for directors, directorin, directorout, directorargout</a>
-<li><a href="Ocaml.html#Ocaml_nn28">typemap</a>
+<li><a href="Ocaml.html#Ocaml_nn28">directorin typemap</a>
 <li><a href="Ocaml.html#Ocaml_nn29">directorout typemap</a>
 <li><a href="Ocaml.html#Ocaml_nn30">directorargout typemap</a>
 </ul>

Doc/Manual/Ocaml.html

@@ -47,7 +47,7 @@
 <li><a href="#Ocaml_nn25">Director Usage Example</a>
 <li><a href="#Ocaml_nn26">Creating director objects</a>
 <li><a href="#Ocaml_nn27">Typemaps for directors, directorin, directorout, directorargout</a>
-<li><a href="#Ocaml_nn28">typemap</a>
+<li><a href="#Ocaml_nn28">directorin typemap</a>
 <li><a href="#Ocaml_nn29">directorout typemap</a>
 <li><a href="#Ocaml_nn30">directorargout typemap</a>
 </ul>
@@ -948,7 +948,7 @@ well as a function return value in the same way you provide function arguments,
 and to receive arguments the same way you normally receive function returns.
 </p>
 
-<H4><a name="Ocaml_nn28">38.2.5.6 typemap</a></H4>
+<H4><a name="Ocaml_nn28">38.2.5.6 directorin typemap</a></H4>
 
 
 <p>

Doc/Manual/Perl5.html

@@ -1888,7 +1888,7 @@ like this:
 <pre>
 %typemap(out) int {
   $result = sv_newmortal();
-  set_setiv($result, (IV) $1);
+  sv_setiv($result, (IV) $1);
   argvi++;
 }
 </pre>

Doc/Manual/Python.html

@@ -7259,12 +7259,12 @@ will not be able to run any other threads, even if the wrapped C/C++ code is wai
         <p>
         The <tt>threads</tt> module option in the *.i template file:
         </p>
-        <div class="code"><pre>%feature("nothread") method;</pre></div>
+        <div class="code"><pre>%module("threads"=1)</pre></div>
       </li>
     </ul>
   </li>
   <li><p>You can disable thread support for a given method:</p>
-    <div class="code"><pre>%module("threads"=1)</pre></div>
+    <div class="code"><pre>%feature("nothread") method;</pre></div>
       or
       <div class="code"><pre>%nothread method;</pre></div>
   </li>

Examples/test-suite/php/ignore_parameter_runme.php

@@ -4,7 +4,7 @@ require "tests.php";
 require "ignore_parameter.php";
 
 // New functions
-check::functions(array('jaguar','lotus','tvr','ferrari','sportscars_daimler','sportscars_astonmartin','sportscars_bugatti','sportscars_lamborghini'));
+check::functions(array('jaguar','lotus','tvr','ferrari','fiat','sportscars_daimler','sportscars_astonmartin','sportscars_bugatti','sportscars_lamborghini','sportscars_maseratti'));
 // New classes
 check::classes(array('ignore_parameter','SportsCars','MiniCooper','MorrisMinor','FordAnglia','AustinAllegro'));
 // No new vars

Lib/php/globalvar.i

@@ -166,7 +166,6 @@
   }
 
   $1 = *($&1_ltype)_temp;
-
 }
 
 %typemap(varin) SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&

Lib/php/php.swg

@@ -471,7 +471,7 @@
 %typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE
 {
   void *tmp;
-  _v = (SWIG_ConvertPtr(&$input, (void **)&tmp, $&1_descriptor, SWIG_POINTER_NO_NULL) >= 0);
+  $1 = (SWIG_ConvertPtr(&$input, (void **)&tmp, $&1_descriptor, SWIG_POINTER_NO_NULL) >= 0);
 }
 
 %typecheck(SWIG_TYPECHECK_POINTER)
@@ -480,7 +480,7 @@
              SWIGTYPE *const&
 {
   void *tmp;
-  _v = (SWIG_ConvertPtr(&$input, (void**)&tmp, $1_descriptor, 0) >= 0);
+  $1 = (SWIG_ConvertPtr(&$input, (void**)&tmp, $1_descriptor, 0) >= 0);
 }
 
 %typecheck(SWIG_TYPECHECK_POINTER)
@@ -488,19 +488,19 @@
              SWIGTYPE &&
 {
   void *tmp;
-  _v = (SWIG_ConvertPtr(&$input, (void**)&tmp, $1_descriptor, SWIG_POINTER_NO_NULL) >= 0);
+  $1 = (SWIG_ConvertPtr(&$input, (void**)&tmp, $1_descriptor, SWIG_POINTER_NO_NULL) >= 0);
 }
 
 %typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE *const&
 {
   void *tmp;
-  _v = (SWIG_ConvertPtr(&$input, (void**)&tmp, $*1_descriptor, 0) >= 0);
+  $1 = (SWIG_ConvertPtr(&$input, (void**)&tmp, $*1_descriptor, 0) >= 0);
 }
 
 %typecheck(SWIG_TYPECHECK_VOIDPTR) void *
 {
   void *tmp;
-  _v = (SWIG_ConvertPtr(&$input, (void**)&tmp, 0, 0) >= 0);
+  $1 = (SWIG_ConvertPtr(&$input, (void**)&tmp, 0, 0) >= 0);
 }
 
 /* Exception handling */