summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChristopher R. Hertel <crh@samba.org>2003-04-22 21:09:29 +0000
committerChristopher R. Hertel <crh@samba.org>2003-04-22 21:09:29 +0000
commitc91cb3098ed9fd365fc9f551fc6099fb97d88852 (patch)
treec29a63562b7ac0a9475edf97c674cb3513dbb8ad /docs
parent0ecfcd3319909a61806cb6e37f7dedca6743ce38 (diff)
downloadsamba-c91cb3098ed9fd365fc9f551fc6099fb97d88852.tar.gz
samba-c91cb3098ed9fd365fc9f551fc6099fb97d88852.tar.bz2
samba-c91cb3098ed9fd365fc9f551fc6099fb97d88852.zip
Merged the changes I made in the 3.0 doc tree (wrong place) and
fiddled the entry for jCIFS (thanks, John!). (This used to be commit 43c1ba0ab2aa538d0defad4cdec385561d3563df)
Diffstat (limited to 'docs')
-rw-r--r--docs/docbook/projdoc/IntroSMB.sgml24
1 files changed, 13 insertions, 11 deletions
diff --git a/docs/docbook/projdoc/IntroSMB.sgml b/docs/docbook/projdoc/IntroSMB.sgml
index 4fd96ee87e..32b18cc8fc 100644
--- a/docs/docbook/projdoc/IntroSMB.sgml
+++ b/docs/docbook/projdoc/IntroSMB.sgml
@@ -141,8 +141,8 @@ http://www.samba.org). Optionally, you could just search mailing.unix.samba at
<title>Related Projects</title>
<para>
-Currently, there are two projects that are directly related to Samba: SMBFS and CIFS network
-client file systems for Linux, both available in the Linux kernel itself.
+There are currently two network filesystem client projects for Linux that are directly
+related to Samba: SMBFS and CIFS VFS. These are both available in the Linux kernel itself.
</para>
<itemizedlist>
@@ -155,18 +155,14 @@ client file systems for Linux, both available in the Linux kernel itself.
</para></listitem>
<listitem><para>
- CIFS (Common Internet File System) is the successor to SMB, and is actively being worked
- on in the upcoming version of the Linux kernel. The intent of this module is to
- provide advanced network file system functionality including support for dfs (heirarchical
+ CIFS VFS (Common Internet File System Virtual File System) is the successor to SMBFS, and
+ is being actively developed for the upcoming version of the Linux kernel. The intent of this module
+ is to provide advanced network file system functionality including support for dfs (heirarchical
name space), secure per-user session establishment, safe distributed caching (oplock),
optional packet signing, Unicode and other internationalization improvements, and optional
Winbind (nsswitch) integration.
- </para></listitem>
-
- <listitem><para>
- jCIFS (Java implementation of CIFS) is an active project headed by Chris Hertel.
- </para></listitem>
-
+ </para></listitem>
+
</itemizedlist>
<para>
@@ -174,6 +170,12 @@ Again, it's important to note that these are implementations for client filesyst
nothing to do with acting as a file and print server for SMB/CIFS clients.
</para>
+<para>
+There are other Open Source CIFS client implementations, such as the jCIFS project
+(jcifs.samba.org) which provides an SMB client toolkit written in Java.
+</para>
+
+
</sect1>