From ee205b29f7a2bb92aeef55ca88fccc8c91f22ec0 Mon Sep 17 00:00:00 2001
From: Hans Bolinder This operation behaves almost like the
Currently, it is not possible to use this operation when the target object represents FTP.
diff --git a/lib/erl_interface/doc/src/erl_format.xml b/lib/erl_interface/doc/src/erl_format.xml index 5699485845..f036b12879 100644 --- a/lib/erl_interface/doc/src/erl_format.xml +++ b/lib/erl_interface/doc/src/erl_format.xml @@ -4,7 +4,7 @@If
- 1997 2009
+ 1997 2011
Ericsson AB. All Rights Reserved.
@@ -170,7 +170,6 @@ Phases [{Phase,PhaseArgs}] undefined
start phase defined by the start_phases key, and only
after this extended start procedure will
application:start(Application) return.
-
Start phases may be used to synchronize startup of an
application and its included applications. In this case,
the mod key must be specified as:
@@ -182,7 +181,6 @@ Phases [{Phase,PhaseArgs}] undefined
for the primary application) both for the primary application
and for each of its included application, for which the start
phase is defined.
-
This implies that for an included application, the set of
start phases must be a subset of the set of phases defined
for the primary application. Refer to OTP Design Principles for more information.
diff --git a/lib/kernel/doc/src/code.xml b/lib/kernel/doc/src/code.xml
index 98cdd416b0..6b89711924 100644
--- a/lib/kernel/doc/src/code.xml
+++ b/lib/kernel/doc/src/code.xml
@@ -177,9 +177,9 @@
archives. But the functions in erl_prim_loader may also be
used by other applications to read files from archives. For
example, the call
- erl_prim_loader:list_dir("/otp/root/lib/mnesia-4.4.7.ez/mnesia-4.4.7/examples/bench)"
+ erl_prim_loader:list_dir( "/otp/root/lib/mnesia-4.4.7.ez/mnesia-4.4.7/examples/bench)"
would list the contents of a directory inside an archive.
- See erl_prim_loader(3)
+ See erl_prim_loader(3) .
An application archive file and a regular application directory
may coexist. This may be useful when there is a need of having
diff --git a/lib/kernel/doc/src/disk_log.xml b/lib/kernel/doc/src/disk_log.xml
index 9721907162..d278d54d93 100644
--- a/lib/kernel/doc/src/disk_log.xml
+++ b/lib/kernel/doc/src/disk_log.xml
@@ -475,8 +475,7 @@
Close a disk log.
-
-The function close/1 closes a
+
The function close/1 closes a
local or distributed disk log properly. An internally
formatted log must be closed before the Erlang system is
stopped, otherwise the log is regarded as unclosed and the
diff --git a/lib/kernel/doc/src/erl_ddll.xml b/lib/kernel/doc/src/erl_ddll.xml
index f9514dda2f..1911fb628e 100644
--- a/lib/kernel/doc/src/erl_ddll.xml
+++ b/lib/kernel/doc/src/erl_ddll.xml
@@ -989,7 +989,7 @@
{ok, pending_driver} or {ok, pending_process} .
- The pending_driver MonitorOption is by far
+
The pending_driver MonitorOption is by far
the most useful and it has to be used to ensure that the
driver has really been unloaded and the ports closed
whenever the kill_ports option is used or the
diff --git a/lib/kernel/doc/src/file.xml b/lib/kernel/doc/src/file.xml
index 861c582211..7db20e6343 100644
--- a/lib/kernel/doc/src/file.xml
+++ b/lib/kernel/doc/src/file.xml
@@ -60,11 +60,13 @@
converted, why the Unicode mode for file names is not default on
systems having completely transparent file naming.
- As of R14B01, the most basic file handling modules
- (file , prim_file , filelib and
- filename ) accept raw file names, but the rest of OTP is not
- guaranteed to handle them, why Unicode file naming on systems
- where it is not default is still considered experimental.
+
+ As of R14B01, the most basic file handling modules
+ (file , prim_file , filelib and
+ filename ) accept raw file names, but the rest of OTP is not
+ guaranteed to handle them, why Unicode file naming on systems
+ where it is not default is still considered experimental.
+
Raw file names is a new feature in OTP R14B01, which allows the
user to supply completely uninterpreted file names to the
@@ -249,11 +251,9 @@
Example:
-
-f.txt: {person, "kalle", 25}.
+f.txt: {person, "kalle", 25}.
{person, "pelle", 30}.
-
-1> file:consult("f.txt").
+1> file:consult("f.txt").
{ok,[{person,"kalle",25},{person,"pelle",30}]}
@@ -362,7 +362,6 @@ f.txt: {person, "kalle", 25}.
In a future release, a bad type for the
Filename argument will probably generate
an exception.
-
@@ -1523,7 +1522,6 @@ f.txt: {person, "kalle", 25}.
In a future release, a bad type for the
Dir
argument will probably generate an exception.
-
diff --git a/lib/kernel/doc/src/gen_sctp.xml b/lib/kernel/doc/src/gen_sctp.xml
index cc49090386..688cd0f78f 100644
--- a/lib/kernel/doc/src/gen_sctp.xml
+++ b/lib/kernel/doc/src/gen_sctp.xml
@@ -47,8 +47,7 @@
SUSE Linux Enterprise Server 10 Service Pack 1 (x86_64)
kernel 2.6.16.54-0.2.3-smp with lksctp-tools-1.0.7.
Record definitions for the gen_sctp module can be found using:
-
- -include_lib("kernel/include/inet_sctp.hrl").
+ -include_lib("kernel/include/inet_sctp.hrl").
These record definitions use the "new" spelling 'adaptation',
not the deprecated 'adaption', regardless of which
spelling the underlying C API uses.
@@ -152,8 +151,7 @@
The result of connect/* is an #sctp_assoc_change{}
event which contains, in particular, the new
Association ID .
-
- #sctp_assoc_change{
+ #sctp_assoc_change{
state = atom(),
error = atom(),
outbound_streams = integer(),
@@ -163,8 +161,7 @@
The number of outbound and inbound streams can be set by
giving an sctp_initmsg option to connect
as in:
-
- connect(Socket , Ip, Port ,
+ connect(Socket , Ip, Port ,
[{sctp_initmsg,#sctp_initmsg{num_ostreams=OutStreams,
max_instreams=MaxInStreams}}])
All options Opt are set on the socket before the
@@ -340,8 +337,7 @@
#sctp_assoc_change{} ;
-
-
- #sctp_paddr_change{
+ #sctp_paddr_change{
addr = {ip_address(),port()},
state = atom(),
error = integer(),
@@ -378,8 +374,7 @@
converted into a string using error_string/1 .
-
-
- #sctp_send_failed{
+ #sctp_send_failed{
flags = true | false,
error = integer(),
info = #sctp_sndrcvinfo{},
@@ -399,8 +394,7 @@
returned by recv/* .
-
-
- #sctp_adaptation_event{
+ #sctp_adaptation_event{
adaptation_ind = integer(),
assoc_id = assoc_id()
}
@@ -411,8 +405,7 @@
the Erlang/SCTP binding, this event is disabled by default.
-
-
- #sctp_pdapi_event{
+ #sctp_pdapi_event{
indication = sctp_partial_delivery_aborted,
assoc_id = assoc_id()
}
@@ -469,7 +462,7 @@
- {mode, list|binary} or just list or binary .
+ {mode, list|binary} or just list or binary
-
Determines the type of data returned from gen_sctp:recv/1,2 .
@@ -562,8 +555,7 @@
{sctp_rtoinfo, #sctp_rtoinfo{}}
-
-
- #sctp_rtoinfo{
+ #sctp_rtoinfo{
assoc_id = assoc_id(),
initial = integer(),
max = integer(),
@@ -577,8 +569,7 @@
{sctp_associnfo, #sctp_assocparams{}}
-
-
- #sctp_assocparams{
+ #sctp_assocparams{
assoc_id = assoc_id(),
asocmaxrxt = integer(),
number_peer_destinations = integer(),
@@ -593,8 +584,7 @@
{sctp_initmsg, #sctp_initmsg{}}
-
-
- #sctp_initmsg{
+ #sctp_initmsg{
num_ostreams = integer(),
max_instreams = integer(),
max_attempts = integer(),
@@ -622,7 +612,6 @@
for establishing an association.
-
{sctp_autoclose, integer() >= 0}
-
@@ -657,8 +646,7 @@
{sctp_primary_addr, #sctp_prim{}}
-
-
- #sctp_prim{
+ #sctp_prim{
assoc_id = assoc_id(),
addr = {IP, Port}
}
@@ -671,8 +659,7 @@
{sctp_set_peer_primary_addr, #sctp_setpeerprim{}}
-
-
- #sctp_setpeerprim{
+ #sctp_setpeerprim{
assoc_id = assoc_id(),
addr = {IP, Port}
}
@@ -686,8 +673,7 @@
{sctp_adaptation_layer, #sctp_setadaptation{}}
-
-
- #sctp_setadaptation{
+ #sctp_setadaptation{
adaptation_ind = integer()
}
When set, requests that the local endpoint uses the value given by
@@ -698,8 +684,7 @@
{sctp_peer_addr_params, #sctp_paddrparams{}}
-
-
- #sctp_paddrparams{
+ #sctp_paddrparams{
assoc_id = assoc_id(),
address = {IP, Port},
hbinterval = integer(),
@@ -756,16 +741,13 @@
sackdelay_disable : disable SAC delay.
-
-
{sctp_default_send_param, #sctp_sndrcvinfo{}}
-
-
- #sctp_sndrcvinfo{
+ #sctp_sndrcvinfo{
stream = integer(),
ssn = integer(),
flags = list(),
@@ -807,20 +789,17 @@
association, with flushing of unsent data.
-
Other fields are rarely used. See
RFC2960 and
Sockets API Extensions for SCTP for full information.
-
{sctp_events, #sctp_event_subscribe{}}
-
-
- #sctp_event_subscribe{
+ #sctp_event_subscribe{
data_io_event = true | false,
association_event = true | false,
address_event = true | false,
@@ -845,8 +824,7 @@
{sctp_delayed_ack_time, #sctp_assoc_value{}}
-
-
- #sctp_assoc_value{
+ #sctp_assoc_value{
assoc_id = assoc_id(),
assoc_value = integer()
}
@@ -857,8 +835,7 @@
{sctp_status, #sctp_status{}}
-
-
- #sctp_status{
+ #sctp_status{
assoc_id = assoc_id(),
state = atom(),
rwnd = integer(),
@@ -930,14 +907,12 @@
address (see below for the format of #sctp_paddrinfo{} ).
-
{sctp_get_peer_addr_info, #sctp_paddrinfo{}}
-
-
- #sctp_paddrinfo{
+ #sctp_paddrinfo{
assoc_id = assoc_id(),
address = {IP, Port},
state = inactive | active,
@@ -968,8 +943,7 @@
-
Example of an Erlang SCTP Server which receives SCTP messages and
prints them on the standard output:
-
- -module(sctp_server).
+ -module(sctp_server).
-export([server/0,server/1,server/2]).
-include_lib("kernel/include/inet.hrl").
@@ -998,7 +972,6 @@
io:format("Received: ~p~n", [Data])
end,
server_loop(S).
-
-
Example of an Erlang SCTP Client which interacts with the above Server.
@@ -1008,8 +981,7 @@
over Stream 5 fails. The client then abort s the association,
which results in the corresponding Event being received on
the Server side.
-
- -module(sctp_client).
+ -module(sctp_client).
-export([client/0, client/1, client/2]).
-include_lib("kernel/include/inet.hrl").
@@ -1042,13 +1014,11 @@
timer:sleep(1000),
gen_sctp:close(S).
-
-
A very simple Erlang SCTP Client which uses the
connect_init API.
-
--module(ex3).
+-module(ex3).
-export([client/4]).
-include_lib("kernel/include/inet.hrl").
@@ -1101,7 +1071,6 @@ client_loop(S, Peer1, Port1, AssocId1, Peer2, Port2, AssocId2) ->
ok
end.
-
diff --git a/lib/kernel/doc/src/net_kernel.xml b/lib/kernel/doc/src/net_kernel.xml
index 96e2aa665d..3b7a710664 100644
--- a/lib/kernel/doc/src/net_kernel.xml
+++ b/lib/kernel/doc/src/net_kernel.xml
@@ -37,13 +37,10 @@
monitoring of the network.
An Erlang node is started using the command line flag
-name or -sname :
-
-$ erl -sname foobar
+$ erl -sname foobar
It is also possible to call net_kernel:start([foobar])
directly from the normal Erlang shell prompt:
-
-
-1> net_kernel:start([foobar, shortnames]).
+1> net_kernel:start([foobar, shortnames]).
{ok,<0.64.0>}
(foobar@gringotts)2>
If the node is started with the command line flag -sname ,
@@ -226,7 +223,6 @@ $ erl -sname foobar
NetTicktime seconds. TransitionPeriod defaults
to 60.
Some definitions:
-
The minimum transition traffic interval (MTTI )
-
diff --git a/lib/megaco/doc/src/megaco.xml b/lib/megaco/doc/src/megaco.xml
index b9bf414299..5dd622368c 100644
--- a/lib/megaco/doc/src/megaco.xml
+++ b/lib/megaco/doc/src/megaco.xml
@@ -4,7 +4,7 @@
- 2000 2010
+ 2000 2011
Ericsson AB. All Rights Reserved.
@@ -646,7 +646,7 @@ megaco_incr_timer() = #megaco_incr_timer{}
segments has not yet been received.
When the timer finally expires, a "megaco segments not
received" (459) error message is sent to the other side
- and the user is notified with a in either the
+ and the user is notified with a in either the
handle_trans_reply callback function or
the return value of the
call function.
@@ -1165,7 +1165,7 @@ megaco_incr_timer() = #megaco_incr_timer{}
When the timer finally expires, a "megaco segments not
received" (459) error message is sent to the other side
and the user is notified with a
- in either the
+ in either the
handle_trans_reply
callback function or
the return value of the
diff --git a/lib/mnesia/doc/src/mnesia.xml b/lib/mnesia/doc/src/mnesia.xml
index 7a8f796cee..19ec70118f 100644
--- a/lib/mnesia/doc/src/mnesia.xml
+++ b/lib/mnesia/doc/src/mnesia.xml
@@ -246,7 +246,7 @@ If a new item is inserted with the same key as
-
-
{max,MaxTabs} MaxTabs is a list of
+
{max,MaxTabs} . MaxTabs is a list of
tables that should be included in the checkpoint. The
default is []. For these tables, the redundancy will be
maximized and checkpoint information will be retained together
@@ -274,7 +274,7 @@ If a new item is inserted with the same key as
-
-
{ram_overrides_dump,Bool} Only applicable
+
{ram_overrides_dump,Bool} . Only applicable
for ram_copies . Bool allows you to choose
to backup the table state as it is in RAM, or as it is on
disc. true means that the latest committed
diff --git a/lib/mnesia/doc/src/mnesia_frag_hash.xml b/lib/mnesia/doc/src/mnesia_frag_hash.xml
index 73162c3974..665796f20d 100644
--- a/lib/mnesia/doc/src/mnesia_frag_hash.xml
+++ b/lib/mnesia/doc/src/mnesia_frag_hash.xml
@@ -64,7 +64,7 @@
Note that the add_frag/2 function will be invoked
one time each for the rest of the fragments (all but number 1)
as a part of the table creation procedure.
- State is the initial value of the hash_state frag_property . The NewState will be stored as
+
State is the initial value of the hash_state frag_property . The NewState will be stored as
hash_state among the other frag_properties .
diff --git a/lib/odbc/doc/src/odbc.xml b/lib/odbc/doc/src/odbc.xml
index 11ca97f743..8a58dc2848 100644
--- a/lib/odbc/doc/src/odbc.xml
+++ b/lib/odbc/doc/src/odbc.xml
@@ -4,7 +4,7 @@
- 1999 2010
+ 1999 2011
Ericsson AB. All Rights Reserved.
@@ -138,7 +138,7 @@
Opens a connection to the database.
ConnectStr = string()
- An example of a connection string:"DSN=sql-server;UID=aladdin;PWD=sesame" where DSN is your ODBC Data Source Name, UID is a database user id and PWD is the password for that user. These are usually the attributes required in the connection string, but some drivers have other driver specific attributes, for example"DSN=Oracle8;DBQ=gandalf;UID=aladdin;PWD=sesame" where DBQ is your TNSNAMES.ORA entry name e.g. some Oracle specific configuration attribute.
+ An example of a connection string: "DSN=sql-server;UID=aladdin;PWD=sesame" where DSN is your ODBC Data Source Name, UID is a database user id and PWD is the password for that user. These are usually the attributes required in the connection string, but some drivers have other driver specific attributes, for example "DSN=Oracle8;DBQ=gandalf;UID=aladdin;PWD=sesame" where DBQ is your TNSNAMES.ORA entry name e.g. some Oracle specific configuration attribute.
Options = [] | [option()]
All options has default values.
option() = {auto_commit, on | off} | {timeout, milliseconds()}
@@ -432,7 +432,7 @@
Selects N consecutive rows of the result set. If
Position is next it is semantically equivalent
- of calling next/[1,2] N times. If
+ of calling next/[1,2] N times. If
Position is {relative, Pos} , Pos will be
used as an offset from the current cursor position to
determine the first selected row. If Position is
diff --git a/lib/orber/doc/src/orber_ifr.xml b/lib/orber/doc/src/orber_ifr.xml
index 021082e101..2d47d57476 100644
--- a/lib/orber/doc/src/orber_ifr.xml
+++ b/lib/orber/doc/src/orber_ifr.xml
@@ -4,7 +4,7 @@
- 1997 2009
+ 1997 2011
Ericsson AB. All Rights Reserved.
@@ -297,7 +297,7 @@
- describe_contents(Objref,Limit_type,Exclude_inherited,Max_returned_objs) -> Return
+ describe_contents(Objref, Limit_type, Exclude_inherited, Max_returned_objs) -> Return
Return a list of descriptions of the IFR objects contained by the target Container object
Objref = #IFR_objref
diff --git a/lib/parsetools/doc/src/yecc.xml b/lib/parsetools/doc/src/yecc.xml
index 1d2a985d7d..66bc6f4795 100644
--- a/lib/parsetools/doc/src/yecc.xml
+++ b/lib/parsetools/doc/src/yecc.xml
@@ -4,7 +4,7 @@
- 1996 2009
+ 1996 2011
Ericsson AB. All Rights Reserved.
@@ -336,7 +336,7 @@ element -> list : '$1'.
{cons, {atom, 1, a,} {cons, {atom, 1, b},
{cons, {atom, 1, c}, nil}}}
- The associated code contains
The associated code contains
The default type -- and currently the only type -- of crypto
algorithm is The The The The The The The The The The If the The The If the The The The The By convention, the name of a tar file should end in " The The The The The The The The If the table never has been fixed, the call returns
-
+
Returns internal statistics about set, bag and duplicate_bag tables on an internal format used by OTP test suites.
- Not for production use.
If the table is of type
This limitation has now been properly documented and the
behavior of the
Several other changes have also been included:
-The new
A supervisor can have one of the following restart strategies:
Same as
Same as
Same as
This example illustrates how to print out "Hello World!" in 5 seconds:
-1> timer:apply_after(5000, io, format, ["~nHello World!~n", []]). {ok,TRef} diff --git a/lib/stdlib/doc/src/zip.xml b/lib/stdlib/doc/src/zip.xml index b03fc7f4e2..cf0d581352 100644 --- a/lib/stdlib/doc/src/zip.xml +++ b/lib/stdlib/doc/src/zip.xml @@ -243,12 +243,10 @@Extract files from a zip archive - The
+- unzip/1 function extracts - all files from a zip archive. The -- unzip/2 function provides options - to extract some files, and more.The
unzip/1 function extracts + all files from a zip archive. + Theunzip/2 function provides + options to extract some files, and more.If the
@@ -413,8 +411,8 @@argument is given as a binary, the contents of the binary is assumed to be a zip archive, otherwise it should be a filename. Archive Open an archive and return a handle to it - The
- zip_open function opens a +The
@@ -436,8 +434,7 @@zip_open function + opens a zip archive, and reads and saves its directory. This means that subsequently reading files from the archive will be faster than unzipping files one at a time withunzip .Extract files from an open archive - The
- zip_get function extracts +The
zip_get function extracts one or all files from an open archive.The files will be unzipped to memory or to file, depending on the options given to the
zip_open function when the @@ -448,9 +445,8 @@Close an open archive - diff --git a/lib/test_server/doc/src/ts.xml b/lib/test_server/doc/src/ts.xml index 496ad3667a..f9b48d8372 100644 --- a/lib/test_server/doc/src/ts.xml +++ b/lib/test_server/doc/src/ts.xml @@ -77,7 +77,7 @@The
- zip_close/1 function closes - a zip archive, previously opened withzip_open . All +The
zip_close/1 function + closes a zip archive, previously opened withzip_open . All resources are closed, and the handle should not be used after closing.%%
ts:install/0 is used if the target platform is the same as the controller host, i.e. if you run on "local target" - and no options are needed. Then runningts:install/0 ts + and no options are needed. Then runningts:install/0 ts will run an autoconf script for your current environment and set up the necessary variables needed by the test suites. diff --git a/lib/wx/src/gen/wxRegion.erl b/lib/wx/src/gen/wxRegion.erl index 0ceba1d203..4e8d98a54f 100644 --- a/lib/wx/src/gen/wxRegion.erl +++ b/lib/wx/src/gen/wxRegion.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2010. All Rights Reserved. +%% Copyright Ericsson AB 2008-2011. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -48,7 +48,7 @@ new() -> %% new(Bmp::wxBitmap:wxBitmap()) -> wxRegion() %%new(#wx_ref{type=BmpT,ref=BmpRef}) -> ?CLASS(BmpT,wxBitmap), diff --git a/lib/wx/src/gen/wxWindow.erl b/lib/wx/src/gen/wxWindow.erl index 33665a0ad6..031314bfe2 100644 --- a/lib/wx/src/gen/wxWindow.erl +++ b/lib/wx/src/gen/wxWindow.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2010. All Rights Reserved. +%% Copyright Ericsson AB 2008-2011. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -1144,10 +1144,10 @@ setCaret(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=CaretT,ref=CaretRef}) -> %% @doc See external documentation. %%
-%% new(Rect::{X::integer(),Y::integer(),W::integer(),H::integer()}) -> wxRegion() +%% new(Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}) -> wxRegion() %%
Alternatives: %%%%
-%% setClientSize(This::wxWindow(), Size::{W::integer(),H::integer()}) -> ok +%% setClientSize(This::wxWindow(), Size::{W::integer(), H::integer()}) -> ok %%setClientSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH}) when is_integer(SizeW),is_integer(SizeH) -> -- cgit v1.2.3
-%% setClientSize(This::wxWindow(), Rect::{X::integer(),Y::integer(),W::integer(),H::integer()}) -> ok +%% setClientSize(This::wxWindow(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}) -> ok %%