[inets] Some documentation cleanup

OTP-9983

14 files changed, 331 insertions, 206 deletions

diff --git a/lib/inets/doc/src/book.xml b/lib/inets/doc/src/book.xml
index 7da0abd98f..51cbb2d963 100644
--- a/lib/inets/doc/src/book.xml
+++ b/lib/inets/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/inets/doc/src/fascicules.xml b/lib/inets/doc/src/fascicules.xml
index 101e745722..ea3b988882 100644
--- a/lib/inets/doc/src/fascicules.xml
+++ b/lib/inets/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/inets/doc/src/ftp_client.xml b/lib/inets/doc/src/ftp_client.xml
index 7f62a453a6..b44674d997 100644
--- a/lib/inets/doc/src/ftp_client.xml
+++ b/lib/inets/doc/src/ftp_client.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/inets/doc/src/httpd_conf.xml b/lib/inets/doc/src/httpd_conf.xml
index a1ad76a8ae..fc34f14ec3 100644
--- a/lib/inets/doc/src/httpd_conf.xml
+++ b/lib/inets/doc/src/httpd_conf.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -33,11 +33,14 @@
     Web server API programmer.</modulesummary>
   <description>
     <p>This module provides the Erlang Webserver API programmer with
-      utility functions for adding run-time configuration directives.</p>
+    utility functions for adding run-time configuration directives.</p>
+
+    <marker id="check_enum"></marker>
   </description>
+
   <funcs>
     <func>
-      <name>check_enum(EnumString,ValidEnumStrings) -> Result</name>
+      <name>check_enum(EnumString, ValidEnumStrings) -> Result</name>
       <fsummary>Check if string is a valid enumeration.</fsummary>
       <type>
         <v>EnumString = string()</v>
@@ -47,10 +50,13 @@
       <desc>
         <marker id="check_enum"></marker>
         <p><c>check_enum/2</c> checks if <c>EnumString</c> is a valid
-          enumeration of <c>ValidEnumStrings</c> in which case it is
-          returned as an atom.</p>
+	enumeration of <c>ValidEnumStrings</c> in which case it is
+	returned as an atom.</p>
+
+	<marker id="clean"></marker>
       </desc>
     </func>
+
     <func>
       <name>clean(String) -> Stripped</name>
       <fsummary>Remove leading and/or trailing white spaces.</fsummary>
@@ -60,9 +66,12 @@
       <desc>
         <marker id="clean"></marker>
         <p><c>clean/1</c> removes leading and/or trailing white spaces
-          from <c>String</c>.</p>
+	from <c>String</c>.</p>
+
+	<marker id="custom_clean"></marker>
       </desc>
     </func>
+
     <func>
       <name>custom_clean(String,Before,After) -> Stripped</name>
       <fsummary>Remove leading and/or trailing white spaces and custom characters.</fsummary>
@@ -73,11 +82,14 @@
       <desc>
         <marker id="custom_clean"></marker>
         <p><c>custom_clean/3</c> removes leading and/or trailing white
-          spaces and custom characters from <c>String</c>. <c>Before</c>
-          and <c>After</c> are regular expressions, as defined in
-          <c>regexp(3)</c>, describing the custom characters.</p>
+	spaces and custom characters from <c>String</c>. <c>Before</c>
+	and <c>After</c> are regular expressions, as defined in
+	<c>regexp(3)</c>, describing the custom characters.</p>
+
+	<marker id="is_directory"></marker>
       </desc>
     </func>
+
     <func>
       <name>is_directory(FilePath) -> Result</name>
       <fsummary>Check if a file path is a directory.</fsummary>
@@ -91,13 +103,16 @@
       <desc>
         <marker id="is_directory"></marker>
         <p><c>is_directory/1</c> checks if <c>FilePath</c> is a
-          directory in which case it is returned. Please read
-          <c>file(3)</c> for a description of <c>enoent</c>,
-          <c>eaccess</c> and <c>enotdir</c>. The definition of 
-          the file info record can be found by including <c>file.hrl</c> 
-          from the kernel application, see file(3).</p>
+	directory in which case it is returned. Please read
+	<c>file(3)</c> for a description of <c>enoent</c>,
+	<c>eaccess</c> and <c>enotdir</c>. The definition of 
+	the file info record can be found by including <c>file.hrl</c> 
+	from the kernel application, see file(3).</p>
+
+	<marker id="is_file"></marker>
       </desc>
     </func>
+
     <func>
       <name>is_file(FilePath) -> Result</name>
       <fsummary>Check if a file path is a regular file.</fsummary>
@@ -111,13 +126,16 @@
       <desc>
         <marker id="is_file"></marker>
         <p><c>is_file/1</c> checks if <c>FilePath</c> is a regular
