merge in lmp-mr1-release history after reset to lmp-mr1-dev
diff --git a/res/assets/templates/macros.cs b/res/assets/templates/macros.cs
index 5fa075c..81217db 100644
--- a/res/assets/templates/macros.cs
+++ b/res/assets/templates/macros.cs
@@ -91,6 +91,7 @@
if:!tag.federatedSite ?><?cs
var:toroot ?><?cs
/if ?><?cs var:tag.href ?>"><?cs var:tag.label ?></a></code><?cs
+ elif:tag.kind == "@linkplain" ?><a href="<?cs var:tag.href ?>"><?cs var:tag.label ?></a><?cs
elif:tag.kind == "@seeHref" ?><a href="<?cs var:tag.href ?>"><?cs var:tag.label ?></a><?cs
elif:tag.kind == "@seeJustLabel" ?><?cs var:tag.label ?><?cs
elif:tag.kind == "@value" ?><code><a href="<?cs
diff --git a/src/com/google/doclava/Comment.java b/src/com/google/doclava/Comment.java
index c93cda7..cfb7aaf 100644
--- a/src/com/google/doclava/Comment.java
+++ b/src/com/google/doclava/Comment.java
@@ -310,8 +310,10 @@
mParamTagsList.add(new ParamTagInfo("@param", "@param", text, mBase, pos));
} else if (name.equals("@see")) {
mSeeTagsList.add(new SeeTagInfo("@see", "@see", text, mBase, pos));
- } else if (name.equals("@link") || name.equals("@linkplain")) {
+ } else if (name.equals("@link")) {
mInlineTagsList.add(new SeeTagInfo(name, "@see", text, mBase, pos));
+ } else if (name.equals("@linkplain")) {
+ mInlineTagsList.add(new SeeTagInfo(name, "@linkplain", text, mBase, pos));
} else if (name.equals("@value")) {
mInlineTagsList.add(new SeeTagInfo(name, "@value", text, mBase, pos));
} else if (name.equals("@throws") || name.equals("@exception")) {