summaryrefslogtreecommitdiff
path: root/test/scaladoc/resources
diff options
context:
space:
mode:
authorVlad Ureche <vlad.ureche@gmail.com>2012-07-19 15:03:13 +0200
committerVlad Ureche <vlad.ureche@gmail.com>2012-07-19 15:05:10 +0200
commit6539a9ddc5ecdec65ef1d874999a200cee46b2c4 (patch)
tree7637fe42a15336de8b4c39087ea6de2915cca14c /test/scaladoc/resources
parent0d367d4794e45ef021d9dfc7eeca186ba9fb632a (diff)
downloadscala-6539a9ddc5ecdec65ef1d874999a200cee46b2c4.tar.gz
scala-6539a9ddc5ecdec65ef1d874999a200cee46b2c4.tar.bz2
scala-6539a9ddc5ecdec65ef1d874999a200cee46b2c4.zip
SI-5784 Scaladoc: Type templates
@template and @documentable are now synomims.
Diffstat (limited to 'test/scaladoc/resources')
-rw-r--r--test/scaladoc/resources/SI-5784.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/scaladoc/resources/SI-5784.scala b/test/scaladoc/resources/SI-5784.scala
index 175cc3cf33..3731d4998c 100644
--- a/test/scaladoc/resources/SI-5784.scala
+++ b/test/scaladoc/resources/SI-5784.scala
@@ -8,7 +8,7 @@ package test.templates {
/** @contentDiagram */
trait Base {
- /** @template */
+ /** @documentable */
type String = test.templates.String
/** @template
* @inheritanceDiagram */
@@ -20,7 +20,7 @@ package test.templates {
/** @contentDiagram */
trait Api extends Base {
- /** @template
+ /** @documentable
* @inheritanceDiagram */
override type T <: FooApi
trait FooApi extends Foo { def bar: String }