-          file in which case it is returned. Read <c>file(3)</c> for a
-          description of <c>enoent</c>, <c>eaccess</c> and
-          <c>enotdir</c>. The definition of the file info record can be 
-          found by including <c>file.hrl</c> from the kernel application, 
-          see file(3).</p>
+	file in which case it is returned. Read <c>file(3)</c> for a
+	description of <c>enoent</c>, <c>eaccess</c> and
+	<c>enotdir</c>. The definition of the file info record can be 
+	found by including <c>file.hrl</c> from the kernel application, 
+	see file(3).</p>
+
+	<marker id="make_integer"></marker>
       </desc>
     </func>
+
     <func>
       <name>make_integer(String) -> Result</name>
       <fsummary>Return an integer representation of a string.</fsummary>
diff --git a/lib/inets/doc/src/httpd_socket.xml b/lib/inets/doc/src/httpd_socket.xml
index fba1a58d3a..58cd2ec575 100644
--- a/lib/inets/doc/src/httpd_socket.xml
+++ b/lib/inets/doc/src/httpd_socket.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -33,10 +33,13 @@
     Web server API programmer.</modulesummary>
   <description>
     <p>This module provides the Erlang Web server API module programmer
-      with utility functions for generic sockets communication. The
-      appropriate communication mechanism is transparently used, that
-      is <c>ip_comm</c> or <c>ssl</c>.</p>
+    with utility functions for generic sockets communication. The
+    appropriate communication mechanism is transparently used, that
+    is <c>ip_comm</c> or <c>ssl</c>.</p>
+    
+    <marker id="deliver"></marker>
   </description>
+
   <funcs>
     <func>
       <name>deliver(SocketType, Socket, Data) -> Result</name>
@@ -50,11 +53,14 @@
       <desc>
         <marker id="deliver"></marker>
         <p><c>deliver/3</c> sends the <c>Binary</c> over the
-          <c>Socket</c> using the specified <c>SocketType</c>. Socket
-          and SocketType should be the socket and the socket_type form
-          the mod record as defined in httpd.hrl</p>
+	<c>Socket</c> using the specified <c>SocketType</c>. Socket
+	and SocketType should be the socket and the socket_type form
+	the mod record as defined in httpd.hrl</p>
+    
+	<marker id="peername"></marker>
       </desc>
     </func>
+
     <func>
       <name>peername(SocketType,Socket) -> {Port,IPAddress}</name>
       <fsummary>Return the port and IP-address of the remote socket.</fsummary>
@@ -67,9 +73,12 @@
       <desc>
         <marker id="peername"></marker>
         <p><c>peername/3</c> returns the <c>Port</c> and
-          <c>IPAddress</c> of the remote <c>Socket</c>. </p>
+	<c>IPAddress</c> of the remote <c>Socket</c>. </p>
+    
+	<marker id="resolve"></marker>
       </desc>
     </func>
+
     <func>
       <name>resolve() -> HostName</name>
       <fsummary>Return the official name of the current host.</fsummary>
@@ -79,7 +88,7 @@
       <desc>
         <marker id="resolve"></marker>
         <p><c>resolve/0</c> returns the official <c>HostName</c> of
-          the current host. </p>
+	the current host. </p>
       </desc>
     </func>
   </funcs>
diff --git a/lib/inets/doc/src/httpd_util.xml b/lib/inets/doc/src/httpd_util.xml
index 6ac2b13c72..9f290084d2 100644
--- a/lib/inets/doc/src/httpd_util.xml
+++ b/lib/inets/doc/src/httpd_util.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2010</year>
+      <year>1997</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/inets/doc/src/inets_services.xml b/lib/inets/doc/src/inets_services.xml
index c274d67f19..e282050b12 100644
--- a/lib/inets/doc/src/inets_services.xml
+++ b/lib/inets/doc/src/inets_services.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/inets/doc/src/mod_alias.xml b/lib/inets/doc/src/mod_alias.xml
index c783b99b23..265a1b8e76 100644
--- a/lib/inets/doc/src/mod_alias.xml
+++ b/lib/inets/doc/src/mod_alias.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,8 +32,11 @@
   <modulesummary>URL aliasing.</modulesummary>
   <description>
     <p>Erlang Webserver Server internal API for handling of things
-      such as interaction data exported by the mod_alias module.</p>
+    such as interaction data exported by the mod_alias module.</p>
+
+    <marker id="default_index"></marker>
   </description>
+
   <funcs>
     <func>
       <name>default_index(ConfigDB, Path) -> NewPath</name>
@@ -45,17 +48,20 @@
       <desc>
         <marker id="default_index"></marker>
         <p>If <c>Path</c> is a directory, <c>default_index/2</c>, it starts
