Merge branch 'rc/edoc-minor' into dev

* rc/edoc-minor:
  forgot to ensure that xmerl is found in path for include_lib to work
  fix -spec declaration that doesn't work in R13B04
  eliminate warnings about unused imports
  removed CVS-keywords from source files
  synchronized with edoc development version

OTP-9463

23 files changed, 41 insertions, 80 deletions

diff --git a/lib/edoc/Makefile b/lib/edoc/Makefile
index e512e390e3..1add669398 100644
--- a/lib/edoc/Makefile
+++ b/lib/edoc/Makefile
@@ -13,8 +13,6 @@
 # Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
 # AB. All Rights Reserved.''
 # 
-#     $Id$
-#
 include $(ERL_TOP)/make/target.mk
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
diff --git a/lib/edoc/doc/Makefile b/lib/edoc/doc/Makefile
index a0f6484382..c5f68b25d0 100644
--- a/lib/edoc/doc/Makefile
+++ b/lib/edoc/doc/Makefile
@@ -13,8 +13,6 @@
 # Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
 # AB. All Rights Reserved.''
 # 
-#     $Id: Makefile,v 1.1.1.1 2004/10/04 13:53:33 richardc Exp $
-#
 include $(ERL_TOP)/make/target.mk
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
diff --git a/lib/edoc/doc/overview.edoc b/lib/edoc/doc/overview.edoc
index bd603b7a13..fa699c6f08 100644
--- a/lib/edoc/doc/overview.edoc
+++ b/lib/edoc/doc/overview.edoc
@@ -1084,10 +1084,11 @@ Details:
       the Erlang programming language.</li>
   <li>`boolean()' is the subset of `atom()' consisting
       of the atoms `true' and `false'.</li>
-  <li>`char()' is a subset of
-      `integer()' representing character codes.</li>
+  <li>`char()' is the subset of `integer()' representing
+      Unicode character codes: hex 000000-10FFFF.</li>
   <li>`tuple()' is the set of all tuples `{...}'.</li>
-  <li>`list(T)' is just an alias for `[T]'.</li>
+  <li>`list(T)' is just an alias for `[T]'; list() is an alias
+      for `list(any())', i.e., `[any()]'.</li>
   <li>`nil()' is an alias for the empty list `[]'.</li>
   <li>`cons(H,T)' is the list constructor. This is usually not
       used directly. It is possible to recursively define `list(T)
diff --git a/lib/edoc/doc/src/Makefile b/lib/edoc/doc/src/Makefile
index 5ee0096f0f..b933094464 100644
--- a/lib/edoc/doc/src/Makefile
+++ b/lib/edoc/doc/src/Makefile
@@ -13,8 +13,6 @@
 # Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
 # AB. All Rights Reserved.''
 # 
-#     $Id$
-#
 include $(ERL_TOP)/make/target.mk
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
diff --git a/lib/edoc/include/Makefile b/lib/edoc/include/Makefile
index 0533c27567..5b2ad38c9d 100644
--- a/lib/edoc/include/Makefile
+++ b/lib/edoc/include/Makefile
@@ -13,8 +13,6 @@
 # Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
 # AB. All Rights Reserved.''
 # 
-#     $Id$
-#
 include $(ERL_TOP)/make/target.mk
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
diff --git a/lib/edoc/priv/edoc_generate.src b/lib/edoc/priv/edoc_generate.src
index e87fdbc902..7ec89207b0 100644
--- a/lib/edoc/priv/edoc_generate.src
+++ b/lib/edoc/priv/edoc_generate.src
@@ -14,9 +14,6 @@
 # Portions created by Ericsson are Copyright 1999-2000, Ericsson 
 # Utvecklings AB. All Rights Reserved.''
 # 
-#     $Id$
-#
-#
 
 #EDOC_DIR=/clearcase/otp/internal_tools/edoc
 EDOC_DIR=/home/otp/sgml/edoc-%EDOC_VSN%
