Automatic merge from branch-5.0

* origin/branch-5.0:
  SONAR-6022 Update dead links pointing to documentation
  SONAR-5753 Update assertions isEqualTo("") -> isEmpty()

8 files changed, 9 insertions, 9 deletions

diff --git a/server/sonar-web/src/main/hbs/design/design.hbs b/server/sonar-web/src/main/hbs/design/design.hbs
index b81223774e7..e4b7a8b3033 100644
--- a/server/sonar-web/src/main/hbs/design/design.hbs
+++ b/server/sonar-web/src/main/hbs/design/design.hbs
@@ -1,5 +1,5 @@
 <div class="dsm-header">
-  <i class="icon-help"></i> <a href="http://docs.codehaus.org/x/QQFhC">{{t 'design.help'}}</a>
+  <i class="icon-help"></i> <a href="http://redirect.sonarsource.com/doc/dsm.html">{{t 'design.help'}}</a>
 </div>
 
 <ul class="dsm-legend">
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/models/database_migration_manager.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/models/database_migration_manager.rb
index f8a817ad128..86914028728 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/models/database_migration_manager.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/models/database_migration_manager.rb
@@ -58,7 +58,7 @@ class DatabaseMigrationManager
         @message = "Migration required."
       else
         @status = MIGRATION_FAILED
-        @message = "Upgrade is not supported. Please use a <a href=\"http://docs.codehaus.org/display/SONAR/Requirements\">production-ready database</a>."
+        @message = "Upgrade is not supported. Please use a <a href=\"http://redirect.sonarsource.com/doc/requirements.html\">production-ready database</a>."
       end
     end
   end
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/encryption_configuration/generate_secret_form.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/encryption_configuration/generate_secret_form.html.erb
index 84dcbea1570..e2624527d17 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/encryption_configuration/generate_secret_form.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/encryption_configuration/generate_secret_form.html.erb
@@ -9,7 +9,7 @@
   <tr class="property">
     <td style="padding: 10px">
       <p class="marginbottom10">Secret key is required to be able to encrypt properties.
-        <a href="http://docs.codehaus.org/display/SONAR/Security#Security-encryption" class="external" target="sonar_doc">More
+        <a href="http://redirect.sonarsource.com/doc/settings-encryption.html" class="external" target="sonar_doc">More
           information</a>.</p>
 
       <div id="secret_content">
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/encryption_configuration/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/encryption_configuration/index.html.erb
index e1c63be7cf6..4b0cb7c2d47 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/encryption_configuration/index.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/encryption_configuration/index.html.erb
@@ -40,7 +40,7 @@
       <span id="encryption_error" class="error" style="display:none"></span>
 
       <p><br/>Note that the <%= link_to 'secret key can be changed', {:action => 'generate_secret_form'}, :class => 'link-action', :id => 'link-generate-key' %>
-        but all the encrypted properties will have to be updated. <a href="http://docs.codehaus.org/display/SONAR/Settings+Encryption" class="external" target="sonar_doc">More information</a>.</p>
+        but all the encrypted properties will have to be updated. <a href="http://redirect.sonarsource.com/doc/settings-encryption.html" class="external" target="sonar_doc">More information</a>.</p>
     </td>
   </tr>
   </tbody>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_footer.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_footer.html.erb
index 687ca6b6db8..7b751817531 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_footer.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_footer.html.erb
@@ -3,7 +3,7 @@
   <div style="margin-top:150px;text-align:center;line-height:1.4;color:#333;">
     The web interface cannot be displayed because your browser is not supported.<br>
     Please switch to a <a target="_blank"
-                          href="http://docs.codehaus.org/x/zYHEBg">supported version or another supported browser</a>.
+                          href="http://redirect.sonarsource.com/doc/requirements.html">supported version or another supported browser</a>.
   </div>
 </div>
 <!--<![endif]-->
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
index e52d7018a19..60e2f5830a9 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
@@ -228,7 +228,7 @@
           <br><br><span class="error">The embedded database will not scale, it will not support upgrading to newer versions of SonarQube, and there is no support for migrating your data out of it into a different database engine.</span>
         <% end %>
       </div>
-      <!--[if lte IE 8 ]><br/><span class="ie-warn">IE 8 is not supported. Some widgets may not be properly displayed. Please switch to a <a target="_blank" href="http://docs.codehaus.org/x/zYHEBg">supported version or another supported browser</a>.</span><!--<![endif]-->
+      <!--[if lte IE 8 ]><br/><span class="ie-warn">IE 8 is not supported. Some widgets may not be properly displayed. Please switch to a <a target="_blank" href="http://redirect.sonarsource.com/doc/requirements.html">supported version or another supported browser</a>.</span><!--<![endif]-->
     </div>
   </div>
 <% end %>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/maintenance/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/maintenance/index.html.erb
index 8917874ce9c..8571ebb1edd 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/maintenance/index.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/maintenance/index.html.erb
@@ -13,5 +13,5 @@
 <div id="maintenance">
 <div id="maintenancelogo"><a href="http://www.sonarqube.org"><%= image_tag('logo.png', :class => 'png') -%></a></div>
 <h1>SonarQube is under maintenance. <a href="<%= ApplicationController.root_context -%>/">Please check back later.</a></h1>
-<p>Whilst waiting, you might want to check <a href="http://sonar-plugins.codehaus.org">new plugins</a> to extend the current functionality. </p><p>If you are an administrator and have no idea why this message is showing, you should read the <a href="http://docs.codehaus.org/x/CIF7BQ">upgrade guide</a>.</p>
+<p>Whilst waiting, you might want to check <a href="http://sonar-plugins.codehaus.org">new plugins</a> to extend the current functionality. </p><p>If you are an administrator and have no idea why this message is showing, you should read the <a href="http://redirect.sonarsource.com/doc/upgrading.html">upgrade guide</a>.</p>
 </div>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb
index 9b7c63199ce..4f671b53038 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb
@@ -71,7 +71,7 @@
                       <ol class="bulletpoints">
                         <li>Stop SonarQube</li>
                         <li><%= link_to 'Download', release.getDownloadUrl(), :class => 'external' -%> and install
-                          SonarQube <%= release.getVersion() -%> after having carefully read the <a href="http://docs.codehaus.org/display/SONAR/Upgrading" class="external">upgrade guide</a>.
+                          SonarQube <%= release.getVersion() -%> after having carefully read the <a href="http://redirect.sonarsource.com/doc/upgrading.html" class="external">upgrade guide</a>.
                         </li>
                         <% update.getIncompatiblePlugins().each do |incompatible_plugin| %>
                         <li>
@@ -92,7 +92,7 @@
 
                     <% else %>
                       <%= link_to 'Download', release.getDownloadUrl(), :class => 'external' -%> and install
-                      SonarQube <%= release.getVersion() -%> after having carefully read the <a href="http://docs.codehaus.org/display/SONAR/Upgrading" class="external">upgrade guide</a>.
+                      SonarQube <%= release.getVersion() -%> after having carefully read the <a href="http://redirect.sonarsource.com/doc/upgrading.html" class="external">upgrade guide</a>.
                     <% end %>
                   </td>
                 </tr>