Merge branch 'maint'

4 files changed, 33 insertions, 33 deletions

diff --git a/INSTALL-WIN32.md b/INSTALL-WIN32.md
index 93b7e3a1e1..4e14c6fee4 100644
--- a/INSTALL-WIN32.md
+++ b/INSTALL-WIN32.md
@@ -211,10 +211,10 @@ Frequently Asked Questions
     A: For Cygwin and Msys alike, we try to use the latest releases
     available when building. What versions you use shouldn't really
     matter, I try to include workarounds for the bugs I've found in
-    different Cygwin/Msys releases, please help me to add workarounds
+    different Cygwin/Msys releases, please help me add workarounds
     for new Cygwin/Msys-related bugs as soon as you encounter
     them. Also please do submit bug reports to the appropriate Cygwin
-    adn/or Msys developers. The GCC we used for %OTP-REL% was version
+    and/or Msys developers. The GCC we used for %OTP-REL% was version
     4.7.0 (MinGW 64bit) and 4.3.4 (Cygwin 32bit). We used VC++ 10.0
     (i.e. Visual studio 2010), Sun's JDK 1.5.0\_17 (32bit) and Sun's
     JDK 1.7.0\_1 (64bit), NSIS 2.46, and Win32 OpenSSL 0.9.8r. Please
@@ -291,7 +291,7 @@ OpenSSL. Well' here's the list:
     used but Sun's Java compiler and virtual machine...
 
     If you are going to build a 64bit Windows version, you should make
-    sure to get MinGWs 64bit gcc installed with cygwin. It's in one of
+    sure to get MinGW's 64bit gcc installed with cygwin. It's in one of
     the development packages.
 
     URL: <http://www.cygwin.com>
@@ -428,7 +428,7 @@ OpenSSL. Well' here's the list:
     e.g. `C:\Program`, they might still reside in `C:\Program Files`
     in reality...
 
-    If you are building a 64 bit verision of Erlang, you should set up
+    If you are building a 64 bit version of Erlang, you should set up
     PATHs etc a little differently. I use the following script to
     make things work in both Cygwin and Msys:
 
@@ -977,7 +977,7 @@ URL:<http://code.google.com/p/msysgit/>
 
 that makes a nice Git port. The msys prompt you get from MsysGIT is
 however not compatible with the full version from MinGW, so you will
-need to check out files using MsysGITs command prompt and then switch
+need to check out files using MsysGIT's command prompt and then switch
 to a common Msys command prompt for building. Also all test suites
 cannot be built as MsysGIT/Msys does not handle symbolic links. To
 build test suites on Windows, you will need Cygwin for now. Hopefully
@@ -1002,11 +1002,11 @@ deserved.
 
 Of course this would have been completely impossible without the
 excellent Cygwin. The guys at Cygnus solutions and
-Redhat deserves a huge THANKS! as well as all the other people in the
+Redhat deserve a huge THANKS! as well as all the other people in the
 free software community who have helped in creating the magnificent
 software that constitutes Cygwin.
 
-Also the people developing the alternative command prompt Msys anfd
+Also the people developing the alternative command prompt Msys and
 the MinGW compiler are worth huge THANKS! The 64bit port would have
 been impossible without the 64bit MinGW compiler.
 
diff --git a/erts/doc/src/driver.xml b/erts/doc/src/driver.xml
index ac5729880d..52283879c7 100644
--- a/erts/doc/src/driver.xml
+++ b/erts/doc/src/driver.xml
@@ -31,7 +31,7 @@
 
   <note><p>This document was written a long time ago. A lot of it is still
            interesting since it explains important concepts, but it was
-	   written for an older driver interface so the examples does not
+	   written for an older driver interface so the examples do not
 	   work anymore. The reader is encouraged to read
 	   <seealso marker="erl_driver">erl_driver</seealso> and the
 	   <seealso marker="driver_entry">driver_entry</seealso> documentation.
diff --git a/erts/doc/src/erl_driver.xml b/erts/doc/src/erl_driver.xml
index b5df4ca0c8..4fd74b783e 100644
--- a/erts/doc/src/erl_driver.xml
+++ b/erts/doc/src/erl_driver.xml
@@ -43,8 +43,8 @@
       to the runtime system at driver initialization, and some new
       driver API functions.      </p>
     <note>
-      <p>As of erts version 5.9 old drivers has to be recompiled
-      and has to use the extended interface. They also has to be
+      <p>As of erts version 5.9 old drivers have to be recompiled
+      and have to use the extended interface. They also have to be
       adjusted to the
       <seealso marker="#rewrites_for_64_bits">64-bit capable driver interface.
       </seealso>
@@ -283,7 +283,7 @@
 	  called return garbage sizes to the emulator causing it
 	  to read random memory and create huge incorrect result blobs.</p>
 	<p>Therefore it is not enough to just recompile drivers written with
-	  version management for pre-R15B types; the types has to be changed
+	  version management for pre-R15B types; the types have to be changed
 	  in the driver suggesting other rewrites especially regarding
 	  size variables. Investigate all warnings when recompiling!</p>
 	<p>Also, the API driver functions <c>driver_output*</c>,
@@ -356,19 +356,19 @@
 	<p>
 	  Driver callback
 	  <c><seealso marker="driver_entry#output">output</seealso></c>
-	  now gets <c>ErlDrvSizeT</c> as 3:rd argument instead
+	  now gets <c>ErlDrvSizeT</c> as 3rd argument instead
 	  of previously <c>int</c>.
 	</p>
 	<p>
 	  Driver callback
 	  <c><seealso marker="driver_entry#control">control</seealso></c>
