Merge branch 'dev' into major

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.
 

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.
 

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>