-          searching for resources or files that are specified in the config
-          directive DirectoryIndex.
-          If an appropriate resource or file is found, it is appended to
-          the end of <c>Path</c> and then returned. <c>Path</c> is
-          returned unaltered, if no appropriate
-          file is found, or if <c>Path</c> is not a directory.
-          <c>config_db()</c> is the server config file in ETS table format
-          as described in
-          <seealso marker="http_server">Inets Users Guide.</seealso>.</p>
+	searching for resources or files that are specified in the config
+	directive DirectoryIndex.
+	If an appropriate resource or file is found, it is appended to
+	the end of <c>Path</c> and then returned. <c>Path</c> is
+	returned unaltered, if no appropriate
+	file is found, or if <c>Path</c> is not a directory.
+	<c>config_db()</c> is the server config file in ETS table format
+	as described in
+	<seealso marker="http_server">Inets Users Guide.</seealso>.</p>
+
+	<marker id="path"></marker>
       </desc>
     </func>
+
     <func>
       <name>path(PathData, ConfigDB, RequestURI) -> Path</name>
       <fsummary>Return the actual file path to a URL.</fsummary>
@@ -67,15 +73,19 @@
       <desc>
         <marker id="path"></marker>
         <p><c>path/3</c> returns the actual file <c>Path</c> in the
-          <c>RequestURI</c> (See RFC 1945). If the interaction data
-          <c>{real_name,{Path,AfterPath}}</c> has been exported by
-          mod_alias;
-          <c>Path</c> is returned. If no interaction data has been
-          exported, ServerRoot is used to
-          generate a file <c>Path</c>. <c>config_db()</c> and
-          <c>interaction_data()</c> are as defined in <seealso marker="http_server">Inets Users Guide</seealso>.</p>
+	<c>RequestURI</c> (See RFC 1945). If the interaction data
+	<c>{real_name,{Path,AfterPath}}</c> has been exported by
+	mod_alias;
+	<c>Path</c> is returned. If no interaction data has been
+	exported, ServerRoot is used to
+	generate a file <c>Path</c>. <c>config_db()</c> and
+	<c>interaction_data()</c> are as defined in 
+	<seealso marker="http_server">Inets Users Guide</seealso>.</p>
+
+	<marker id="real_name"></marker>
       </desc>
     </func>
+
     <func>
       <name>real_name(ConfigDB, RequestURI, Aliases) -> Ret</name>
       <fsummary>Expand a request uri using  Alias config directives.</fsummary>
@@ -89,18 +99,24 @@
       <desc>
         <marker id="real_name"></marker>
         <p><c>real_name/3</c> traverses <c>Aliases</c>, typically
-          extracted from <c>ConfigDB</c>, and matches each
-          <c>FakeName</c> with <c>RequestURI</c>. If a match is found 
-          <c>FakeName</c> is replaced with <c>RealName</c> in the
-          match. The resulting path is split into two parts, that
-          is <c>ShortPath</c> and <c>AfterPath</c> as defined in <seealso marker="httpd_util#split_path">httpd_util:split_path/1</seealso>. 
-          <c>Path</c> is generated from <c>ShortPath</c>, that is
-          the result from <seealso marker="#default_index">default_index/2</seealso> with
-          <c>ShortPath</c> as an argument.
-          <c>config_db()</c> is the server config file in ETS table
-          format as described in <seealso marker="http_server">Inets User Guide.</seealso>. </p>
+	extracted from <c>ConfigDB</c>, and matches each
+	<c>FakeName</c> with <c>RequestURI</c>. If a match is found 
+	<c>FakeName</c> is replaced with <c>RealName</c> in the
+	match. The resulting path is split into two parts, that
+	is <c>ShortPath</c> and <c>AfterPath</c> as defined in 
+	<seealso marker="httpd_util#split_path">httpd_util:split_path/1</seealso>. 
+	<c>Path</c> is generated from <c>ShortPath</c>, that is
+	the result from 
+	<seealso marker="#default_index">default_index/2</seealso> with
+	<c>ShortPath</c> as an argument.
+	<c>config_db()</c> is the server config file in ETS table
+	format as described in 
+	<seealso marker="http_server">Inets User Guide.</seealso>. </p>
+
+	<marker id="real_script_name"></marker>
       </desc>
     </func>
+
     <func>
       <name>real_script_name(ConfigDB,RequestURI,ScriptAliases) -> Ret</name>
       <fsummary>Expand a request uri using ScriptAlias config directives.</fsummary>
@@ -114,15 +130,15 @@
       <desc>
         <marker id="real_script_name"></marker>
         <p><c>real_name/3</c> traverses <c>ScriptAliases</c>,
-          typically extracted from <c>ConfigDB</c>, and matches each
-          <c>FakeName</c> with <c>RequestURI</c>. If a match is found
-          <c>FakeName</c> is replaced with <c>RealName</c> in the
-          match. If the resulting match is not an executable script
-          <c>not_a_script</c> is returned. If it is a script the
-          resulting script path is in two parts, that is
-          <c>ShortPath</c> and <c>AfterPath</c> as defined in <seealso marker="httpd_util#split_script_path">httpd_util:split_script_path/1</seealso>.
-          <c>config_db()</c> is the server config file in ETS table
-          format as described in <seealso marker="http_server">Inets Users Guide.</seealso>.</p>
+	typically extracted from <c>ConfigDB</c>, and matches each
+	<c>FakeName</c> with <c>RequestURI</c>. If a match is found
+	<c>FakeName</c> is replaced with <c>RealName</c> in the
+	match. If the resulting match is not an executable script
+	<c>not_a_script</c> is returned. If it is a script the
+	resulting script path is in two parts, that is
+	<c>ShortPath</c> and <c>AfterPath</c> as defined in <seealso marker="httpd_util#split_script_path">httpd_util:split_script_path/1</seealso>.
+	<c>config_db()</c> is the server config file in ETS table
+	format as described in <seealso marker="http_server">Inets Users Guide.</seealso>.</p>
       </desc>
     </func>
   </funcs>
