aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2012-08-30 14:55:36 +0200
committerPeter Andersson <[email protected]>2012-08-30 14:55:36 +0200
commitc7787af81f8cf4ae2991ee5c032fb4a7cd29d29d (patch)
treeae92bc72cc5ecb3e71e794acf930cf27f0caa973
parent7fc63425563fabdd75b5cb40139e646459d8381b (diff)
parentcc3e7a0c3865fb58cb7474872f4c4ef0e7e32f39 (diff)
downloadotp-c7787af81f8cf4ae2991ee5c032fb4a7cd29d29d.tar.gz
otp-c7787af81f8cf4ae2991ee5c032fb4a7cd29d29d.tar.bz2
otp-c7787af81f8cf4ae2991ee5c032fb4a7cd29d29d.zip
Merge remote branch 'upstream/maint'
-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