6 files changed, 31 insertions, 8 deletions
diff --git a/lib/docbuilder/doc/src/notes.xml b/lib/docbuilder/doc/src/notes.xml
index d04c8dd839..95f24ea9ca 100644
--- a/lib/docbuilder/doc/src/notes.xml
+++ b/lib/docbuilder/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2007</year><year>2010</year>
+      <year>2007</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,6 +31,22 @@
   <p>This document describes the changes made to the DocBuilder
      application.</p>
 
+<section><title>Docbuilder 0.9.8.11</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The docbuilder application has been deprecated and will
+	    be removed in the R15 release.</p>
+          <p>
+	    Own Id: OTP-9509</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Docbuilder 0.9.8.10</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/docbuilder/src/docb_gen.erl b/lib/docbuilder/src/docb_gen.erl
index 0d8d640324..75494314f1 100644
--- a/lib/docbuilder/src/docb_gen.erl
+++ b/lib/docbuilder/src/docb_gen.erl
@@ -18,6 +18,10 @@
 -module(docb_gen).
 
 -export([module/1, module/2, users_guide/1, users_guide/2]).
+-deprecated([{module,1,next_major_release},
+	     {module,2,next_major_release},
+	     {users_guide,1,next_major_release},
+	     {users_guide,2,next_major_release}]).
 
 -record(args, {suffix=".xml",
 	       layout=docb_edoc_xml_cb,
diff --git a/lib/docbuilder/src/docb_main.erl b/lib/docbuilder/src/docb_main.erl
index 4f5f035a65..c20cfc8e67 100644
--- a/lib/docbuilder/src/docb_main.erl
+++ b/lib/docbuilder/src/docb_main.erl
@@ -436,11 +436,11 @@ transform(From, To, Opts, File, Tree) ->
     case catch Filter:transform(File, Tree, Opts) of
 
 	%% R5C
-	{'EXIT', {undef, [{Filter, transform, [File, Tree, Opts]}|_]}}->
+	{'EXIT', {undef, [{Filter, transform, [File, Tree, Opts],_}|_]}}->
 	    %% No transformation defined
 	    finish_transform(Tree, File, Opts, Filter);
 	
-	{'EXIT', {undef, {Filter, transform, [File, Tree, Opts]}}} ->
+	{'EXIT', {undef, {Filter, transform, [File, Tree, Opts],_}}} ->
 	    %% No transformation defined
 	    finish_transform(Tree, File, Opts, Filter);
 
@@ -507,16 +507,16 @@ pp({Tag, Optional, Args}, TagPath, Level, Filter, Opts) ->
     Rule_3_result =
 	case catch Filter:rule(TagPath1, {Level,Optional1,Args},Opts) of
 	    %% R5C
-	    {'EXIT', {undef, [{_, rule, _}|_]}} -> % No rule/3 defined
+	    {'EXIT', {undef, [{_, rule, _, _}|_]}} -> % No rule/3 defined
 		failed;
 
-	    {'EXIT', {undef, {_, rule, _}}} -> % No rule/3 defined
+	    {'EXIT', {undef, {_, rule, _, _}}} -> % No rule/3 defined
 		failed;
 	    %% R5C
-	    {'EXIT', {function_clause, [{_, rule, _}|_]}} -> % No MATCHING rule/3
+	    {'EXIT', {function_clause, [{_, rule, _, _}|_]}} -> % No MATCHING rule/3
 		failed;
 
-	    {'EXIT', {function_clause, {_, rule, _}}} -> % No MATCHING rule/3
+	    {'EXIT', {function_clause, {_, rule, _, _}}} -> % No MATCHING rule/3
 		failed;
 
 	    {'EXIT', What} ->
diff --git a/lib/docbuilder/src/docb_transform.erl b/lib/docbuilder/src/docb_transform.erl
index 9c7561b07b..736ac92274 100644
--- a/lib/docbuilder/src/docb_transform.erl
+++ b/lib/docbuilder/src/docb_transform.erl
@@ -18,6 +18,8 @@
 -module(docb_transform).
 
 -export([file/1, file/2]).
+-deprecated([{file,1,next_major_release},
+	     {file,2,next_major_release}]).
 
 %% file(File) -> ok | {error, Reason}
 %% file(File, Opts) -> ok | {error, Reason}
diff --git a/lib/docbuilder/src/docb_xml_check.erl b/lib/docbuilder/src/docb_xml_check.erl
index 8ae5cd2eac..5912e22e7b 100644
--- a/lib/docbuilder/src/docb_xml_check.erl
+++ b/lib/docbuilder/src/docb_xml_check.erl
@@ -18,6 +18,7 @@
 -module(docb_xml_check).
 
 -export([validate/1]).
+-deprecated([{validate,1,next_major_release}]).
 
 %% validate(File) -> ok | error | {error, badfile}
 %%   File = string(), file name with or without ".xml" extension
diff --git a/lib/docbuilder/vsn.mk b/lib/docbuilder/vsn.mk
index 2475966ec2..6df438a537 100644
--- a/lib/docbuilder/vsn.mk
+++ b/lib/docbuilder/vsn.mk
@@ -1 +1 @@
-DOCB_VSN = 0.9.8.10
+DOCB_VSN = 0.9.8.11