diff --git a/lib/inets/doc/src/mod_auth.xml b/lib/inets/doc/src/mod_auth.xml
index 2134ebeeae..7801567862 100644
--- a/lib/inets/doc/src/mod_auth.xml
+++ b/lib/inets/doc/src/mod_auth.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
@@ -32,8 +32,11 @@
   <modulesummary>User authentication using text files, dets or mnesia database.</modulesummary>
   <description>
     <p>This module provides for basic user authentication using
-      textual files, dets databases as well as mnesia databases. </p>
+    textual files, dets databases as well as mnesia databases. </p>
+
+    <marker id="add_user"></marker>
   </description>
+
   <funcs>
     <func>
       <name>add_user(UserName, Options) ->  true| {error, Reason}</name>
@@ -55,12 +58,17 @@
       <desc>
         <marker id="user_api"></marker>
         <marker id="add_user"></marker>
-        <p><c>add_user/2, add_user/5</c> and <c>add_user/6</c> adds a user to the user 
-          database. If the operation is successful, this function returns 
-          <c>true</c>. If an error occurs, <c>{error,Reason}</c> is returned. When <c>add_user/2</c> 
-          is called the Password, UserData Port and Dir options is mandatory.</p>
+        <p><c>add_user/2, add_user/5</c> and <c>add_user/6</c> adds a 
+	user to the user 
+	database. If the operation is successful, this function returns 
+	<c>true</c>. If an error occurs, <c>{error,Reason}</c> is returned. 
+	When <c>add_user/2</c> is called the Password, 
+	UserData Port and Dir options is mandatory.</p>
+
+	<marker id="delete_user"></marker>
       </desc>
     </func>
+
     <func>
       <name>delete_user(UserName,Options)  -> true | {error, Reason}</name>
       <name>delete_user(UserName, Port, Dir) -> true | {error, Reason}</name>
@@ -79,13 +87,16 @@
       <desc>
         <marker id="delete_user"></marker>
         <p><c>delete_user/2, delete_user/3</c> and <c>delete_user/4</c> 
-          deletes a user 
-          from the user database. If the operation is successful, this
-          function returns <c>true</c>. If an error occurs, 
-          <c>{error,Reason}</c> is returned. When <c>delete_user/2</c> is
-          called the Port and Dir options are mandatory.</p>
+	deletes a user from the user database. 
+	If the operation is successful, this function returns <c>true</c>. 
+	If an error occurs, <c>{error,Reason}</c> is returned. 
+	When <c>delete_user/2</c> is called the Port and Dir options 
+	are mandatory.</p>
+
+	<marker id="get_user"></marker>
       </desc>
     </func>
