From 7cdb7fea00c360bc93e6a4ba1c7932bc92008dd8 Mon Sep 17 00:00:00 2001 From: Tuncer Ayaz Date: Thu, 15 Dec 2011 00:00:20 +0100 Subject: Fix typos in INSTALL-WIN32.md --- INSTALL-WIN32.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/INSTALL-WIN32.md b/INSTALL-WIN32.md index 1e5e1f45fa..acb5a6b0ab 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: @@ -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: @@ -971,7 +971,7 @@ URL: 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 @@ -996,11 +996,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. -- cgit v1.2.3 From 1588a1d4c109bd9c800cec098d4fa48a4472003a Mon Sep 17 00:00:00 2001 From: Tuncer Ayaz Date: Thu, 15 Dec 2011 00:01:31 +0100 Subject: Fix typos in driver.xml and erl_driver.xml --- erts/doc/src/driver.xml | 2 +- erts/doc/src/erl_driver.xml | 46 ++++++++++++++++++++++----------------------- 2 files changed, 24 insertions(+), 24 deletions(-) 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 @@

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 erl_driver and the driver_entry 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.

-

As of erts version 5.9 old drivers has to be recompiled - and has to use the extended interface. They also has to be +

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 64-bit capable driver interface. @@ -283,7 +283,7 @@ called return garbage sizes to the emulator causing it to read random memory and create huge incorrect result blobs.

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!

Also, the API driver functions driver_output*, @@ -356,19 +356,19 @@

Driver callback output - now gets ErlDrvSizeT as 3:rd argument instead + now gets ErlDrvSizeT as 3rd argument instead of previously int.

Driver callback control - now gets ErlDrvSizeT as 4:th and 6:th arguments instead + now gets ErlDrvSizeT as 4th and 6th arguments instead of previously int.

Driver callback call - now gets ErlDrvSizeT as 4:th and 6:th arguments instead + now gets ErlDrvSizeT as 4th and 6th arguments instead of previously int.

@@ -410,54 +410,54 @@ Arguments and return values in the driver API

- Many driver API functions has changed argument type + Many driver API functions have changed argument type and/or return value to ErlDrvSizeT from mostly int. Automatic type casting probably makes these changes necessary only for a driver that encounters sizes larger than 32 bits.

driver_output - 3:rd argument + 3rd argument driver_output2 - 3:rd and 5:th arguments + 3rd and 5th arguments driver_output_binary - 3:rd 5:th and 6:th arguments + 3rd 5th and 6th arguments driver_outputv - 3:rd and 5:th arguments + 3rd and 5th arguments driver_vec_to_buf - 3:rd argument and return value + 3rd argument and return value driver_alloc - 1:st argument + 1st argument driver_realloc - 2:nd argument + 2nd argument driver_alloc_binary - 1:st argument + 1st argument driver_realloc_binary - 2:nd argument + 2nd argument driver_enq - 3:rd argument + 3rd argument driver_pushq - 3:rd argument + 3rd argument driver_deq - 2:nd argument and return value + 2nd argument and return value driver_sizeq return value driver_enq_bin - 3:rd and 4:th argument + 3rd and 4th argument driver_pushq_bin - 3:rd and 4:th argument + 3rd and 4th argument driver_enqv - 3:rd argument + 3rd argument driver_pushqv - 3:rd argument + 3rd argument driver_peekqv return value -- cgit v1.2.3 From 1eca92e381a3cdc10f801808894dabb4026c366f Mon Sep 17 00:00:00 2001 From: Tuncer Ayaz Date: Sat, 7 Jan 2012 11:52:33 +0100 Subject: Fix typos in ct getting_started_chapter.xml --- lib/common_test/doc/src/getting_started_chapter.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/common_test/doc/src/getting_started_chapter.xml b/lib/common_test/doc/src/getting_started_chapter.xml index 7de0912036..5b5f7475c9 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 @@

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 exit/1, preferrably - through the ct:fail/1/2 help function). A succesful execution is + through the ct:fail/1,2 help function). A succesful execution is indicated by means of a normal return from the test case function.

@@ -197,7 +197,7 @@ 
       1> ct:run_test([{suite, "check_log_SUITE"}]).

- 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:

-- cgit v1.2.3