Author: krejzi
Date: Sun Jul 28 08:10:03 2013
New Revision: 11510
Log:
Rename samba3 to samba, begin updating packages in GNOME chapter.
Added:
trunk/BOOK/networking/netprogs/samba.xml
- copied, changed from r11509, trunk/BOOK/networking/netprogs/samba3.xml
Deleted:
trunk/BOOK/networking/netprogs/samba3.xml
Modified:
trunk/BOOK/archive/kde/core/kdebase.xml
trunk/BOOK/general.ent
trunk/BOOK/general/sysutils/autofs.xml
trunk/BOOK/general/sysutils/mc.xml
trunk/BOOK/gnome/deprecated/gnome-vfs.xml
trunk/BOOK/gnome/platform/accountsservice.xml
trunk/BOOK/gnome/platform/gvfs.xml
trunk/BOOK/gnome/platform/libgnome-keyring.xml
trunk/BOOK/gnome/platform/libsecret.xml
trunk/BOOK/kde/core/kde-runtime.xml
trunk/BOOK/multimedia/libdriv/xine-lib.xml
trunk/BOOK/multimedia/videoutils/mplayer.xml
trunk/BOOK/multimedia/videoutils/vlc.xml
trunk/BOOK/networking/netlibs/libsoup.xml
trunk/BOOK/networking/netprogs/cifsutils.xml
trunk/BOOK/networking/netprogs/netprogs.xml
trunk/BOOK/postlfs/security/stunnel.xml
trunk/BOOK/x/lib/webkitgtk2.xml
Modified: trunk/BOOK/archive/kde/core/kdebase.xml
==============================================================================
--- trunk/BOOK/archive/kde/core/kdebase.xml Sun Jul 28 06:53:35 2013
(r11509)
+++ trunk/BOOK/archive/kde/core/kdebase.xml Sun Jul 28 08:10:03 2013
(r11510)
@@ -79,7 +79,7 @@
<xref linkend="libusb-compat"/>,
<xref linkend="linux-pam"/>,
<xref linkend="openldap"/>,
- <xref linkend="samba3"/>,
+ <xref linkend="samba"/>,
<xref linkend="sudo"/>,
<ulink url="http://www.openexr.com/";>OpenEXR</ulink>, and
<ulink
url="http://sourceforge.net/projects/libraw1394/";>libraw1394</ulink>
Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent Sun Jul 28 06:53:35 2013 (r11509)
+++ trunk/BOOK/general.ent Sun Jul 28 08:10:03 2013 (r11510)
@@ -448,8 +448,7 @@
<!ENTITY ntp-version "4.2.6p5">
<!ENTITY rpcbind-version "0.2.0">
<!ENTITY rsync-version "3.0.9">
-<!ENTITY samba3-version "3.6.12">
-<!ENTITY samba4-version "4.0.2">
+<!ENTITY samba-version "3.6.12">
<!ENTITY wget-version "1.14">
<!ENTITY wireless-tools-version "29">
<!ENTITY wpa_supplicant-version "2.0">
@@ -578,7 +577,7 @@
<!ENTITY shared-mime-info-version "1.1">
<!ENTITY startup-notification-version "0.12">
<!ENTITY webkitgtk-version "1.10.2"> <!-- Even minors only -->
-<!ENTITY webkitgtk2-version "2.0.3"> <!-- Even minors only -->
+<!ENTITY webkitgtk2-version "2.0.4"> <!-- Even minors only -->
<!ENTITY xulrunner-version "22.0">
<!ENTITY gtk2-libdir "2.0/2.10.0">
@@ -622,12 +621,12 @@
<!-- Chapter 30 -->
<!-- Platform -->
-<!ENTITY accountsservice-version "0.6.31">
+<!ENTITY accountsservice-version "0.6.34">
<!ENTITY polkit-gnome-version "0.105">
<!ENTITY gsettings-desktop-schemas-version "3.8.2">
<!ENTITY GConf-version "3.2.6">
-<!ENTITY libgnome-keyring-version "3.6.0">
-<!ENTITY libsecret-version "0.14">
+<!ENTITY libgnome-keyring-version "3.8.0">
+<!ENTITY libsecret-version "0.15">
<!ENTITY gcr-version "3.6.2">
<!ENTITY gnome-keyring-version "3.6.3">
<!ENTITY gvfs-version "1.14.2">
Modified: trunk/BOOK/general/sysutils/autofs.xml
==============================================================================
--- trunk/BOOK/general/sysutils/autofs.xml Sun Jul 28 06:53:35 2013
(r11509)
+++ trunk/BOOK/general/sysutils/autofs.xml Sun Jul 28 08:10:03 2013
(r11510)
@@ -32,7 +32,7 @@
<para>The <application>Autofs</application> package contains userspace
tools that work with the kernel to mount and un-mount removable file
systems. The primary use is to mount external network file systems like
- NFS (see <xref linkend="nfs-utils"/>) or Samba (see <xref
linkend="samba3"/>)
+ NFS (see <xref linkend="nfs-utils"/>) or Samba (see <xref
linkend="samba"/>)
on demand.</para>
<para>It may also be useful for allowing users to mount floppies, cdroms
and
Modified: trunk/BOOK/general/sysutils/mc.xml
==============================================================================
--- trunk/BOOK/general/sysutils/mc.xml Sun Jul 28 06:53:35 2013 (r11509)
+++ trunk/BOOK/general/sysutils/mc.xml Sun Jul 28 08:10:03 2013 (r11510)
@@ -74,7 +74,7 @@
<para role="optional">
<xref linkend="doxygen"/>,
<xref linkend="gpm"/>,
- <xref linkend="samba3"/>,
+ <xref linkend="samba"/>,
<xref linkend="slang"/>,
<xref linkend="unzip"/>,
<xref linkend="x-window-system"/>, and
Modified: trunk/BOOK/gnome/deprecated/gnome-vfs.xml
==============================================================================
--- trunk/BOOK/gnome/deprecated/gnome-vfs.xml Sun Jul 28 06:53:35 2013
(r11509)
+++ trunk/BOOK/gnome/deprecated/gnome-vfs.xml Sun Jul 28 08:10:03 2013
(r11510)
@@ -68,7 +68,7 @@
<xref linkend="gnome-mime-data"/></para>
<bridgehead renderas="sect4">Optional</bridgehead>
- <para role="optional"><xref linkend="samba3"/>,
+ <para role="optional"><xref linkend="samba"/>,
<xref linkend="gamin"/>,
<ulink url="http://www.freedesktop.org/wiki/Software/hal";>Hal</ulink>,
<xref linkend="gtk-doc"/>,
Modified: trunk/BOOK/gnome/platform/accountsservice.xml
==============================================================================
--- trunk/BOOK/gnome/platform/accountsservice.xml Sun Jul 28 06:53:35
2013 (r11509)
+++ trunk/BOOK/gnome/platform/accountsservice.xml Sun Jul 28 08:10:03
2013 (r11510)
@@ -7,7 +7,7 @@
<!ENTITY accountsservice-download-http
"http://www.freedesktop.org/software/accountsservice/accountsservice-&accountsservice-version;.tar.xz";>
<!ENTITY accountsservice-download-ftp " ">
- <!ENTITY accountsservice-md5sum "d594f1da95c6a83c0463695ca31815b2">
+ <!ENTITY accountsservice-md5sum "dbf4323b688a314b4bf76890ad6d5279">
<!ENTITY accountsservice-size "352 KB">
<!ENTITY accountsservice-buildsize "12 MB">
<!ENTITY accountsservice-time "0.1 SBU">
@@ -110,6 +110,7 @@
--sysconfdir=/etc \
--localstatedir=/var \
--libexecdir=/usr/lib/accountsservice \
+ --enable-admin-group=adm \
--disable-static &&
make</userinput></screen>
@@ -128,6 +129,11 @@
<sect2 role="commands">
<title>Command Explanations</title>
+ <para>
+ <parameter>--enable-admin-group=adm</parameter>: This switch sets
+ group for administrator accounts.
+ </para>
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="../../xincludes/static-libraries.xml"/>
Modified: trunk/BOOK/gnome/platform/gvfs.xml
==============================================================================
--- trunk/BOOK/gnome/platform/gvfs.xml Sun Jul 28 06:53:35 2013 (r11509)
+++ trunk/BOOK/gnome/platform/gvfs.xml Sun Jul 28 08:10:03 2013 (r11510)
@@ -102,7 +102,7 @@
<ulink url="http://www.gphoto.org/";>libgphoto2</ulink>,
<ulink url="http://www.libimobiledevice.org/";>libimobiledevice</ulink>,
<xref linkend="openssh"/> and
- <xref linkend="samba3"/>
+ <xref linkend="samba"/>
</para>
<bridgehead renderas="sect4">Optional (Runtime)</bridgehead>
Modified: trunk/BOOK/gnome/platform/libgnome-keyring.xml
==============================================================================
--- trunk/BOOK/gnome/platform/libgnome-keyring.xml Sun Jul 28 06:53:35
2013 (r11509)
+++ trunk/BOOK/gnome/platform/libgnome-keyring.xml Sun Jul 28 08:10:03
2013 (r11510)
@@ -5,13 +5,13 @@
%general-entities;
<!ENTITY libgnome-keyring-download-http
-
"&gnome-download-http;/libgnome-keyring/3.6/libgnome-keyring-&libgnome-keyring-version;.tar.xz">
+
"&gnome-download-http;/libgnome-keyring/3.8/libgnome-keyring-&libgnome-keyring-version;.tar.xz">
<!ENTITY libgnome-keyring-download-ftp
-
"&gnome-download-ftp;/libgnome-keyring/3.6/libgnome-keyring-&libgnome-keyring-version;.tar.xz">
- <!ENTITY libgnome-keyring-md5sum "4d8a8e81e6f5413c2c0c472380988e6e">
- <!ENTITY libgnome-keyring-size "416 KB">
- <!ENTITY libgnome-keyring-buildsize "15 MB">
- <!ENTITY libgnome-keyring-time "0.1 SBU">
+
"&gnome-download-ftp;/libgnome-keyring/3.8/libgnome-keyring-&libgnome-keyring-version;.tar.xz">
+ <!ENTITY libgnome-keyring-md5sum "caec6bcfac4d1fce6927c2338bdc5058">
+ <!ENTITY libgnome-keyring-size "420 KB">
+ <!ENTITY libgnome-keyring-buildsize "18 MB">
+ <!ENTITY libgnome-keyring-time "0.2 SBU">
]>
<sect1 id="libgnome-keyring"
xreflabel="libgnome-keyring-&libgnome-keyring-version;">
Modified: trunk/BOOK/gnome/platform/libsecret.xml
==============================================================================
--- trunk/BOOK/gnome/platform/libsecret.xml Sun Jul 28 06:53:35 2013
(r11509)
+++ trunk/BOOK/gnome/platform/libsecret.xml Sun Jul 28 08:10:03 2013
(r11510)
@@ -6,7 +6,7 @@
<!ENTITY libsecret-download-http
"&gnome-download-http;/libsecret/&libsecret-version;/libsecret-&libsecret-version;.tar.xz">
<!ENTITY libsecret-download-ftp
"&gnome-download-ftp;/libsecret/&libsecret-version;/libsecret-&libsecret-version;.tar.xz">
- <!ENTITY libsecret-md5sum "ac4db2be8e970899ca5091791c1f7c36">
+ <!ENTITY libsecret-md5sum "51093b922823a7bdb5d7e951a9f2337f">
<!ENTITY libsecret-size "476 KB">
<!ENTITY libsecret-buildsize "21 MB">
<!ENTITY libsecret-time "0.2 SBU">
@@ -116,8 +116,8 @@
make</userinput></screen>
<para>
- To test the results, issue: <command>make -k check</command>. The
- JavaScript tests can sometimes fail for unknown reasons.
+ To test the results, issue: <command>make check</command> from an
+ X terminal emulator.
</para>
<para>
Modified: trunk/BOOK/kde/core/kde-runtime.xml
==============================================================================
--- trunk/BOOK/kde/core/kde-runtime.xml Sun Jul 28 06:53:35 2013 (r11509)
+++ trunk/BOOK/kde/core/kde-runtime.xml Sun Jul 28 08:10:03 2013 (r11510)
@@ -87,7 +87,7 @@
<xref linkend="pulseaudio"/>,
<xref linkend="xine-lib"/>,
<xref linkend="libcanberra"/>,
- <xref linkend="samba3"/>,
+ <xref linkend="samba"/>,
<xref linkend="NetworkManager"/>,
<ulink url="http://www.openslp.org/";>OpenSLP</ulink>,
<ulink url="http://launchpad.net/ntrack";>QNtrack</ulink>,
Modified: trunk/BOOK/multimedia/libdriv/xine-lib.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/xine-lib.xml Sun Jul 28 06:53:35 2013
(r11509)
+++ trunk/BOOK/multimedia/libdriv/xine-lib.xml Sun Jul 28 08:10:03 2013
(r11510)
@@ -96,7 +96,7 @@
<xref linkend="mesalib"/>,
<ulink
url="http://sourceforge.net/projects/modplug-xmms/";>libmodplug</ulink>,
<ulink url="http://www.musepack.net/";>musepack</ulink>,
- <xref linkend="samba3"/>,
+ <xref linkend="samba"/>,
<xref linkend="sdl"/>,
<xref linkend="speex"/>,
<ulink url="http://ftp.gnu.org/gnu/vcdimager/";>VCDImager</ulink>,
Modified: trunk/BOOK/multimedia/videoutils/mplayer.xml
==============================================================================
--- trunk/BOOK/multimedia/videoutils/mplayer.xml Sun Jul 28 06:53:35
2013 (r11509)
+++ trunk/BOOK/multimedia/videoutils/mplayer.xml Sun Jul 28 08:10:03
2013 (r11510)
@@ -138,7 +138,7 @@
<bridgehead renderas="sect4">Optional Input Drivers and
Libraries</bridgehead>
<para role="optional">
<xref linkend="cdparanoia"/>,
- <xref linkend="samba3"/>,
+ <xref linkend="samba"/>,
<xref linkend="libdvdread"/>,
<xref linkend="libdvdnav"/>,
<xref linkend="libdvdcss"/>,
Modified: trunk/BOOK/multimedia/videoutils/vlc.xml
==============================================================================
--- trunk/BOOK/multimedia/videoutils/vlc.xml Sun Jul 28 06:53:35 2013
(r11509)
+++ trunk/BOOK/multimedia/videoutils/vlc.xml Sun Jul 28 08:10:03 2013
(r11510)
@@ -114,7 +114,7 @@
<xref linkend="libdvdnav"/>,
<ulink
url="http://www.videolan.org/developers/libbluray.html";>libbluray</ulink>,
<ulink url="http://opencv.willowgarage.com/wiki/";>OpenCV</ulink>,
- <xref linkend="samba3"/>,
+ <xref linkend="samba"/>,
<ulink url="http://linuxtv.org/downloads/v4l-utils/";>Video4Linux</ulink>,
<ulink url="http://www.gnu.org/software/vcdimager/";>VCDImager</ulink>
(requires <ulink
url="http://www.gnu.org/software/libcdio/";>libcdio</ulink>)
Modified: trunk/BOOK/networking/netlibs/libsoup.xml
==============================================================================
--- trunk/BOOK/networking/netlibs/libsoup.xml Sun Jul 28 06:53:35 2013
(r11509)
+++ trunk/BOOK/networking/netlibs/libsoup.xml Sun Jul 28 08:10:03 2013
(r11510)
@@ -95,7 +95,7 @@
<xref linkend="gtk-doc"/>,
<xref linkend="php"/> compiled with XMLRPC-EPI <!-- It seems that XMLRPC
is part of PHP 5.4.10 -->
support (only used for the XMLRPC regression tests) and
- <xref linkend="samba3"/> (ntlm_auth is required to run the test suite).
+ <xref linkend="samba"/> (ntlm_auth is required to run the test suite).
</para>
<para condition="html" role="usernotes">
Modified: trunk/BOOK/networking/netprogs/cifsutils.xml
==============================================================================
--- trunk/BOOK/networking/netprogs/cifsutils.xml Sun Jul 28 06:53:35
2013 (r11509)
+++ trunk/BOOK/networking/netprogs/cifsutils.xml Sun Jul 28 08:10:03
2013 (r11510)
@@ -60,7 +60,7 @@
<bridgehead renderas="sect4">Recommended</bridgehead>
<para role="recommended">
- <xref linkend="samba3"/></para>
+ <xref linkend="samba"/></para>
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
Modified: trunk/BOOK/networking/netprogs/netprogs.xml
==============================================================================
--- trunk/BOOK/networking/netprogs/netprogs.xml Sun Jul 28 06:53:35 2013
(r11509)
+++ trunk/BOOK/networking/netprogs/netprogs.xml Sun Jul 28 08:10:03 2013
(r11510)
@@ -29,7 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="ntp.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="rpcbind.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="rsync.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="samba3.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="samba.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="wget.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="wireless-tools.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="wpa_supplicant.xml"/>
Copied and modified: trunk/BOOK/networking/netprogs/samba.xml (from r11509,
trunk/BOOK/networking/netprogs/samba3.xml)
==============================================================================
--- trunk/BOOK/networking/netprogs/samba3.xml Sun Jul 28 06:53:35 2013
(r11509, copy source)
+++ trunk/BOOK/networking/netprogs/samba.xml Sun Jul 28 08:10:03 2013
(r11510)
@@ -4,25 +4,25 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
- <!ENTITY samba3-download-http
"http://ftp.samba.org/pub/samba/stable/samba-&samba3-version;.tar.gz";>
- <!ENTITY samba3-download-ftp
"ftp://ftp.samba.org/pub/samba/stable/samba-&samba3-version;.tar.gz";>
- <!ENTITY samba3-md5sum "430fd21a1acd26964d3ccf366df8709a">
- <!ENTITY samba3-size "34 MB">
- <!ENTITY samba3-buildsize "535 MB (includes running the test suite)">
- <!ENTITY samba3-time "2.7 SBU (additionall 1.4 SBU to run the test
suite)">
+ <!ENTITY samba-download-http
"http://ftp.samba.org/pub/samba/stable/samba-&samba-version;.tar.gz";>
+ <!ENTITY samba-download-ftp
"ftp://ftp.samba.org/pub/samba/stable/samba-&samba-version;.tar.gz";>
+ <!ENTITY samba-md5sum "430fd21a1acd26964d3ccf366df8709a">
+ <!ENTITY samba-size "34 MB">
+ <!ENTITY samba-buildsize "535 MB (includes running the test suite)">
+ <!ENTITY samba-time "2.7 SBU (additionall 1.4 SBU to run the test
suite)">
]>
-<sect1 id="samba3" xreflabel="Samba-&samba3-version;">
- <?dbhtml filename="samba3.html"?>
+<sect1 id="samba" xreflabel="Samba-&samba-version;">
+ <?dbhtml filename="samba.html"?>
<sect1info>
<othername>$LastChangedBy$</othername>
<date>$Date$</date>
</sect1info>
- <title>Samba-&samba3-version;</title>
+ <title>Samba-&samba-version;</title>
- <indexterm zone="samba3">
+ <indexterm zone="samba">
<primary sortas="a-Samba">Samba</primary>
</indexterm>
@@ -42,22 +42,22 @@
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
<listitem>
- <para>Download (HTTP): <ulink url="&samba3-download-http;"/></para>
+ <para>Download (HTTP): <ulink url="&samba-download-http;"/></para>
</listitem>
<listitem>
- <para>Download (FTP): <ulink url="&samba3-download-ftp;"/></para>
+ <para>Download (FTP): <ulink url="&samba-download-ftp;"/></para>
</listitem>
<listitem>
- <para>Download MD5 sum: &samba3-md5sum;</para>
+ <para>Download MD5 sum: &samba-md5sum;</para>
</listitem>
<listitem>
- <para>Download size: &samba3-size;</para>
+ <para>Download size: &samba-size;</para>
</listitem>
<listitem>
- <para>Estimated disk space required: &samba3-buildsize;</para>
+ <para>Estimated disk space required: &samba-buildsize;</para>
</listitem>
<listitem>
- <para>Estimated build time: &samba3-time;</para>
+ <para>Estimated build time: &samba-time;</para>
</listitem>
</itemizedlist>
@@ -65,7 +65,7 @@
<itemizedlist spacing="compact">
<listitem>
<para>Required patch: <ulink
-
url="http://us3.samba.org/samba/patches/patches-&samba3-version;/spoolss.diff"/></para>
+
url="http://us3.samba.org/samba/patches/patches-&samba-version;/spoolss.diff"/></para>
</listitem>
</itemizedlist> -->
@@ -102,7 +102,7 @@
<xref linkend="sqlite"/></para> -->
<para condition="html" role="usernotes">User Notes:
- <ulink url="&blfs-wiki;/samba3"/></para>
+ <ulink url="&blfs-wiki;/samba"/></para>
</sect2>
@@ -166,10 +166,10 @@
/etc/openldap/schema &&
fi &&
-install -v -m755 -d /usr/share/doc/samba-&samba3-version; &&
+install -v -m755 -d /usr/share/doc/samba-&samba-version; &&
install -v -m644 ../docs/*.pdf \
- /usr/share/doc/samba-&samba3-version; &&
-ln -v -s ../../samba/swat
/usr/share/doc/samba-&samba3-version;</userinput></screen>
+ /usr/share/doc/samba-&samba-version; &&
+ln -v -s ../../samba/swat
/usr/share/doc/samba-&samba-version;</userinput></screen>
</sect2>
@@ -233,12 +233,12 @@
<sect2 role="configuration">
<title>Configuring Samba</title>
- <sect3 id="samba3-config">
+ <sect3 id="samba-config">
<title>Config Files</title>
<para>/etc/samba/smb.conf</para>
- <indexterm zone="samba3 samba3-config">
+ <indexterm zone="samba samba-config">
<primary sortas="e-etc-samba-smb.conf">/etc/samba/smb.conf</primary>
</indexterm>
@@ -436,7 +436,7 @@
</sect4>
- <sect4 id="samba3-init">
+ <sect4 id="samba-init">
<title>Boot Script</title>
<para>For your convenience, boot scripts have been provided for
@@ -448,11 +448,11 @@
the <command>winbindd</command> daemon, used for providing Windows
domain services to Linux clients.</para>
- <indexterm zone="samba3 samba3-init">
+ <indexterm zone="samba samba-init">
<primary sortas="f-samba">samba</primary>
</indexterm>
- <indexterm zone="samba3 samba3-init">
+ <indexterm zone="samba samba-init">
<primary sortas="f-winbind">winbind</primary>
</indexterm>
@@ -485,25 +485,25 @@
</sect3>
- <sect3 id="samba3-swat-config">
+ <sect3 id="samba-swat-config">
<title>Configuring SWAT</title>
<para>The SWAT (<application>Samba</application> Web Administration Tool)
utility can be used for configuration of the
<application>Samba</application> installation.</para>
- <indexterm zone="samba3 samba3-swat-config">
+ <indexterm zone="samba samba-swat-config">
<primary sortas="g-configuring-SWAT">Configuring SWAT</primary>
</indexterm>
<!--
<sect4>
<title>Setting up SWAT using inetd</title>
- <indexterm zone="samba3 samba3-swat-config">
+ <indexterm zone="samba samba-swat-config">
<primary sortas="e-etc-inetd.conf">/etc/inetd.conf</primary>
</indexterm>
- <indexterm zone="samba3 samba3-swat-config">
+ <indexterm zone="samba samba-swat-config">
<primary sortas="e-etc-services">/etc/services</primary>
</indexterm>
@@ -539,7 +539,7 @@
<sect4>
<title>Setting up SWAT using xinetd</title>
- <indexterm zone="samba3 samba3-swat-config">
+ <indexterm zone="samba samba-swat-config">
<primary sortas="e-etc-xinetd.conf">/etc/xinetd.conf</primary>
</indexterm>
@@ -600,7 +600,7 @@
been provided for SWAT via stunnel. First, create the stunnel
configuration file:</para>
- <indexterm zone="samba3 samba3-swat-config">
+ <indexterm zone="samba samba-swat-config">
<primary
sortas="e-etc-stunnel-swat.conf">/etc/stunnel/swat.conf</primary>
</indexterm>
@@ -636,7 +636,7 @@
<title/>
- <indexterm zone="samba3 samba3-swat-config">
+ <indexterm zone="samba samba-swat-config">
<primary sortas="e-etc-pam.d-samba">/etc/pam.d/samba</primary>
</indexterm>
@@ -665,7 +665,7 @@
libsmbsharemodes.so, libtalloc.so, libwbclient.so, the pam_winbind.so
and pam_smbpass.so PAM libraries, and assorted character set,
filesystem and support modules.</seg>
- <seg>/etc/samba, /usr/lib/samba, /usr/share/doc/samba-&samba3-version;,
+ <seg>/etc/samba, /usr/lib/samba, /usr/share/doc/samba-&samba-version;,
/usr/share/samba, /var/lib/samba, /var/log/samba (if configured), and
/var/nmbd</seg>
</seglistitem>
@@ -682,7 +682,7 @@
<para>is used to write records to eventlogs from STDIN, add the
specified source and DLL eventlog registry entries and display the
active eventlog names (from <filename>smb.conf</filename>).</para>
- <indexterm zone="samba3 eventlogadm">
+ <indexterm zone="samba eventlogadm">
<primary sortas="b-eventlogadm">eventlogadm</primary>
</indexterm>
</listitem>
@@ -693,7 +693,7 @@
<listitem>
<para>lists information about machines that respond to
SMB name queries on a subnet.</para>
- <indexterm zone="samba3 findsmb">
+ <indexterm zone="samba findsmb">
<primary sortas="b-findsmb">findsmb</primary>
</indexterm>
</listitem>
@@ -704,7 +704,7 @@
<listitem>
<para>is a command-line utility for adding records to an LDB
database.</para>
- <indexterm zone="samba3 ldbadd">
+ <indexterm zone="samba ldbadd">
<primary sortas="b-ldbadd">ldbadd</primary>
</indexterm>
</listitem>
@@ -715,7 +715,7 @@
<listitem>
<para>is a command-line program for deleting LDB database
records.</para>
- <indexterm zone="samba3 ldbdel">
+ <indexterm zone="samba ldbdel">
<primary sortas="b-ldbdel">ldbdel</primary>
</indexterm>
</listitem>
@@ -726,7 +726,7 @@
<listitem>
<para>allows you to edit LDB databases using your preferred
editor.</para>
- <indexterm zone="samba3 ldbedit">
+ <indexterm zone="samba ldbedit">
<primary sortas="b-ldbedit">ldbedit</primary>
</indexterm>
</listitem>
@@ -736,7 +736,7 @@
<term><command>ldbmodify</command></term>
<listitem>
<para>allows you to modify records in an LDB database.</para>
- <indexterm zone="samba3 ldbmodify">
+ <indexterm zone="samba ldbmodify">
<primary sortas="b-ldbmodify">ldbmodify</primary>
</indexterm>
</listitem>
@@ -747,7 +747,7 @@
<listitem>
<para>allows you to edit LDB databases using your preferred
editor.</para>
- <indexterm zone="samba3 ldbrename">
+ <indexterm zone="samba ldbrename">
<primary sortas="b-ldbrename">ldbrename</primary>
</indexterm>
</listitem>
@@ -758,7 +758,7 @@
<listitem>
<para>searches an LDB database for records matching a specified
expression.</para>
- <indexterm zone="samba3 ldbsearch">
+ <indexterm zone="samba ldbsearch">
<primary sortas="b-ldbsearch">ldbsearch</primary>
</indexterm>
</listitem>
@@ -770,7 +770,7 @@
<para>is a tool for administration of
<application>Samba</application> and remote CIFS servers, similar
to the <command>net</command> utility for DOS/Windows.</para>
- <indexterm zone="samba3 net">
+ <indexterm zone="samba net">
<primary sortas="b-net">net</primary>
</indexterm>
</listitem>
@@ -781,7 +781,7 @@
<listitem>
<para>is the <application>Samba</application>
NetBIOS name server.</para>
- <indexterm zone="samba3 nmbd">
+ <indexterm zone="samba nmbd">
<primary sortas="b-nmbd">nmbd</primary>
</indexterm>
</listitem>
@@ -792,7 +792,7 @@
<listitem>
<para>is used to query NetBIOS names and map
them to IP addresses.</para>
- <indexterm zone="samba3 nmblookup">
+ <indexterm zone="samba nmblookup">
<primary sortas="b-nmblookup">nmblookup</primary>
</indexterm>
</listitem>
@@ -803,7 +803,7 @@
<listitem>
<para>is a tool to allow external access to Winbind's
NTLM authentication function.</para>
- <indexterm zone="samba3 ntlm_auth">
+ <indexterm zone="samba ntlm_auth">
<primary sortas="b-ntlm_auth">ntlm_auth</primary>
</indexterm>
</listitem>
@@ -813,7 +813,7 @@
<term><command>pdbedit</command></term>
<listitem>
<para>is a tool used to manage the SAM database.</para>
- <indexterm zone="samba3 pdbedit">
+ <indexterm zone="samba pdbedit">
<primary sortas="b-pdbedit">pdbedit</primary>
</indexterm>
</listitem>
@@ -824,7 +824,7 @@
<listitem>
<para>is a utility that reports and changes SIDs in Windows
registry files. It currently only supports Windows NT.</para>
- <indexterm zone="samba3 profiles">
+ <indexterm zone="samba profiles">
<primary sortas="b-profiles">profiles</primary>
</indexterm>
</listitem>
@@ -834,7 +834,7 @@
<term><command>rpcclient</command></term>
<listitem>
<para>is used to execute MS-RPC client side functions.</para>
- <indexterm zone="samba3 rpcclient">
+ <indexterm zone="samba rpcclient">
<primary sortas="b-rpcclient">rpcclient</primary>
</indexterm>
</listitem>
@@ -844,7 +844,7 @@
<term><command>sharesec</command></term>
<listitem>
<para>manipulates share ACL permissions on SMB file shares.</para>
- <indexterm zone="samba3 sharesec">
+ <indexterm zone="samba sharesec">
<primary sortas="b-sharesec">sharesec</primary>
</indexterm>
</listitem>
@@ -854,7 +854,7 @@
<term><command>smbcacls</command></term>
<listitem>
<para>is used to manipulate Windows NT access control lists.</para>
- <indexterm zone="samba3 smbcacls">
+ <indexterm zone="samba smbcacls">
<primary sortas="b-smbcacls">smbcacls</primary>
</indexterm>
</listitem>
@@ -864,7 +864,7 @@
<term><command>smbclient</command></term>
<listitem>
<para>is a SMB/CIFS access utility, similar to FTP.</para>
- <indexterm zone="samba3 smbclient">
+ <indexterm zone="samba smbclient">
<primary sortas="b-smbclient">smbclient</primary>
</indexterm>
</listitem>
@@ -876,7 +876,7 @@
<para>is used to control running <command>smbd</command>,
<command>nmbd</command> and <command>winbindd</command>
daemons.</para>
- <indexterm zone="samba3 smbcontrol">
+ <indexterm zone="samba smbcontrol">
<primary sortas="b-smbcontrol">smbcontrol</primary>
</indexterm>
</listitem>
@@ -887,7 +887,7 @@
<listitem>
<para>is used to manipulate Windows NT quotas on
SMB file shares.</para>
- <indexterm zone="samba3 smbcquotas">
+ <indexterm zone="samba smbcquotas">
<primary sortas="b-smbcquotas">smbcquotas</primary>
</indexterm>
</listitem>
@@ -898,7 +898,7 @@
<listitem>
<para>is the main <application>Samba</application> daemon which
provides SMB/CIFS services to clients.</para>
- <indexterm zone="samba3 smbd">
+ <indexterm zone="samba smbd">
<primary sortas="b-smbd">smbd</primary>
</indexterm>
</listitem>
@@ -910,7 +910,7 @@
<para>is a simple utility with <command>wget</command>-like
semantics, that can download files from SMB servers. You can specify
the files you would like to download on the command-line.</para>
- <indexterm zone="samba3 smbget">
+ <indexterm zone="samba smbget">
<primary sortas="b-smbget">smbget</primary>
</indexterm>
</listitem>
@@ -921,7 +921,7 @@
<listitem>
<para>changes a user's <application>Samba</application>
password.</para>
- <indexterm zone="samba3 smbpasswd">
+ <indexterm zone="samba smbpasswd">
<primary sortas="b-smbpasswd">smbpasswd</primary>
</indexterm>
</listitem>
@@ -931,7 +931,7 @@
<term><command>smbspool</command></term>
<listitem>
<para>sends a print job to an SMB printer.</para>
- <indexterm zone="samba3 smbspool">
+ <indexterm zone="samba smbspool">
<primary sortas="b-smbspool">smbspool</primary>
</indexterm>
</listitem>
@@ -942,7 +942,7 @@
<listitem>
<para>reports current <application>Samba</application>
connections.</para>
- <indexterm zone="samba3 smbstatus">
+ <indexterm zone="samba smbstatus">
<primary sortas="b-smbstatus">smbstatus</primary>
</indexterm>
</listitem>
@@ -953,7 +953,7 @@
<listitem>
<para>is a shell script used for backing up SMB/CIFS shares
directly to Linux tape drives or a file.</para>
- <indexterm zone="samba3 smbtar">
+ <indexterm zone="samba smbtar">
<primary sortas="b-smbtar">smbtar</primary>
</indexterm>
</listitem>
@@ -963,7 +963,7 @@
<term><command>smbtree</command></term>
<listitem>
<para>is a text-based SMB network browser.</para>
- <indexterm zone="samba3 smbtree">
+ <indexterm zone="samba smbtree">
<primary sortas="b-smbtree">smbtree</primary>
</indexterm>
</listitem>
@@ -974,7 +974,7 @@
<listitem>
<para>is the <application>Samba</application> Web Administration
Tool.</para>
- <indexterm zone="samba3 swat">
+ <indexterm zone="samba swat">
<primary sortas="b-swat">swat</primary>
</indexterm>
</listitem>
@@ -986,7 +986,7 @@
<para>is a tool for backing up or validating the integrity of
<application>Samba</application> <filename>.tdb</filename>
files.</para>
- <indexterm zone="samba3 tdbbackup">
+ <indexterm zone="samba tdbbackup">
<primary sortas="b-tdbbackup">tdbbackup</primary>
</indexterm>
</listitem>
@@ -998,7 +998,7 @@
<para> is a tool used to print the contents of a
<application>Samba</application> <filename>.tdb</filename>
file.</para>
- <indexterm zone="samba3 tdbdump">
+ <indexterm zone="samba tdbdump">
<primary sortas="b-tdbdump">tdbdump</primary>
</indexterm>
</listitem>
@@ -1009,7 +1009,7 @@
<listitem>
<para>is a tool which allows simple database manipulation from the
command line.</para>
- <indexterm zone="samba3 tdbtool">
+ <indexterm zone="samba tdbtool">
<primary sortas="b-tdbtool">tdbtool</primary>
</indexterm>
</listitem>
@@ -1020,7 +1020,7 @@
<listitem>
<para>checks an <filename>smb.conf</filename> file for proper
syntax.</para>
- <indexterm zone="samba3 testparm">
+ <indexterm zone="samba testparm">
<primary sortas="b-testparm">testparm</primary>
</indexterm>
</listitem>
@@ -1030,7 +1030,7 @@
<term><command>wbinfo</command></term>
<listitem>
<para>queries a running <command>winbindd</command> daemon.</para>
- <indexterm zone="samba3 wbinfo">
+ <indexterm zone="samba wbinfo">
<primary sortas="b-wbinfo">wbinfo</primary>
</indexterm>
</listitem>
@@ -1040,7 +1040,7 @@
<term><command>winbindd</command></term>
<listitem>
<para>resolves names from Windows NT servers.</para>
- <indexterm zone="samba3 winbindd">
+ <indexterm zone="samba winbindd">
<primary sortas="b-winbindd">winbindd</primary>
</indexterm>
</listitem>
@@ -1051,7 +1051,7 @@
<listitem>
<para>provides Name Service Switch API functions for resolving names
from NT servers.</para>
- <indexterm zone="samba3 libnss_winbind">
+ <indexterm zone="samba libnss_winbind">
<primary sortas="c-libnss_winbind">libnss_winbind.so</primary>
</indexterm>
</listitem>
@@ -1062,7 +1062,7 @@
<listitem>
<para>provides API functions for Samba's implementation of the
Windows Internet Naming Service.</para>
- <indexterm zone="samba3 libnss_wins">
+ <indexterm zone="samba libnss_wins">
<primary sortas="c-libnss_wins">libnss_wins.so</primary>
</indexterm>
</listitem>
@@ -1073,7 +1073,7 @@
<listitem>
<para>provides the API functions for the administration tools used
for Samba and remote CIFS servers.</para>
- <indexterm zone="samba3 libnetapi">
+ <indexterm zone="samba libnetapi">
<primary sortas="c-libnetapi">libnetapi.so</primary>
</indexterm>
</listitem>
@@ -1083,7 +1083,7 @@
<term><filename class='libraryfile'>libsmbclient.so</filename></term>
<listitem>
<para>provides the API functions for the Samba SMB client
tools.</para>
- <indexterm zone="samba3 libsmbclient">
+ <indexterm zone="samba libsmbclient">
<primary sortas="c-libsmbclient">libsmbclient.so</primary>
</indexterm>
</listitem>
@@ -1094,7 +1094,7 @@
<listitem>
<para>provides API functions for accessing SMB share modes
(locks etc.)</para>
- <indexterm zone="samba3 libsmbsharemodes">
+ <indexterm zone="samba libsmbsharemodes">
<primary sortas="c-libsmbsharemodes">libsmbsharemodes.so</primary>
</indexterm>
</listitem>
@@ -1104,7 +1104,7 @@
<term><filename class='libraryfile'>libwbclient.so</filename></term>
<listitem>
<para>provides API functions for Windows domain client
services.</para>
- <indexterm zone="samba3 libwbclient">
+ <indexterm zone="samba libwbclient">
<primary sortas="c-libwbclient">libwbclient.so</primary>
</indexterm>
</listitem>
Modified: trunk/BOOK/postlfs/security/stunnel.xml
==============================================================================
--- trunk/BOOK/postlfs/security/stunnel.xml Sun Jul 28 06:53:35 2013
(r11509)
+++ trunk/BOOK/postlfs/security/stunnel.xml Sun Jul 28 08:10:03 2013
(r11510)
@@ -220,7 +220,7 @@
<para>For a full explanation of the commands and syntax used in the
configuration file, run <command>man stunnel</command>. To see a
BLFS example of an actual setup of an <command>stunnel</command>
encrypted
- service, read the <xref linkend="samba3-swat-config"/> in the
+ service, read the <xref linkend="samba-swat-config"/> in the
<application>Samba</application> instructions.</para>
</sect3>
Modified: trunk/BOOK/x/lib/webkitgtk2.xml
==============================================================================
--- trunk/BOOK/x/lib/webkitgtk2.xml Sun Jul 28 06:53:35 2013 (r11509)
+++ trunk/BOOK/x/lib/webkitgtk2.xml Sun Jul 28 08:10:03 2013 (r11510)
@@ -6,10 +6,10 @@
<!ENTITY webkitgtk2-download-http
"http://webkitgtk.org/releases/webkitgtk-&webkitgtk2-version;.tar.xz";>
<!ENTITY webkitgtk2-download-ftp " ">
- <!ENTITY webkitgtk2-md5sum "9eca9eec4595b66b72a1ac7ceaef08ba">
+ <!ENTITY webkitgtk2-md5sum "413be319ba171feed9348d1bede6b0a7">
<!ENTITY webkitgtk2-size "9.4 MB">
<!ENTITY webkitgtk2-buildsize "900 MB">
- <!ENTITY webkitgtk2-time "60 SBU">
+ <!ENTITY webkitgtk2-time "50 SBU">
]>
<sect1 id="webkitgtk2" xreflabel="WebKitGTK+-&webkitgtk-version;">
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
