OTP-8057 Removed spurious documentation files.

12 files changed, 58 insertions, 108 deletions

diff --git a/lib/reltool/doc/src/Makefile b/lib/reltool/doc/src/Makefile
index 2c634bdf6c..8bc1488f77 100644
--- a/lib/reltool/doc/src/Makefile
+++ b/lib/reltool/doc/src/Makefile
@@ -1,19 +1,19 @@
 #
 # %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2009. All Rights Reserved.
-# 
+#
+# Copyright Ericsson AB 2009-2010. 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
 # compliance with the License. You should have received a copy of the
 # Erlang Public License along with this software. If not, it can be
 # retrieved online at http://www.erlang.org/.
-# 
+#
 # Software distributed under the License is distributed on an "AS IS"
 # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 # the License for the specific language governing rights and limitations
 # under the License.
-# 
+#
 # %CopyrightEnd%
 
 include $(ERL_TOP)/make/target.mk
@@ -39,6 +39,10 @@ include files.mk
 
 # ----------------------------------------------------
 
+XML_FILES = \
+	$(BOOK_FILES)  $(XML_APPLICATION_FILES) $(XML_REF3_FILES) \
+	$(XML_PART_FILES) $(XML_CHAPTER_FILES)
+
 HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \
 	$(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html)
 
@@ -46,10 +50,6 @@ INFO_FILE = ../../info
 
 MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
 
-XML_FILES = \
-	$(BOOK_FILES) $(XML_CHAPTER_FILES) \
-	$(XML_PART_FILES) $(XML_REF3_FILES) $(XML_APPLICATION_FILES)
-
 HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
@@ -72,15 +72,20 @@ $(TOP_PDF_FILE): $(XML_FILES)
 
 pdf: $(TOP_PDF_FILE)
 
-html: gifs $(HTML_REF_MAN_FILE)
+html:images $(HTML_REF_MAN_FILE)
 
 man: $(MAN3_FILES)
 
-gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
+images: $(IMAGE_FILES:%=$(HTMLDIR)/%)
 
 debug opt: 
 
 clean clean_docs:
