Merge branch 'ta/doc-fixes' into dev

2 files changed, 73 insertions, 73 deletions

diff --git a/lib/reltool/doc/src/reltool.xml b/lib/reltool/doc/src/reltool.xml
index 0c2b7d2a2b..598594145a 100644
--- a/lib/reltool/doc/src/reltool.xml
+++ b/lib/reltool/doc/src/reltool.xml
@@ -48,8 +48,8 @@
     <c>root_dir</c> is the root directory of the analysed system and
     it defaults to the system executing <c>reltool</c>. Applications
     may also be located outside <c>root_dir</c>. <c>lib_dirs</c>
-    defines additional library directories where applications
-    additional may reside and it defaults to the the directories
+    defines library directories where additional applications
+    may reside and it defaults to the directories
     listed by the operating system environment variable
     <c>ERL_LIBS</c>. See the module <c>code</c> for more info.
     Finally single modules and entire applications may be read from
@@ -58,10 +58,10 @@
     <p>Some configuration parameters control the behavior of Reltool
     on system (<c>sys</c>) level. Others provide control on
     application (<c>app</c>) level and yet others are on module
-    (<c>mod</c>) level. Module level parameters overrides application
-    level parameters and application level parameters overrides system
+    (<c>mod</c>) level. Module level parameters override application
+    level parameters and application level parameters override system
     level parameters. Escript <c>escript</c> level parameters
-    overrides system level parameters.</p>
+    override system level parameters.</p>
 
     <p>The following top level <c>options</c> are supported:</p>
 
@@ -74,7 +74,7 @@
            a name of a <c>file</c> containing a sys tuple.</p>
       </item>
 
-      <tag><c>trap_exit></c></tag>
+      <tag><c>trap_exit</c></tag>
       <item>
         <p>This option controls the error handling behavior of
            <c>reltool</c>.  By default the window processes traps
@@ -123,10 +123,10 @@
         defaults to <c>all</c> which means that if an application is
         included (either explicitly or implicitly) all modules in that
         application will be included. This implies that both modules
-        that exists on the <c>ebin</c> directory of the application,
+        that exist in the <c>ebin</c> directory of the application,
         as well as modules that are named in the <c>app</c> file will
         be included. If the parameter is set to <c>ebin</c>, both
-        modules on the <c>ebin</c> directory and derived modules are
+        modules in the <c>ebin</c> directory and derived modules are
         included. If the parameter is set to <c>app</c>, both modules
         in the <c>app</c> file and derived modules are included.
         <c>derived</c> means that only modules that are used by other
@@ -138,13 +138,13 @@
       <item>
         <p>This parameter controls the application and escript
         inclusion policy. It defaults to <c>derived</c> which means
-        that the applications that not have any explicit
+        that the applications that do not have any explicit
         <c>incl_cond</c> setting, will only be included if any other
         (explicitly or implicitly included) application uses it. The
         value <c>include</c> implies that all applications and
-        escripts that that not have any explicit <c>incl_cond</c>
+        escripts that do not have any explicit <c>incl_cond</c>
         setting will be included. <c>exclude</c> implies that all
-        applications and escripts) that that not have any explicit
+        applications and escripts) that do not have any explicit
         <c>incl_cond</c> setting will be excluded.</p>
       </item>
 
@@ -158,7 +158,7 @@
       <tag><c>rel</c></tag>
       <item>
         <p>Release specific configuration. Each release maps to a
-        <c>rel</c>, <c>script</c> and <c>boot </c> file. See the
+        <c>rel</c>, <c>script</c> and <c>boot</c> file. See the
         module <c>systools</c> for more info about the details. Each
         release has a name, a version and a set of applications with a
         few release specific parameters such as type and included
@@ -168,7 +168,7 @@
       <tag><c>relocatable</c></tag>
       <item>
         <p>This parameter controls whether the <c>erl</c> executable
-        in the target system automatically should determine where it
+        in the target system should automatically determine where it
         is installed or if it should use a hardcoded path to the
         installation. In the latter case the target system must be
         installed with <c>reltool:install/2</c> before it can be
@@ -182,7 +182,7 @@
         <p>The creation of the specification for a target system is
         performed in two steps. In the first step a complete
         specification is generated. It will likely contain much more
-        files than you are interested in your customized target
+        files than you are interested in in your customized target
         system. In the second step the specification will be filtered
         according to your filters. There you have the ability to
         specify filters per application as well as system wide
@@ -224,12 +224,12 @@
       <tag><c>incl_sys_filters</c></tag>
       <item>
         <p>This parameter normally contains a list of regular
-        expressions that controls which files in the system that
+        expressions that controls which files in the system
         should be included. Each file in the target system must match
         at least one of the listed regular expressions in order to be
         included. Further the files may not match any filter in
         <c>excl_sys_filters</c> in order to be included. Which
