aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2010-10-21 12:09:24 +0200
committerErlang/OTP <[email protected]>2010-10-21 12:09:24 +0200
commit5c68a006f173a75db1ac973dd45e2fe3945958f3 (patch)
tree848ccf69c15bc6234e05ca9fc9af8ad7674a9a7c
parentc09fa792fad151f43cd3fa3d998b666a91badc5e (diff)
parent85ce3f39ba8e131d8b13ca5ade4836e703b4d041 (diff)
downloadotp-5c68a006f173a75db1ac973dd45e2fe3945958f3.tar.gz
otp-5c68a006f173a75db1ac973dd45e2fe3945958f3.tar.bz2
otp-5c68a006f173a75db1ac973dd45e2fe3945958f3.zip
Merge branch 'lars/erts/fix-erl-html-tools/OTP-8875' into maint-r14
* lars/erts/fix-erl-html-tools/OTP-8875: Fix that the documentation top index generator can handle an Ericsson internal application group
-rw-r--r--system/doc/top/Makefile2
-rw-r--r--system/doc/top/src/erl_html_tools.erl3
2 files changed, 3 insertions, 2 deletions
diff --git a/system/doc/top/Makefile b/system/doc/top/Makefile
index 148fefaf13..aac90fcaa4 100644
--- a/system/doc/top/Makefile
+++ b/system/doc/top/Makefile
@@ -246,7 +246,7 @@ release_docs_spec: docs
$(INSTALL_DATA) $(INDEX_FILES) $(MAN_INDEX) $(TOP_HTML_FILES) $(RELSYSDIR)
$(INSTALL_DIR) $(RELSYSDIR)/docbuild
$(INSTALL_DATA) $(INDEX_SCRIPT) $(MAN_INDEX_SCRIPT) $(JAVASCRIPT_BUILD_SCRIPT) \
- $(INDEX_SCRIPT_SRC) $(MAN_INDEX_SCRIPT_SRC) $(JAVASCRIPT_BUILD_SCRIPT_SRC) \
+ $(INDEX_SRC) $(MAN_INDEX_SRC) $(JAVASCRIPT_BUILD_SCRIPT_SRC) \
$(TEMPLATES) $(RELSYSDIR)/docbuild
diff --git a/system/doc/top/src/erl_html_tools.erl b/system/doc/top/src/erl_html_tools.erl
index fef56331fc..599268804e 100644
--- a/system/doc/top/src/erl_html_tools.erl
+++ b/system/doc/top/src/erl_html_tools.erl
@@ -40,7 +40,8 @@ group_order() ->
{test, "Test"},
{doc, "Documentation"},
{orb, "Object Request Broker & IDL"},
- {misc, "Miscellaneous"}
+ {misc, "Miscellaneous"},
+ {eric, "Ericsson Internal"}
].
top_index() ->