diff --git a/lib/edoc/src/Makefile b/lib/edoc/src/Makefile
index 9c5a9d30d1..fcb0b61292 100644
--- a/lib/edoc/src/Makefile
+++ b/lib/edoc/src/Makefile
@@ -23,7 +23,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/edoc-$(VSN)
 
 EBIN = ../ebin
 XMERL = ../../xmerl
-ERL_COMPILE_FLAGS += -I../include -I$(XMERL)/include +warn_unused_vars +nowarn_shadow_vars +warn_unused_import +warn_deprecated_guard
+ERL_COMPILE_FLAGS += -pa $(XMERL) -I../include -I$(XMERL)/include +warn_unused_vars +nowarn_shadow_vars +warn_unused_import +warn_deprecated_guard
 
 SOURCES= \
 	edoc.erl edoc_data.erl edoc_doclet.erl edoc_extract.erl \
diff --git a/lib/edoc/src/edoc.erl b/lib/edoc/src/edoc.erl
index 360f2dbc9e..a279f7dcb3 100644
--- a/lib/edoc/src/edoc.erl
+++ b/lib/edoc/src/edoc.erl
@@ -14,8 +14,6 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$
-%%
 %% @copyright 2001-2007 Richard Carlsson
 %% @author Richard Carlsson <[email protected]>
 %% @version {@version}
@@ -60,8 +58,6 @@
 
 -compile({no_auto_import,[error/1]}).
 
--import(edoc_report, [report/2, report/3, error/1, error/3]).
-
 -include("edoc.hrl").
 
 
@@ -179,8 +175,8 @@ application(App, Options) when is_atom(App) ->
  	Dir when is_list(Dir) ->
  	    application(App, Dir, Options);
  	_ ->
- 	    report("cannot find application directory for '~s'.",
- 		   [App]),
+	    edoc_report:report("cannot find application directory for '~s'.",
+                               [App]),
  	    exit(error)
     end.
 
@@ -663,8 +659,8 @@ read_source(Name, Opts0) ->
 	    check_forms(Forms, Name),
 	    Forms;
 	{error, R} ->
-	    error({"error reading file '~s'.",
-		   [edoc_lib:filename(Name)]}),
+	    edoc_report:error({"error reading file '~s'.",
+                               [edoc_lib:filename(Name)]}),
 	    exit({error, R})
     end.
 
@@ -688,11 +684,10 @@ check_forms(Fs, Name) ->
 		 error_marker ->
 		     case erl_syntax:error_marker_info(F) of
 			 {L, M, D} ->
-			     error(L, Name, {format_error, M, D});
-
+			     edoc_report:error(L, Name, {format_error, M, D});
 			 Other ->
-			     report(Name, "unknown error in "
-				    "source code: ~w.", [Other])
+			     edoc_report:report(Name, "unknown error in "
+                                                "source code: ~w.", [Other])
 		     end,
 		     exit(error);
 		 _ ->
diff --git a/lib/edoc/src/edoc_data.erl b/lib/edoc/src/edoc_data.erl
index 27f43dca5a..e3b5a0d51b 100644
--- a/lib/edoc/src/edoc_data.erl
+++ b/lib/edoc/src/edoc_data.erl
@@ -14,8 +14,6 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$
-%%
 %% @private
 %% @copyright 2003 Richard Carlsson
 %% @author Richard Carlsson <[email protected]>
diff --git a/lib/edoc/src/edoc_doclet.erl b/lib/edoc/src/edoc_doclet.erl
index 30eef3e63a..c66be9d7c7 100644
--- a/lib/edoc/src/edoc_doclet.erl
+++ b/lib/edoc/src/edoc_doclet.erl
@@ -14,8 +14,6 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$
-%%
 %% @copyright 2003-2006 Richard Carlsson
 %% @author Richard Carlsson <[email protected]>
 %% @see edoc
@@ -52,7 +50,7 @@
 -define(IMAGE, "erlang.png").
 -define(NL, "\n").
 
