summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs-xml/manpages-3/samba.7.xml10
-rw-r--r--docs-xml/using_samba/ch02.xml6
-rwxr-xr-xpackaging/SGI/mkman3
-rw-r--r--source3/po/ru/help/welcome.html3
-rw-r--r--swat/help/welcome.html3
-rw-r--r--swat/lang/ja/help/welcome.html3
-rw-r--r--swat/lang/tr/help/welcome.html3
7 files changed, 0 insertions, 31 deletions
diff --git a/docs-xml/manpages-3/samba.7.xml b/docs-xml/manpages-3/samba.7.xml
index 2a76dff5ab..95cbf070d6 100644
--- a/docs-xml/manpages-3/samba.7.xml
+++ b/docs-xml/manpages-3/samba.7.xml
@@ -244,16 +244,6 @@
</para></listitem></varlistentry>
<varlistentry>
- <term>
-<citerefentry><refentrytitle>smbmount</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>smbumount</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>smbmnt</refentrytitle><manvolnum>8</manvolnum></citerefentry></term>
- <listitem><para><command>smbmount</command>,<command>smbumount</command> and <command>smbmnt</command> are commands that can be used to
- mount CIFS/SMB shares on Linux.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
<term><citerefentry><refentrytitle>smbcquotas</refentrytitle>
<manvolnum>1</manvolnum></citerefentry></term>
<listitem><para><command>smbcquotas</command> is a tool that
diff --git a/docs-xml/using_samba/ch02.xml b/docs-xml/using_samba/ch02.xml
index 307f5f336b..ad4b51c0dd 100644
--- a/docs-xml/using_samba/ch02.xml
+++ b/docs-xml/using_samba/ch02.xml
@@ -269,12 +269,6 @@ docs/textdocs/UNIX_INSTALL.txt</programlisting>
</varlistentry>
-<varlistentry><term><literal>--with-smbmount</literal></term>
-<listitem><para>Include <emphasis>smbmount</emphasis>
-<indexterm id="ch02-idx-947366-0"><primary>smbmount, support for</primary></indexterm> support, which is for <indexterm id="ch02-idx-947367-0"><primary>Linux</primary><secondary>submount and</secondary></indexterm>Linux only. This feature wasn't being maintained at the time the book was written, so the Samba team made it an optional feature and provided <emphasis>smbwrapper</emphasis> instead. The <emphasis>smbwrapper</emphasis> feature works on more Unix platforms than <emphasis>smbmount</emphasis>, so you'll usually want to use <literal>--with-smbwrapper</literal> instead of this option.</para></listitem>
-</varlistentry>
-
-
<varlistentry><term><literal>--with-pam</literal></term>
<listitem><para>Include support for <indexterm id="ch02-idx-947368-0"><primary>pluggable authentication modules (PAM)</primary><secondary>support for</secondary></indexterm>
<indexterm id="ch02-idx-947368-1"><primary>PAM (pluggable authentication modules)</primary><secondary>support for</secondary></indexterm>pluggable authentication modules (PAM), an authentication feature common in the Linux operating system.</para></listitem>
diff --git a/packaging/SGI/mkman b/packaging/SGI/mkman
index a39ed9fdd0..dfb6fb9fda 100755
--- a/packaging/SGI/mkman
+++ b/packaging/SGI/mkman
@@ -9,9 +9,6 @@ FILES="*.?"
cd ../../docs/manpages
for FILE in $FILES ; do
- if [ "$FILE" = "smbmnt.8" ]; then continue; fi;
- if [ "$FILE" = "smbmount.8" -o "$FILE" = "smbumount.8" ]; then continue; fi;
- if [ "$FILE" = "smbrun.1" ]; then continue; fi;
neqn $FILE | tbl | nroff -man > ../../packaging/SGI/catman/`basename $FILE`
pack -f ../../packaging/SGI/catman/`basename $FILE`
done
diff --git a/source3/po/ru/help/welcome.html b/source3/po/ru/help/welcome.html
index 636d96f8c5..0e4b2c1273 100644
--- a/source3/po/ru/help/welcome.html
+++ b/source3/po/ru/help/welcome.html
@@ -34,9 +34,6 @@ samba-3.0.25a-2
<li><a href="/swat/help/manpages/rpcclient.1.html" target="docs">rpcclient</a> - клиент MS-RPC с интерфейсом командной строки
<li><a href="/swat/help/manpages/smbtar.1.html" target="docs">smbtar</a> - инструмент резервного копирования SMB
<li><a href="/swat/help/manpages/smbclient.1.html" target="docs">smbclient</a> - клиент SMB с интерфейсом командной строки
- <li><a href="/swat/help/manpages/smbmnt.8.html" target="docs">smbmnt</a> - вспомогательная утилита для монтирования файловых систем SMB на машинах Linux
- <li><a href="/swat/help/manpages/smbmount.8.html" target="docs">smbmount</a> - пользовательский инструмент для монтирования файловых систем SMB под Linux
- <li><a href="/swat/help/manpages/smbumount.8.html" target="docs">smbumount</a> - пользовательский инструмент для размонтирования файловых систем SMB под Linux
<li><a href="/swat/help/manpages/ntlm_auth.1.html" target="docs">ntlm_auth</a> - позволяет внешним программам использовать аутентификацию NTLM
<li><a href="/swat/help/manpages/smbcquotas.1.html" target="docs">smbcquotas</a> - запрашивает или устанавливает квоты ресурсов на NTFS 5
<li><a href="/swat/help/manpages/smbspool.8.html" target="docs">smbspool</a> - отправляет задание на печать через SMB-принтер
diff --git a/swat/help/welcome.html b/swat/help/welcome.html
index bf045806fe..5f7379388c 100644
--- a/swat/help/welcome.html
+++ b/swat/help/welcome.html
@@ -31,9 +31,6 @@ Please choose a configuration action using one of the above buttons
<li><a href="/swat/help/manpages/rpcclient.1.html" target="docs">rpcclient</a> - command line MS-RPC client
<li><a href="/swat/help/manpages/smbtar.1.html" target="docs">smbtar</a> - SMB backup tool
<li><a href="/swat/help/manpages/smbclient.1.html" target="docs">smbclient</a> - command line SMB client
- <li><a href="/swat/help/manpages/smbmnt.8.html" target="docs">smbmnt</a> - helper utility for mounting SMB filesystems on Linux hosts
- <li><a href="/swat/help/manpages/smbmount.8.html" target="docs">smbmount</a> - user space tool for mounting SMB filesystems under Linux
- <li><a href="/swat/help/manpages/smbumount.8.html" target="docs">smbumount</a> - user space tool for umounting SMB filesystems under Linux
<li><a href="/swat/help/manpages/ntlm_auth.1.html" target="docs">ntlm_auth</a> - allow external programs to use NTLM authentication
<li><a href="/swat/help/manpages/smbcquotas.1.html" target="docs">smbcquotas</a> - get or set quotas on NTFS 5 shares
<li><a href="/swat/help/manpages/smbspool.8.html" target="docs">smbspool</a> - Send a print job to an SMB printer
diff --git a/swat/lang/ja/help/welcome.html b/swat/lang/ja/help/welcome.html
index bcae8e9a5e..01d3f78745 100644
--- a/swat/lang/ja/help/welcome.html
+++ b/swat/lang/ja/help/welcome.html
@@ -31,10 +31,7 @@
<li><a href="/swat/help/rpcclient.1.html" target="docs">rpcclient</a> - コマンドラインの MS-RPC クライアント
<li><a href="/swat/help/smbtar.1.html" target="docs">smbtar</a> - SMB バックアップツール
<li><a href="/swat/help/smbclient.1.html" target="docs">smbclient</a> - コマンドラインの SMB クライアント
- <li><a href="/swat/help/smbmnt.8.html" target="docs">smbmnt</a> - Linux 上の SMB ファイルシステムをマウントする際の補助ツール
- <li><a href="/swat/help/smbmount.8.html" target="docs">smbmount</a> - Linux における SMB ファイルシステムのマウントを実現するユーザ空間のツール
<li><a href="/swat/help/smbspool.8.html" target="docs">smbspool</a> - コマンドラインの SMB 印刷クライアント
- <li><a href="/swat/help/smbumount.8.html" target="docs">smbumount</a> - Linux における SMB ファイルシステムのアンマウントを実現するユーザ空間のツール
<li><a href="/swat/help/ntlm_auth.1.html" target="docs">ntlm_auth</a> - 別プログラムからの NTLM 認証の使用を実現
<li><a href="/swat/help/smbcquotas.1.html" target="docs">smbcquotas</a> - NTFS 5 共有のクォータ情報の設定と取得
<li><a href="/swat/help/smbsh.1.html" target="docs">smbsh</a> - UNIX シェルを用いたリモート SMB 共有へのアクセスを実現
diff --git a/swat/lang/tr/help/welcome.html b/swat/lang/tr/help/welcome.html
index 2dc4c092a0..bc0d584d94 100644
--- a/swat/lang/tr/help/welcome.html
+++ b/swat/lang/tr/help/welcome.html
@@ -31,10 +31,7 @@ Yukarıdaki düğmelerden birini kullanarak bir ayar eylemi seçin.
<li><a href="/swat/help/rpcclient.1.html" target="docs">rpcclient</a> - komut satırı MS-RPC istemcisi
<li><a href="/swat/help/smbtar.1.html" target="docs">smbtar</a> - SMB yedekleme aracı
<li><a href="/swat/help/smbclient.1.html" target="docs">smbclient</a> - komut satırı SMB istemcisi
- <li><a href="/swat/help/smbmnt.8.html" target="docs">smbmnt</a> - Linux makinalarına SMB dosya sistemlerini bağlamak için yardımcı araç
- <li><a href="/swat/help/smbmount.8.html" target="docs">smbmount</a> - Linux altında SMB dosya sistemlerini bağlamak için kullanıcı aracı
<li><a href="/swat/help/smbspool.8.html" target="docs">smbspool</a> - komut satırı SMB yazıcı istemcisi
- <li><a href="/swat/help/smbumount.8.html" target="docs">smbumount</a> - Linux altında SMB dosya sistemlerini çözmek için kullanıcı aracı
</ul>
<li><b>Teşhis Araçları</b>
<ul>