+	for file in $(XML_FILES); do \
+		if  [ -f $$file\src ]; then \
+                  rm -f $$file; \
+                  fi \
+        done
 	rm -rf $(HTMLDIR)/*
 	rm -f $(MAN3DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
@@ -95,8 +100,7 @@ release_docs_spec: docs
 	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
 	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
 	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
+	$(INSTALL_DATA) $(HTMLDIR)/* $(RELSYSDIR)/doc/html
 	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
 	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
 	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
diff --git a/lib/reltool/doc/src/book.gif b/lib/reltool/doc/src/book.gif
deleted file mode 100644
index 94b3868792..0000000000
--- a/lib/reltool/doc/src/book.gif
+++ /dev/null
diff --git a/lib/reltool/doc/src/fascicules.xml b/lib/reltool/doc/src/fascicules.xml
deleted file mode 100644
index a57808974e..0000000000
--- a/lib/reltool/doc/src/fascicules.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE fascicules SYSTEM "fascicules.dtd">
-
-<fascicules>
-  <fascicule file="part" href="part_frame.html" entry="no">
-    User's Guide
-  </fascicule>
-  <fascicule file="ref_man" href="ref_man_frame.html" entry="yes">
-    Reference Manual
-  </fascicule>
-  <fascicule file="part_notes" href="part_notes_frame.html" entry="no">
-    Release Notes
-  </fascicule>
-  <fascicule file="" href="../../../../doc/print.html" entry="no">
-    Off-Print
-  </fascicule>
-</fascicules>
diff --git a/lib/reltool/doc/src/files.mk b/lib/reltool/doc/src/files.mk
index b2dc06411d..07b52f4934 100644
--- a/lib/reltool/doc/src/files.mk
+++ b/lib/reltool/doc/src/files.mk
@@ -1,20 +1,20 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 #
 # %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2009. All Rights Reserved.
-# 
+#
+# Copyright Ericsson AB 2009-2010. 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
 # compliance with the License. You should have received a copy of the
 # Erlang Public License along with this software. If not, it can be
 # retrieved online at http://www.erlang.org/.
-# 
+#
 # Software distributed under the License is distributed on an "AS IS"
 # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 # the License for the specific language governing rights and limitations
 # under the License.
-# 
+#
 # %CopyrightEnd%
 
 XML_APPLICATION_FILES = \
@@ -24,8 +24,7 @@ XML_REF3_FILES = \
 	reltool.xml
 
 XML_PART_FILES = \
-	part.xml \
-        part_notes.xml
+	part.xml
 
 XML_CHAPTER_FILES = \
 	reltool_intro.xml \
@@ -35,11 +34,5 @@ XML_CHAPTER_FILES = \
 
 BOOK_FILES = book.xml
 
-GIF_FILES = \
-	book.gif \
-	note.gif \
-	notes.gif \
-	ref_man.gif \
-	user_guide.gif \
-	warning.gif
+IMAGE_FILES =
 
diff --git a/lib/reltool/doc/src/note.gif b/lib/reltool/doc/src/note.gif
deleted file mode 100644
index 6fffe30419..0000000000
--- a/lib/reltool/doc/src/note.gif
+++ /dev/null
diff --git a/lib/reltool/doc/src/notes.gif b/lib/reltool/doc/src/notes.gif
deleted file mode 100644
index e000cca26a..0000000000
--- a/lib/reltool/doc/src/notes.gif
+++ /dev/null
diff --git a/lib/reltool/doc/src/part_notes.xml b/lib/reltool/doc/src/part_notes.xml
deleted file mode 100644
index 5a2aeecce6..0000000000
--- a/lib/reltool/doc/src/part_notes.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE part SYSTEM "part.dtd">
-
-<part xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>2009</year>
-      <year>2009</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  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
-  compliance with the License. You should have received a copy of the
-  Erlang Public License along with this software. If not, it can be
-  retrieved online at http://www.erlang.org/.
-
-  Software distributed under the License is distributed on an "AS IS"
-  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-  the License for the specific language governing rights and limitations
-  under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>Reltool Release Notes</title>
-    <prepared>H&aring;kan Mattsson</prepared>
-    <docno></docno>
-    <date></date>
-    <rev>%VSN%</rev>
-  </header>
-  <description>
-    <p><c>Reltool</c> is a release management tool. It analyses a given
-     Erlang/OTP installation and determines various dependencies
-     between applications. The <c>graphical</c> frontend depicts the
-     dependencies and enables interactive customization of a
-     target system. The backend provides a <c>batch</c> interface
-     for generation of customized target systems.</p>
-  </description>
-  <xi:include href="notes.xml"/>
-</part>
diff --git a/lib/reltool/doc/src/ref_man.gif b/lib/reltool/doc/src/ref_man.gif
deleted file mode 100644
index b13c4efd53..0000000000
--- a/lib/reltool/doc/src/ref_man.gif
+++ /dev/null
diff --git a/lib/reltool/doc/src/reltool_examples.xml b/lib/reltool/doc/src/reltool_examples.xml
index 3d087862e6..d6db246f6c 100644
--- a/lib/reltool/doc/src/reltool_examples.xml
+++ b/lib/reltool/doc/src/reltool_examples.xml
@@ -45,7 +45,8 @@
     its server can be obtained with <c>reltool:get_server/1</c></p>
     
     <pre>
-Erlang R13B02 (erts-5.7.3) [source] [64-bit] [smp:4:4] [rq:4] [async-threads:0] [kernel-poll:false]
+Erlang R13B02 (erts-5.7.3) [source] [64-bit] [smp:4:4] [rq:4]
+                           [async-threads:0] [kernel-poll:false]
 
 Eshell V5.7.3  (abort with ^G)
 1&gt; {ok, Win} = reltool:start([]).
@@ -72,10 +73,13 @@ ok
     <title>Inspecting the configuration</title>
 
     <pre>
-Erlang R13B02 (erts-5.7.3) [source] [64-bit] [smp:4:4] [rq:4] [async-threads:0] [kernel-poll:false]
+Erlang R13B02 (erts-5.7.3) [source] [64-bit] [smp:4:4] [rq:4]
+                           [async-threads:0] [kernel-poll:false]
 
 Eshell V5.7.3  (abort with ^G)
-1&gt; Config = {sys, [{escript, "examples/display_args", [{incl_cond, include}]},
+1&gt; Config = {sys, [{escript, 
+                    "examples/display_args",
+                    [{incl_cond, include}]},
 		   {app, inets, [{incl_cond, include}]},
 		   {app, mnesia, [{incl_cond, exclude}]},
 		   {app, ssl, [{incl_cond, exclude}]},
@@ -244,7 +248,8 @@ Eshell V5.7.3  (abort with ^G)
     <title>Generate release and script files</title>
     <pre>
 5&gt; {ok, Server} = reltool:start_server([{config, {sys, [{boot_rel, "NAME"},
-                                                        {rel, "NAME", "VSN", [kernel, stdlib, sasl]}]}}]).
+                                                        {rel, "NAME", "VSN",
+                                                        [kernel, stdlib, sasl]}]}}]).
 {ok,&lt;0.1288.0&gt;}
 6&gt;  reltool:get_config(Server).
 {ok,{sys,[{boot_rel,"NAME"},
@@ -297,10 +302,13 @@ ok
   <section>
     <title>Create a target system</title>
     <pre>
-Erlang R13B02 (erts-5.7.3) [source] [64-bit] [smp:4:4] [rq:4] [async-threads:0] [kernel-poll:false]
+Erlang R13B02 (erts-5.7.3) [source] [64-bit] [smp:4:4] [rq:4]
+                           [async-threads:0] [kernel-poll:false]
 
 Eshell V5.7.3  (abort with ^G)
-1&gt; Config = {sys, [{escript, "examples/display_args", [{incl_cond, include}]},
+1&gt; Config = {sys, [{escript, 
+                    "examples/display_args", 
+                    [{incl_cond, include}]},
 		   {app, inets, [{incl_cond, include}]},
 		   {app, mnesia, [{incl_cond, exclude}]},
 		   {app, ssl, [{incl_cond, exclude}]},
@@ -320,11 +328,11 @@ Eshell V5.7.3  (abort with ^G)
                  [{write_file,"start_erl.data","5.7.3 1.0"},
                   {create_dir,"1.0",
                               [{write_file,"start_clean.rel",
-                                           [37,37,32,114,101,108,32,103,101,110,101,114,97,116|...]},
+                                           [37,37,32,114,101,108,32,103,101,110,101|...]},
                                {write_file,"start_clean.script",
-                                           [37,37,32,115,99,114,105,112,116,32,103,101,110|...]},
+                                           [37,37,32,115,99,114,105,112,116,32|...]},
                                {write_file,"start_clean.boot",
-                                           &lt;&lt;131,104,3,100,0,6,115,99,114,105,112,116,...&gt;&gt;},
+                                           &lt;&lt;131,104,3,100,0,6,115,99,114,...&gt;&gt;},
                                {write_file,"start_sasl.rel",
                                            [37,37,32,114,101,108,32,103,101,110,101|...]},
                                {write_file,"start_sasl.script",
@@ -409,11 +417,13 @@ Eshell V5.7.3  (abort with ^G)
                                                       {copy_file,...},
                                                       {...}|...]},
                                          {create_dir,"src",
-                                                     [{copy_file,[...]},{copy_file,...},{...}|...]}]}]},
+                                                     [{copy_file,[...]},
+                                                      {copy_file,...},{...}|...]}]}]},
                   {archive,"crypto-1.6.1.ez",[],
                            [{create_dir,"crypto-1.6.1",
                                         [{create_dir,"ebin",
-                                                     [{copy_file,[...]},{copy_file,...},{...}|...]},
+                                                     [{copy_file,[...]},
+                                                      {copy_file,...},{...}|...]},
                                          {create_dir,"src",[{copy_file,...},{...}|...]}]}]},
                   {create_dir,"crypto-1.6.1",
                               [{create_dir,"priv",
diff --git a/lib/reltool/doc/src/user_guide.gif b/lib/reltool/doc/src/user_guide.gif
deleted file mode 100644
index e6275a803d..0000000000
--- a/lib/reltool/doc/src/user_guide.gif
+++ /dev/null
diff --git a/lib/reltool/doc/src/warning.gif b/lib/reltool/doc/src/warning.gif
deleted file mode 100644
index 96af52360e..0000000000
--- a/lib/reltool/doc/src/warning.gif
+++ /dev/null
diff --git a/lib/reltool/src/reltool_target.erl b/lib/reltool/src/reltool_target.erl
index 895fc6702b..6d85a98d9f 100644
--- a/lib/reltool/src/reltool_target.erl
+++ b/lib/reltool/src/reltool_target.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2009-2010. 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
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 
 -module(reltool_target).
@@ -966,9 +966,9 @@ do_eval_spec({create_dir, Dir, Files}, OrigSourceDir, SourceDir, TargetDir) ->
     TargetDir2 = filename:join([TargetDir, Dir]),
     reltool_utils:create_dir(TargetDir2),
     do_eval_spec(Files, OrigSourceDir, SourceDir2, TargetDir2);
-do_eval_spec({create_dir, NewDir, OldDir, Files}, OrigSourceDir, _SourceDir, TargetDir) ->
+do_eval_spec({create_dir, Dir, OldDir, Files}, OrigSourceDir, _SourceDir, TargetDir) ->
     SourceDir2 = filename:join([OrigSourceDir, OldDir]),
-    TargetDir2 = filename:join([TargetDir, NewDir]),
+    TargetDir2 = filename:join([TargetDir, Dir]),
     reltool_utils:create_dir(TargetDir2),
     do_eval_spec(Files, SourceDir2, SourceDir2, TargetDir2);
 do_eval_spec({archive, Archive, Options, Files}, OrigSourceDir, SourceDir, TargetDir) ->
@@ -992,9 +992,9 @@ do_eval_spec({copy_file, File}, _OrigSourceDir, SourceDir, TargetDir) ->
     SourceFile = filename:join([SourceDir, File]),
     TargetFile = filename:join([TargetDir, File]),
     reltool_utils:copy_file(SourceFile, TargetFile);
-do_eval_spec({copy_file, NewFile, OldFile}, OrigSourceDir, _SourceDir, TargetDir) ->
+do_eval_spec({copy_file, File, OldFile}, OrigSourceDir, _SourceDir, TargetDir) ->
     SourceFile = filename:join([OrigSourceDir, OldFile]),
-    TargetFile = filename:join([TargetDir, NewFile]),
+    TargetFile = filename:join([TargetDir, File]),
     reltool_utils:copy_file(SourceFile, TargetFile);
 do_eval_spec({write_file, File, IoList}, _OrigSourceDir, _SourceDir, TargetDir) ->
     TargetFile = filename:join([TargetDir, File]),
@@ -1014,8 +1014,8 @@ cleanup_spec({create_dir, Dir, Files}, TargetDir) ->
     TargetDir2 = filename:join([TargetDir, Dir]),
     cleanup_spec(Files, TargetDir2),
     file:del_dir(TargetDir2);
-cleanup_spec({create_dir, NewDir, _OldDir, Files}, TargetDir) ->
-    TargetDir2 = filename:join([TargetDir, NewDir]),
+cleanup_spec({create_dir, Dir, _OldDir, Files}, TargetDir) ->
+    TargetDir2 = filename:join([TargetDir, Dir]),
     cleanup_spec(Files, TargetDir2),
     file:del_dir(TargetDir2);
 cleanup_spec({archive, Archive, _Options, Files}, TargetDir) ->
@@ -1125,6 +1125,8 @@ match(String, [#regexp{source = _, compiled = MP} | Regexps]) ->
     end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Old style installation
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 install(RelName, TargetDir) ->
     try
@@ -1220,7 +1222,6 @@ subst_var([C| Rest], Vars, Result, VarAcc) ->
     subst_var(Rest, Vars, Result, [C| VarAcc]);
 subst_var([], Vars, Result, VarAcc) ->
     subst([], Vars, [VarAcc ++ [$% | Result]]).
-   
 
 start_scripts() ->
     ["erl", "start", "start_erl"].