--include("xmerl.hrl").
+-include_lib("xmerl/include/xmerl.hrl").
 
 %% Sources is the list of inputs in the order they were found.  Packages
 %% and Modules are sorted lists of atoms without duplicates. (They
diff --git a/lib/edoc/src/edoc_extract.erl b/lib/edoc/src/edoc_extract.erl
index 5e28762c53..1209d86fe5 100644
--- a/lib/edoc/src/edoc_extract.erl
+++ b/lib/edoc/src/edoc_extract.erl
@@ -14,8 +14,6 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id: $
-%%
 %% @copyright 2001-2003 Richard Carlsson
 %% @author Richard Carlsson <[email protected]>
 %% @see edoc
@@ -238,8 +236,8 @@ file(File, Context, Env, Opts) ->
     case file:read_file(File) of
 	{ok, Bin} ->
 	    {ok, text(binary_to_list(Bin), Context, Env, Opts, File)};
-	{error, _R} = Error ->
-	    Error
+        {error, _} = Error ->
+            Error
     end.
 
 
@@ -298,8 +296,8 @@ get_module_info(Forms, File) ->
     {Name, Vars} = case lists:keyfind(module, 1, L) of
 		       {module, N} when is_atom(N) ->
 			   {N, none};
-		       {module, {N, _Vs} = NVs} when is_atom(N) ->
-			   NVs;
+		       {module, {N, _}=Mod} when is_atom(N) ->
+			   Mod;
 		       _ ->
 			   report(File, "module name missing.", []),
 			   exit(error)
diff --git a/lib/edoc/src/edoc_layout.erl b/lib/edoc/src/edoc_layout.erl
index 3ec87b7060..1c0841815f 100644
--- a/lib/edoc/src/edoc_layout.erl
+++ b/lib/edoc/src/edoc_layout.erl
@@ -14,8 +14,6 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id: $
-%%
 %% @author Richard Carlsson <[email protected]>
 %% @copyright 2001-2006 Richard Carlsson
 %% @see edoc
@@ -33,7 +31,7 @@
 
 -import(edoc_report, [report/2]).
 
--include("xmerl.hrl").
+-include_lib("xmerl/include/xmerl.hrl").
 
 -define(HTML_EXPORT, xmerl_html).
 -define(DEFAULT_XML_EXPORT, ?HTML_EXPORT).
@@ -959,12 +957,16 @@ local_label(R) ->
 
 xhtml(Title, CSS, Body) ->
     [{html, [?NL,
-	    {head, [?NL,
-		    {title, Title},
-		    ?NL] ++ CSS},
-	    ?NL,
-	    {body, [{bgcolor, "white"}], Body},
-	    ?NL]
+	     {head, [?NL,
+		     {meta, [{'http-equiv',"Content-Type"},
+			     {content, "text/html; charset=ISO-8859-1"}],
+		      []},
+		     ?NL,
+		     {title, Title},
+		     ?NL] ++ CSS},
+	     ?NL,
+	     {body, [{bgcolor, "white"}], Body},
+	     ?NL]
      },
      ?NL].
 
diff --git a/lib/edoc/src/edoc_lib.erl b/lib/edoc/src/edoc_lib.erl
index 585e30a2d2..6c698e83ef 100644
--- a/lib/edoc/src/edoc_lib.erl
+++ b/lib/edoc/src/edoc_lib.erl
@@ -14,8 +14,6 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$
-%%
 %% @copyright 2001-2003 Richard Carlsson
 %% @author Richard Carlsson <[email protected]>
 %% @see edoc
@@ -40,7 +38,7 @@
 -import(edoc_report, [report/2, warning/2]).
 
 -include("edoc.hrl").
--include("xmerl.hrl").
+-include_lib("xmerl/include/xmerl.hrl").
 
 -define(FILE_BASE, "/").
 
@@ -494,7 +492,7 @@ uri_get_file(File0) ->
 uri_get_http(URI) ->
     %% Try using option full_result=false
     case catch {ok, httpc:request(get, {URI,[]}, [],
-				 [{full_result, false}])} of
+				  [{full_result, false}])} of
 	{'EXIT', _} ->
 	    uri_get_http_r10(URI);
 	Result ->
