diff --git a/Lib/csharp/std_unique_ptr.i b/Lib/csharp/std_unique_ptr.i
index ba13fce4e..2233cdc06 100644
--- a/Lib/csharp/std_unique_ptr.i
+++ b/Lib/csharp/std_unique_ptr.i
@@ -1,10 +1,11 @@
 /* -----------------------------------------------------------------------------
  * std_unique_ptr.i
  *
- * The typemaps here allow handling functions returning std::unique_ptr<>,
- * which is the most common use of this type. If you have functions taking it
- * as parameter, these typemaps can't be used for them and you need to do
- * something else (e.g. use shared_ptr<> which SWIG supports fully).
+ * SWIG library file for handling std::unique_ptr.
+ * Memory ownership is passed from the std::unique_ptr C++ layer to the proxy
+ * class when returning a std::unique_ptr from a function.
+ * Memory ownership is passed from the proxy class to the std::unique_ptr in the
+ * C++ layer when passed as a parameter to a wrapped function.
  * ----------------------------------------------------------------------------- */
 
 %define %unique_ptr(TYPE)
@@ -18,16 +19,18 @@
 %typemap(csin) std::unique_ptr< TYPE > "$typemap(cstype, TYPE).swigRelease($csinput)"
 
 %typemap (out) std::unique_ptr< TYPE > %{
-   $result = (void *)$1.release();
+  $result = (void *)$1.release();
 %}
+
 %typemap(csout, excode=SWIGEXCODE) std::unique_ptr< TYPE > {
-     System.IntPtr cPtr = $imcall;
-     $typemap(cstype, TYPE) ret = (cPtr == System.IntPtr.Zero) ? null : new $typemap(cstype, TYPE)(cPtr, true);$excode
-     return ret;
-   }
+    System.IntPtr cPtr = $imcall;
+    $typemap(cstype, TYPE) ret = (cPtr == System.IntPtr.Zero) ? null : new $typemap(cstype, TYPE)(cPtr, true);$excode
+    return ret;
+  }
+
 %template() std::unique_ptr< TYPE >;
 %enddef
 
 namespace std {
   template <class T> class unique_ptr {};
-} 
+}
diff --git a/Lib/java/std_unique_ptr.i b/Lib/java/std_unique_ptr.i
index 5f4a0c5a2..e1e5a2622 100644
--- a/Lib/java/std_unique_ptr.i
+++ b/Lib/java/std_unique_ptr.i
@@ -1,10 +1,11 @@
 /* -----------------------------------------------------------------------------
  * std_unique_ptr.i
  *
- * The typemaps here allow handling functions returning std::unique_ptr<>,
- * which is the most common use of this type. If you have functions taking it
- * as parameter, these typemaps can't be used for them and you need to do
- * something else (e.g. use shared_ptr<> which SWIG supports fully).
+ * SWIG library file for handling std::unique_ptr.
+ * Memory ownership is passed from the std::unique_ptr C++ layer to the proxy
+ * class when returning a std::unique_ptr from a function.
+ * Memory ownership is passed from the proxy class to the std::unique_ptr in the
+ * C++ layer when passed as a parameter to a wrapped function.
  * ----------------------------------------------------------------------------- */
 
 %define %unique_ptr(TYPE)
@@ -20,19 +21,19 @@
 %typemap(javain) std::unique_ptr< TYPE > "$typemap(jstype, TYPE).swigRelease($javainput)"
 
 %typemap (out) std::unique_ptr< TYPE > %{
-   jlong lpp = 0;
-   *(TYPE **) &lpp = $1.release();
-   $result = lpp;
+  jlong lpp = 0;
+  *(TYPE **) &lpp = $1.release();
+  $result = lpp;
 %}
 
 %typemap(javaout) std::unique_ptr< TYPE > {
-     long cPtr = $jnicall;
-     return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
-   }
+    long cPtr = $jnicall;
+    return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
+  }
 
 %template() std::unique_ptr< TYPE >;
 %enddef
 
 namespace std {
-   template <class T> class unique_ptr {};
-} 
+  template <class T> class unique_ptr {};
+}
diff --git a/Lib/perl5/std_unique_ptr.i b/Lib/perl5/std_unique_ptr.i
index a0128ba78..1a7ec06fa 100644
--- a/Lib/perl5/std_unique_ptr.i
+++ b/Lib/perl5/std_unique_ptr.i
@@ -1,10 +1,11 @@
 /* -----------------------------------------------------------------------------
  * std_unique_ptr.i
  *
- * The typemaps here allow handling functions returning std::unique_ptr<>,
- * which is the most common use of this type. If you have functions taking it
- * as parameter, these typemaps can't be used for them and you need to do
- * something else (e.g. use shared_ptr<> which SWIG supports fully).
+ * SWIG library file for handling std::unique_ptr.
+ * Memory ownership is passed from the std::unique_ptr C++ layer to the proxy
+ * class when returning a std::unique_ptr from a function.
+ * Memory ownership is passed from the proxy class to the std::unique_ptr in the
+ * C++ layer when passed as a parameter to a wrapped function.
  * ----------------------------------------------------------------------------- */
 
 %define %unique_ptr(TYPE)
