[Pkg-samba-maint] r4138 - trunk/samba/debian/patches
bubulle at alioth.debian.org
bubulle at alioth.debian.org
Tue Jun 26 19:59:26 UTC 2012
Author: bubulle
Date: 2012-06-26 19:59:26 +0000 (Tue, 26 Jun 2012)
New Revision: 4138
Modified:
trunk/samba/debian/patches/documentation2.patch
Log:
Refresh for 3.6.6
Modified: trunk/samba/debian/patches/documentation2.patch
===================================================================
--- trunk/samba/debian/patches/documentation2.patch 2012-06-26 19:58:53 UTC (rev 4137)
+++ trunk/samba/debian/patches/documentation2.patch 2012-06-26 19:59:26 UTC (rev 4138)
@@ -3,10 +3,10 @@
Bug: https://bugzilla.samba.org/show_bug.cgi?id=8789
Forwarded: yes
-Index: samba-debian/docs-xml/manpages-3/nmbd.8.xml
+Index: samba/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
+--- samba.orig/docs-xml/manpages-3/nmbd.8.xml
++++ samba/docs-xml/manpages-3/nmbd.8.xml
@@ -266,7 +266,6 @@
<manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>smb.conf</refentrytitle>
<manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbclient</refentrytitle>
@@ -15,10 +15,10 @@
<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
+Index: samba/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
+--- samba.orig/docs-xml/manpages-3/samba.7.xml
++++ samba/docs-xml/manpages-3/samba.7.xml
@@ -76,16 +76,6 @@
</varlistentry>
@@ -46,10 +46,10 @@
</varlistentry>
<varlistentry>
-Index: samba-debian/docs-xml/manpages-3/smb.conf.5.xml
+Index: samba/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
+--- samba.orig/docs-xml/manpages-3/smb.conf.5.xml
++++ samba/docs-xml/manpages-3/smb.conf.5.xml
@@ -856,7 +856,6 @@
<manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbclient</refentrytitle>
<manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>nmblookup</refentrytitle>
@@ -58,10 +58,10 @@
<manvolnum>1</manvolnum></citerefentry>.</para>
</refsect1>
-Index: samba-debian/docs-xml/manpages-3/smbd.8.xml
+Index: samba/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
+--- samba.orig/docs-xml/manpages-3/smbd.8.xml
++++ samba/docs-xml/manpages-3/smbd.8.xml
@@ -417,7 +417,6 @@
<manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>smb.conf</refentrytitle>
<manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbclient</refentrytitle>
@@ -70,10 +70,10 @@
<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
+Index: samba/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
+--- samba.orig/docs-xml/using_samba/appd.xml
++++ samba/docs-xml/using_samba/appd.xml
@@ -296,7 +296,7 @@
@@ -108,10 +108,10 @@
-Index: samba-debian/docs-xml/using_samba/ch01.xml
+Index: samba/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
+--- samba.orig/docs-xml/using_samba/ch01.xml
++++ samba/docs-xml/using_samba/ch01.xml
@@ -1375,12 +1375,6 @@
</varlistentry>
@@ -125,10 +125,10 @@
<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
+Index: samba/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
+--- samba.orig/docs-xml/using_samba/ch07.xml
++++ samba/docs-xml/using_samba/ch07.xml
@@ -306,7 +306,7 @@
public: true</programlisting>
@@ -138,10 +138,10 @@
<programlisting># testprns lp /etc/printcap
-Index: samba-debian/docs/htmldocs/manpages/nmbd.8.html
+Index: samba/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
+--- samba.orig/docs/htmldocs/manpages/nmbd.8.html
++++ samba/docs/htmldocs/manpages/nmbd.8.html
@@ -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
@@ -151,10 +151,10 @@
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
+Index: samba/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
+--- samba.orig/docs/htmldocs/manpages/samba.7.html
++++ samba/docs/htmldocs/manpages/samba.7.html
@@ -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
@@ -177,23 +177,23 @@
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
+Index: samba/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 @@
+--- samba.orig/docs/htmldocs/manpages/smb.conf.5.html
++++ samba/docs/htmldocs/manpages/smb.conf.5.html
+@@ -6964,7 +6964,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>
+ </p></div><div class="refsect1" title="VERSION"><a name="id340677"></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="id340688"></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="id340767"></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="id340767"></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
+Index: samba/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
+--- samba.orig/docs/htmldocs/manpages/smbd.8.html
++++ samba/docs/htmldocs/manpages/smbd.8.html
@@ -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
@@ -203,10 +203,10 @@
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
+Index: samba/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
+--- samba.orig/docs/manpages/nmbd.8
++++ samba/docs/manpages/nmbd.8
@@ -252,8 +252,7 @@
\fBsmbd\fR(8),
\fBsmb.conf\fR(5),
@@ -217,10 +217,10 @@
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
+Index: samba/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
+--- samba.orig/docs/manpages/samba.7
++++ samba/docs/manpages/samba.7
@@ -60,15 +60,6 @@
configuration file\&.
.RE
@@ -246,11 +246,11 @@
.RE
.PP
\fBsmbtree\fR(1)
-Index: samba-debian/docs/manpages/smb.conf.5
+Index: samba/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 @@
+--- samba.orig/docs/manpages/smb.conf.5
++++ samba/docs/manpages/smb.conf.5
+@@ -11021,8 +11021,7 @@
\fBnmbd\fR(8),
\fBsmbclient\fR(1),
\fBnmblookup\fR(1),
@@ -260,10 +260,10 @@
.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
+Index: samba/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
+--- samba.orig/docs/manpages/smbd.8
++++ samba/docs/manpages/smbd.8
@@ -370,8 +370,7 @@
\fBnmbd\fR(8),
\fBsmb.conf\fR(5),
@@ -274,10 +274,10 @@
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
+Index: samba/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
+--- samba.orig/examples/tridge/smb.conf
++++ samba/examples/tridge/smb.conf
@@ -31,14 +31,6 @@
print ok = yes
print command = xmenu -heading "%s" OK&
@@ -293,10 +293,10 @@
[amd]
comment = amd area
path = /mount
-Index: samba-debian/swat/lang/tr/help/welcome.html
+Index: samba/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
+--- samba.orig/swat/lang/tr/help/welcome.html
++++ samba/swat/lang/tr/help/welcome.html
@@ -40,7 +40,6 @@
<ul>
<li><a href="/swat/help/smbstatus.1.html" target="docs">smbstatus</a> - Samba gözlemcisi
More information about the Pkg-samba-maint
mailing list