diff --git a/lib/edoc/src/edoc_parser.yrl b/lib/edoc/src/edoc_parser.yrl
index 6943f1bdb8..3ce4cde4fb 100644
--- a/lib/edoc/src/edoc_parser.yrl
+++ b/lib/edoc/src/edoc_parser.yrl
@@ -23,9 +23,6 @@
 %% USA
 %%
 %% Author contact: [email protected]
-%%
-%% $Id $
-%%
 %% =====================================================================
 
 Nonterminals
@@ -362,10 +359,10 @@ parse_spec(S, L) ->
 		{ok, Spec} ->
 		    Spec;
 		{error, E} ->
-		    throw_error(E, L)
+		    throw_error({parse_spec, E}, L)
 	    end;
 	{error, E, _} ->
-	    throw_error(E, L)
+	    throw_error({parse_spec, E}, L)
     end.
 
 %% ---------------------------------------------------------------------
diff --git a/lib/edoc/src/edoc_report.erl b/lib/edoc/src/edoc_report.erl
index ee54c60c90..f082513bee 100644
--- a/lib/edoc/src/edoc_report.erl
+++ b/lib/edoc/src/edoc_report.erl
@@ -14,8 +14,6 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$
-%% 
 %% @private
 %% @copyright 2001-2003 Richard Carlsson
 %% @author Richard Carlsson <[email protected]>
diff --git a/lib/edoc/src/edoc_run.erl b/lib/edoc/src/edoc_run.erl
index 96e5ea4631..1355db840f 100644
--- a/lib/edoc/src/edoc_run.erl
+++ b/lib/edoc/src/edoc_run.erl
@@ -14,8 +14,6 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$
-%%
 %% @copyright 2003 Richard Carlsson
 %% @author Richard Carlsson <[email protected]>
 %% @see edoc
diff --git a/lib/edoc/src/edoc_scanner.erl b/lib/edoc/src/edoc_scanner.erl
index 9d2e6f3aed..8e895ad1ad 100644
--- a/lib/edoc/src/edoc_scanner.erl
+++ b/lib/edoc/src/edoc_scanner.erl
@@ -13,8 +13,6 @@
 %% AB. Portions created by Ericsson are Copyright 1999, Ericsson
 %% Utvecklings AB. All Rights Reserved.''
 %%
-%% $Id: $
-%%
 %% @private
 %% @copyright Richard Carlsson 2001-2003. Portions created by Ericsson
 %% are Copyright 1999, Ericsson Utvecklings AB. All Rights Reserved.
diff --git a/lib/edoc/src/edoc_specs.erl b/lib/edoc/src/edoc_specs.erl
index 79a5d142bc..bfb17515be 100644
--- a/lib/edoc/src/edoc_specs.erl
+++ b/lib/edoc/src/edoc_specs.erl
@@ -87,8 +87,9 @@ dummy_spec(Form) ->
     #tag{name = spec, line = element(2, hd(TypeSpecs)),
          origin = code, data = S}.
 
