diff options
author | Jenkins CI <ci@sonarsource.com> | 2015-01-06 11:43:59 +0100 |
---|---|---|
committer | Jenkins CI <ci@sonarsource.com> | 2015-01-06 11:43:59 +0100 |
commit | 9c9c900e7720fb838c1dcc6345e3289fbdcfe9e3 (patch) | |
tree | 4f0ca88ade77d944e1bb5aa5c3c2e8c7ad16e46e /sonar-markdown | |
parent | 17486e3aecc47fbad31f189a9b68904bc18c59fb (diff) | |
parent | 099f5133ceec1648c5dc96420c8cd0676e48df68 (diff) | |
download | sonarqube-9c9c900e7720fb838c1dcc6345e3289fbdcfe9e3.tar.gz sonarqube-9c9c900e7720fb838c1dcc6345e3289fbdcfe9e3.zip |
Automatic merge from branch-5.0
* origin/branch-5.0:
SONAR-6022 Update dead links pointing to documentation
SONAR-5753 Update assertions isEqualTo("") -> isEmpty()
Diffstat (limited to 'sonar-markdown')
-rw-r--r-- | sonar-markdown/src/main/java/org/sonar/markdown/HtmlLinkChannel.java | 4 | ||||
-rw-r--r-- | sonar-markdown/src/test/java/org/sonar/markdown/MarkdownTest.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sonar-markdown/src/main/java/org/sonar/markdown/HtmlLinkChannel.java b/sonar-markdown/src/main/java/org/sonar/markdown/HtmlLinkChannel.java index bcaada38172..41874951533 100644 --- a/sonar-markdown/src/main/java/org/sonar/markdown/HtmlLinkChannel.java +++ b/sonar-markdown/src/main/java/org/sonar/markdown/HtmlLinkChannel.java @@ -27,8 +27,8 @@ import java.util.regex.Pattern; /** * Markdown interprets text in brackets followed by text in parentheses to generate documented links. * - * E.g., the input [See documentation](http://docs.codehaus.org/display/SONAR) will produce - * {@literal<a href="http://docs.codehaus.org/display/SONAR">}See documentation{@literal</a>} + * E.g., the input [See documentation](http://docs.sonarqube.org/display/SONAR) will produce + * {@literal<a href="http://docs.sonarqube.org/display/SONAR">}See documentation{@literal</a>} */ class HtmlLinkChannel extends RegexChannel<MarkdownOutput> { diff --git a/sonar-markdown/src/test/java/org/sonar/markdown/MarkdownTest.java b/sonar-markdown/src/test/java/org/sonar/markdown/MarkdownTest.java index 462bee37175..900118963d1 100644 --- a/sonar-markdown/src/test/java/org/sonar/markdown/MarkdownTest.java +++ b/sonar-markdown/src/test/java/org/sonar/markdown/MarkdownTest.java @@ -33,8 +33,8 @@ public class MarkdownTest { @Test public void shouldDecorateDocumentedLink() { - assertThat(Markdown.convertToHtml("For more details, please [check online documentation](http://docs.codehaus.org/display/SONAR).")) - .isEqualTo("For more details, please <a href=\"http://docs.codehaus.org/display/SONAR\" target=\"_blank\">check online documentation</a>."); + assertThat(Markdown.convertToHtml("For more details, please [check online documentation](http://docs.sonarqube.org/display/SONAR).")) + .isEqualTo("For more details, please <a href=\"http://docs.sonarqube.org/display/SONAR\" target=\"_blank\">check online documentation</a>."); } |