mega-merge from 2.2

(This used to be commit c76bf8ed3275e217d1b691879153fe9137bcbe38)

1 files changed, 4 insertions, 4 deletions

diff --git a/docs/htmldocs/CVS-Access.html b/docs/htmldocs/CVS-Access.html
index ea47cede04..1329433f1a 100644
--- a/docs/htmldocs/CVS-Access.html
+++ b/docs/htmldocs/CVS-Access.html
@@ -19,7 +19,7 @@ CLASS="TITLEPAGE"
 ><H1
 CLASS="TITLE"
 ><A
-NAME="AEN1"
+NAME="CVS-ACCESS"
 >HOWTO Access Samba source code via CVS</A
 ></H1
 ><HR></DIV
@@ -32,10 +32,10 @@ NAME="AEN3"
 >Introduction</A
 ></H1
 ><P
->Samba is developed in an open environnment.  Developers use CVS
+>Samba is developed in an open environment.  Developers use CVS
 (Concurrent Versioning System) to "checkin" (also known as 
 "commit") new source code.  Samba's various CVS branches can
-be accessed via anonymouns CVS using the instructions
+be accessed via anonymous CVS using the instructions
 detailed in this chapter.</P
 ><P
 >This document is a modified version of the instructions found at
@@ -91,7 +91,7 @@ NAME="AEN16"
 >You can also access the source code via a 
 normal cvs client.  This gives you much more control over you can 
 do with the repository and allows you to checkout whole source trees 
-and keep them uptodate via normal cvs commands. This is the 
+and keep them up to date via normal cvs commands. This is the 
 preferred method of access if you are a developer and not
 just a casual browser.</P
 ><P