-	  now gets <c>ErlDrvSizeT</c> as 4:th and 6:th arguments instead
+	  now gets <c>ErlDrvSizeT</c> as 4th and 6th arguments instead
 	  of previously <c>int</c>.
 	</p>
 	<p>
 	  Driver callback
 	  <c><seealso marker="driver_entry#call">call</seealso></c>
-	  now gets <c>ErlDrvSizeT</c> as 4:th and 6:th arguments instead
+	  now gets <c>ErlDrvSizeT</c> as 4th and 6th arguments instead
 	  of previously <c>int</c>.
 	</p>
 	<p>
@@ -410,54 +410,54 @@
       <tag>Arguments and return values in the driver API</tag>
       <item>
 	<p>
-	  Many driver API functions has changed argument type
+	  Many driver API functions have changed argument type
 	  and/or return value to <c>ErlDrvSizeT</c> from mostly <c>int</c>.
 	  Automatic type casting probably makes these changes necessary only
 	  for a driver that encounters sizes larger than 32 bits.
 	</p>
 	<taglist>
 	  <tag><seealso marker="#driver_output">driver_output</seealso></tag>
-	  <item>3:rd argument</item>
+	  <item>3rd argument</item>
 	  <tag><seealso marker="#driver_output2">driver_output2</seealso></tag>
-	  <item>3:rd and 5:th arguments</item>
+	  <item>3rd and 5th arguments</item>
 	  <tag>
 	  <seealso marker="#driver_output_binary">driver_output_binary</seealso>
 	  </tag>
-	  <item>3:rd 5:th and 6:th arguments</item>
+	  <item>3rd 5th and 6th arguments</item>
 	  <tag><seealso marker="#driver_outputv">driver_outputv</seealso></tag>
-	  <item>3:rd and 5:th arguments</item>
+	  <item>3rd and 5th arguments</item>
 	  <tag>
 	  <seealso marker="#driver_vec_to_buf">driver_vec_to_buf</seealso>
 	  </tag>
-	  <item>3:rd argument and return value</item>
+	  <item>3rd argument and return value</item>
 	  <tag><seealso marker="#driver_alloc">driver_alloc</seealso></tag>
-	  <item>1:st argument</item>
+	  <item>1st argument</item>
 	  <tag><seealso marker="#driver_realloc">driver_realloc</seealso></tag>
-	  <item>2:nd argument</item>
+	  <item>2nd argument</item>
 	  <tag>
 	  <seealso marker="#driver_alloc_binary">driver_alloc_binary</seealso>
 	  </tag>
-	  <item>1:st argument</item>
+	  <item>1st argument</item>
 	  <tag>
 	  <seealso marker="#driver_realloc_binary">driver_realloc_binary</seealso>
 	  </tag>
-	  <item>2:nd argument</item>
+	  <item>2nd argument</item>
 	  <tag><seealso marker="#driver_enq">driver_enq</seealso></tag>
-	  <item>3:rd argument</item>
+	  <item>3rd argument</item>
 	  <tag><seealso marker="#driver_pushq">driver_pushq</seealso></tag>
-	  <item>3:rd argument</item>
+	  <item>3rd argument</item>
 	  <tag><seealso marker="#driver_deq">driver_deq</seealso></tag>
-	  <item>2:nd argument and return value</item>
+	  <item>2nd argument and return value</item>
 	  <tag><seealso marker="#driver_sizeq">driver_sizeq</seealso></tag>
 	  <item>return value</item>
 	  <tag><seealso marker="#driver_enq_bin">driver_enq_bin</seealso></tag>
-	  <item>3:rd and 4:th argument</item>
+	  <item>3rd and 4th argument</item>
 	  <tag><seealso marker="#driver_pushq_bin">driver_pushq_bin</seealso></tag>
-	  <item>3:rd and 4:th argument</item>
+	  <item>3rd and 4th argument</item>
 	  <tag><seealso marker="#driver_enqv">driver_enqv</seealso></tag>
-	  <item>3:rd argument</item>
+	  <item>3rd argument</item>
 	  <tag><seealso marker="#driver_pushqv">driver_pushqv</seealso></tag>
-	  <item>3:rd argument</item>
+	  <item>3rd argument</item>
 	  <tag><seealso marker="#driver_peekqv">driver_peekqv</seealso></tag>
 	  <item>return value</item>
 	</taglist>
diff --git a/lib/common_test/doc/src/getting_started_chapter.xml b/lib/common_test/doc/src/getting_started_chapter.xml
index 05e21241cb..7919edd183 100644
--- a/lib/common_test/doc/src/getting_started_chapter.xml
+++ b/lib/common_test/doc/src/getting_started_chapter.xml
@@ -90,7 +90,7 @@
     <p>As you can understand from the illustration above, Common Test requires
       that a test case generates a runtime error to indicate failure (e.g.
       by causing a bad match error or by calling <c>exit/1</c>, preferrably
-      through the <c>ct:fail/1/2</c> help function). A succesful execution is
+      through the <c>ct:fail/1,2</c> help function). A succesful execution is
       indicated by means of a normal return from the test case function.
     </p>
     </section>
@@ -198,7 +198,7 @@
     <pre>
       1> ct:run_test([{suite, "check_log_SUITE"}]).</pre>
     <p>
-      The result from running our test is printed in log files on HTML format
+      The result from running our test is printed in log files in HTML format
       (stored in unique log directories on different level). This illustration
       shows the log file structure:
     </p>