lib/talloc: Move manpage to man/.

Trying to be more consistent.

Karolin

Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/lib/talloc/talloc.3.xml b/lib/talloc/man/talloc.3.xml
similarity index 99%
rename from lib/talloc/talloc.3.xml
rename to lib/talloc/man/talloc.3.xml
index 85cd6c49d86ab3324efbfdf0031dde179d4eee6b..553eaec7ea8c88f242d122734880a4f90d9ade63 100644 (file)
--- a/lib/talloc/talloc.3.xml
+++ b/lib/talloc/man/talloc.3.xml
@@ -28,7 +28,7 @@
     <para>
       Perhaps the biggest change from Samba3 is that there is no
       distinction between a "talloc context" and a "talloc pointer".  Any
-      pointer returned from talloc() is itself a valid talloc context. 
+      pointer returned from talloc() is itself a valid talloc context.
       This means you can do this:
     </para>
     <programlisting>
@@ -153,8 +153,8 @@
        <para>
          <screen format="linespecific">
            ERROR: talloc_free with references at some_dir/source/foo.c:123
-               reference at some_dir/source/other.c:325
-               reference at some_dir/source/third.c:121
+               reference at some_dir/source/other.c:325
+               reference at some_dir/source/third.c:121
          </screen>
        </para>
        <para>
@@ -188,7 +188,7 @@
         <itemizedlist>
           <listitem>
             <para>
-             you can talloc_free() any parent of the original pointer. 
+             you can talloc_free() any parent of the original pointer.
              That will reduce the number of parents of this pointer by 1,
              and will cause this pointer to be freed if it runs out of
              parents.
@@ -218,7 +218,7 @@
         </para>
         <para>
          Note that if the parent has already been removed using
-         talloc_free() then this function will fail and will return -1. 
+         talloc_free() then this function will fail and will return -1.
          Likewise, if <emphasis role="italic">ptr</emphasis> is NULL, then
          the function will make no modifications and return -1.
         </para>
@@ -373,7 +373,7 @@ talloc_set_name_const(ptr, name);</programlisting>
     </refsect2>
     <refsect2><title>(<emphasis role="italic">type</emphasis> *)talloc_realloc(const void *<emphasis role="italic">ctx</emphasis>, void *<emphasis role="italic">ptr</emphasis>, <emphasis role="italic">type</emphasis>, <emphasis role="italic">count</emphasis>);</title>
         <para>
-         The talloc_realloc() macro changes the size of a talloc pointer. 
+         The talloc_realloc() macro changes the size of a talloc pointer.
          It has the following equivalences:
         </para>
         <programlisting>talloc_realloc(ctx, NULL, type, 1) ==> talloc(ctx, type);
@@ -384,7 +384,7 @@ talloc_realloc(ctx, ptr, type, 0)  ==> talloc_free(ptr);</programlisting>
          it is ignored.
         </para>
         <para>
-         talloc_realloc() returns the new pointer, or NULL on failure. 
+         talloc_realloc() returns the new pointer, or NULL on failure.
          The call will fail either due to a lack of memory, or because the
          pointer has more than one parent (see <link
          linkend="talloc_reference"><quote>talloc_reference()</quote></link>).
@@ -423,8 +423,8 @@ talloc_realloc(ctx, ptr, type, 0)  ==> talloc_free(ptr);</programlisting>
         <para>
          <screen format="linespecific">
          WARNING: talloc_steal with references at some_dir/source/foo.c:123
-               reference at some_dir/source/other.c:325
-               reference at some_dir/source/third.c:121
+               reference at some_dir/source/other.c:325
+               reference at some_dir/source/third.c:121
          </screen>
         </para>
         <para>
@@ -432,7 +432,7 @@ talloc_realloc(ctx, ptr, type, 0)  ==> talloc_free(ptr);</programlisting>
          the
          function <link linkend="talloc_reference"><quote>talloc_reparent()</quote></link>. See
          the talloc_set_log_fn() documentation for more information
-         on talloc logging.  
+         on talloc logging.
        </para>
     </refsect2>
     <refsect2><title>TYPE *talloc_reparent(const void *<emphasis role="italic">old_parent</emphasis>, const void *<emphasis role="italic">new_parent</emphasis>, const TYPE *<emphasis role="italic">ptr</emphasis>);</title>
@@ -776,7 +776,7 @@ if (ptr) memcpy(ptr, p, strlen(p)+1);</programlisting>
   </refsect1>
   <refsect1><title>SEE ALSO</title>
     <para>
-      malloc(3), strndup(3), vasprintf(3), asprintf(3), 
+      malloc(3), strndup(3), vasprintf(3), asprintf(3),
       <ulink url="http://talloc.samba.org/"/>
     </para>
   </refsect1>
@@ -795,7 +795,7 @@ if (ptr) memcpy(ptr, p, strlen(p)+1);</programlisting>
     </para>
     <para>
       This program is free software; you can redistribute it and/or modify
-      it under the terms of the GNU Lesser General Public License as 
+      it under the terms of the GNU Lesser General Public License as
       published by the Free Software Foundation; either version 3 of the
       License, or (at your option) any later version.
     </para>

diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index 8d3246b26bb937cffba24c944719fd13777e4e5b..bd7708e47d06ab6542d2f6f0961b1ed2194af60c 100644 (file)
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -108,7 +108,7 @@ def build(bld):
                           pc_files='talloc.pc',
                           public_headers_install=not private_library,
                           private_library=private_library,
-                          manpages='talloc.3')
+                          manpages='man/talloc.3')
 
     if not bld.CONFIG_SET('USING_SYSTEM_PYTALLOC_UTIL') and not bld.env.disable_python:
         bld.SAMBA_LIBRARY('pytalloc-util',