The branch, v3-6-test has been updated
via 3e3b85f s3-docs: Fix some typos.
via b747545 s3: Fix a typo
from 859d131 Fix our asn.1 parser to handle negative numbers.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 3e3b85f2796166109ce9a72f797a3ca708e7d186
Author: Benjamin Brunner <[email protected]>
Date: Fri May 27 12:39:41 2011 +0200
s3-docs: Fix some typos.
This patch is a manpage update addressing the typos and mistakes in the
vfs_smb_traffic_analyzer manpage and the smbta-util manpage, which have been
brought up in these threads on samba-technical:
http://lists.samba.org/archive/samba-technical/2011-May/077801.html
http://lists.samba.org/archive/samba-technical/2011-May/077800.html
http://lists.samba.org/archive/samba-technical/2011-May/077753.html
I have seen Volker already fixed the typos in
127d417e8ebc967572df7a75b342897a6a8fb71e , but I haven't found
"Ultimatively" in any dictionary, so this patch just removes the
word completely.
Thanks to Samba-JP oota <[email protected]> for reporting.
The last 2 patches address bug #8178 (Collection of manpage updates for SMB
Traffic Analyzer).
commit b747545fa4cd8985f4e06a08623d38205fa5d0cf
Author: Volker Lendecke <[email protected]>
Date: Fri May 27 08:42:30 2011 +0200
s3: Fix a typo
Thanks to Samba-JP oota <[email protected]>
(cherry picked from commit 127d417e8ebc967572df7a75b342897a6a8fb71e)
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages-3/smbta-util.8.xml | 8 ++++----
docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages-3/smbta-util.8.xml
b/docs-xml/manpages-3/smbta-util.8.xml
index 6e53aaa..3a88f7b 100644
--- a/docs-xml/manpages-3/smbta-util.8.xml
+++ b/docs-xml/manpages-3/smbta-util.8.xml
@@ -25,7 +25,7 @@
<cmdsynopsis>
<command>smbta-util</command>
<arg rep="repeat" choice="opt">
- <replaceable>COMMANDS</replaceable>
+ <replaceable>OPTIONS</replaceable>
</arg>
</cmdsynopsis>
@@ -36,7 +36,7 @@
<para>This tool is part of the
<citerefentry><refentrytitle>samba</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry> suite.</para>
+ <manvolnum>7</manvolnum></citerefentry> suite.</para>
<para><command>smbta-util</command> is a tool to ease the
configuration of the vfs_smb_traffic_analyzer module regarding
@@ -52,7 +52,7 @@
<refsect1>
- <title>COMMANDS</title>
+ <title>OPTIONS</title>
<variablelist>
@@ -103,7 +103,7 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version 3.4 of the Samba
suite.</para>
+ <para>This man page is correct for version 3.6 of the Samba
suite.</para>
</refsect1>
<refsect1>
diff --git a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml
b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml
index 9450703..605e096 100644
--- a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml
+++ b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml
@@ -139,7 +139,7 @@
The module now can identify itself against the receiver with a
sub-release number, where
the receiver may run with a different sub-release number than
the module. However, as
long as both run on the V2.x protocol, the receiver will not
crash, even if the module
- uses features only implemented in the newer subrelease.
Ultimativly, if the module uses
+ uses features only implemented in the newer subrelease. If the
module uses
a new feature from a newer subrelease, and the receiver runs an
older protocol, it is just
ignoring the functionality. Of course it is best to have both
the receiver and the module
running the same subrelease of the protocol.
--
Samba Shared Repository
