From ee205b29f7a2bb92aeef55ca88fccc8c91f22ec0 Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Mon, 19 Sep 2011 15:36:08 +0200 Subject: Correct XML files --- .../src/CosFileTransfer_FileTransferSession.xml | 4 +- lib/erl_interface/doc/src/erl_format.xml | 4 +- lib/kernel/doc/src/app.xml | 4 +- lib/kernel/doc/src/code.xml | 4 +- lib/kernel/doc/src/disk_log.xml | 3 +- lib/kernel/doc/src/erl_ddll.xml | 2 +- lib/kernel/doc/src/file.xml | 20 +++--- lib/kernel/doc/src/gen_sctp.xml | 77 +++++++--------------- lib/kernel/doc/src/net_kernel.xml | 8 +-- lib/megaco/doc/src/megaco.xml | 6 +- lib/mnesia/doc/src/mnesia.xml | 4 +- lib/mnesia/doc/src/mnesia_frag_hash.xml | 2 +- lib/odbc/doc/src/odbc.xml | 6 +- lib/orber/doc/src/orber_ifr.xml | 4 +- lib/parsetools/doc/src/yecc.xml | 4 +- lib/stdlib/doc/src/beam_lib.xml | 1 - lib/stdlib/doc/src/dets.xml | 3 +- lib/stdlib/doc/src/erl_tar.xml | 60 ++++++++--------- lib/stdlib/doc/src/ets.xml | 15 ++--- lib/stdlib/doc/src/gb_sets.xml | 1 - lib/stdlib/doc/src/gen_fsm.xml | 3 +- lib/stdlib/doc/src/notes.xml | 3 +- lib/stdlib/doc/src/qlc.xml | 1 - lib/stdlib/doc/src/supervisor.xml | 1 - lib/stdlib/doc/src/timer.xml | 13 ++-- lib/stdlib/doc/src/zip.xml | 22 +++---- lib/test_server/doc/src/ts.xml | 2 +- lib/wx/src/gen/wxRegion.erl | 4 +- lib/wx/src/gen/wxWindow.erl | 6 +- 29 files changed, 116 insertions(+), 171 deletions(-) (limited to 'lib') diff --git a/lib/cosFileTransfer/doc/src/CosFileTransfer_FileTransferSession.xml b/lib/cosFileTransfer/doc/src/CosFileTransfer_FileTransferSession.xml index 5ac2c61c92..918f0bf9f7 100644 --- a/lib/cosFileTransfer/doc/src/CosFileTransfer_FileTransferSession.xml +++ b/lib/cosFileTransfer/doc/src/CosFileTransfer_FileTransferSession.xml @@ -159,7 +159,7 @@ insert(FTS, SourceFile, DestinationFile, Offset) -> Return - Insert the SourceFileinto the DestinationFileOffsetbytes from the start of the file + Insert the SourceFileinto the DestinationFile Offsetbytes from the start of the file FTS = SourceFile = DestinationFile = #objref Offset = long() @@ -168,7 +168,7 @@

This operation behaves almost like the append/3 operation. The difference is that the SourceFile will be inserted into the - DestinationFileOffset bytes from the start of the file.

