Merge upstream 3.0.29 in trunk

git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@1886 fc4039ab-9d04-0410-8cac-899223bdd6b0

1 files changed, 78 insertions, 0 deletions

diff --git a/docs-xml/manpages-3/vfs_cap.8.xml b/docs-xml/manpages-3/vfs_cap.8.xml
new file mode 100644
index 0000000000..94eea9ed90
--- /dev/null
+++ b/docs-xml/manpages-3/vfs_cap.8.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<refentry id="vfs_cap.8">
+
+<refmeta>
+	<refentrytitle>vfs_cap</refentrytitle>
+	<manvolnum>8</manvolnum>
+	<refmiscinfo class="source">Samba</refmiscinfo>
+	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
+	<refmiscinfo class="version">3.0</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+	<refname>vfs_cap</refname>
+	<refpurpose>CAP encode filenames</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+	<cmdsynopsis>
+		<command>vfs objects = cap</command>
+	</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+	<title>DESCRIPTION</title>
+
+	<para>This VFS module is part of the
+	<citerefentry><refentrytitle>samba</refentrytitle>
+	<manvolnum>7</manvolnum></citerefentry> suite.</para>
+
+	<para>CAP (Columbia Appletalk Protocol) encoding is a
+	technique for representing non-ASCII filenames in ASCII. The
+	<command>vfs_cap</command> VFS module translates filenames to and
+	from CAP format, allowing users to name files in their native
+	encoding.  </para>
+
+	<para>CAP encoding is most commonly
+	used in Japanese language environments. </para>
+
+	<para>This module is stackable.</para>
+
+</refsect1>
+
+
+<refsect1>
+	<title>EXAMPLES</title>
+
+	<para>On a system using GNU libiconv, use CAP encoding to support
+	users in the Shift_JIS locale:</para>
+
+<programlisting>
+        <smbconfsection name="[global]"/>
+	<smbconfoption name="dos charset">CP932</smbconfoption>
+	<smbconfoption name="dos charset">CP932</smbconfoption>
+	<smbconfoption name="vfs objects">cap</smbconfoption>
+</programlisting>
+
+</refsect1>
+
+<refsect1>
+	<title>VERSION</title>
+
+	<para>This man page is correct for version 3.0.25 of the Samba suite.
+	</para>
+</refsect1>
+
+<refsect1>
+	<title>AUTHOR</title>
+
+	<para>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.</para>
+
+</refsect1>
+
+</refentry>