summaryrefslogtreecommitdiff
path: root/docs/Samba3-ByExample/SBE-Appendix1.xml
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-06-13 15:29:53 +0000
committerGerald W. Carter <jerry@samba.org>2008-04-23 08:46:47 -0500
commit2757cde29e2b49c988bcf1d5140bae22f8f0bab2 (patch)
tree656515558d378c68c34b1ef3e6fd5722a7f322d8 /docs/Samba3-ByExample/SBE-Appendix1.xml
parent789fda4de0ea8427e3a40e91bf1fd1d0f7cb2d85 (diff)
downloadsamba-2757cde29e2b49c988bcf1d5140bae22f8f0bab2.tar.gz
samba-2757cde29e2b49c988bcf1d5140bae22f8f0bab2.tar.bz2
samba-2757cde29e2b49c988bcf1d5140bae22f8f0bab2.zip
Put Johns' changes back in again.
(This used to be commit d5a730fc097311f498dd7c3fb2516a1fc0fa1fe7)
Diffstat (limited to 'docs/Samba3-ByExample/SBE-Appendix1.xml')
-rw-r--r--docs/Samba3-ByExample/SBE-Appendix1.xml10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/Samba3-ByExample/SBE-Appendix1.xml b/docs/Samba3-ByExample/SBE-Appendix1.xml
index 5e9fd1f07b..cc22e4ca9d 100644
--- a/docs/Samba3-ByExample/SBE-Appendix1.xml
+++ b/docs/Samba3-ByExample/SBE-Appendix1.xml
@@ -1224,10 +1224,10 @@ to LAM using only SSL.
</para>
<para>
- The next major release, LAM 0.5, will have less restrictions and support the latest Samba features
- (e.g. logon hours). The new plugin based architecture also allows to manage much more different
- account types like plain Unix accounts. The upload can now handle groups and hosts, too. Another
- important point is the tree view which allows to browse and edit LDAP objects directly.
+ The next major release, LAM 0.5, will have fewer restrictions and support the latest Samba features
+ (e.g., logon hours). The new plugin-based architecture also allows management of much more different
+ account types like plain UNIX accounts. The upload can now handle groups and hosts, too. Another
+ important point is the tree view which allows browsing and editing LDAP objects directly.
</para>
<example id="lamcfg">
@@ -1419,7 +1419,7 @@ drw-rw-r-- 2 bobj Domain Users 12346 Dec 18 18:11 maryvfile.txt
<title>Microsoft Access</title>
<para>
- The best advice that can be given is to carefully read the Microsoft knowledge base articles that
+ The best advice that can be given is to carefully read the Microsoft knowledgebase articles that
cover this area. Examples of relevant documents include:
</para>