--spec docs(Forms::[syntaxTree()], CommentFun) -> dict() when
-      CommentFun :: fun(([syntaxTree()], Line :: term()) -> #tag{}).
+-spec docs(Forms::[syntaxTree()],
+           CommentFun :: fun( ([syntaxTree()], Line :: term()) -> #tag{} ))
+          -> dict().
 
 %% @doc Find comments after -type/-opaque declarations.
 %% Postcomments "inside" the type are skipped.
diff --git a/lib/edoc/src/edoc_tags.erl b/lib/edoc/src/edoc_tags.erl
index 8ee8f87b5f..80989428ce 100644
--- a/lib/edoc/src/edoc_tags.erl
+++ b/lib/edoc/src/edoc_tags.erl
@@ -14,8 +14,6 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$
-%%
 %% @private
 %% @copyright 2001-2003 Richard Carlsson
 %% @author Richard Carlsson <[email protected]>
diff --git a/lib/edoc/src/edoc_types.erl b/lib/edoc/src/edoc_types.erl
index e784b3359a..a54544868c 100644
--- a/lib/edoc/src/edoc_types.erl
+++ b/lib/edoc/src/edoc_types.erl
@@ -14,8 +14,6 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$
-%%
 %% @private
 %% @copyright 2001-2003 Richard Carlsson
 %% @author Richard Carlsson <[email protected]>
@@ -34,13 +32,13 @@
 %% @headerfile "edoc_types.hrl"
 
 -include("edoc_types.hrl").
--include("xmerl.hrl").
+-include_lib("xmerl/include/xmerl.hrl").
 
 
 is_predefined(any, 0) -> true;
 is_predefined(atom, 0) -> true;
 is_predefined(binary, 0) -> true;
-is_predefined(bool, 0) -> true;
+is_predefined(bool, 0) -> true;    % kept for backwards compatibility
 is_predefined(char, 0) -> true;
 is_predefined(cons, 2) -> true;
 is_predefined(deep_string, 0) -> true;
diff --git a/lib/edoc/src/edoc_wiki.erl b/lib/edoc/src/edoc_wiki.erl
index ba33198787..2f2d14853c 100644
--- a/lib/edoc/src/edoc_wiki.erl
+++ b/lib/edoc/src/edoc_wiki.erl
@@ -14,8 +14,6 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$
-%%
 %% @private
 %% @copyright 2001-2003 Richard Carlsson
 %% @author Richard Carlsson <[email protected]>
@@ -70,7 +68,7 @@
 -export([parse_xml/2, expand_text/2]).
 
 -include("edoc.hrl").
--include("xmerl.hrl").
+-include_lib("xmerl/include/xmerl.hrl").
 
 -define(BASE_HEADING, 3).
 
@@ -82,8 +80,8 @@ parse_xml(Data, Line) ->
 
 parse_xml_1(Text, Line) ->
     Text1 = "<doc>" ++ Text ++ "</doc>",
-    Options = [{line, Line}, {encoding, "iso-8859-1"}],
-    case catch {ok, xmerl_scan:string(Text1, Options)} of
+    Opts = [{line, Line}, {encoding, 'iso-8859-1'}],
+    case catch {ok, xmerl_scan:string(Text1, Opts)} of
 	{ok, {E, _}} ->
 	    E#xmlElement.content;
 	{'EXIT', {fatal, {Reason, L, _C}}} ->
diff --git a/lib/edoc/src/otpsgml_layout.erl b/lib/edoc/src/otpsgml_layout.erl
index 45f74b299e..d425dc0ed8 100644
--- a/lib/edoc/src/otpsgml_layout.erl
+++ b/lib/edoc/src/otpsgml_layout.erl
@@ -14,8 +14,6 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$
-%%
 %% @author Richard Carlsson <[email protected]>
 %% @author Kenneth Lundin <[email protected]>
 %% @copyright 2001-2004 Richard Carlsson
@@ -34,7 +32,7 @@
 
 -import(edoc_report, [report/2]).
 
--include("xmerl.hrl").
+-include_lib("xmerl/include/xmerl.hrl").
 
 -define(SGML_EXPORT, xmerl_otpsgml).
 -define(DEFAULT_XML_EXPORT, ?SGML_EXPORT).
diff --git a/lib/edoc/test/edoc_SUITE.erl b/lib/edoc/test/edoc_SUITE.erl
index 0d57591e3e..5b95c35756 100644
--- a/lib/edoc/test/edoc_SUITE.erl
+++ b/lib/edoc/test/edoc_SUITE.erl
@@ -13,8 +13,6 @@
 %% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
 %% AB. All Rights Reserved.''
 %% 
-%%     $Id$
-%%
 -module(edoc_SUITE).
 
 -include_lib("test_server/include/test_server.hrl").