Merged revisions 21467,21471-21482,21486-21487 ...

Merged revisions 21467,21471-21482,21486-21487 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk

........
  r21467 | plocinic | 2010-04-12 10:09:26 +0200 (Mon, 12 Apr 2010) | 1 line

  Closes #2757. No review.
........
  r21471 | odersky | 2010-04-12 13:52:39 +0200 (Mon, 12 Apr 2010) | 1 line

  Closes #3224. Review by retronym.
........
  r21472 | odersky | 2010-04-12 13:53:05 +0200 (Mon, 12 Apr 2010) | 1 line

  Cosmetic renamings. No review.
........
  r21473 | phaller | 2010-04-12 13:59:29 +0200 (Mon, 12 Apr 2010) | 1 line

  actors.UncaughtException stores most recent sender. Default output
for unhandled exceptions can be disabled using actors.Debug. Review by
plocinic. ........ r21474 | phaller | 2010-04-12 14:00:10 +0200 (Mon, 12
Apr 2010) | 1 line

  Improved deprecation warnings in actors package object. No review.
........ r21475 | phaller | 2010-04-12 14:02:51 +0200 (Mon, 12 Apr 2010)
| 1 line

  Another test for see #2017. No review.
........
  r21476 | phaller | 2010-04-12 15:25:57 +0200 (Mon, 12 Apr 2010) | 1 line

  Attempting to unblock partest by handling AssertionErrors. No review.
........ r21477 | dubochet | 2010-04-12 15:29:05 +0200 (Mon, 12 Apr
2010) | 1 line

  [scaladoc] meta-documentation (attributes, definition classes, etc.)
is available for members that do not have a comment. No review. ........
r21478 | dubochet | 2010-04-12 16:16:01 +0200 (Mon, 12 Apr 2010) | 1
line

  [scaladoc] Dangerous HTML (that can break Scaladoc) is stripped out
of comments and replaced by corresponding wiki syntax when possible. No
review. ........ r21479 | dubochet | 2010-04-12 16:29:47 +0200 (Mon, 12
Apr 2010) | 1 line

  [scaladoc] Not all 23 AbstractFunction classes are listed in the left
list. No review. ........ r21480 | dubochet | 2010-04-12 16:38:16 +0200
(Mon, 12 Apr 2010) | 1 line

  [scaladoc] More mitigation code for dangerous HTML tags. No review.
........ r21481 | malayeri | 2010-04-12 16:52:39 +0200 (Mon, 12 Apr
2010) | 1 line

  Move constructors to beginning of scaladoc html page; show implicit
modifier in main list. Review by dubochet. ........ r21482 | rytz |
2010-04-12 17:12:56 +0200 (Mon, 12 Apr 2010) | 1 line

  fixed LOAD_MODULE for companions of primitive types. fixes .net build.
review by dragos. ........ r21486 | odersky | 2010-04-12 17:26:20 +0200
(Mon, 12 Apr 2010) | 1 line

  changed testfile, to satisfy new diff algo (which should be reverted
IMO). review by extempore. ........ r21487 | extempore | 2010-04-12
18:11:36 +0200 (Mon, 12 Apr 2010) | 1 line

  Some modifications to partest to improve output. Review by phaller.
........

1 files changed, 10 insertions, 12 deletions

diff --git a/src/library/scala/native.scala b/src/library/scala/native.scala
index fbacf43b72..8aeffe1632 100644
--- a/src/library/scala/native.scala
+++ b/src/library/scala/native.scala
@@ -11,16 +11,14 @@
 
 package scala
 
-/**
- * Marker for native methods.
- * <p>
- *   <code>@native def f(x: Int, y: List[Long]): String = ..</code>
- * </p>
- * <p>
- *   Method body is not generated if method is marked with <code>@native</code>,
- *   but it is type checked when present.
- * </p>
- *
- * @since 2.6
- */
+/** Marker for native methods.
+  *
+  * {{{
+  * @native def f(x: Int, y: List[Long]): String = ...
+  * }}}
+  *
+  * Method body is not generated if method is marked with `@native`,
+  * but it is type checked when present.
+  *
+  * @since 2.6 */
 class native extends StaticAnnotation {}