diff options
| author | Henrik Nord <[email protected]> | 2011-08-29 17:00:27 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-08-29 17:00:27 +0200 |
| commit | b9ef73203a1b7f1400dc6d302827d7d732bab3f4 (patch) | |
| tree | a79609f9fb8f369cc8b414dadb91a8052cdd8176 | |
| parent | efc604ee01ce88ae2c18a640ef0adf90700848a4 (diff) | |
| parent | f94beb7788106a85a02bebcd6362a170248fa659 (diff) | |
| download | otp-b9ef73203a1b7f1400dc6d302827d7d732bab3f4.tar.gz otp-b9ef73203a1b7f1400dc6d302827d7d732bab3f4.tar.bz2 otp-b9ef73203a1b7f1400dc6d302827d7d732bab3f4.zip | |
Merge branch 'dev' into major
| -rw-r--r-- | INSTALL.md | 2 | ||||
| -rw-r--r-- | lib/odbc/test/odbc_data_type_SUITE.erl | 6 | ||||
| -rw-r--r-- | lib/stdlib/doc/src/gen_fsm.xml | 6 |
3 files changed, 6 insertions, 8 deletions
diff --git a/INSTALL.md b/INSTALL.md index 8e3a49472c..8a3b71e4ec 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/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. diff --git a/lib/stdlib/doc/src/gen_fsm.xml b/lib/stdlib/doc/src/gen_fsm.xml index 4900a8f0ef..e35b5adace 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> > | {next_state,NextStateName,NewStateData,Timeout}</v> - <v> > | {next_state,NextStateName,NewStateData,hibernate}</v> - <v> > | {stop,Reason,NewStateData}</v> + <v> | {next_state,NextStateName,NewStateData,Timeout}</v> + <v> | {next_state,NextStateName,NewStateData,hibernate}</v> + <v> | {stop,Reason,NewStateData}</v> <v> NextStateName = atom()</v> <v> NewStateData = term()</v> <v> Timeout = int()>0 | infinity</v> |