summaryrefslogtreecommitdiff
path: root/docs/docbook/global.ent
diff options
context:
space:
mode:
authorJohn Terpstra <jht@samba.org>2003-04-21 20:00:38 +0000
committerJohn Terpstra <jht@samba.org>2003-04-21 20:00:38 +0000
commit3ac50a125e27911ec29f1c637417fa9ae1612a86 (patch)
tree78d755d6cbaf4059d36268d9fb6c105a9095a6be /docs/docbook/global.ent
parent13c8154ccdfc36445e66472a7448bdd710a909ae (diff)
downloadsamba-3ac50a125e27911ec29f1c637417fa9ae1612a86.tar.gz
samba-3ac50a125e27911ec29f1c637417fa9ae1612a86.tar.bz2
samba-3ac50a125e27911ec29f1c637417fa9ae1612a86.zip
Merged the two browsing documents into one. Added locking module to global.ent file.
(This used to be commit 1027525be23e7db97677e2ed3e2706d271ad0a0b)
Diffstat (limited to 'docs/docbook/global.ent')
-rw-r--r--docs/docbook/global.ent7
1 files changed, 3 insertions, 4 deletions
diff --git a/docs/docbook/global.ent b/docs/docbook/global.ent
index c69b72d8a6..dcef1084d6 100644
--- a/docs/docbook/global.ent
+++ b/docs/docbook/global.ent
@@ -407,8 +407,7 @@ an Active Directory environment.
<!ENTITY ID-BUGS SYSTEM "bugreport">
<!ENTITY ID-SECURITY-LEVEL SYSTEM "securitylevels">
<!ENTITY ID-SPEED SYSTEM "speed">
-<!ENTITY ID-BROWSING SYSTEM "improved-browsing">
-<!ENTITY ID-BROWSING-Quick SYSTEM "Browsing-Quick">
+<!ENTITY ID-NetworkBrowsing SYSTEM "network-browsing">
<!ENTITY ID-GROUP-MAPPING-HOWTO SYSTEM "groupmapping">
<!ENTITY ID-Portability SYSTEM "Portability">
<!ENTITY ID-Other-Clients SYSTEM "Other-Clients">
@@ -451,8 +450,7 @@ an Active Directory environment.
<!ENTITY ADS-HOWTO SYSTEM "projdoc/ADS-HOWTO.sgml">
<!ENTITY AdvancedNetworkAdmin SYSTEM "projdoc/AdvancedNetworkAdmin.sgml">
-<!ENTITY BROWSING SYSTEM "projdoc/Browsing.sgml">
-<!ENTITY BROWSING-Quick SYSTEM "projdoc/Browsing-Quickguide.sgml">
+<!ENTITY NetworkBrowsing SYSTEM "projdoc/NetworkBrowsing.sgml">
<!ENTITY BUGS SYSTEM "projdoc/Bugs.sgml">
<!ENTITY CUPS SYSTEM "projdoc/CUPS-printing.sgml">
<!ENTITY CVS-Access SYSTEM "projdoc/CVS-Access.sgml">
@@ -463,6 +461,7 @@ an Active Directory environment.
<!ENTITY GROUP-MAPPING-HOWTO SYSTEM "projdoc/GROUP-MAPPING-HOWTO.sgml">
<!ENTITY IntegratingWithWindows SYSTEM "projdoc/Integrating-with-Windows.sgml">
<!ENTITY IntroSMB SYSTEM "projdoc/IntroSMB.sgml">
+<!ENTITY locking SYSTEM "projdoc/locking.sgml">
<!ENTITY MS-Dfs-Setup SYSTEM "projdoc/msdfs_setup.sgml">
<!ENTITY NT-Security SYSTEM "projdoc/NT_Security.sgml">
<!ENTITY NT4Migration SYSTEM "projdoc/NT4Migration.sgml">