[Pkg-samba-maint] r4032 - in trunk/samba/debian: . patches

bubulle at alioth.debian.org bubulle at alioth.debian.org
Thu Mar 8 20:56:18 UTC 2012


tags 662243 pending
thanks

Author: bubulle
Date: 2012-03-08 20:56:18 +0000 (Thu, 08 Mar 2012)
New Revision: 4032

Added:
   trunk/samba/debian/patches/documentation2.patch
Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/patches/series
Log:
* Removed references to the testprns command from documentation
* Added notes that the smbsh command is not available in this package
  Closes: #662243

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2012-03-03 17:46:40 UTC (rev 4031)
+++ trunk/samba/debian/changelog	2012-03-08 20:56:18 UTC (rev 4032)
@@ -5,6 +5,11 @@
   * Set minimal version of tdb ot 1.2.6 in Build-Depends
     (thanks, backports!)
 
+  [ Maarten Bezemer ]
+  * Removed references to the testprns command from documentation
+  * Added notes that the smbsh command is not available in this package
+    Closes: #662243
+
   [ Debconf translations ]
   * Indonesian (Arief S Fitrianto).  Closes: #660312
   * Slovak (Ivan Masár).  Closes: #661125

Added: trunk/samba/debian/patches/documentation2.patch
===================================================================
--- trunk/samba/debian/patches/documentation2.patch	                        (rev 0)
+++ trunk/samba/debian/patches/documentation2.patch	2012-03-08 20:56:18 UTC (rev 4032)
@@ -0,0 +1,313 @@
+Description: Remove documentation parts that do not apply to Debian
+Author: Christian Perrier <bubulle at debian.org>
+Forwarded: https://bugzilla.samba.org/show_bug.cgi?id=8789
+
+Index: samba-debian/docs-xml/manpages-3/nmbd.8.xml
+===================================================================
+--- samba-debian.orig/docs-xml/manpages-3/nmbd.8.xml	2012-03-07 10:07:07.000000000 +0100
++++ samba-debian/docs-xml/manpages-3/nmbd.8.xml	2012-03-07 10:07:36.000000000 +0100
+@@ -266,7 +266,6 @@
+ 	<manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>smb.conf</refentrytitle>
+ 	<manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbclient</refentrytitle>
+ 	<manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testparm</refentrytitle>
+-	<manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testprns</refentrytitle>
+ 	<manvolnum>1</manvolnum></citerefentry>, and the Internet 
+ 	RFC's <filename>rfc1001.txt</filename>, <filename>rfc1002.txt</filename>. 
+ 	In addition the CIFS (formerly SMB) specification is available 
+Index: samba-debian/docs-xml/manpages-3/samba.7.xml
+===================================================================
+--- samba-debian.orig/docs-xml/manpages-3/samba.7.xml	2012-03-07 10:07:07.000000000 +0100
++++ samba-debian/docs-xml/manpages-3/samba.7.xml	2012-03-07 10:07:36.000000000 +0100
+@@ -76,16 +76,6 @@
+ 		</varlistentry>
+ 
+ 		<varlistentry>
+-		<term><citerefentry><refentrytitle>testprns</refentrytitle>
+-		<manvolnum>1</manvolnum></citerefentry></term>
+-		<listitem><para>The <command>testprns</command>
+-		utility supports testing printer names defined 
+-		in your <filename>printcap</filename> file used 
+-		by Samba.</para>
+-		</listitem>
+-		</varlistentry>
+-
+-		<varlistentry>
+ 		<term><citerefentry><refentrytitle>smbstatus</refentrytitle>
+ 		<manvolnum>1</manvolnum></citerefentry></term>
+ 		<listitem><para>The <command>smbstatus</command>
+@@ -125,7 +115,8 @@
+ 		<manvolnum>1</manvolnum></citerefentry></term>
+ 		<listitem><para>The <command>smbsh</command> command is 
+ 		a program that allows you to run a unix shell with 
+-		with an overloaded VFS.</para></listitem>
++		with an overloaded VFS. Note that, it is not installed by
++		the current samba package.</para></listitem>
+ 		</varlistentry>
+ 
+ 		<varlistentry>
+Index: samba-debian/docs-xml/manpages-3/smb.conf.5.xml
+===================================================================
+--- samba-debian.orig/docs-xml/manpages-3/smb.conf.5.xml	2012-03-07 10:07:07.000000000 +0100
++++ samba-debian/docs-xml/manpages-3/smb.conf.5.xml	2012-03-07 10:07:36.000000000 +0100
+@@ -856,7 +856,6 @@
+ 	<manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbclient</refentrytitle>
+ 	<manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>nmblookup</refentrytitle>
+ 	<manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testparm</refentrytitle>
+-	<manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testprns</refentrytitle>
+ 	<manvolnum>1</manvolnum></citerefentry>.</para>
+ </refsect1>
+ 
+Index: samba-debian/docs-xml/manpages-3/smbd.8.xml
+===================================================================
+--- samba-debian.orig/docs-xml/manpages-3/smbd.8.xml	2012-03-07 10:07:07.000000000 +0100
++++ samba-debian/docs-xml/manpages-3/smbd.8.xml	2012-03-07 10:07:36.000000000 +0100
+@@ -417,7 +417,6 @@
+ 	<manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>smb.conf</refentrytitle>
+ 	<manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbclient</refentrytitle>
+ 	<manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testparm</refentrytitle>
+-	<manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testprns</refentrytitle>
+ 	<manvolnum>1</manvolnum></citerefentry>, and the 
+ 	Internet RFC's	<filename>rfc1001.txt</filename>, <filename>rfc1002.txt</filename>. 
+ 	In addition the CIFS (formerly SMB) specification is available 
+Index: samba-debian/docs-xml/using_samba/appd.xml
+===================================================================
+--- samba-debian.orig/docs-xml/using_samba/appd.xml	2012-03-07 10:07:07.000000000 +0100
++++ samba-debian/docs-xml/using_samba/appd.xml	2012-03-07 10:07:36.000000000 +0100
+@@ -296,7 +296,7 @@
+ 
+ 
+ <para>The <emphasis>smbsh</emphasis>
+-<indexterm id="appd-idx-993744-0"><primary>smbsh program</primary></indexterm> program lets you use a remote Windows share on your Samba server as if the share was a regular Unix directory. When it's run, it provides an extra directory tree under <filename>/smb</filename>. Subdirectories of <filename>/smb</filename> are servers, and subdirectories of the servers are their individual disk and printer shares. Commands run by <emphasis>smbsh</emphasis> treat the <filename>/smb</filename> filesystem as if it were local to Unix. This means that you don't need <emphasis>smbmount</emphasis> in your kernel to mount Windows filesystems the way you mount with NFS filesystems. However, you do need to configure Samba with the <literal>--with-smbwrappers</literal> option to enable <filename>smbsh</filename>.</para>
++<indexterm id="appd-idx-993744-0"><primary>smbsh program</primary></indexterm> program (<emphasis>not available in this samba package</emphasis>) lets you use a remote Windows share on your Samba server as if the share was a regular Unix directory. When it's run, it provides an extra directory tree under <filename>/smb</filename>. Subdirectories of <filename>/smb</filename> are servers, and subdirectories of the servers are their individual disk and printer shares. Commands run by <emphasis>smbsh</emphasis> treat the <filename>/smb</filename> filesystem as if it were local to Unix. This means that you don't need <emphasis>smbmount</emphasis> in your kernel to mount Windows filesystems the way you mount with NFS filesystems. However, you do need to configure Samba with the <literal>--with-smbwrappers</literal> option to enable <filename>smbsh</filename>.</para>
+ 
+ 
+ <sect3 role="" label="D.1.4.1" id="appd-SECT-1.4.1">
+@@ -1320,24 +1320,6 @@
+ </sect2>
+ 
+ 
+-
+-
+-
+-<sect2 role="" label="D.1.11" id="appd-SECT-1.11">
+-<title>testprns</title>
+-
+-
+-<para>The<indexterm id="appd-idx-993761-0"><primary>testprns program</primary></indexterm>
+-<indexterm id="appd-idx-993761-1"><primary>printers</primary><secondary>names</secondary><tertiary>checking</tertiary></indexterm> <emphasis>testprns</emphasis> program checks a specified printer name against the system printer capabilities (<filename>printcap</filename>) file. Its command line is:</para>
+-
+-
+-<programlisting>testprns <replaceable>printername</replaceable> [<replaceable>printcapname</replaceable>]</programlisting>
+-
+-
+-<para>If the <literal>printcapname</literal> isn't specified, Samba attempts to use one located in the <filename>smb.conf</filename> file. If one isn't specified there, Samba will try <filename>/etc/printcap</filename>. If that fails, the program will generate an error.</para>
+-</sect2>
+-
+-
+ 
+ 
+ 
+Index: samba-debian/docs-xml/using_samba/ch01.xml
+===================================================================
+--- samba-debian.orig/docs-xml/using_samba/ch01.xml	2012-03-07 10:07:07.000000000 +0100
++++ samba-debian/docs-xml/using_samba/ch01.xml	2012-03-07 10:07:36.000000000 +0100
+@@ -1375,12 +1375,6 @@
+ </varlistentry>
+ 
+ 
+-<varlistentry><term>testprns</term>
+-<listitem><para>A program that tests whether various printers are recognized by the <filename>smbd</filename> daemon</para></listitem>
+-</varlistentry>
+-</variablelist>
+-
+-
+ <para>Each significant release of Samba goes through a significant exposure test before it's announced. In addition, it is quickly updated afterward if problems or unwanted side-effects are found. The latest stable distribution as of this writing is Samba 2.0.5, the long-awaited production version of Samba 2.0. This book focuses on the functionality supported in Samba 2.0, as opposed to the older 1.9.<emphasis>x</emphasis> versions of Samba, which are now obsolete.</para>
+ </sect1>
+ 
+Index: samba-debian/docs-xml/using_samba/ch07.xml
+===================================================================
+--- samba-debian.orig/docs-xml/using_samba/ch07.xml	2012-03-07 10:07:07.000000000 +0100
++++ samba-debian/docs-xml/using_samba/ch07.xml	2012-03-07 10:07:36.000000000 +0100
+@@ -306,7 +306,7 @@
+ 	public: true</programlisting>
+ 
+ 
+-<para>Second, try the command <literal>testprns</literal> <replaceable>printername</replaceable>. This is a simple program that verifies that the specified printer is available in your <emphasis>printcap</emphasis> file. If your <emphasis>printcap</emphasis> file is not in the usual place, you can specify its full pathname as the second argument to the <emphasis>testprns</emphasis> command:</para>
++<para>Second, try the command <literal>testprns</literal> <replaceable>printername</replaceable>. <emphasis>Note</emphasis>: This command is not available in this package. This is a simple program that verifies that the specified printer is available in your <emphasis>printcap</emphasis> file. If your <emphasis>printcap</emphasis> file is not in the usual place, you can specify its full pathname as the second argument to the <emphasis>testprns</emphasis> command:</para>
+ 
+ 
+ <programlisting># testprns lp /etc/printcap
+Index: samba-debian/docs/htmldocs/manpages/nmbd.8.html
+===================================================================
+--- samba-debian.orig/docs/htmldocs/manpages/nmbd.8.html	2012-03-07 10:07:07.000000000 +0100
++++ samba-debian/docs/htmldocs/manpages/nmbd.8.html	2012-03-07 10:07:36.000000000 +0100
+@@ -131,7 +131,7 @@
+ 	transient problems to be diagnosed, whilst still running 
+ 	at a normally low log level.</p></div><div class="refsect1" title="VERSION"><a name="id307511"></a><h2>VERSION</h2><p>This man page is correct for version 3 of 
+ 	the Samba suite.</p></div><div class="refsect1" title="SEE ALSO"><a name="id307521"></a><h2>SEE ALSO</h2><p>
+-	<a class="citerefentry" href="inetd.8.html"><span class="citerefentry"><span class="refentrytitle">inetd</span>(8)</span></a>, <a class="citerefentry" href="smbd.8.html"><span class="citerefentry"><span class="refentrytitle">smbd</span>(8)</span></a>, <a class="citerefentry" href="smb.conf.5.html"><span class="citerefentry"><span class="refentrytitle">smb.conf</span>(5)</span></a>, <a class="citerefentry" href="smbclient.1.html"><span class="citerefentry"><span class="refentrytitle">smbclient</span>(1)</span></a>, <a class="citerefentry" href="testparm.1.html"><span class="citerefentry"><span class="refentrytitle">testparm</span>(1)</span></a>, <a class="citerefentry" href="testprns.1.html"><span class="citerefentry"><span class="refentrytitle">testprns</span>(1)</span></a>, and the Internet 
++	<a class="citerefentry" href="inetd.8.html"><span class="citerefentry"><span class="refentrytitle">inetd</span>(8)</span></a>, <a class="citerefentry" href="smbd.8.html"><span class="citerefentry"><span class="refentrytitle">smbd</span>(8)</span></a>, <a class="citerefentry" href="smb.conf.5.html"><span class="citerefentry"><span class="refentrytitle">smb.conf</span>(5)</span></a>, <a class="citerefentry" href="smbclient.1.html"><span class="citerefentry"><span class="refentrytitle">smbclient</span>(1)</span></a>, <a class="citerefentry" href="testparm.1.html"><span class="citerefentry"><span class="refentrytitle">testparm</span>(1)</span></a>, and the Internet
+ 	RFC's <code class="filename">rfc1001.txt</code>, <code class="filename">rfc1002.txt</code>. 
+ 	In addition the CIFS (formerly SMB) specification is available 
+ 	as a link from the Web page <a class="ulink" href="http://samba.org/cifs/" target="_top"> 
+Index: samba-debian/docs/htmldocs/manpages/samba.7.html
+===================================================================
+--- samba-debian.orig/docs/htmldocs/manpages/samba.7.html	2012-03-07 10:07:07.000000000 +0100
++++ samba-debian/docs/htmldocs/manpages/samba.7.html	2012-03-07 10:07:36.000000000 +0100
+@@ -17,10 +17,7 @@
+ 		servers (such as Windows NT), and can also be used 
+ 		to allow a UNIX box to print to a printer attached to 
+ 		any SMB server (such as a PC running Windows NT).</p></dd><dt><span class="term"><a class="citerefentry" href="testparm.1.html"><span class="citerefentry"><span class="refentrytitle">testparm</span>(1)</span></a></span></dt><dd><p>The <code class="literal">testparm</code>
+-		utility is a simple syntax checker for Samba's <a class="citerefentry" href="smb.conf.5.html"><span class="citerefentry"><span class="refentrytitle">smb.conf</span>(5)</span></a> configuration file.</p></dd><dt><span class="term"><a class="citerefentry" href="testprns.1.html"><span class="citerefentry"><span class="refentrytitle">testprns</span>(1)</span></a></span></dt><dd><p>The <code class="literal">testprns</code>
+-		utility supports testing printer names defined 
+-		in your <code class="filename">printcap</code> file used 
+-		by Samba.</p></dd><dt><span class="term"><a class="citerefentry" href="smbstatus.1.html"><span class="citerefentry"><span class="refentrytitle">smbstatus</span>(1)</span></a></span></dt><dd><p>The <code class="literal">smbstatus</code>
++		utility is a simple syntax checker for Samba's <a class="citerefentry" href="smb.conf.5.html"><span class="citerefentry"><span class="refentrytitle">smb.conf</span>(5)</span></a> configuration file.</p></dd><dt><span class="term"><a class="citerefentry" href="smbstatus.1.html"><span class="citerefentry"><span class="refentrytitle">smbstatus</span>(1)</span></a></span></dt><dd><p>The <code class="literal">smbstatus</code>
+ 		tool provides access to information about the 
+ 		current connections to <code class="literal">smbd</code>.</p></dd><dt><span class="term"><a class="citerefentry" href="nmblookup.1.html"><span class="citerefentry"><span class="refentrytitle">nmblookup</span>(1)</span></a></span></dt><dd><p>The <code class="literal">nmblookup</code>
+ 		tools allows NetBIOS name queries to be made 
+@@ -29,7 +26,8 @@
+ 		password hashes on Samba and Windows NT servers.</p></dd><dt><span class="term"><a class="citerefentry" href="smbcacls.1.html"><span class="citerefentry"><span class="refentrytitle">smbcacls</span>(1)</span></a></span></dt><dd><p>The <code class="literal">smbcacls</code> command is 
+ 		a tool to set ACL's on remote CIFS servers. </p></dd><dt><span class="term"><a class="citerefentry" href="smbsh.1.html"><span class="citerefentry"><span class="refentrytitle">smbsh</span>(1)</span></a></span></dt><dd><p>The <code class="literal">smbsh</code> command is 
+ 		a program that allows you to run a unix shell with 
+-		with an overloaded VFS.</p></dd><dt><span class="term"><a class="citerefentry" href="smbtree.1.html"><span class="citerefentry"><span class="refentrytitle">smbtree</span>(1)</span></a></span></dt><dd><p>The <code class="literal">smbtree</code> command 
++		with an overloaded VFS. Note that, it is not installed by 
++		the current samba package.</p></dd><dt><span class="term"><a class="citerefentry" href="smbtree.1.html"><span class="citerefentry"><span class="refentrytitle">smbtree</span>(1)</span></a></span></dt><dd><p>The <code class="literal">smbtree</code> command 
+ 		is a text-based network neighborhood tool.</p></dd><dt><span class="term"><a class="citerefentry" href="smbtar.1.html"><span class="citerefentry"><span class="refentrytitle">smbtar</span>(1)</span></a></span></dt><dd><p>The <code class="literal">smbtar</code> can make 
+ 		backups of data on CIFS/SMB servers.</p></dd><dt><span class="term"><a class="citerefentry" href="smbspool.8.html"><span class="citerefentry"><span class="refentrytitle">smbspool</span>(8)</span></a></span></dt><dd><p><code class="literal">smbspool</code> is a 
+ 		helper utility for printing on printers connected 
+Index: samba-debian/docs/htmldocs/manpages/smb.conf.5.html
+===================================================================
+--- samba-debian.orig/docs/htmldocs/manpages/smb.conf.5.html	2012-03-07 10:07:07.000000000 +0100
++++ samba-debian/docs/htmldocs/manpages/smb.conf.5.html	2012-03-07 10:07:36.000000000 +0100
+@@ -6961,7 +6961,7 @@
+ 	care when designing these sections. In particular, ensure that the permissions on spool directories are
+ 	correct.
+ 	</p></div><div class="refsect1" title="VERSION"><a name="id340672"></a><h2>VERSION</h2><p>This man page is correct for version 3 of the Samba suite.</p></div><div class="refsect1" title="SEE ALSO"><a name="id340683"></a><h2>SEE ALSO</h2><p>
+-	<a class="citerefentry" href="samba.7.html"><span class="citerefentry"><span class="refentrytitle">samba</span>(7)</span></a>, <a class="citerefentry" href="smbpasswd.8.html"><span class="citerefentry"><span class="refentrytitle">smbpasswd</span>(8)</span></a>, <a class="citerefentry" href="swat.8.html"><span class="citerefentry"><span class="refentrytitle">swat</span>(8)</span></a>, <a class="citerefentry" href="smbd.8.html"><span class="citerefentry"><span class="refentrytitle">smbd</span>(8)</span></a>, <a class="citerefentry" href="nmbd.8.html"><span class="citerefentry"><span class="refentrytitle">nmbd</span>(8)</span></a>, <a class="citerefentry" href="smbclient.1.html"><span class="citerefentry"><span class="refentrytitle">smbclient</span>(1)</span></a>, <a class="citerefentry" href="nmblookup.1.html"><span class="citerefentry"><span class="refentrytitle">nmblookup</span>(1)</span></a>, <a class="citerefentry" href="testparm.1.html"><span class="citerefentry"><span class="refentrytitle">testparm</span>(1)</span></a>, <a class="citerefentry" href="testprns.1.html"><span class="citerefentry"><span class="refentrytitle">testprns</span>(1)</span></a>.</p></div><div class="refsect1" title="AUTHOR"><a name="id340762"></a><h2>AUTHOR</h2><p>
++	<a class="citerefentry" href="samba.7.html"><span class="citerefentry"><span class="refentrytitle">samba</span>(7)</span></a>, <a class="citerefentry" href="smbpasswd.8.html"><span class="citerefentry"><span class="refentrytitle">smbpasswd</span>(8)</span></a>, <a class="citerefentry" href="swat.8.html"><span class="citerefentry"><span class="refentrytitle">swat</span>(8)</span></a>, <a class="citerefentry" href="smbd.8.html"><span class="citerefentry"><span class="refentrytitle">smbd</span>(8)</span></a>, <a class="citerefentry" href="nmbd.8.html"><span class="citerefentry"><span class="refentrytitle">nmbd</span>(8)</span></a>, <a class="citerefentry" href="smbclient.1.html"><span class="citerefentry"><span class="refentrytitle">smbclient</span>(1)</span></a>, <a class="citerefentry" href="nmblookup.1.html"><span class="citerefentry"><span class="refentrytitle">nmblookup</span>(1)</span></a>, <a class="citerefentry" href="testparm.1.html"><span class="citerefentry"><span class="refentrytitle">testparm</span>(1)</span></a>.</p></div><div class="refsect1" title="AUTHOR"><a name="id340762"></a><h2>AUTHOR</h2><p>
+ 	The original Samba software and related utilities were created by Andrew Tridgell. Samba is now developed
+ 	by the Samba Team as an Open Source project similar to the way the Linux kernel is developed.
+ 	</p><p>
+Index: samba-debian/docs/htmldocs/manpages/smbd.8.html
+===================================================================
+--- samba-debian.orig/docs/htmldocs/manpages/smbd.8.html	2012-03-07 10:07:07.000000000 +0100
++++ samba-debian/docs/htmldocs/manpages/smbd.8.html	2012-03-07 10:07:36.000000000 +0100
+@@ -147,7 +147,7 @@
+ 	<code class="literal">smbd</code> is in a state of waiting for an incoming SMB before 
+ 	issuing them. It is possible to make the signal handlers safe 
+ 	by un-blocking the signals before the select call and re-blocking 
+-	them after, however this would affect performance.</p></div><div class="refsect1" title="SEE ALSO"><a name="id307739"></a><h2>SEE ALSO</h2><p><a class="citerefentry" href="hosts_access.5.html"><span class="citerefentry"><span class="refentrytitle">hosts_access</span>(5)</span></a>, <a class="citerefentry" href="inetd.8.html"><span class="citerefentry"><span class="refentrytitle">inetd</span>(8)</span></a>, <a class="citerefentry" href="nmbd.8.html"><span class="citerefentry"><span class="refentrytitle">nmbd</span>(8)</span></a>, <a class="citerefentry" href="smb.conf.5.html"><span class="citerefentry"><span class="refentrytitle">smb.conf</span>(5)</span></a>, <a class="citerefentry" href="smbclient.1.html"><span class="citerefentry"><span class="refentrytitle">smbclient</span>(1)</span></a>, <a class="citerefentry" href="testparm.1.html"><span class="citerefentry"><span class="refentrytitle">testparm</span>(1)</span></a>, <a class="citerefentry" href="testprns.1.html"><span class="citerefentry"><span class="refentrytitle">testprns</span>(1)</span></a>, and the 
++	them after, however this would affect performance.</p></div><div class="refsect1" title="SEE ALSO"><a name="id307739"></a><h2>SEE ALSO</h2><p><a class="citerefentry" href="hosts_access.5.html"><span class="citerefentry"><span class="refentrytitle">hosts_access</span>(5)</span></a>, <a class="citerefentry" href="inetd.8.html"><span class="citerefentry"><span class="refentrytitle">inetd</span>(8)</span></a>, <a class="citerefentry" href="nmbd.8.html"><span class="citerefentry"><span class="refentrytitle">nmbd</span>(8)</span></a>, <a class="citerefentry" href="smb.conf.5.html"><span class="citerefentry"><span class="refentrytitle">smb.conf</span>(5)</span></a>, <a class="citerefentry" href="smbclient.1.html"><span class="citerefentry"><span class="refentrytitle">smbclient</span>(1)</span></a>, <a class="citerefentry" href="testparm.1.html"><span class="citerefentry"><span class="refentrytitle">testparm</span>(1)</span></a>, and the
+ 	Internet RFC's	<code class="filename">rfc1001.txt</code>, <code class="filename">rfc1002.txt</code>. 
+ 	In addition the CIFS (formerly SMB) specification is available 
+ 	as a link from the Web page <a class="ulink" href="http://samba.org/cifs/" target="_top"> 
+Index: samba-debian/docs/manpages/nmbd.8
+===================================================================
+--- samba-debian.orig/docs/manpages/nmbd.8	2012-03-07 10:07:07.000000000 +0100
++++ samba-debian/docs/manpages/nmbd.8	2012-03-07 10:07:36.000000000 +0100
+@@ -252,8 +252,7 @@
+ \fBsmbd\fR(8),
+ \fBsmb.conf\fR(5),
+ \fBsmbclient\fR(1),
+-\fBtestparm\fR(1),
+-\fBtestprns\fR(1), and the Internet RFC\'s
++\fBtestparm\fR(1), and the Internet RFC\'s
+ rfc1001\&.txt,
+ rfc1002\&.txt\&. In addition the CIFS (formerly SMB) specification is available as a link from the Web page
+ http://samba\&.org/cifs/\&.
+Index: samba-debian/docs/manpages/samba.7
+===================================================================
+--- samba-debian.orig/docs/manpages/samba.7	2012-03-07 10:07:07.000000000 +0100
++++ samba-debian/docs/manpages/samba.7	2012-03-07 10:07:36.000000000 +0100
+@@ -60,15 +60,6 @@
+ configuration file\&.
+ .RE
+ .PP
+-\fBtestprns\fR(1)
+-.RS 4
+-The
+-testprns
+-utility supports testing printer names defined in your
+-printcap
+-file used by Samba\&.
+-.RE
+-.PP
+ \fBsmbstatus\fR(1)
+ .RS 4
+ The
+@@ -102,7 +93,7 @@
+ .RS 4
+ The
+ smbsh
+-command is a program that allows you to run a unix shell with with an overloaded VFS\&.
++command is a program that allows you to run a unix shell with with an overloaded VFS. Note that, it is not installed by the current samba package\&.
+ .RE
+ .PP
+ \fBsmbtree\fR(1)
+Index: samba-debian/docs/manpages/smb.conf.5
+===================================================================
+--- samba-debian.orig/docs/manpages/smb.conf.5	2012-03-07 10:07:07.000000000 +0100
++++ samba-debian/docs/manpages/smb.conf.5	2012-03-07 10:07:36.000000000 +0100
+@@ -11019,8 +11019,7 @@
+ \fBnmbd\fR(8),
+ \fBsmbclient\fR(1),
+ \fBnmblookup\fR(1),
+-\fBtestparm\fR(1),
+-\fBtestprns\fR(1)\&.
++\fBtestparm\fR(1)\&.
+ .SH "AUTHOR"
+ .PP
+ The original Samba software and related utilities were created by Andrew Tridgell\&. Samba is now developed by the Samba Team as an Open Source project similar to the way the Linux kernel is developed\&.
+Index: samba-debian/docs/manpages/smbd.8
+===================================================================
+--- samba-debian.orig/docs/manpages/smbd.8	2012-03-07 10:07:07.000000000 +0100
++++ samba-debian/docs/manpages/smbd.8	2012-03-07 10:07:36.000000000 +0100
+@@ -370,8 +370,7 @@
+ \fBnmbd\fR(8),
+ \fBsmb.conf\fR(5),
+ \fBsmbclient\fR(1),
+-\fBtestparm\fR(1),
+-\fBtestprns\fR(1), and the Internet RFC\'s
++\fBtestparm\fR(1), and the Internet RFC\'s
+ rfc1001\&.txt,
+ rfc1002\&.txt\&. In addition the CIFS (formerly SMB) specification is available as a link from the Web page
+ http://samba\&.org/cifs/\&.
+Index: samba-debian/examples/tridge/smb.conf
+===================================================================
+--- samba-debian.orig/examples/tridge/smb.conf	2012-03-07 10:07:07.000000000 +0100
++++ samba-debian/examples/tridge/smb.conf	2012-03-07 10:07:36.000000000 +0100
+@@ -31,14 +31,6 @@
+    print ok = yes
+    print command = xmenu -heading "%s" OK&
+ 
+-[testprn]
+-   comment = Test printer
+-   path = /tmp
+-   user = susan
+-   print ok = yes
+-   print command = cp %s /tmp/smb.%U.prn
+-   lpq command = cat /tmp/xxyz
+-
+ [amd]
+    comment = amd area
+    path = /mount
+Index: samba-debian/swat/lang/tr/help/welcome.html
+===================================================================
+--- samba-debian.orig/swat/lang/tr/help/welcome.html	2012-03-07 10:07:07.000000000 +0100
++++ samba-debian/swat/lang/tr/help/welcome.html	2012-03-07 10:07:36.000000000 +0100
+@@ -40,7 +40,6 @@
+    <ul>
+     <li><a href="/swat/help/smbstatus.1.html" target="docs">smbstatus</a> - Samba gözlemcisi
+     <li><a href="/swat/help/testparm.1.html" target="docs">testparm</a> - ayar dosyasını kontrol eder
+-    <li><a href="/swat/help/testprns.1.html" target="docs">testprns</a> - yazıcı ayarlarını kontrol eder
+     <li><a href="/swat/help/nmblookup.1.html" target="docs">nmblookup</a> - NetBIOS isim sorgulama aracı
+    </ul>
+  <li><b>Kitaplar</b>
+@@ -66,4 +65,4 @@
+ 
+  Eğer SWAT'ın bu sürümü ile ilgili konuları tartışmak istiyorsanız, lütfen
+ <A HREF="http://lists.samba.org/">samba</A> eposta listesine üye olun.
+- 
+\ No newline at end of file
++

Modified: trunk/samba/debian/patches/series
===================================================================
--- trunk/samba/debian/patches/series	2012-03-03 17:46:40 UTC (rev 4031)
+++ trunk/samba/debian/patches/series	2012-03-08 20:56:18 UTC (rev 4032)
@@ -1,4 +1,5 @@
 documentation.patch
+documentation2.patch
 fhs-filespaths.patch
 installswat.sh.patch
 pam-examples.patch





More information about the Pkg-samba-maint mailing list