@@ -21,12 +22,12 @@
 }
 
 %typemap (out) std::unique_ptr< TYPE > %{
-   %set_output(SWIG_NewPointerObj($1.release(), $descriptor(TYPE *), SWIG_POINTER_OWN | %newpointer_flags));
+  %set_output(SWIG_NewPointerObj($1.release(), $descriptor(TYPE *), SWIG_POINTER_OWN | %newpointer_flags));
 %}
 
 %template() std::unique_ptr< TYPE >;
 %enddef
 
 namespace std {
-   template <class T> class unique_ptr {};
+  template <class T> class unique_ptr {};
 }
diff --git a/Lib/python/std_unique_ptr.i b/Lib/python/std_unique_ptr.i
index bec8bf968..1a7ec06fa 100644
--- a/Lib/python/std_unique_ptr.i
+++ b/Lib/python/std_unique_ptr.i
@@ -1,10 +1,11 @@
 /* -----------------------------------------------------------------------------
  * std_unique_ptr.i
  *
- * The typemaps here allow handling functions returning std::unique_ptr<>,
- * which is the most common use of this type. If you have functions taking it
- * as parameter, these typemaps can't be used for them and you need to do
- * something else (e.g. use shared_ptr<> which SWIG supports fully).
+ * SWIG library file for handling std::unique_ptr.
+ * Memory ownership is passed from the std::unique_ptr C++ layer to the proxy
+ * class when returning a std::unique_ptr from a function.
+ * Memory ownership is passed from the proxy class to the std::unique_ptr in the
+ * C++ layer when passed as a parameter to a wrapped function.
  * ----------------------------------------------------------------------------- */
 
 %define %unique_ptr(TYPE)
@@ -21,12 +22,12 @@
 }
 
 %typemap (out) std::unique_ptr< TYPE > %{
-   %set_output(SWIG_NewPointerObj($1.release(), $descriptor(TYPE *), SWIG_POINTER_OWN | %newpointer_flags));
+  %set_output(SWIG_NewPointerObj($1.release(), $descriptor(TYPE *), SWIG_POINTER_OWN | %newpointer_flags));
 %}
 
 %template() std::unique_ptr< TYPE >;
 %enddef
 
 namespace std {
-   template <class T> class unique_ptr {};
-} 
+  template <class T> class unique_ptr {};
+}
diff --git a/Lib/ruby/std_unique_ptr.i b/Lib/ruby/std_unique_ptr.i
index a0128ba78..1a7ec06fa 100644
--- a/Lib/ruby/std_unique_ptr.i
+++ b/Lib/ruby/std_unique_ptr.i
@@ -1,10 +1,11 @@
 /* -----------------------------------------------------------------------------
  * std_unique_ptr.i
  *
- * The typemaps here allow handling functions returning std::unique_ptr<>,
- * which is the most common use of this type. If you have functions taking it
- * as parameter, these typemaps can't be used for them and you need to do
- * something else (e.g. use shared_ptr<> which SWIG supports fully).
+ * SWIG library file for handling std::unique_ptr.
+ * Memory ownership is passed from the std::unique_ptr C++ layer to the proxy
+ * class when returning a std::unique_ptr from a function.
+ * Memory ownership is passed from the proxy class to the std::unique_ptr in the
+ * C++ layer when passed as a parameter to a wrapped function.
  * ----------------------------------------------------------------------------- */
 
 %define %unique_ptr(TYPE)
@@ -21,12 +22,12 @@
 }
 
 %typemap (out) std::unique_ptr< TYPE > %{
-   %set_output(SWIG_NewPointerObj($1.release(), $descriptor(TYPE *), SWIG_POINTER_OWN | %newpointer_flags));
+  %set_output(SWIG_NewPointerObj($1.release(), $descriptor(TYPE *), SWIG_POINTER_OWN | %newpointer_flags));
 %}
 
 %template() std::unique_ptr< TYPE >;
 %enddef
 
 namespace std {
-   template <class T> class unique_ptr {};
+  template <class T> class unique_ptr {};
 }