aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2012-08-30 14:48:22 +0200
committerPeter Andersson <[email protected]>2012-08-30 14:48:22 +0200
commitcc3e7a0c3865fb58cb7474872f4c4ef0e7e32f39 (patch)
tree6406401ee130a1d43deb55eac25299d4534e99df /lib
parent6de88765e9e3275e2b52dd25a1e6bc8e4df8486b (diff)
parentd406af7208ed159a27649ca3059c104abdacb2ff (diff)
downloadotp-cc3e7a0c3865fb58cb7474872f4c4ef0e7e32f39.tar.gz
otp-cc3e7a0c3865fb58cb7474872f4c4ef0e7e32f39.tar.bz2
otp-cc3e7a0c3865fb58cb7474872f4c4ef0e7e32f39.zip
Merge branch 'peppe/common_test/ct_doc_error' into maint
* peppe/common_test/ct_doc_error: Fix documentation error
Diffstat (limited to 'lib')
-rw-r--r--lib/common_test/src/ct.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/common_test/src/ct.erl b/lib/common_test/src/ct.erl
index 455fd1e4f1..49b51c9207 100644
--- a/lib/common_test/src/ct.erl
+++ b/lib/common_test/src/ct.erl
@@ -353,12 +353,12 @@ require(Required) ->
%%% <p>For this to work, the config file must at least contain:</p>
%%% <pre>{machine,[{node,[{telnet,IpAddr},{ftp,IpAddr}]}]}.</pre>
%%%
-%%% <note>The behaviour of this function changed radically in common_test
+%%% <note><p>The behaviour of this function changed radically in common_test
%%% 1.6.2. In order too keep some backwards compatability it is still possible
%%% to do: <br/><c>ct:require(a,{node,[telnet,ftp]}).</c><br/>
%%% This will associate the name <c>a</c> with the top level <c>node</c> entry.
%%% For this to work, the config file must at least contain:<br/>
-%%% <c>{node,[{telnet,IpAddr},{ftp,IpAddr}]}.</c></note>
+%%% <c>{node,[{telnet,IpAddr},{ftp,IpAddr}]}.</c></p></note>
%%%
%%% @see require/1
%%% @see get_config/1