sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-24 02:04:21 +03:00
Code

merge from 2.2

Browse Source
This commit is contained in:
Gerald Carter -
parent 674ee2f1d1
commit 5932471a03
7 changed files with 1615 additions and 370 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/Samba-HOWTO-Collection.pdf
View File

Binary file not shown.

2
docs/docbook/Makefile.in
View File

@ -58,7 +58,7 @@ HOWTOSRC=projdoc/DOMAIN_MEMBER.sgml projdoc/NT_Security.sgml \
projdoc/msdfs_setup.sgml projdoc/printer_driver2.sgml \
projdoc/UNIX_INSTALL.sgml projdoc/winbind.sgml projdoc/OS2-Client-HOWTO.sgml \
projdoc/Samba-PDC-HOWTO.sgml projdoc/ENCRYPTION.sgml \
projdoc/CVS-Access.sgml
projdoc/CVS-Access.sgml projdoc/Integrating-with-Windows.sgml
FAQSRC=faq/samba-pdc-faq.sgml

2
docs/docbook/projdoc/samba-doc.sgml
View File

@ -9,6 +9,7 @@
<!ENTITY OS2-Client SYSTEM "OS2-Client-HOWTO.sgml">
<!ENTITY Samba-PDC-HOWTO SYSTEM "Samba-PDC-HOWTO.sgml">
<!ENTITY CVS-Access SYSTEM "CVS-Access.sgml">
<!ENTITY IntegratingWithWindows SYSTEM "Integrating-with-Windows.sgml">
]>
<book id="Samba-Project-Documentation">
@ -42,6 +43,7 @@ Cheers, jerry
</dedication>
&UNIX-INSTALL;
&IntegratingWithWindows;
&ENCRYPTION;
&MS-Dfs-Setup;
&PRINTER-DRIVER2;

1909
docs/htmldocs/Samba-HOWTO-Collection.html
View File

File diff suppressed because it is too large Load Diff

2
docs/htmldocs/nmblookup.1.html
View File

@ -321,7 +321,7 @@ CLASS="COMMAND"
><P
><B
CLASS="COMMAND"
>nmblookup -U samba.org -R IRIX#1B'</B
>nmblookup -U samba.org -R 'IRIX#1B'</B
></P
><P
>would query the WINS server samba.org for the domain

4
docs/manpages/nmblookup.1
View File

@ -3,7 +3,7 @@
.\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/>
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng <steve@ggi-project.org>.
.TH "NMBLOOKUP" "1" "24 April 2001" "" ""
.TH "NMBLOOKUP" "1" "21 June 2001" "" ""
.SH NAME
nmblookup \- NetBIOS over TCP/IP client used to lookup NetBIOS names
.SH SYNOPSIS
@ -126,7 +126,7 @@ used to query DNS servers). To query a WINS server,
.PP
For example, running :
.PP
\fBnmblookup -U samba.org -R IRIX#1B'\fR
\fBnmblookup -U samba.org -R 'IRIX#1B'\fR
.PP
would query the WINS server samba.org for the domain
master browser (1B name type) for the IRIX workgroup.

66
swat/help/welcome.html
View File