+ DestinationFile Offset bytes from the start of the file.

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 @@
- 19962009 + 19962011 Ericsson AB. All Rights Reserved. @@ -105,7 +105,7 @@ erl_format("[{name,~a},{age,~i},{data,~w}]", values in .

If and can be matched, the function returns a non-zero value and binds any unbound - variables in . If do + variables in . If do not match, the function returns 0. For example:

- 19972009 + 19972011 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_driverMonitorOption 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 aborts 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 @@
- 20002010 + 20002011 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_statefrag_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 @@
- 19992010 + 19992011 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 @@

- 19972009 + 19972011 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 @@
- 19962009 + 19962011 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 pseudo variables'$1', '$2', '$3', etc. which refer to (are +

The associated code contains pseudo variables '$1', '$2', '$3', etc. which refer to (are bound to) the values associated previously by the parser with the symbols of the right hand side of the rule. When these symbols are terminal categories, the values are token tuples of diff --git a/lib/stdlib/doc/src/beam_lib.xml b/lib/stdlib/doc/src/beam_lib.xml index 013e94c393..db65eb3848 100644 --- a/lib/stdlib/doc/src/beam_lib.xml +++ b/lib/stdlib/doc/src/beam_lib.xml @@ -88,7 +88,6 @@ it is recommended that it contains at least 32 characters and that both upper and lower case letters as well as digits and special characters are used.

-

The default type -- and currently the only type -- of crypto algorithm is des3_cbc, three rounds of DES. The key string will be scrambled using erlang:md5/1 to generate diff --git a/lib/stdlib/doc/src/dets.xml b/lib/stdlib/doc/src/dets.xml index 54fefbe2b8..215ec154ed 100644 --- a/lib/stdlib/doc/src/dets.xml +++ b/lib/stdlib/doc/src/dets.xml @@ -1006,8 +1006,7 @@ ok Return a QLC query handle. -

- Returns a QLC (Query List +

Returns a QLC (Query List Comprehension) query handle. The module qlc implements a query language aimed mainly at Mnesia but Ets tables, Dets tables, and lists are also recognized by qlc diff --git a/lib/stdlib/doc/src/erl_tar.xml b/lib/stdlib/doc/src/erl_tar.xml index 929620bb88..fe166dbd01 100644 --- a/lib/stdlib/doc/src/erl_tar.xml +++ b/lib/stdlib/doc/src/erl_tar.xml @@ -4,7 +4,7 @@

- 20032009 + 20032011 Ericsson AB. All Rights Reserved. @@ -89,9 +89,8 @@ Reason = term() -

The -add/3 function adds a file to a tar file - that has been opened for writing by +

The add/3 function adds + a file to a tar file that has been opened for writing by open/1.

dereference @@ -138,8 +137,8 @@ TarDescriptor = term() -

The -close/1 function closes a tar file +

The close/1 function + closes a tar file opened by open/1.

@@ -151,11 +150,12 @@ FileList = [Filename|{NameInArchive, binary()},{NameInArchive, Filename}] Filename = filename() NameInArchive = filename() - RetValue = ok|{error,{Name,Reason}} <V>Reason = term() + RetValue = ok|{error,{Name,Reason}} + Reason = term() -

The -create/2 function creates a tar file and +

The create/2 function + creates a tar file and archives the files whose names are given in FileList into it. The files may either be read from disk or given as binaries.

@@ -171,11 +171,11 @@ NameInArchive = filename() OptionList = [Option] Option = compressed|cooked|dereference|verbose - RetValue = ok|{error,{Name,Reason}} <V>Reason = term() + RetValue = ok|{error,{Name,Reason}} + Reason = term() -

The -create/3 function +

The create/3 function creates a tar file and archives the files whose names are given in FileList into it. The files may either be read from disk or given as binaries.

@@ -220,9 +220,8 @@ Reason = term() -

The -extract/1 function extracts - all files from a tar archive.

+

The extract/1 function + extracts all files from a tar archive.

If the Name argument is given as "{binary,Binary}", the contents of the binary is assumed to be a tar archive.

@@ -250,9 +249,8 @@ Reason = term() -

The -extract/2 function extracts - files from a tar archive.

+

The extract/2 function + extracts files from a tar archive.

If the Name argument is given as "{binary,Binary}", the contents of the binary is assumed to be a tar archive.

@@ -322,8 +320,8 @@ Reason = term() -

The -format_error/1 converts +

The format_error/1 + function converts an error reason term to a human-readable error message string.

@@ -339,8 +337,8 @@ Reason = term() -

The -open/2 function creates a tar file for writing. +

The open/2 function creates + a tar file for writing. (Any existing file with the same name will be truncated.)

By convention, the name of a tar file should end in ".tar". To abide to the convention, you'll need to add ".tar" yourself @@ -373,7 +371,6 @@ You should not rely on the specific contents of the TarDescriptor term, as it may change in future versions as more features are added to the erl_tar module.

-

@@ -386,9 +383,8 @@ Reason = term() -

The -table/1 function retrieves - the names of all files in the tar file Name.

+

The table/1 function + retrieves the names of all files in the tar file Name.

@@ -398,9 +394,8 @@ Name = filename() -

The -table/2 function retrieves - the names of all files in the tar file Name.

+

The table/2 function + retrieves the names of all files in the tar file Name.

@@ -410,8 +405,7 @@ Name = filename() -

The -t/1 function prints the names +

The t/1 function prints the names of all files in the tar file Name to the Erlang shell. (Similar to "tar t".)

@@ -423,8 +417,8 @@ Name = filename() -

The -tt/1 function prints names and +

The tt/1 function prints + names and information about all files in the tar file Name to the Erlang shell. (Similar to "tar tv".)

diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml index f19f92be6f..efd9514db6 100644 --- a/lib/stdlib/doc/src/ets.xml +++ b/lib/stdlib/doc/src/ets.xml @@ -512,11 +512,10 @@ Error: fun containing local Erlang function calls of the reference counter, keeping track of how many times the table has been fixed by the process.

If the table never has been fixed, the call returns - false.

- Item=stats, Value=tuple()

+ false.

+

Item=stats, Value=tuple()

Returns internal statistics about set, bag and duplicate_bag tables on an internal format used by OTP test suites. - Not for production use. - + Not for production use.

@@ -661,9 +660,9 @@ ets:is_compiled_ms(Broken). table. The difference being the same as between =:= and ==. As an example, one might insert an object with the - integer()1 as a key in an ordered_set + integer() 1 as a key in an ordered_set and get the object returned as a result of doing a - lookup/2 with the float()1.0 as the + lookup/2 with the float() 1.0 as the key to search for.

If the table is of type set or ordered_set, the function returns either the empty list or a list with one @@ -946,7 +945,7 @@ ets:select(Table,MatchSpec), table is named or not. If one or more options are left out, the default values are used. This means that not specifying any options ([]) is the same as specifying - [set,protected,{keypos,1},{heir,none},{write_concurrency,false},{read_concurrency,false}].

+ [set, protected, {keypos,1}, {heir,none}, {write_concurrency,false}, {read_concurrency,false}].

set @@ -963,7 +962,7 @@ ets:select(Table,MatchSpec), ordered_set tables regard keys as equal when they compare equal, not only when they match. This means that to an ordered_set, the - integer()1 and the float()1.0 are regarded as equal. This also means that the + integer() 1 and the float() 1.0 are regarded as equal. This also means that the key used to lookup an element not necessarily matches the key in the elements returned, if float()'s and integer()'s are mixed in diff --git a/lib/stdlib/doc/src/gb_sets.xml b/lib/stdlib/doc/src/gb_sets.xml index 38de51322f..f91fac9c82 100644 --- a/lib/stdlib/doc/src/gb_sets.xml +++ b/lib/stdlib/doc/src/gb_sets.xml @@ -61,7 +61,6 @@ and do the same thing in the sets and ordsets modules. That is, by only changing the module name for each call, you can try out different set representations.

-

add_element/2

diff --git a/lib/stdlib/doc/src/gen_fsm.xml b/lib/stdlib/doc/src/gen_fsm.xml index e35b5adace..421eeb4fd3 100644 --- a/lib/stdlib/doc/src/gen_fsm.xml +++ b/lib/stdlib/doc/src/gen_fsm.xml @@ -4,7 +4,7 @@
- 19962010 + 19962011 Ericsson AB. All Rights Reserved. @@ -430,7 +430,6 @@ gen_fsm:sync_send_all_state_event -----> Module:handle_sync_event/4 denote a state of the state machine. state data is used to denote the internal state of the Erlang process which implements the state machine.

-

diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml index 60c0b91212..36089f2603 100644 --- a/lib/stdlib/doc/src/notes.xml +++ b/lib/stdlib/doc/src/notes.xml @@ -2632,7 +2632,7 @@ that is, also when starting a gen_server, gen_fsm etc.

This limitation has now been properly documented and the behavior of the gen_fsm, gen_server, and - proc_libstart and start_link + proc_lib start and start_link functions when providing this option has been changed from hanging indefinitely to failing with reason badarg.

@@ -2749,7 +2749,6 @@ join option that can be used to force QLC to use a particular kind of join in some QLC expression.

Several other changes have also been included:

-

The new tmpdir option of cursor/2, diff --git a/lib/stdlib/doc/src/qlc.xml b/lib/stdlib/doc/src/qlc.xml index 6a45ade447..ce50631ca9 100644 --- a/lib/stdlib/doc/src/qlc.xml +++ b/lib/stdlib/doc/src/qlc.xml @@ -688,7 +688,6 @@ ets:match_spec_run(ets:lookup(86033, {2,2}), -

diff --git a/lib/stdlib/doc/src/supervisor.xml b/lib/stdlib/doc/src/supervisor.xml index edd119d37a..ec607d6e4c 100644 --- a/lib/stdlib/doc/src/supervisor.xml +++ b/lib/stdlib/doc/src/supervisor.xml @@ -59,7 +59,6 @@ processes are started in order from left to right according to this list. When the supervisor terminates, it first terminates its child processes in reversed start order, from right to left.

-

A supervisor can have one of the following restart strategies:

diff --git a/lib/stdlib/doc/src/timer.xml b/lib/stdlib/doc/src/timer.xml index b741ab7db1..0c1e398dc4 100644 --- a/lib/stdlib/doc/src/timer.xml +++ b/lib/stdlib/doc/src/timer.xml @@ -84,7 +84,7 @@ Send Messageto Pidafter a specified Time. -

+

send_after/3 @@ -98,6 +98,7 @@

Same as send_after(Time, self(), Message).

+

@@ -107,7 +108,7 @@ Send an exit signal with Reasonafter a specified Time. -

+

exit_after/3 @@ -128,6 +129,7 @@

Same as exit_after(Time, self(), kill).

+

@@ -144,7 +146,7 @@ Send Messagerepeatedly at intervals of Time. -

+

send_interval/3 @@ -158,6 +160,7 @@

Same as send_interval(Time, self(), Message).

+

@@ -188,7 +191,7 @@ Function, Arguments) or apply(Fun, Arguments) In microseconds -

+

tc/3 @@ -209,6 +212,7 @@ +

@@ -254,7 +258,6 @@
Examples

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. + The unzip/2 function provides + options to extract some files, and more.

If the Archive argument is given as a binary, the contents of the binary is assumed to be a zip archive, otherwise it should be a filename.

@@ -413,8 +411,8 @@ Open an archive and return a handle to it -

The -zip_open function opens a +

The 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 with unzip.

@@ -436,8 +434,7 @@ 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 -

The -zip_close/1 function closes - a zip archive, previously opened with zip_open. All +

The zip_close/1 function + closes a zip archive, previously opened with zip_open. All resources are closed, and the handle should not be used after closing.

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

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 running ts:install/0ts + and no options are needed. Then running ts: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(Rect::{X::integer(),Y::integer(),W::integer(),H::integer()}) -> wxRegion() +%% new(Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}) -> 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. %%
Alternatives: %%

-%% setClientSize(This::wxWindow(), Size::{W::integer(),H::integer()}) -> ok +%% setClientSize(This::wxWindow(), Size::{W::integer(), H::integer()}) -> ok %%

%%

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

setClientSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH}) when is_integer(SizeW),is_integer(SizeH) -> -- cgit v1.2.3