diff options
| author | Björn Gustavsson <[email protected]> | 2010-10-21 14:31:33 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2010-10-21 14:31:33 +0200 |
| commit | 4bf6acc06b5a6b155caebbf575ce524a0fedd75a (patch) | |
| tree | 542afae453222edf944a644cc70c904da0ecf30b /system/doc/top | |
| parent | 5fcb6e185734a42ff8236a1ee2626b0adfc3c65e (diff) | |
| parent | 1419cda9991775c51a931ef63a51da477391722c (diff) | |
| download | otp-4bf6acc06b5a6b155caebbf575ce524a0fedd75a.tar.gz otp-4bf6acc06b5a6b155caebbf575ce524a0fedd75a.tar.bz2 otp-4bf6acc06b5a6b155caebbf575ce524a0fedd75a.zip | |
Merge branch 'maint-r14' into dev
* maint-r14:
Prepare release
Fix that the documentation top index generator can handle an Ericsson internal application group
Teach -init_debug to print info about on_load handlers begin run
Fix hang in on_load handlers in embedded mode
Conflicts:
erts/vsn.mk
lib/kernel/vsn.mk
Diffstat (limited to 'system/doc/top')
| -rw-r--r-- | system/doc/top/Makefile | 2 | ||||
| -rw-r--r-- | system/doc/top/src/erl_html_tools.erl | 3 |
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() -> |