@ -2,7 +2,7 @@
Please choose a configuration action using one of the above buttons
<h3>Documentation</h3>
<h3><a href="/swat/help/samba.7.html" target="docs">Samba</a> Documentation</h3>
<ul>
<li><b>Daemons</b>
@ -11,46 +11,58 @@ Please choose a configuration action using one of the above buttons
<li><a href="/swat/help/nmbd.8.html" target="docs">nmbd</a> - the NetBIOS nameserver
<li><a href="/swat/help/winbindd.8.html" target="docs">winbindd</a> - the winbind daemon
</ul>
<li><b>Administrative Utilities</b>
<ul>
<li><a href="/swat/help/smbcontrol.1.html" target="docs">smbcontrol</a> - send control messages to Samba daemons
<li><a href="/swat/help/smbstatus.1.html" target="docs">smbstatus</a> - monitoring Samba
<li><a href="/swat/help/swat.8.html" target="docs">SWAT</a> - web configuration tool
<li><a href="/swat/help/smbpasswd.8.html" target="docs">smbpasswd</a> - managing SMB passwords
<li><a href="/swat/help/make_smbcodepage.1.html" target="docs">make_smbcodepage</a> - codepage creation
<li><a href="/swat/help/make_unicodemap.1.html" target="docs">make_unicodemap</a> - unicode map file creation
<li><a href="/swat/help/testparm.1.html" target="docs">testparm</a> - validating your config file
<li><a href="/swat/help/testprns.1.html" target="docs">testprns</a> - testing printer configuration
</ul>
<li><b>General Utilities</b>
<ul>
<li><a href="/swat/help/nmblookup.1.html" target="docs">nmblookup</a> - NetBIOS name query tool
<li><a href="/swat/help/smbtar.1.html" target="docs">smbtar</a> - SMB backup tool
<li><a href="/swat/help/smbclient.1.html" target="docs">smbclient</a> - command line SMB client
<li><a href="/swat/help/smbspool.8.html" target="docs">smbspool</a> - command line SMB print client
</ul>
<li><b>Configuration Files</b>
<ul>
<li><a href="/swat/help/smb.conf.5.html" target="docs">smb.conf</a> - the main Samba configuration file
<li><a href="/swat/help/lmhosts.5.html" target="docs">lmhosts</a> - NetBIOS hosts file
<li><a href="/swat/help/smbpasswd.5.html" target="docs">smbpasswd</a> - SMB password file
</ul>
<li><b>Miscellaneous</b>
<li><b>Administrative Utilities</b>
<ul>
<li><a href="/swat/help/samba.7.html" target="docs">Samba introduction</a>
<li><a href="/swat/help/DOMAIN_MEMBER.html" target="docs">Joining an NT Domain</a>
<li><a href="/swat/help/NT_Security.html" target="docs">Changing UNIX permissions using NT</a>
<li><a href="/swat/help/smbcontrol.1.html" target="docs">smbcontrol</a> - send control messages to Samba daemons
<li><a href="/swat/help/smbpasswd.8.html" target="docs">smbpasswd</a> - managing SMB passwords
<li><a href="/swat/help/swat.8.html" target="docs">SWAT</a> - web configuration tool
<li><a href="/swat/help/make_smbcodepage.1.html" target="docs">make_smbcodepage</a> - codepage creation
<li><a href="/swat/help/make_unicodemap.1.html" target="docs">make_unicodemap</a> - unicode map file creation
<li><a href="/swat/help/smbrun.1.html" target="docs">smbrun</a> - internal smbd utility
</ul>
<li><b>Client Tools</b>
<ul>
<li><a href="/swat/help/rpcclient.1.html" target="docs">rpcclient</a> - command line MS-RPC client
<li><a href="/swat/help/smbtar.1.html" target="docs">smbtar</a> - SMB backup tool
<li><a href="/swat/help/smbclient.1.html" target="docs">smbclient</a> - command line SMB client
<li><a href="/swat/help/smbmnt.8.html" target="docs">smbmnt</a> - helper utility for mounting SMB filesystems on Linux hosts
<li><a href="/swat/help/smbmount.8.html" target="docs">smbmount</a> - user space tool for mounting SMB filesystems under Linux
<li><a href="/swat/help/smbspool.8.html" target="docs">smbspool</a> - command line SMB print client
<li><a href="/swat/help/smbumount.8.html" target="docs">smbumount</a> - user space tool for umounting SMB filesystems under Linux
</ul>
<li><b>Diagnostic Utilities</b>
<ul>
<li><a href="/swat/help/smbstatus.1.html" target="docs">smbstatus</a> - monitoring Samba
<li><a href="/swat/help/testparm.1.html" target="docs">testparm</a> - validating your config file
<li><a href="/swat/help/testprns.1.html" target="docs">testprns</a> - testing printer configuration
<li><a href="/swat/help/nmblookup.1.html" target="docs">nmblookup</a> - NetBIOS name query tool
</ul>
<li><b>Books</b>
<ul>
<li><a href="/swat/using_samba/index.html" target="docs">Using Samba</a> - by Robert Eckstein, David Collier-Brown and Peter Kelly
<li><a href="/swat/using_samba/index.html" target="docs">Using Samba</a> - by Robert Eckstein, David Collier-Brown and Peter Kelly
</ul>
<li><b>Samba HOWTO Collection</b></li>
<ul>
<li><a href="/swat/help/Samba-HOWTO-Collection.html">Entire Collection (one file)</a>
<li><a href="/swat/help/DOMAIN_MEMBER.html">security = domain in Samba 2.x</a>
<li><a href="/swat/help/winbind.html">Unified Logons between Windows NT and UNIX Using Winbind</a>
<li><a href="/swat/help/msdfs_setup.html">Setting Samba as an MS-DFS server</a>
<li><a href="/swat/help/NT_Security.html">UNIX Permission Bits and Samba 2.x</a>
<li><a href="/swat/help/OS2-Client-HOWTO.html">OS/2 Clients and Samba</a>
<li><a href="/swat/help/printer_driver2.html">Printing under Samba 2.2.x</a>
<li><a href="/swat/help/UNIX_INSTALL.html">HOWTO Install and Test Samba</a>
<li><a href="/swat/help/Integrating-with-Windows.html">Integrating Name Resolution and Authentication Services</a>
<li><a href="/swat/help/CVS-Access.html">CVS Access to Samba code</a>
</ul>
</ul>
<h3>Feedback</h3>
Please join the <A
HREF="http://lists.samba.org/listinfo/samba/">samba</A> mailing
Please join the <A HREF="http://lists.samba.org/">samba</A> mailing
list if you want to discuss issues with this release of SWAT.