aboutsummaryrefslogtreecommitdiffstats
path: root/system/doc
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <egil@erlang.org>2012-08-30 15:59:23 +0200
committerBjörn-Egil Dahlberg <egil@erlang.org>2012-08-30 15:59:23 +0200
commitff83656affde48d373398a670584b9dc0f4e9269 (patch)
tree6c3f49278b1196dc9e3ddd04e64ba7c1eb992c8e /system/doc
parent3f959449578ce652aad353631f3c3c51aa7b5d50 (diff)
parent4685b50df9f7f4205502142bb3e2aa62ea259400 (diff)
downloadotp-ff83656affde48d373398a670584b9dc0f4e9269.tar.gz
otp-ff83656affde48d373398a670584b9dc0f4e9269.tar.bz2
otp-ff83656affde48d373398a670584b9dc0f4e9269.zip
Merge branch 'maint'
Diffstat (limited to 'system/doc')
-rw-r--r--system/doc/top/templates/index.html.src9
1 files changed, 4 insertions, 5 deletions
diff --git a/system/doc/top/templates/index.html.src b/system/doc/top/templates/index.html.src
index 655f532a5d..a3cbc8bc69 100644
--- a/system/doc/top/templates/index.html.src
+++ b/system/doc/top/templates/index.html.src
@@ -94,7 +94,7 @@ Some hints that may get you started faster
<ul>
<li>
-The complete Erlang language is described in the
+The Erlang language is described in the
<a href="reference_manual/users_guide.html">Erlang Reference Manual</a>.
An Erlang tutorial can be found in
<a href="getting_started/users_guide.html">
@@ -108,6 +108,7 @@ In addition to the documentation here Erlang is described in several recent book
</li>
<li>
<a href="http://www.pragprog.com/titles/jaerlang">"Programming Erlang"</a> from Pragmatic.
+<a href="http://www.manning.com/logan">"Erlang and OTP in Action"</a> from Manning.
</li>
</ul>
<p>
@@ -143,16 +144,14 @@ environment. ErlIDE is under active development with new features in almost ever
from the interactive shell (see <a href="getting_started/users_guide.html">
Getting Started With Erlang</a>) where you can call individual
functions. There is also a number of tools available, such as the graphical <a
-href="#debugger#/index.html" >Debugger</a>, the process
-manager <a href="#pman#/index.html" >Pman</a> and table
-viewer <a href="#tv#/index.html">TV</a>.
+href="#debugger#/index.html" >Debugger</a> and the <a href="#observer#/index.html" >Observer tool</a> for inspection of system information, ets and mnesia tables etc.
<p> Also note that there are some shell features like history list
(control-p and control-n), in line editing (Emacs key bindings) and
module and function name completion (tab) if the module is loaded.
<p>
<li>OpenSource users can ask questions
-and share experiences on the <a href="http://www.erlang.org/faq.html">
+and share experiences on the <a href="http://www.erlang.org/static/doc/mailinglist.html">
Erlang questions mailing list</a>. <p>
<li>Before asking a question you can browse the <a