From 217f907da97aa8f4c59a5dd60820e0dc72c9c660 Mon Sep 17 00:00:00 2001
From: Matthias Lang <matthias@corelatus.com>
Date: Tue, 21 Jun 2011 13:04:05 +0200
Subject: Fix trivial documentation errors

---
 INSTALL.md                     | 2 +-
 lib/stdlib/doc/src/gen_fsm.xml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/INSTALL.md b/INSTALL.md
index 1061c5187a..dd7650f0d1 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -27,7 +27,7 @@ on Unix. For detailed instructions on how to
     Binary releases for Windows can be found at
     <http://www.erlang.org/download.html>.
 
-Before reading the above mensioned documents you are in any case advised to
+Before reading the above mentioned documents you are in any case advised to
 read this document first, since it covers building Erlang/OTP in general as
 well as other important information.
 
diff --git a/lib/stdlib/doc/src/gen_fsm.xml b/lib/stdlib/doc/src/gen_fsm.xml
index d15383c621..ed652f04fb 100644
--- a/lib/stdlib/doc/src/gen_fsm.xml
+++ b/lib/stdlib/doc/src/gen_fsm.xml
@@ -639,9 +639,9 @@ gen_fsm:sync_send_all_state_event -----> Module:handle_sync_event/4
         <v>StateName = atom()</v>
         <v>StateData = term()</v>
         <v>Result = {next_state,NextStateName,NewStateData}</v> 
-	<v>&nbsp;>&nbsp;| {next_state,NextStateName,NewStateData,Timeout}</v> 
-	<v>&nbsp;>&nbsp;| {next_state,NextStateName,NewStateData,hibernate}</v>
-        <v>&nbsp;>&nbsp;| {stop,Reason,NewStateData}</v>
+	<v>&nbsp;&nbsp;| {next_state,NextStateName,NewStateData,Timeout}</v>
+	<v>&nbsp;&nbsp;| {next_state,NextStateName,NewStateData,hibernate}</v>
+        <v>&nbsp;&nbsp;| {stop,Reason,NewStateData}</v>
         <v>&nbsp;NextStateName = atom()</v>
         <v>&nbsp;NewStateData = term()</v>
         <v>&nbsp;Timeout = int()>0 | infinity</v>
-- 
cgit v1.2.3


From edd9a067a5c38397558d99696404b98b400f96a3 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Fri, 26 Aug 2011 17:35:02 +0200
Subject: Skip utf8 test case on linux 64 due to old driver

When the test environment supports a newer Postgres driver,
(newer than psqlODBC 08.04.0200) the utf8 test case should work
as expected and can be enabled again.
---
 lib/odbc/test/odbc_data_type_SUITE.erl | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/odbc/test/odbc_data_type_SUITE.erl b/lib/odbc/test/odbc_data_type_SUITE.erl
index 323190dd99..d61a91f973 100644
--- a/lib/odbc/test/odbc_data_type_SUITE.erl
+++ b/lib/odbc/test/odbc_data_type_SUITE.erl
@@ -89,17 +89,15 @@ init_per_group(GroupName, Config) when GroupName == fixed_char;
     end;
 
 init_per_group(unicode, Config) ->
-    %% Uses parameterized queries
-    case {os:type(), erlang:system_info(wordsize)} of
+    case {os:type(), erlang:system_info({wordsize, external})} of
 	{{unix, _}, 4} ->
 	    Config;
 	{{unix, _}, _} ->
-	    {skip, "Not supported by driver"};
+	    {skip, "Postgres drivers pre version psqlODBC 08.04.0200 have utf8-problems"};
 	_ ->
 	    Config
     end;
 
-
 init_per_group(_GroupName, Config) ->
     Config.
 
-- 
cgit v1.2.3