6 files changed, 41 insertions, 6 deletions
diff --git a/lib/tools/doc/src/notes.xml b/lib/tools/doc/src/notes.xml
index 2d9bee0dd1..415f1b8516 100644
--- a/lib/tools/doc/src/notes.xml
+++ b/lib/tools/doc/src/notes.xml
@@ -31,6 +31,42 @@
   </header>
   <p>This document describes the changes made to the Tools application.</p>
 
+<section><title>Tools 2.9</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix unhandled trace event send_to_non_existing_process in
+	    fprof.</p>
+          <p>
+	    Own Id: OTP-13998</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Improved edoc support in emacs erlang-mode.</p>
+          <p>
+	    Own Id: OTP-13945 Aux Id: PR-1157 </p>
+        </item>
+        <item>
+          <p>
+	    Added erldoc to emacs mode which opens html documentation
+	    in browser from emacs. For example <c>M-x erldoc-browse
+	    RET lists:foreach/2</c>.</p>
+          <p>
+	    Own Id: OTP-14018 Aux Id: PR-1197 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Tools 2.8.6</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/tools/emacs/erlang-edoc.el b/lib/tools/emacs/erlang-edoc.el
index 034036ad04..2801aa8ae7 100644
--- a/lib/tools/emacs/erlang-edoc.el
+++ b/lib/tools/emacs/erlang-edoc.el
@@ -78,7 +78,7 @@
   '(("^%+\\s-*\\(@\\w+\\)\\_>" 1 'erlang-edoc-tag prepend)
     ("^%+\\s-*" ("{\\(@\\w+\\)\\_>" nil nil (1 'erlang-edoc-macro prepend)))
     ("^%+\\s-*" ("\\(?:@@\\)*\\(@[@{}]\\)" nil nil (1 'escape-glyph prepend)))
-    ("^%+\\s-*@\\(deprecated\\)\\_>" 1 font-lock-warning-face prepend)
+    ("^%+\\s-*\\(@deprecated\\)\\_>" 1 font-lock-warning-face prepend)
     ;; http://www.erlang.org/doc/apps/edoc/chapter.html#Wiki_notation
     ("^%+\\s-*" ("[^`]`\\([^`]?\\|[^`].*?[^']\\)'"
                  (forward-char -1) nil (1 'erlang-edoc-verbatim prepend)))
diff --git a/lib/tools/emacs/erlang-flymake.el b/lib/tools/emacs/erlang-flymake.el
index 2e447b55de..0b7936a81f 100644
--- a/lib/tools/emacs/erlang-flymake.el
+++ b/lib/tools/emacs/erlang-flymake.el
@@ -37,8 +37,7 @@
   "Return a list of include directories to add to the compiler options.")
 
 (defvar erlang-flymake-extra-opts
-  (list "+warn_obsolete_guard"
-        "+warn_unused_import"
+  (list "+warn_unused_import"
         "+warn_shadow_vars"
         "+warn_export_vars"
         "+strong_validation"
diff --git a/lib/tools/src/tags.erl b/lib/tools/src/tags.erl
index b833d96c19..fff67eb0fd 100644
--- a/lib/tools/src/tags.erl
+++ b/lib/tools/src/tags.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2015. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/tools/src/tools.app.src b/lib/tools/src/tools.app.src
index 18166cceb0..4c7dd24006 100644
--- a/lib/tools/src/tools.app.src
+++ b/lib/tools/src/tools.app.src
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2015. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/tools/vsn.mk b/lib/tools/vsn.mk
index e066dbf5e9..07bc39f76e 100644
--- a/lib/tools/vsn.mk
+++ b/lib/tools/vsn.mk
@@ -1 +1 @@
-TOOLS_VSN = 2.8.6
+TOOLS_VSN = 2.9