Merge pull request #4272 from retronym/merge/2.11.x-to-2.12.x-20150129

Merge 2.11.x to 2.12.x

1 files changed, 11 insertions, 0 deletions

diff --git a/test/files/presentation/doc/src/p/Base.scala b/test/files/presentation/doc/src/p/Base.scala
new file mode 100755
index 0000000000..d91632b6f6
--- /dev/null
+++ b/test/files/presentation/doc/src/p/Base.scala
@@ -0,0 +1,11 @@
+package p
+
+/**
+ * @define BaseComment This is $BaseVar comment.
+ */
+trait Base {
+  /**
+   * Base method has documentation.
+   */
+  def foo: String
+}