diff --git a/general.ent b/general.ent index a56bae12c6..9921d9e6fc 100644 --- a/general.ent +++ b/general.ent @@ -3,13 +3,13 @@ $LastChangedBy$ $Date$ --> - + - + @@ -311,8 +311,8 @@ $Date$ + diff --git a/postlfs/config/autofs.xml b/general/sysutils/autofs.xml similarity index 99% rename from postlfs/config/autofs.xml rename to general/sysutils/autofs.xml index 40c2336e64..b7bd354cd5 100644 --- a/postlfs/config/autofs.xml +++ b/general/sysutils/autofs.xml @@ -20,7 +20,7 @@ $Date$ - Automate Mounting of File Systems + autofs-&autofs-version; Autofs diff --git a/postlfs/config/initdtools.xml b/general/sysutils/initdtools.xml similarity index 100% rename from postlfs/config/initdtools.xml rename to general/sysutils/initdtools.xml diff --git a/general/sysutils/sysutils.xml b/general/sysutils/sysutils.xml index 49e7408539..9d9c6ffe8d 100644 --- a/general/sysutils/sysutils.xml +++ b/general/sysutils/sysutils.xml @@ -19,12 +19,14 @@ $Date$ some applications used by other applications in the book for installation or configuration purposes. + + @@ -47,7 +49,7 @@ $Date$ - + diff --git a/index.xml b/index.xml index dcfd143618..e96697c628 100644 --- a/index.xml +++ b/index.xml @@ -18,7 +18,7 @@ $Date$ - + diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index b4b16332b4..6d0c8c6d3f 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -41,6 +41,15 @@ --> + + November 3rd, 2011 + + + [bdubbs] - Rearrange package organization. + + + + November 2nd, 2011 @@ -107,7 +116,7 @@ - October 26th, 2011 + October 27th, 2011 [bdubbs] - Updated to vsftpd-2.3.4. diff --git a/basicnet/connect/connect.xml b/networking/connect/connect.xml similarity index 95% rename from basicnet/connect/connect.xml rename to networking/connect/connect.xml index 0647d0f26b..1d81d0a4ad 100644 --- a/basicnet/connect/connect.xml +++ b/networking/connect/connect.xml @@ -33,6 +33,7 @@ $Date$ + diff --git a/basicnet/connect/dhcp-client.xml b/networking/connect/dhcp-client.xml similarity index 100% rename from basicnet/connect/dhcp-client.xml rename to networking/connect/dhcp-client.xml diff --git a/server/other/dhcp.xml b/networking/connect/dhcp.xml similarity index 100% rename from server/other/dhcp.xml rename to networking/connect/dhcp.xml diff --git a/basicnet/connect/dhcpcd.xml b/networking/connect/dhcpcd.xml similarity index 100% rename from basicnet/connect/dhcpcd.xml rename to networking/connect/dhcpcd.xml diff --git a/basicnet/connect/ppp.xml b/networking/connect/ppp.xml similarity index 100% rename from basicnet/connect/ppp.xml rename to networking/connect/ppp.xml diff --git a/basicnet/mailnews/fetchmail.xml b/networking/mailnews/fetchmail.xml similarity index 100% rename from basicnet/mailnews/fetchmail.xml rename to networking/mailnews/fetchmail.xml diff --git a/basicnet/mailnews/mailnews.xml b/networking/mailnews/mailnews.xml similarity index 100% rename from basicnet/mailnews/mailnews.xml rename to networking/mailnews/mailnews.xml diff --git a/basicnet/mailnews/mailx.xml b/networking/mailnews/mailx.xml similarity index 100% rename from basicnet/mailnews/mailx.xml rename to networking/mailnews/mailx.xml diff --git a/basicnet/mailnews/mutt.xml b/networking/mailnews/mutt.xml similarity index 100% rename from basicnet/mailnews/mutt.xml rename to networking/mailnews/mutt.xml diff --git a/basicnet/mailnews/other.xml b/networking/mailnews/other.xml similarity index 100% rename from basicnet/mailnews/other.xml rename to networking/mailnews/other.xml diff --git a/basicnet/mailnews/pine.xml b/networking/mailnews/pine.xml similarity index 100% rename from basicnet/mailnews/pine.xml rename to networking/mailnews/pine.xml diff --git a/basicnet/mailnews/procmail.xml b/networking/mailnews/procmail.xml similarity index 100% rename from basicnet/mailnews/procmail.xml rename to networking/mailnews/procmail.xml diff --git a/basicnet/mailnews/slrn.xml b/networking/mailnews/slrn.xml similarity index 100% rename from basicnet/mailnews/slrn.xml rename to networking/mailnews/slrn.xml diff --git a/basicnet/mailnews/tin.xml b/networking/mailnews/tin.xml similarity index 100% rename from basicnet/mailnews/tin.xml rename to networking/mailnews/tin.xml diff --git a/basicnet/netlibs/curl.xml b/networking/netlibs/curl.xml similarity index 100% rename from basicnet/netlibs/curl.xml rename to networking/netlibs/curl.xml diff --git a/basicnet/netlibs/gnet.xml b/networking/netlibs/gnet.xml similarity index 100% rename from basicnet/netlibs/gnet.xml rename to networking/netlibs/gnet.xml diff --git a/basicnet/netlibs/libnice.xml b/networking/netlibs/libnice.xml similarity index 100% rename from basicnet/netlibs/libnice.xml rename to networking/netlibs/libnice.xml diff --git a/basicnet/netlibs/libpcap.xml b/networking/netlibs/libpcap.xml similarity index 100% rename from basicnet/netlibs/libpcap.xml rename to networking/netlibs/libpcap.xml diff --git a/basicnet/netlibs/libproxy.xml b/networking/netlibs/libproxy.xml similarity index 100% rename from basicnet/netlibs/libproxy.xml rename to networking/netlibs/libproxy.xml diff --git a/basicnet/netlibs/libsoup.xml b/networking/netlibs/libsoup.xml similarity index 100% rename from basicnet/netlibs/libsoup.xml rename to networking/netlibs/libsoup.xml diff --git a/basicnet/netlibs/neon.xml b/networking/netlibs/neon.xml similarity index 100% rename from basicnet/netlibs/neon.xml rename to networking/netlibs/neon.xml diff --git a/basicnet/netlibs/netlibs.xml b/networking/netlibs/netlibs.xml similarity index 100% rename from basicnet/netlibs/netlibs.xml rename to networking/netlibs/netlibs.xml diff --git a/basicnet/netprogs/cvs.xml b/networking/netprogs/cvs.xml similarity index 100% rename from basicnet/netprogs/cvs.xml rename to networking/netprogs/cvs.xml diff --git a/basicnet/netprogs/ggz-client-libs.xml b/networking/netprogs/ggz-client-libs.xml similarity index 100% rename from basicnet/netprogs/ggz-client-libs.xml rename to networking/netprogs/ggz-client-libs.xml diff --git a/basicnet/netprogs/inetutils.xml b/networking/netprogs/inetutils.xml similarity index 100% rename from basicnet/netprogs/inetutils.xml rename to networking/netprogs/inetutils.xml diff --git a/basicnet/netprogs/ncftp.xml b/networking/netprogs/ncftp.xml similarity index 100% rename from basicnet/netprogs/ncftp.xml rename to networking/netprogs/ncftp.xml diff --git a/basicnet/netprogs/ncpfs.xml b/networking/netprogs/ncpfs.xml similarity index 100% rename from basicnet/netprogs/ncpfs.xml rename to networking/netprogs/ncpfs.xml diff --git a/basicnet/netprogs/net-tools.xml b/networking/netprogs/net-tools.xml similarity index 100% rename from basicnet/netprogs/net-tools.xml rename to networking/netprogs/net-tools.xml diff --git a/postlfs/config/netfs.xml b/networking/netprogs/netfs.xml similarity index 100% rename from postlfs/config/netfs.xml rename to networking/netprogs/netfs.xml diff --git a/basicnet/netprogs/netprogs.xml b/networking/netprogs/netprogs.xml similarity index 90% rename from basicnet/netprogs/netprogs.xml rename to networking/netprogs/netprogs.xml index 64f4ebbf73..6c1e3ca823 100644 --- a/basicnet/netprogs/netprogs.xml +++ b/networking/netprogs/netprogs.xml @@ -10,10 +10,10 @@ $LastChangedBy$ $Date$ --> - + - Basic Networking Programs + Networking Programs These applications are generally client applications used to access the appropriate server across the building or across the world. @@ -25,7 +25,9 @@ $Date$ + + diff --git a/basicnet/netprogs/nfs-utils-client.xml b/networking/netprogs/nfs-utils-client.xml similarity index 100% rename from basicnet/netprogs/nfs-utils-client.xml rename to networking/netprogs/nfs-utils-client.xml diff --git a/server/major/nfs-utils.xml b/networking/netprogs/nfs-utils.xml similarity index 100% rename from server/major/nfs-utils.xml rename to networking/netprogs/nfs-utils.xml diff --git a/basicnet/netprogs/ntp.xml b/networking/netprogs/ntp.xml similarity index 100% rename from basicnet/netprogs/ntp.xml rename to networking/netprogs/ntp.xml diff --git a/basicnet/netprogs/openssh-client.xml b/networking/netprogs/openssh-client.xml similarity index 100% rename from basicnet/netprogs/openssh-client.xml rename to networking/netprogs/openssh-client.xml diff --git a/basicnet/netprogs/othernetprogs.xml b/networking/netprogs/othernetprogs.xml similarity index 100% rename from basicnet/netprogs/othernetprogs.xml rename to networking/netprogs/othernetprogs.xml diff --git a/basicnet/netprogs/portmap.xml b/networking/netprogs/portmap.xml similarity index 100% rename from basicnet/netprogs/portmap.xml rename to networking/netprogs/portmap.xml diff --git a/basicnet/netprogs/rsync-client.xml b/networking/netprogs/rsync-client.xml similarity index 100% rename from basicnet/netprogs/rsync-client.xml rename to networking/netprogs/rsync-client.xml diff --git a/basicnet/netprogs/rsync.xml b/networking/netprogs/rsync.xml similarity index 100% rename from basicnet/netprogs/rsync.xml rename to networking/netprogs/rsync.xml diff --git a/basicnet/netprogs/samba3-client.xml b/networking/netprogs/samba3-client.xml similarity index 100% rename from basicnet/netprogs/samba3-client.xml rename to networking/netprogs/samba3-client.xml diff --git a/basicnet/netprogs/subversion.xml b/networking/netprogs/subversion.xml similarity index 100% rename from basicnet/netprogs/subversion.xml rename to networking/netprogs/subversion.xml diff --git a/basicnet/netprogs/tcpwrappers.xml b/networking/netprogs/tcpwrappers.xml similarity index 100% rename from basicnet/netprogs/tcpwrappers.xml rename to networking/netprogs/tcpwrappers.xml diff --git a/basicnet/netprogs/wget.xml b/networking/netprogs/wget.xml similarity index 100% rename from basicnet/netprogs/wget.xml rename to networking/netprogs/wget.xml diff --git a/basicnet/netprogs/wireless-tools.xml b/networking/netprogs/wireless-tools.xml similarity index 100% rename from basicnet/netprogs/wireless-tools.xml rename to networking/netprogs/wireless-tools.xml diff --git a/basicnet/netutils/avahi.xml b/networking/netutils/avahi.xml similarity index 100% rename from basicnet/netutils/avahi.xml rename to networking/netutils/avahi.xml diff --git a/basicnet/netutils/bind-utils.xml b/networking/netutils/bind-utils.xml similarity index 100% rename from basicnet/netutils/bind-utils.xml rename to networking/netutils/bind-utils.xml diff --git a/basicnet/netutils/mod_dnssd.xml b/networking/netutils/mod_dnssd.xml similarity index 100% rename from basicnet/netutils/mod_dnssd.xml rename to networking/netutils/mod_dnssd.xml diff --git a/basicnet/netutils/netutils.xml b/networking/netutils/netutils.xml similarity index 93% rename from basicnet/netutils/netutils.xml rename to networking/netutils/netutils.xml index fd05628272..ca1232d04a 100644 --- a/basicnet/netutils/netutils.xml +++ b/networking/netutils/netutils.xml @@ -10,10 +10,10 @@ $LastChangedBy$ $Date$ --> - + - Basic Networking Utilities + Networking Utilities This chapter contains some tools that come in handy when the network needs investigating. @@ -21,7 +21,6 @@ $Date$ User Notes: - diff --git a/basicnet/netutils/nmap.xml b/networking/netutils/nmap.xml similarity index 100% rename from basicnet/netutils/nmap.xml rename to networking/netutils/nmap.xml diff --git a/basicnet/netutils/traceroute.xml b/networking/netutils/traceroute.xml similarity index 100% rename from basicnet/netutils/traceroute.xml rename to networking/netutils/traceroute.xml diff --git a/basicnet/netutils/whois.xml b/networking/netutils/whois.xml similarity index 100% rename from basicnet/netutils/whois.xml rename to networking/netutils/whois.xml diff --git a/basicnet/netutils/wireshark.xml b/networking/netutils/wireshark.xml similarity index 100% rename from basicnet/netutils/wireshark.xml rename to networking/netutils/wireshark.xml diff --git a/basicnet/basicnet.xml b/networking/networking.xml similarity index 91% rename from basicnet/basicnet.xml rename to networking/networking.xml index ddbb0dcfb4..7fab23a0a9 100644 --- a/basicnet/basicnet.xml +++ b/networking/networking.xml @@ -10,17 +10,16 @@ $LastChangedBy$ $Date$ --> - + - Basic Networking - + Networking - - + + diff --git a/basicnet/textweb/links.xml b/networking/textweb/links.xml similarity index 100% rename from basicnet/textweb/links.xml rename to networking/textweb/links.xml diff --git a/basicnet/textweb/lynx.xml b/networking/textweb/lynx.xml similarity index 100% rename from basicnet/textweb/lynx.xml rename to networking/textweb/lynx.xml diff --git a/basicnet/textweb/textweb.xml b/networking/textweb/textweb.xml similarity index 100% rename from basicnet/textweb/textweb.xml rename to networking/textweb/textweb.xml diff --git a/basicnet/textweb/w3m.xml b/networking/textweb/w3m.xml similarity index 100% rename from basicnet/textweb/w3m.xml rename to networking/textweb/w3m.xml diff --git a/postlfs/config/config.xml b/postlfs/config/config.xml index 1452040b79..811d8ee68d 100644 --- a/postlfs/config/config.xml +++ b/postlfs/config/config.xml @@ -48,7 +48,7 @@ $Date$ - + @@ -56,7 +56,7 @@ $Date$ - - + + diff --git a/server/major/major.xml b/server/major/major.xml index 8c57e00d34..e298dec875 100644 --- a/server/major/major.xml +++ b/server/major/major.xml @@ -20,7 +20,7 @@ $Date$ - + diff --git a/server/other/other.xml b/server/other/other.xml index 676d4b10a7..8ea7dea034 100644 --- a/server/other/other.xml +++ b/server/other/other.xml @@ -22,7 +22,7 @@ $Date$ helpful to learn about the consequences of an improper setup so that you can analyze the risks. - +