aboutsummaryrefslogtreecommitdiffstats
path: root/system/doc
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2016-04-07 14:33:52 +0200
committerHenrik Nord <[email protected]>2016-04-07 14:33:52 +0200
commit32c51ebc10754d9ce0dd0500251306ef82149b2a (patch)
tree7895bebf82c6d2e85a1f6a0e0c2a63d2f4378512 /system/doc
parent003eb55cba4cf97e412cd307c8b954e127ebb052 (diff)
parentb355f7200c04786daf702d3d32c6245e02c74fa6 (diff)
downloadotp-32c51ebc10754d9ce0dd0500251306ef82149b2a.tar.gz
otp-32c51ebc10754d9ce0dd0500251306ef82149b2a.tar.bz2
otp-32c51ebc10754d9ce0dd0500251306ef82149b2a.zip
Merge branch 'derek121/mention_intellij_plugin/PR-970'
* derek121/mention_intellij_plugin/PR-970: Add mention of IntelliJ plugin
Diffstat (limited to 'system/doc')
-rw-r--r--system/doc/top/templates/index.html.src8
1 files changed, 4 insertions, 4 deletions
diff --git a/system/doc/top/templates/index.html.src b/system/doc/top/templates/index.html.src
index bdac3895b0..ef2e2916a4 100644
--- a/system/doc/top/templates/index.html.src
+++ b/system/doc/top/templates/index.html.src
@@ -145,10 +145,10 @@ verification, comment support including paragraph filling, skeletons,
tags support and more. See the <a href="#tools#/index.html">
Tools</a> application for details.
<p>
-There is also an
-<a href="http://erlide.org/index.html">
-Erlang plugin (ErlIDE) for Eclipse</a> if you prefer a more graphical
-environment. ErlIDE is under active development with new features in almost every release.
+There are also Erlang plugins for
+<a href="http://erlide.org/index.html">Eclipse (ErlIDE)</a> and
+<a href="http://ignatov.github.io/intellij-erlang/">IntelliJ IDEA</a>
+if you prefer a more graphical environment, which are both under active development.
<li>When developing with Erlang/OTP you usually test your programs
from the interactive shell (see <a href="getting_started/users_guide.html">
Getting Started With Erlang</a>) where you can call individual