+
     <func>
       <name>get_user(UserName,Options) -> {ok, #httpd_user} |{error, Reason}</name>
       <name>get_user(UserName, Port, Dir) -> {ok, #httpd_user} | {error, Reason}</name>
@@ -104,12 +115,15 @@
       <desc>
         <marker id="get_user"></marker>
         <p><c>get_user/2, get_user/3</c> and <c>get_user/4</c> returns a 
-          <c>httpd_user</c> record containing the userdata for a 
-          specific user. If the user cannot be found, <c>{error, Reason}</c> 
-          is returned. When <c>get_user/2</c> is called the Port and Dir 
-          options are mandatory.</p>
+	<c>httpd_user</c> record containing the userdata for a 
+	specific user. If the user cannot be found, <c>{error, Reason}</c> 
+	is returned. When <c>get_user/2</c> is called the Port and Dir 
+	options are mandatory.</p>
+
+	<marker id="list_users"></marker>
       </desc>
     </func>
+
     <func>
       <name>list_users(Options) -> {ok, Users} | {error, Reason}</name>
       <name>list_users(Port, Dir) -> {ok, Users} | {error, Reason}</name>
@@ -127,12 +141,16 @@
       </type>
       <desc>
         <marker id="list_users"></marker>
-        <p><c>list_users/1, list_users/2</c> and <c>list_users/3</c> returns a list 
-          of users in the user database for a specific <c>Port/Dir</c>.
-          When <c>list_users/1</c> is called the Port and Dir 
-          options are mandatory.</p>
+        <p><c>list_users/1, list_users/2</c> and <c>list_users/3</c> 
+	returns a list 
+	of users in the user database for a specific <c>Port/Dir</c>.
+	When <c>list_users/1</c> is called the Port and Dir 
+	options are mandatory.</p>
+
+	<marker id="add_group_member"></marker>
       </desc>
     </func>
+
     <func>
       <name>add_group_member(GroupName, UserName, Options) -> true | {error, Reason}</name>
       <name>add_group_member(GroupName, UserName, Port, Dir) -> true | {error, Reason}</name>
@@ -151,13 +169,18 @@
       </type>
       <desc>
         <marker id="add_group_member"></marker>
-        <p><c>add_group_member/3, add_group_member/4</c> and <c>add_group_member/5</c> 
-          adds a user to a group. If the group does not exist, it 
-          is created and the user is added to the group. Upon successful 
-          operation, this function returns <c>true</c>. When <c>add_group_members/3</c> 
-          is called the Port and Dir options are mandatory.</p>
+        <p><c>add_group_member/3, add_group_member/4</c> and 
+	<c>add_group_member/5</c> 
+	adds a user to a group. If the group does not exist, it 
+	is created and the user is added to the group. Upon successful 
+	operation, this function returns <c>true</c>. 
+	When <c>add_group_members/3</c> 
+	is called the Port and Dir options are mandatory.</p>
+
+	<marker id="delete_group_member"></marker>
       </desc>
     </func>
+
     <func>
       <name>delete_group_member(GroupName, UserName, Options) -> true | {error, Reason}</name>
       <name>delete_group_member(GroupName, UserName, Port, Dir) -> true | {error, Reason}</name>
@@ -176,13 +199,17 @@
       </type>
       <desc>
         <marker id="delete_group_member"></marker>
-        <p><c>delete_group_member/3, delete_group_member/4</c> and <c>delete_group_member/5</c>  deletes a user from a group. 
-          If the group or the user does not exist, 
-          this function returns an error, otherwise it returns <c>true</c>.
-          When <c>delete_group_member/3</c> is called the Port and Dir options
-          are mandatory.</p>
+	<p><c>delete_group_member/3, delete_group_member/4</c> and 
+	<c>delete_group_member/5</c>  deletes a user from a group. 
+	If the group or the user does not exist, 
+	this function returns an error, otherwise it returns <c>true</c>.
+	When <c>delete_group_member/3</c> is called the Port and Dir options
+	are mandatory.</p>
+
+	<marker id="list_group_members"></marker>
       </desc>
     </func>
+
     <func>
       <name>list_group_members(GroupName, Options) -> {ok, Users} | {error, Reason}</name>
       <name>list_group_members(GroupName, Port, Dir) -> {ok, Users} | {error, Reason}</name>
@@ -201,13 +228,17 @@
       </type>
       <desc>
         <marker id="list_group_members"></marker>
-        <p><c>list_group_members/2, list_group_members/3</c> and <c>list_group_members/4</c> 
-          lists the members of a specified group. If the group does not 
-          exist or there is an error, <c>{error, Reason}</c> is returned.
-          When <c>list_group_members/2</c> is called the Port and Dir options
-          are mandatory.</p>
+        <p><c>list_group_members/2, list_group_members/3</c> and 
+	<c>list_group_members/4</c> 
+	lists the members of a specified group. If the group does not 
+	exist or there is an error, <c>{error, Reason}</c> is returned.
+	When <c>list_group_members/2</c> is called the Port and Dir options
+	are mandatory.</p>
+
+	<marker id="list_groups"></marker>
       </desc>
     </func>
+
     <func>
       <name>list_groups(Options) -> {ok, Groups} | {error, Reason}</name>
       <name>list_groups(Port, Dir) -> {ok, Groups} | {error, Reason}</name>
@@ -225,12 +256,16 @@
       </type>
       <desc>
         <marker id="list_groups"></marker>
-        <p><c>list_groups/1, list_groups/2</c> and <c>list_groups/3</c> lists all 
-          the groups available. If there is an error, <c>{error, Reason}</c> 
-          is returned. When <c>list_groups/1</c> is called the Port and Dir options
-          are mandatory.</p>
+	<p><c>list_groups/1, list_groups/2</c> and <c>list_groups/3</c> 
+	lists all the groups available. 
+	If there is an error, <c>{error, Reason}</c> is returned. 
+	When <c>list_groups/1</c> is called the Port and Dir options
+	are mandatory.</p>
+
+	<marker id="delete_group"></marker>
       </desc>
     </func>
+
     <func>
       <name>delete_group(GroupName, Options) -> true | {error,Reason} &lt;name>delete_group(GroupName, Port, Dir) -> true | {error, Reason}</name>
       <name>delete_group(GroupName, Address, Port, Dir) -> true | {error, Reason}</name>
@@ -247,12 +282,16 @@
       </type>
       <desc>
         <marker id="delete_group"></marker>
-        <p><c>delete_group/2, delete_group/3</c> and <c>delete_group/4</c> deletes the 
-          group specified and returns <c>true</c>. If there is an error, 
-          <c>{error, Reason}</c> is returned. When <c>delete_group/2</c> is called the 
-          Port and Dir options are mandatory.</p>
+	<p><c>delete_group/2, delete_group/3</c> and <c>delete_group/4</c> 
+	deletes the group specified and returns <c>true</c>. 
+	If there is an error, <c>{error, Reason}</c> is returned. 
+	When <c>delete_group/2</c> is called the 
+	Port and Dir options are mandatory.</p>
+
+	<marker id="update_password"></marker>
       </desc>
     </func>
+
     <func>
       <name>update_password(Port, Dir, OldPassword, NewPassword, NewPassword) -> ok | {error, Reason}</name>
       <name>update_password(Address,Port, Dir, OldPassword, NewPassword, NewPassword) -> ok | {error, Reason}</name>
@@ -268,10 +307,12 @@
       </type>
       <desc>
         <marker id="update_password"></marker>
-        <p><c>update_password/5</c> and <c>update_password/6</c> Updates the AuthAccessPassword
-          for the specified directory. If NewPassword is equal to "NoPassword" no password is requires to
-          change authorisation data. If NewPassword is equal to "DummyPassword" no changes can be done 
-          without changing the password first.</p>
+        <p><c>update_password/5</c> and <c>update_password/6</c> 
+	Updates the AuthAccessPassword for the specified directory. 
+	If NewPassword is equal to "NoPassword" no password is requires to
+	change authorisation data. 
+	If NewPassword is equal to "DummyPassword" no changes can be done 
+	without changing the password first.</p>
       </desc>
     </func>
   </funcs>
diff --git a/lib/inets/doc/src/notes_history.xml b/lib/inets/doc/src/notes_history.xml
index 151bec375e..bd59c1ba47 100644
--- a/lib/inets/doc/src/notes_history.xml
+++ b/lib/inets/doc/src/notes_history.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2011</year>
+      <year>2004</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/inets/doc/src/part.xml b/lib/inets/doc/src/part.xml
index 36955df6b3..3b6734a9b8 100644
--- a/lib/inets/doc/src/part.xml
+++ b/lib/inets/doc/src/part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/inets/doc/src/part_notes.xml b/lib/inets/doc/src/part_notes.xml
index 21f464318b..81b0dedbfa 100644
--- a/lib/inets/doc/src/part_notes.xml
+++ b/lib/inets/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/inets/doc/src/part_notes_history.xml b/lib/inets/doc/src/part_notes_history.xml
index 3c1e6f5232..f714a6d2e3 100644
--- a/lib/inets/doc/src/part_notes_history.xml
+++ b/lib/inets/doc/src/part_notes_history.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/inets/doc/src/tftp.xml b/lib/inets/doc/src/tftp.xml
index 96d6ae0dd5..0b3e93a153 100644
--- a/lib/inets/doc/src/tftp.xml
+++ b/lib/inets/doc/src/tftp.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2006</year><year>2009</year>
+      <year>2006</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -218,6 +218,8 @@
 	  <c>5</c> times when the timeout expires.</p>
       </item>
     </taglist>
+
+    <marker id="start1"></marker>
   </section>
 
   <funcs>
@@ -231,11 +233,14 @@
       </type>
       <desc>
         <p>Starts a daemon process which listens for udp packets on a
-          port. When it receives a request for read or write it spawns
-          a temporary server process which handles the actual transfer
-          of the (virtual) file.</p>
+	port. When it receives a request for read or write it spawns
+	a temporary server process which handles the actual transfer
+	of the (virtual) file.</p>
+	
+	<marker id="read_file"></marker>
       </desc>
     </func>
+
     <func>
       <name>read_file(RemoteFilename, LocalFilename, Options) -> {ok, LastCallbackState} | {error, Reason}</name>
       <fsummary>Read a (virtual) file from a TFTP server</fsummary>
@@ -248,23 +253,26 @@
       </type>
       <desc>
         <p>Reads a (virtual) file <c>RemoteFilename</c> from a TFTP
-          server.</p>
-        <p>If <c>LocalFilename</c> is the atom <c>binary</c>,
-          <c>tftp_binary</c> is used as callback module. It concatenates
-          all transferred blocks and returns them as one single binary
-          in <c>LastCallbackState</c>.</p>
-        <p>If <c>LocalFilename</c> is a string and there are no
-          registered callback modules, <c>tftp_file</c> is used as
-          callback module. It writes each transferred block to the file
-          named <c>LocalFilename</c> and returns the number of
-          transferred bytes in <c>LastCallbackState</c>.</p>
-        <p>If <c>LocalFilename</c> is a string and there are registered
-          callback modules, <c>LocalFilename</c> is tested against
-          the regexps of these and the callback module corresponding to
-          the first match is used, or an error tuple is returned if no
-          matching regexp is found.</p>
+	server.</p>
+	<p>If <c>LocalFilename</c> is the atom <c>binary</c>,
+	<c>tftp_binary</c> is used as callback module. It concatenates
+	all transferred blocks and returns them as one single binary
+	in <c>LastCallbackState</c>.</p>
+	<p>If <c>LocalFilename</c> is a string and there are no
+	registered callback modules, <c>tftp_file</c> is used as
+	callback module. It writes each transferred block to the file
+	named <c>LocalFilename</c> and returns the number of
+	transferred bytes in <c>LastCallbackState</c>.</p>
+	<p>If <c>LocalFilename</c> is a string and there are registered
+	callback modules, <c>LocalFilename</c> is tested against
+	the regexps of these and the callback module corresponding to
+	the first match is used, or an error tuple is returned if no
+	matching regexp is found.</p>
       </desc>
+	
+      <marker id="write_file"></marker>
     </func>
+
     <func>
       <name>write_file(RemoteFilename, LocalFilename, Options) -> {ok, LastCallbackState} | {error, Reason}</name>
       <fsummary>Write a (virtual) file to a TFTP server</fsummary>
@@ -288,10 +296,12 @@
           block by block and returns the number of transferred bytes
           in <c>LastCallbackState</c>.</p>
         <p>If <c>LocalFilename</c> is a string and there are registered
-          callback modules, <c>LocalFilename</c> is tested against
-          the regexps of these and the callback module corresponding to
-          the first match is used, or an error tuple is returned if no
-          matching regexp is found.</p>
+	callback modules, <c>LocalFilename</c> is tested against
+	the regexps of these and the callback module corresponding to
+	the first match is used, or an error tuple is returned if no
+	matching regexp is found.</p>
+	
+	<marker id="info_daemons"></marker>
       </desc>
     </func>
 
@@ -304,8 +314,9 @@
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>Returns info about all TFTP daemon processes.
-        </p>
+        <p>Returns info about all TFTP daemon processes. </p>
+	
+	<marker id="info_servers"></marker>
       </desc>
     </func>
 
@@ -318,8 +329,9 @@
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>Returns info about all TFTP server processes.
-        </p>
+        <p>Returns info about all TFTP server processes. </p>
+	
+	<marker id="info_pid"></marker>
       </desc>
     </func>
 
@@ -332,6 +344,8 @@
       </type>
       <desc>
         <p>Returns info about a TFTP daemon, server or client process.</p>
+	
+	<marker id="change_config_daemons"></marker>
       </desc>
     </func>
 
@@ -346,8 +360,9 @@
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>Changes config for all TFTP daemon processes
-        </p>
+        <p>Changes config for all TFTP daemon processes. </p>
+	
+	<marker id="change_config_servers"></marker>
       </desc>
     </func>
 
@@ -362,8 +377,9 @@
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>Changes config for all TFTP server processes
-        </p>
+        <p>Changes config for all TFTP server processes. </p>
+	
+	<marker id="change_config_pid"></marker>
       </desc>
     </func>
 
@@ -378,8 +394,11 @@
       </type>
       <desc>
         <p>Changes config for a TFTP daemon, server or client process</p>
+	
+	<marker id="start2"></marker>
       </desc>
     </func>
+
     <func>
       <name>start() -> ok | {error, Reason}</name>
       <fsummary>Start the Inets application</fsummary>
@@ -442,8 +461,9 @@
     by the already ongoing connection on the server
     side. By not setting up yet another connection, in
     parallel with the ongoing one, the server will
-    consumer lesser resources.
-    </p>
+    consumer lesser resources. </p>
+    
+    <marker id="prepare"></marker>
   </section>
 
   <funcs>
@@ -468,17 +488,20 @@
         <v>Text = string()</v>
       </type>
       <desc>
-        <p>Prepares to open a file on the client side.</p>
-        <p>No new options may be added, but the ones that are present in
-          <c>SuggestedOptions</c> may be omitted or replaced with new
-          values in <c>AcceptedOptions</c>.</p>
-        <p>Will be followed by a call to <c>open/4</c> before any
-          read/write access is performed. <c>AcceptedOptions</c> is
-          sent to the server which replies with those options that it
-          accepts. These will be forwarded to <c>open/4</c> as
-          <c>SuggestedOptions</c>.</p>
+	<p>Prepares to open a file on the client side.</p>
+	<p>No new options may be added, but the ones that are present in
+	<c>SuggestedOptions</c> may be omitted or replaced with new
+	values in <c>AcceptedOptions</c>.</p>
+	<p>Will be followed by a call to <c>open/4</c> before any
+	read/write access is performed. <c>AcceptedOptions</c> is
+	sent to the server which replies with those options that it
+	accepts. These will be forwarded to <c>open/4</c> as
+	<c>SuggestedOptions</c>.</p>
+    
+	<marker id="open"></marker>
       </desc>
     </func>
+
     <func>
       <name>open(Peer, Access, Filename, Mode, SuggestedOptions, State) -> {ok, AcceptedOptions, NewState} | {error, {Code, Text}}</name>
       <fsummary>Open a file for read or write access</fsummary>
@@ -503,14 +526,17 @@
       <desc>
         <p>Opens a file for read or write access.</p>
         <p>On the client side where the <c>open/5</c> call has been
-          preceded by a call to <c>prepare/5</c>, all options must be
-          accepted or rejected.</p>
-        <p>On the server side, where there is no preceding
-          <c>prepare/5</c> call, no new options may be added, but
-          the ones that are present in <c>SuggestedOptions</c> may be
-          omitted or replaced with new values in <c>AcceptedOptions</c>.</p>
+	preceded by a call to <c>prepare/5</c>, all options must be
+	accepted or rejected.</p>
+	<p>On the server side, where there is no preceding
+	<c>prepare/5</c> call, no new options may be added, but
+	the ones that are present in <c>SuggestedOptions</c> may be
+	omitted or replaced with new values in <c>AcceptedOptions</c>.</p>
+    
+	<marker id="read"></marker>
       </desc>
     </func>
+
     <func>
       <name>read(State) -> {more, Bin, NewState} | {last, Bin, FileSize} | {error, {Code, Text}}</name>
       <fsummary>Read a chunk from the file</fsummary>
@@ -526,15 +552,18 @@
       <desc>
         <p>Read a chunk from the file.</p>
         <p>The callback function is expected to close
-          the file when the last file chunk is
-          encountered. When an error is encountered
-          the callback function is expected to clean
-          up after the aborted file transfer, such as
-          closing open file descriptors etc. In both
-          cases there will be no more calls to any of
-          the callback functions.</p>
+	the file when the last file chunk is
+	encountered. When an error is encountered
+	the callback function is expected to clean
+	up after the aborted file transfer, such as
+	closing open file descriptors etc. In both
+	cases there will be no more calls to any of
+	the callback functions.</p>
+    
+	<marker id="write"></marker>
       </desc>
     </func>
+
     <func>
       <name>write(Bin, State) -> {more, NewState} | {last, FileSize} | {error, {Code, Text}}</name>
       <fsummary>Write a chunk to the file</fsummary>
@@ -550,15 +579,18 @@
       <desc>
         <p>Write a chunk to the file.</p>
         <p>The callback function is expected to close
-          the file when the last file chunk is
-          encountered. When an error is encountered
-          the callback function is expected to clean
-          up after the aborted file transfer, such as
-          closing open file descriptors etc. In both
-          cases there will be no more calls to any of
-          the callback functions.</p>
+	the file when the last file chunk is
+	encountered. When an error is encountered
+	the callback function is expected to clean
+	up after the aborted file transfer, such as
+	closing open file descriptors etc. In both
+	cases there will be no more calls to any of
+	the callback functions.</p>
+    
+	<marker id="abort"></marker>
       </desc>
     </func>
+
     <func>
       <name>abort(Code, Text, State) -> ok</name>
       <fsummary>Abort the file transfer</fsummary>
@@ -572,14 +604,14 @@
       <desc>
         <p>Invoked when the file transfer is aborted.</p>
         <p>The callback function is expected to clean
-          up its used resources after the aborted file
-          transfer, such as closing open file
-          descriptors etc. The function will not be
-          invoked if any of the other callback
-          functions returns an error, as it is
-          expected that they already have cleaned up
-          the necessary resources. It will however be
-          invoked if the functions fails (crashes).</p>
+	up its used resources after the aborted file
+	transfer, such as closing open file
+	descriptors etc. The function will not be
+	invoked if any of the other callback
+	functions returns an error, as it is
+	expected that they already have cleaned up
+	the necessary resources. It will however be
+	invoked if the functions fails (crashes).</p>
       </desc>
     </func>
   </funcs>
@@ -589,7 +621,9 @@
     <title>LOGGER FUNCTIONS</title>
     
     <p>A <c>tftp_logger</c> callback module should be implemented as a
-      <c>tftp_logger</c> behavior and export the functions listed below.</p>
+    <c>tftp_logger</c> behavior and export the functions listed below.</p>
+    
+    <marker id="error_msg"></marker>
     </section>
 
   <funcs>
@@ -602,7 +636,10 @@
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>Log an error message. See <c>error_logger:error_msg/2 for details.</c> </p>
+	<p>Log an error message. 
+	See <c>error_logger:error_msg/2 for details.</c> </p>
+	
+	<marker id="warning_msg"></marker>
       </desc>
     </func>
 
@@ -615,7 +652,10 @@
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>Log a warning message. See <c>error_logger:warning_msg/2 for details.</c> </p>
+        <p>Log a warning message. 
+	See <c>error_logger:warning_msg/2 for details.</c> </p>
+	
+	<marker id="info_msg"></marker>
       </desc>
     </func>
 
@@ -628,7 +668,8 @@
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>Log an info message. See <c>error_logger:info_msg/2 for details.</c> </p>
+        <p>Log an info message. 
+	See <c>error_logger:info_msg/2 for details.</c> </p>
       </desc>
     </func>
   </funcs>