-        application files that should be included are controlled with
+        application files should be included is controlled with
         the parameters <c>incl_app_filters</c> and
         <c>excl_app_filters</c>. This parameter defaults to
         <c>[".*"]</c>.</p>
@@ -238,8 +238,8 @@
       <tag><c>excl_sys_filters</c></tag>
       <item>
         <p>This parameter normally contains a list of regular
-        expressions that controls which files in the system that not
-        should be included in the target system. In order to be
+        expressions that controls which files in the system should
+        not be included in the target system. In order to be
         included, a file must match some filter in
         <c>incl_sys_filters</c> but not any filter in
         <c>excl_sys_filters</c>. This parameter defaults to
@@ -260,7 +260,7 @@
       <item>
         <p>This parameter normally contains a list of regular
         expressions that controls which application specific files
-        that not should be included in the target system. In order to
+        should not be included in the target system. In order to
         be included, a file must match some filter in
         <c>incl_app_filters</c> but not any filter in
         <c>excl_app_filters</c>. This parameter defaults to
@@ -271,8 +271,8 @@
       <item>
         <p>This parameter normally contains a list of regular
         expressions that controls which top level directories in an
-        application that should be included in an archive file (as
-        opposed of beeing included as a regular directory outside the
+        application should be included in an archive file (as
+        opposed to being included as a regular directory outside the
         archive). Each top directory in the application must match at
         least one of the listed regular expressions in order to be
         included. Further the files may not match any filter in
@@ -284,7 +284,7 @@
       <item>
         <p>This parameter normally contains a list of regular
         expressions that controls which top level directories in an
-        application that not should be included in an archive file. In
+        application should not be included in an archive file. In
         order to be included in the application archive, a top
         directory must match some filter in <c>incl_archive_filters</c>
         but not any filter in <c>excl_archive_filters</c>. This
@@ -295,15 +295,15 @@
       <item>
         <p>This parameter contains a list of options that are given to
         <c>zip:create/3</c> when application specific files are
-        packaged into an archive. All options are not supported. The
-        most useful options in this context, are the ones that
-        controls which types of files that should be compressed. This
+        packaged into an archive. Only a subset of the options are
+        supported. The most useful options in this context are the ones
+        that control which types of files should be compressed. This
         parameter defaults to <c>[]</c>.</p>
       </item>
 
     </taglist>
 
-    <p>On application (<c>escript</c>) level,the following options are
+    <p>On application (<c>escript</c>) level, the following options are
     supported:</p>
 
    <taglist>
@@ -314,7 +314,7 @@
       </item>
     </taglist>
 
-    <p>On application (<c>app</c>) level,the following options are
+    <p>On application (<c>app</c>) level, the following options are
        supported:</p>
 
    <taglist>
@@ -322,8 +322,8 @@
       <item>
         <p>The version of the application. In an installed system there may
         exist several versions of an application. The <c>vsn</c> parameter
-        controls which version of the application that will be choosen. If it
-        is omitted, the latest version will be choosen.</p>
+        controls which version of the application will be chosen. If it
+        is omitted, the latest version will be chosen.</p>
       </item>
       <tag><c>mod</c></tag>
       <item>
@@ -380,7 +380,7 @@
       </item>
     </taglist>
 
-     <p>On module (<c>mod</c>) level,the following options are
+     <p>On module (<c>mod</c>) level, the following options are
        supported:</p>
 
    <taglist>
@@ -391,9 +391,9 @@
         will be used to control whether the module is included or not. The
         value of <c>incl_cond</c> overrides the module inclusion policy.
         <c>include</c> implies that the module is included, while
-        <c>exclude</c> implies that the module not is included.
-        <c>derived</c> implies that the is included if any included uses the
-        module.</p>
+        <c>exclude</c> implies that the module is not included.
+        <c>derived</c> implies that the module is included if it is used
+        by any other included module.</p>
       </item>
       <tag><c>debug_info</c></tag>
       <item>
@@ -546,12 +546,12 @@ target_spec()       = [target_spec()]
       files are by default copied to the target system. The
       <c>releases</c> directory contains generated <c>rel</c>,
       <c>script</c>, and <c>boot</c> files. The <c>lib</c> directory
-      contains the applications. Which applications that are included
+      contains the applications. Which applications are included
       and if they should be customized (archived, stripped from debug
       info etc.) is specified with various configuration
       parameters. The files in the <c>bin</c> directory are copied
       from the <c>erts-vsn/bin</c> directory, but only those files
-      that was originally included in <c>bin</c> directory of the
+      that were originally included in the <c>bin</c> directory of the
       source system.</p>
 
       <p>If the configuration parameter <c>relocatable</c> was set to
@@ -584,10 +584,10 @@ target_spec()       = [target_spec()]
         <v>Reason        = reason()</v>
       </type>
       <desc><p>Get reltool configuration. Normally, only the explicit
-      configuration parameters with values that differs from their
+      configuration parameters with values that differ from their
       defaults are interesting. But the builtin default values can be
       returned by setting <c>InclDefaults</c> to <c>true</c>. The
-      derived configuration can be return by setting
+      derived configuration can be returned by setting
       <c>InclDerived</c> to <c>true</c>.</p></desc>
     </func>
 
@@ -705,7 +705,7 @@ target_spec()       = [target_spec()]
         <v>Reason      = reason()</v>
       </type>
       <desc><p>Start a server process with options. The server process
-      identity can be given as argument to several other functions in the
+      identity can be given as an argument to several other functions in the
       API.</p></desc>
     </func>
 
diff --git a/lib/reltool/doc/src/reltool_usage.xml b/lib/reltool/doc/src/reltool_usage.xml
index 885828d1f0..0a053a014e 100644
--- a/lib/reltool/doc/src/reltool_usage.xml
+++ b/lib/reltool/doc/src/reltool_usage.xml
@@ -44,7 +44,7 @@
   <section>
     <title>System window</title>
     <p>The system window is started with the function
-    <c>reltool:start/1</c>. At startup the tool will process the all
+    <c>reltool:start/1</c>. At startup the tool will process all
     <c>beam</c> files and <c>app</c> files in order to find out dependencies
     between applications and their modules. Once all this information has been
     derived, it will be possible to explore the tool.</p>
@@ -67,29 +67,29 @@
     <section>
     <title>Libraries</title>
         <p>On the library page it is possible to control which sources
-        that the tool will use. The page is organized as a tree which
+        the tool will use. The page is organized as a tree which
         can be expanded and collapsed by clicking on the little symbol
         in the beginning of the expandable/collapsible lines.</p>
 
 	<p>The <c>Root directory</c> can be edited by selecting the
 	line where the path of the root directory is displayed and
-	clicking with the right mouse button. Choose edit in the menu
-	that pops up. </p>
+	clicking the right mouse button. Choose edit in the menu
+	that pops up.</p>
 
 	<p>Library directories can be added, edited or deleted. This
 	is done by selecting the line where the path to a library
-	directory is displayed and clicking with the right mouse
+	directory is displayed and clicking the right mouse
 	button. Choose add, edit or delete in the menu that pops
 	up. New library directories can also be added by selecting the
-	line <c>Library directories</c> and clicking with the right
+	line <c>Library directories</c> and clicking the right
 	mouse button. Choose add in the menu that pops up.</p>
 
 	<p>Escript files can be added, edited or deleted. This is done
 	by selecting the line where the path to an escript file is
-	displayed and clicking with the right mouse button. Choose
+	displayed and clicking the right mouse button. Choose
 	add, edit or delete in the menu that pops up. New escripts can
 	also be added by selecting the line <c>Escript files</c> and
-	clicking with the right mouse button. Choose add in the menu
+	clicking the right mouse button. Choose add in the menu
 	that pops up.</p>
 
 	<p>When libraries and escripts are expanded, the names of
@@ -102,7 +102,7 @@
         <p>On the system settings page it is possible to control some
         global settings that are used as defaults for all
         applications. Set the <c>Application inclusion policy</c> to
-        <c>include</c> to include all applications that not are
+        <c>include</c> to include all applications that are not
         explicitly excluded. See <c>incl_cond</c> (application
         inclusion) and <c>mod_cond</c> (module inclusion) in the
         reference manual for the module <c>reltool</c> for more
@@ -131,14 +131,14 @@
 
 	<p>The symbols in front of the application names are intended
 	to describe the status of the application. There are error
-	symbols and warning symbols that means that there are
-	something that needs attention. The tick symbol means that the
+	and warning symbols to signalize that there is
+	something which needs attention. The tick symbol means that the
 	application is included or derived and no problem has been
 	detected. The cross symbol means that the application is
 	excluded or available and no problem has been
 	detected. Applications with error symbols are listed first in
-	each category, then comes the warnings and the normal ones
-	(ticks and crosses) are found at the end.</p>
+  each category and are followed by the warnings and the
+  normal ones (ticks and crosses) at the end.</p>
 
 	<p>Double click on an application to launch its application
 	window.</p>
@@ -175,8 +175,8 @@
 	</item>
 	<item>
 	  <p><c>Save configuration</c> - Saves the current
-	  configuration to file. Normally, only the explictit
-	  configuration parameters with values that differs from their
+	  configuration to file. Normally, only the explicit
+	  configuration parameters with values that differ from their
 	  defaults are saved. But the configuration with or without
 	  default values and with or without derived values may also
 	  be saved.</p>
@@ -204,21 +204,21 @@
       <p>It is possible to perform some limited manipulations of the
       graph. Nodes can be moved, selected, locked or deleted. Move a
       single node or the entire graph by moving the mouse while the
-      left mouse button is pressed. A node is can be locked into a fix
+      left mouse button is pressed. A node can be locked into a fix
       position by holding down the shift button when the left mouse
       button is released. Select several nodes by moving the mouse
-      while the control key and the left mouse button i
+      while the control key and the left mouse button are
       pressed. Selected nodes can be locked, unlocked or deleted by
-      klicking on a suitable button.</p>
+      clicking on a suitable button.</p>
 
       <p>The algorithm that is used to draw a graph with as few
       crossed links as possible is called force graph. A force graph
-      consists of nodes and directed link between nodes. Each node is
+      consists of nodes and directed links between nodes. Each node is
       associated with a repulsive force that pushes nodes away from
       each other. This force can be adjusted with the left slider or
       with the mouse wheel. Each link is associated with an attractive
-      force that pulls the nodes nearer each other. This force can be
-      adjusted with the right slider. If this force becomes to strong,
+      force that pulls the nodes nearer to each other. This force can be
+      adjusted with the right slider. If this force becomes too strong,
       the graph will be unstable. The third parameter that can be
       adjusted is the length of the links. It is adjusted with the
       middle slider.</p>
@@ -256,7 +256,7 @@
     <p>Select version of the application in the <c>Source selection
     policy</c> part of the page. By default the latest version of the
     application is selected, but it is possible to override this by
-    explicitly select another version.</p>
+    explicitly selecting another version.</p>
     
     <p>By default the <c>Application inclusion policy</c> on system
     level is used for all applications. Set the value to
@@ -272,10 +272,10 @@
     want actually used modules to be included. Set it to <c>app</c> if
     you, besides derived modules, also want the modules listed in the
     app file to be included. Set it to <c>ebin</c> if you, besides
-    derived modules, also want the modules that exists as beam files
-    on the ebin directory to be included. Set it to <c>all</c> if you
+    derived modules, also want the modules that exist as beam files
+    in the ebin directory to be included. Set it to <c>all</c> if you
     want all modules to be included, that is the union of modules
-    found on the ebin directory and listed in the app file.</p>
+    found in the ebin directory and listed in the app file.</p>
 
     <p>The application settings page is rather incomplete.</p>
     </section>
@@ -299,16 +299,16 @@
     undone.</p>
 
     <p>The symbols in front of the module names are intended to
-    describe the status of the module. There are error symbols
-    and warning symbols that means that there are something that needs
+    describe the status of the module. There are error and
+    and warning symbols to signalize that there is something that needs
     attention. The tick symbol means that the module is included
     or derived and no problem has been detected. The cross symbol
     means that the module is excluded or available and no problem
     has been detected. Modules with error symbols are listed
-    first in each category, then comes the warnings and the normal
-    ones (ticks and crosses) are found at the end.</p>
+    first in each category and are followed by warnings and the
+    normal ones (ticks and crosses) at the end.</p>
 
-    <p>Double click on an module to launch its module window.</p>
+    <p>Double click on a module to launch its module window.</p>
 
     </section>
 
@@ -323,7 +323,7 @@
     <c>app</c> file. If the application includes other applications,
     these are listed under <c>Included</c>. These applications are
     listed in the <c>included_applications</c> part of the <c>app</c>
-    file.  If the application uses modules other applications, these
+    file.  If the application uses other applications, these
     are listed under <c>Uses</c>.</p>
 
     <p>Double click on an application name to launch an application window.</p>
@@ -336,7 +336,7 @@
     <p>There are two categories of modules on the <c>Module
     dependencies</c> page. If the module is used by other modules,
     these are listed under <c>Modules used by others</c>. If the
-    module uses modules other modules, these are listed under <c>Used
+    module uses other modules, these are listed under <c>Used
     modules</c>.</p>
 
     <p>Double click on an module name to launch a module window.</p>
@@ -365,8 +365,8 @@
 
     <p>There are two categories of modules on the <c>Dependencies</c>
     page. If the module is used by other modules, these are listed
-    under <c>Modules used by others</c>. If the module uses modules
-    other modules, these are listed under <c>Used modules</c>.</p>
+    under <c>Modules used by others</c>. If the module uses other
+    modules, these are listed under <c>Used modules</c>.</p>
 
     <p>Double click on an module name to launch a module window.</p>
 
@@ -378,7 +378,7 @@
     <p>On the <c>Code</c> page the Erlang source code is displayed. It
     is possible to search forwards and backwards for text in the
     module. Enter a regular expression in the <c>Find</c> field and
-    press enter. It is also possible to goto a certain line on the
+    press enter. It is also possible to go to a certain line in the
     module. The <c>Back</c> button can be used to go back to the
     previous position.</p>