diff options
| author | Björn Gustavsson <[email protected]> | 2011-09-02 10:28:36 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-09-02 10:28:36 +0200 |
| commit | ce148d0dc69797091a998ed73cf0a3dd6df83ec9 (patch) | |
| tree | 4ffbd1ec55d8a60fb6a80c0ce52c81bcd5c3622a /lib/docbuilder | |
| parent | 025e5799c3204fbacb59340e752f9a72f75363bd (diff) | |
| parent | 9f1e455017228e8f35d82e2fe1e3c5268c2e0aa3 (diff) | |
| download | otp-ce148d0dc69797091a998ed73cf0a3dd6df83ec9.tar.gz otp-ce148d0dc69797091a998ed73cf0a3dd6df83ec9.tar.bz2 otp-ce148d0dc69797091a998ed73cf0a3dd6df83ec9.zip | |
Merge branch 'dev' into major
* dev:
Make the check_old_code/1 BIF auto-imported
Deprecate the docbuilder application
Conflicts:
lib/stdlib/src/otp_internal.erl
Diffstat (limited to 'lib/docbuilder')
| -rw-r--r-- | lib/docbuilder/src/docb_gen.erl | 4 | ||||
| -rw-r--r-- | lib/docbuilder/src/docb_transform.erl | 2 | ||||
| -rw-r--r-- | lib/docbuilder/src/docb_xml_check.erl | 1 | ||||
| -rw-r--r-- | lib/docbuilder/vsn.mk | 2 |
4 files changed, 8 insertions, 1 deletions
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_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 |