You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-commits@maven.apache.org by bu...@apache.org on 2015/05/10 12:48:06 UTC

svn commit: r950807 [1/3] - in /websites/staging/maven/trunk/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ docs/2.0.1/ docs/2.0.10/ docs/2.0.11/ do...

Author: buildbot
Date: Sun May 10 10:48:04 2015
New Revision: 950807

Log:
Staging update by buildbot for maven

Modified:
    websites/staging/maven/trunk/content/   (props changed)
    websites/staging/maven/trunk/content/about.html
    websites/staging/maven/trunk/content/apache-resource-bundles/index.html
    websites/staging/maven/trunk/content/archives/maven-2.x/index.html
    websites/staging/maven/trunk/content/articles.html
    websites/staging/maven/trunk/content/background/history-of-maven.html
    websites/staging/maven/trunk/content/background/philosophy-of-maven.html
    websites/staging/maven/trunk/content/code-quality-management.html
    websites/staging/maven/trunk/content/community.html
    websites/staging/maven/trunk/content/continuous-integration.html
    websites/staging/maven/trunk/content/developers/committer-environment.html
    websites/staging/maven/trunk/content/developers/committer-settings.html
    websites/staging/maven/trunk/content/developers/conventions/code.html
    websites/staging/maven/trunk/content/developers/conventions/git.html
    websites/staging/maven/trunk/content/developers/conventions/jira.html
    websites/staging/maven/trunk/content/developers/conventions/svn.html
    websites/staging/maven/trunk/content/developers/dependency-policies.html
    websites/staging/maven/trunk/content/developers/index.html
    websites/staging/maven/trunk/content/developers/java5.html
    websites/staging/maven/trunk/content/developers/java6.html
    websites/staging/maven/trunk/content/developers/mojo-api-specification.html
    websites/staging/maven/trunk/content/developers/release/index.html
    websites/staging/maven/trunk/content/developers/release/maven-core-release.html
    websites/staging/maven/trunk/content/developers/release/maven-project-release-procedure.html
    websites/staging/maven/trunk/content/developers/release/parent-pom-release.html
    websites/staging/maven/trunk/content/developers/release/pmc-gpg-keys.html
    websites/staging/maven/trunk/content/developers/retirement-plan-plugins.html
    websites/staging/maven/trunk/content/developers/website/deploy-component-reference-documentation.html
    websites/staging/maven/trunk/content/developers/website/deploy-maven-website.html
    websites/staging/maven/trunk/content/developers/website/index.html
    websites/staging/maven/trunk/content/developers/website/website-overview.html
    websites/staging/maven/trunk/content/developers/welcome-to-new-committers.html
    websites/staging/maven/trunk/content/docs-required.html
    websites/staging/maven/trunk/content/docs/2.0.1/release-notes.html
    websites/staging/maven/trunk/content/docs/2.0.10/release-notes.html
    websites/staging/maven/trunk/content/docs/2.0.11/release-notes.html
    websites/staging/maven/trunk/content/docs/2.0.2/release-notes.html
    websites/staging/maven/trunk/content/docs/2.0.3/release-notes.html
    websites/staging/maven/trunk/content/docs/2.0.4/release-notes.html
    websites/staging/maven/trunk/content/docs/2.0.5/release-notes.html
    websites/staging/maven/trunk/content/docs/2.0.6/release-notes.html
    websites/staging/maven/trunk/content/docs/2.0.7/release-notes.html
    websites/staging/maven/trunk/content/docs/2.0.8/release-notes.html
    websites/staging/maven/trunk/content/docs/2.0.9/release-notes.html
    websites/staging/maven/trunk/content/docs/2.0/release-notes.html
    websites/staging/maven/trunk/content/docs/2.1.0/release-notes.html
    websites/staging/maven/trunk/content/docs/2.2.0/release-notes.html
    websites/staging/maven/trunk/content/docs/2.2.1/release-notes.html
    websites/staging/maven/trunk/content/docs/3.0-alpha-3/release-notes.html
    websites/staging/maven/trunk/content/docs/3.0-alpha-4/release-notes.html
    websites/staging/maven/trunk/content/docs/3.0-alpha-5/release-notes.html
    websites/staging/maven/trunk/content/docs/3.0-alpha-6/release-notes.html
    websites/staging/maven/trunk/content/docs/3.0-alpha-7/release-notes.html
    websites/staging/maven/trunk/content/docs/3.0-beta-1/release-notes.html
    websites/staging/maven/trunk/content/docs/3.0-beta-2/release-notes.html
    websites/staging/maven/trunk/content/docs/3.0-beta-3/release-notes.html
    websites/staging/maven/trunk/content/docs/3.0.1/release-notes.html
    websites/staging/maven/trunk/content/docs/3.0.2/release-notes.html
    websites/staging/maven/trunk/content/docs/3.0.3/release-notes.html
    websites/staging/maven/trunk/content/docs/3.0.4/release-notes.html
    websites/staging/maven/trunk/content/docs/3.0.5/release-notes.html
    websites/staging/maven/trunk/content/docs/3.0/release-notes.html
    websites/staging/maven/trunk/content/docs/3.1.0-alpha-1/release-notes.html
    websites/staging/maven/trunk/content/docs/3.1.0/release-notes.html
    websites/staging/maven/trunk/content/docs/3.1.1/release-notes.html
    websites/staging/maven/trunk/content/docs/3.2.1/release-notes.html
    websites/staging/maven/trunk/content/docs/3.2.2/release-notes.html
    websites/staging/maven/trunk/content/docs/3.2.3/release-notes.html
    websites/staging/maven/trunk/content/docs/3.2.5/release-notes.html
    websites/staging/maven/trunk/content/docs/3.3.1/release-notes.html
    websites/staging/maven/trunk/content/docs/3.3.3/release-notes.html
    websites/staging/maven/trunk/content/docs/history.html
    websites/staging/maven/trunk/content/download.html
    websites/staging/maven/trunk/content/eclipse-plugin.html
    websites/staging/maven/trunk/content/errors/404.html
    websites/staging/maven/trunk/content/examples/index.html
    websites/staging/maven/trunk/content/examples/injecting-properties-via-settings.html
    websites/staging/maven/trunk/content/examples/maven-3-lifecycle-extensions.html
    websites/staging/maven/trunk/content/general.html
    websites/staging/maven/trunk/content/glossary.html
    websites/staging/maven/trunk/content/guides/development/guide-building-maven.html
    websites/staging/maven/trunk/content/guides/development/guide-documentation-style.html
    websites/staging/maven/trunk/content/guides/development/guide-helping.html
    websites/staging/maven/trunk/content/guides/development/guide-maven-development.html
    websites/staging/maven/trunk/content/guides/development/guide-plugin-documentation.html
    websites/staging/maven/trunk/content/guides/development/guide-testing-development-plugins.html
    websites/staging/maven/trunk/content/guides/development/guide-testing-releases.html
    websites/staging/maven/trunk/content/guides/getting-started/index.html
    websites/staging/maven/trunk/content/guides/getting-started/maven-in-five-minutes.html
    websites/staging/maven/trunk/content/guides/getting-started/windows-prerequisites.html
    websites/staging/maven/trunk/content/guides/index.html
    websites/staging/maven/trunk/content/guides/introduction/introduction-to-archetypes.html
    websites/staging/maven/trunk/content/guides/introduction/introduction-to-dependency-mechanism.html
    websites/staging/maven/trunk/content/guides/introduction/introduction-to-optional-and-excludes-dependencies.html
    websites/staging/maven/trunk/content/guides/introduction/introduction-to-plugin-prefix-mapping.html
    websites/staging/maven/trunk/content/guides/introduction/introduction-to-plugins.html
    websites/staging/maven/trunk/content/guides/introduction/introduction-to-profiles.html
    websites/staging/maven/trunk/content/guides/introduction/introduction-to-repositories.html
    websites/staging/maven/trunk/content/guides/introduction/introduction-to-the-lifecycle.html
    websites/staging/maven/trunk/content/guides/introduction/introduction-to-the-pom.html
    websites/staging/maven/trunk/content/guides/introduction/introduction-to-the-standard-directory-layout.html
    websites/staging/maven/trunk/content/guides/mini/guide-3rd-party-jars-local.html
    websites/staging/maven/trunk/content/guides/mini/guide-3rd-party-jars-remote.html
    websites/staging/maven/trunk/content/guides/mini/guide-archive-configuration.html
    websites/staging/maven/trunk/content/guides/mini/guide-assemblies.html
    websites/staging/maven/trunk/content/guides/mini/guide-attached-tests.html
    websites/staging/maven/trunk/content/guides/mini/guide-bash-m2-completion.html
    websites/staging/maven/trunk/content/guides/mini/guide-building-for-different-environments.html
    websites/staging/maven/trunk/content/guides/mini/guide-building-jdk14-on-jdk15.html
    websites/staging/maven/trunk/content/guides/mini/guide-central-repository-upload.html
    websites/staging/maven/trunk/content/guides/mini/guide-configuring-maven.html
    websites/staging/maven/trunk/content/guides/mini/guide-configuring-plugins.html
    websites/staging/maven/trunk/content/guides/mini/guide-coping-with-sun-jars.html
    websites/staging/maven/trunk/content/guides/mini/guide-creating-archetypes.html
    websites/staging/maven/trunk/content/guides/mini/guide-default-execution-ids.html
    websites/staging/maven/trunk/content/guides/mini/guide-deployment-security-settings.html
    websites/staging/maven/trunk/content/guides/mini/guide-encryption.html
    websites/staging/maven/trunk/content/guides/mini/guide-generating-sources.html
    websites/staging/maven/trunk/content/guides/mini/guide-http-settings.html
    websites/staging/maven/trunk/content/guides/mini/guide-ide-eclipse.html
    websites/staging/maven/trunk/content/guides/mini/guide-ide-idea.html
    websites/staging/maven/trunk/content/guides/mini/guide-ide-netbeans/guide-ide-netbeans.html
    websites/staging/maven/trunk/content/guides/mini/guide-m1-m2.html
    websites/staging/maven/trunk/content/guides/mini/guide-manifest.html
    websites/staging/maven/trunk/content/guides/mini/guide-maven-classloading.html
    websites/staging/maven/trunk/content/guides/mini/guide-maven-evangelism.html
    websites/staging/maven/trunk/content/guides/mini/guide-mirror-settings.html
    websites/staging/maven/trunk/content/guides/mini/guide-multiple-modules.html
    websites/staging/maven/trunk/content/guides/mini/guide-multiple-repositories.html
    websites/staging/maven/trunk/content/guides/mini/guide-naming-conventions.html
    websites/staging/maven/trunk/content/guides/mini/guide-new-committers.html
    websites/staging/maven/trunk/content/guides/mini/guide-proxies.html
    websites/staging/maven/trunk/content/guides/mini/guide-releasing.html
    websites/staging/maven/trunk/content/guides/mini/guide-relocation.html
    websites/staging/maven/trunk/content/guides/mini/guide-repository-ssl.html
    websites/staging/maven/trunk/content/guides/mini/guide-site.html
    websites/staging/maven/trunk/content/guides/mini/guide-snippet-macro.html
    websites/staging/maven/trunk/content/guides/mini/guide-using-ant.html
    websites/staging/maven/trunk/content/guides/mini/guide-using-extensions.html
    websites/staging/maven/trunk/content/guides/mini/guide-using-modello.html
    websites/staging/maven/trunk/content/guides/mini/guide-using-one-source-directory.html
    websites/staging/maven/trunk/content/guides/mini/guide-using-toolchains.html
    websites/staging/maven/trunk/content/guides/mini/guide-wagon-providers.html
    websites/staging/maven/trunk/content/guides/mini/index.html
    websites/staging/maven/trunk/content/guides/plugin/guide-ant-plugin-development.html
    websites/staging/maven/trunk/content/guides/plugin/guide-java-plugin-development.html
    websites/staging/maven/trunk/content/index.html
    websites/staging/maven/trunk/content/integration.html
    websites/staging/maven/trunk/content/issue-tracking.html
    websites/staging/maven/trunk/content/mail-lists.html
    websites/staging/maven/trunk/content/maven-1.x-eol.html
    websites/staging/maven/trunk/content/maven-2.x-eol.html
    websites/staging/maven/trunk/content/maven-conventions.html
    websites/staging/maven/trunk/content/maven-features.html
    websites/staging/maven/trunk/content/maven-jsr330.html
    websites/staging/maven/trunk/content/maven-logging.html
    websites/staging/maven/trunk/content/maven-site-1.0-site.jar
    websites/staging/maven/trunk/content/maven1.html
    websites/staging/maven/trunk/content/netbeans-module.html
    websites/staging/maven/trunk/content/plugin-developers/common-bugs.html
    websites/staging/maven/trunk/content/plugin-developers/cookbook/add-build-time-to-manifest.html
    websites/staging/maven/trunk/content/plugin-developers/cookbook/add-svn-revision-to-manifest.html
    websites/staging/maven/trunk/content/plugin-developers/cookbook/attach-source-javadoc-artifacts.html
    websites/staging/maven/trunk/content/plugin-developers/cookbook/generate-assembly.html
    websites/staging/maven/trunk/content/plugin-developers/cookbook/index.html
    websites/staging/maven/trunk/content/plugin-developers/cookbook/plexus-plugin-upgrade.html
    websites/staging/maven/trunk/content/plugin-developers/index.html
    websites/staging/maven/trunk/content/plugin-developers/plugin-documenting.html
    websites/staging/maven/trunk/content/plugin-developers/plugin-testing.html
    websites/staging/maven/trunk/content/plugins/index.html
    websites/staging/maven/trunk/content/plugins/localization.html
    websites/staging/maven/trunk/content/pom.html
    websites/staging/maven/trunk/content/pom/index.html
    websites/staging/maven/trunk/content/privacy-policy.html
    websites/staging/maven/trunk/content/project-faq.html
    websites/staging/maven/trunk/content/project-info.html
    websites/staging/maven/trunk/content/project-roles.html
    websites/staging/maven/trunk/content/reference/maven-classloading.html
    websites/staging/maven/trunk/content/release-notes-all.html
    websites/staging/maven/trunk/content/repository-management.html
    websites/staging/maven/trunk/content/repository/index.html
    websites/staging/maven/trunk/content/run-maven/index.html
    websites/staging/maven/trunk/content/security.html
    websites/staging/maven/trunk/content/settings.html
    websites/staging/maven/trunk/content/shared/index.html
    websites/staging/maven/trunk/content/skins/index.html
    websites/staging/maven/trunk/content/source-repository.html
    websites/staging/maven/trunk/content/support-and-training.html
    websites/staging/maven/trunk/content/team-list.html
    websites/staging/maven/trunk/content/testimonials.html
    websites/staging/maven/trunk/content/users/getting-help.html
    websites/staging/maven/trunk/content/users/index.html
    websites/staging/maven/trunk/content/what-is-maven.html

Propchange: websites/staging/maven/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun May 10 10:48:04 2015
@@ -1 +1 @@
-1678549
+1678550

Modified: websites/staging/maven/trunk/content/about.html
==============================================================================
--- websites/staging/maven/trunk/content/about.html (original)
+++ websites/staging/maven/trunk/content/about.html Sun May 10 10:48:04 2015
@@ -180,16 +180,9 @@
                 
       <li>
   
-                          <a href="general.html" title="FAQ (official)">
+                          <a href="general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/apache-resource-bundles/index.html
==============================================================================
--- websites/staging/maven/trunk/content/apache-resource-bundles/index.html (original)
+++ websites/staging/maven/trunk/content/apache-resource-bundles/index.html Sun May 10 10:48:04 2015
@@ -181,16 +181,9 @@
                 
       <li>
   
-                          <a href="../general.html" title="FAQ (official)">
+                          <a href="../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/archives/maven-2.x/index.html
==============================================================================
--- websites/staging/maven/trunk/content/archives/maven-2.x/index.html (original)
+++ websites/staging/maven/trunk/content/archives/maven-2.x/index.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/articles.html
==============================================================================
--- websites/staging/maven/trunk/content/articles.html (original)
+++ websites/staging/maven/trunk/content/articles.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="general.html" title="FAQ (official)">
+                          <a href="general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/background/history-of-maven.html
==============================================================================
--- websites/staging/maven/trunk/content/background/history-of-maven.html (original)
+++ websites/staging/maven/trunk/content/background/history-of-maven.html Sun May 10 10:48:04 2015
@@ -180,16 +180,9 @@
                 
       <li>
   
-                          <a href="../general.html" title="FAQ (official)">
+                          <a href="../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/background/philosophy-of-maven.html
==============================================================================
--- websites/staging/maven/trunk/content/background/philosophy-of-maven.html (original)
+++ websites/staging/maven/trunk/content/background/philosophy-of-maven.html Sun May 10 10:48:04 2015
@@ -180,16 +180,9 @@
                 
       <li>
   
-                          <a href="../general.html" title="FAQ (official)">
+                          <a href="../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/code-quality-management.html
==============================================================================
--- websites/staging/maven/trunk/content/code-quality-management.html (original)
+++ websites/staging/maven/trunk/content/code-quality-management.html Sun May 10 10:48:04 2015
@@ -180,16 +180,9 @@
                 
       <li>
   
-                          <a href="general.html" title="FAQ (official)">
+                          <a href="general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/community.html
==============================================================================
--- websites/staging/maven/trunk/content/community.html (original)
+++ websites/staging/maven/trunk/content/community.html Sun May 10 10:48:04 2015
@@ -180,16 +180,9 @@
                 
       <li>
   
-                          <a href="general.html" title="FAQ (official)">
+                          <a href="general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/continuous-integration.html
==============================================================================
--- websites/staging/maven/trunk/content/continuous-integration.html (original)
+++ websites/staging/maven/trunk/content/continuous-integration.html Sun May 10 10:48:04 2015
@@ -180,16 +180,9 @@
                 
       <li>
   
-                          <a href="general.html" title="FAQ (official)">
+                          <a href="general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/developers/committer-environment.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/committer-environment.html (original)
+++ websites/staging/maven/trunk/content/developers/committer-environment.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../general.html" title="FAQ (official)">
+                          <a href="../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/developers/committer-settings.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/committer-settings.html (original)
+++ websites/staging/maven/trunk/content/developers/committer-settings.html Sun May 10 10:48:04 2015
@@ -183,16 +183,9 @@ Dennis Lundberg" />
                 
       <li>
   
-                          <a href="../general.html" title="FAQ (official)">
+                          <a href="../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/developers/conventions/code.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/conventions/code.html (original)
+++ websites/staging/maven/trunk/content/developers/conventions/code.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/developers/conventions/git.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/conventions/git.html (original)
+++ websites/staging/maven/trunk/content/developers/conventions/git.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/developers/conventions/jira.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/conventions/jira.html (original)
+++ websites/staging/maven/trunk/content/developers/conventions/jira.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/developers/conventions/svn.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/conventions/svn.html (original)
+++ websites/staging/maven/trunk/content/developers/conventions/svn.html Sun May 10 10:48:04 2015
@@ -183,16 +183,9 @@ Dennis Lundberg" />
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/developers/dependency-policies.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/dependency-policies.html (original)
+++ websites/staging/maven/trunk/content/developers/dependency-policies.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../general.html" title="FAQ (official)">
+                          <a href="../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/developers/index.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/index.html (original)
+++ websites/staging/maven/trunk/content/developers/index.html Sun May 10 10:48:04 2015
@@ -183,16 +183,9 @@ Brett Porter" />
                 
       <li>
   
-                          <a href="../general.html" title="FAQ (official)">
+                          <a href="../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/developers/java5.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/java5.html (original)
+++ websites/staging/maven/trunk/content/developers/java5.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../general.html" title="FAQ (official)">
+                          <a href="../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/developers/java6.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/java6.html (original)
+++ websites/staging/maven/trunk/content/developers/java6.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../general.html" title="FAQ (official)">
+                          <a href="../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/developers/mojo-api-specification.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/mojo-api-specification.html (original)
+++ websites/staging/maven/trunk/content/developers/mojo-api-specification.html Sun May 10 10:48:04 2015
@@ -181,16 +181,9 @@
                 
       <li>
   
-                          <a href="../general.html" title="FAQ (official)">
+                          <a href="../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/developers/release/index.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/release/index.html (original)
+++ websites/staging/maven/trunk/content/developers/release/index.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/developers/release/maven-core-release.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/release/maven-core-release.html (original)
+++ websites/staging/maven/trunk/content/developers/release/maven-core-release.html Sun May 10 10:48:04 2015
@@ -180,16 +180,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/developers/release/maven-project-release-procedure.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/release/maven-project-release-procedure.html (original)
+++ websites/staging/maven/trunk/content/developers/release/maven-project-release-procedure.html Sun May 10 10:48:04 2015
@@ -183,16 +183,9 @@ Karl Heinz Marbaise" />
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/developers/release/parent-pom-release.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/release/parent-pom-release.html (original)
+++ websites/staging/maven/trunk/content/developers/release/parent-pom-release.html Sun May 10 10:48:04 2015
@@ -183,16 +183,9 @@ Dennis Lundberg" />
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/developers/release/pmc-gpg-keys.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/release/pmc-gpg-keys.html (original)
+++ websites/staging/maven/trunk/content/developers/release/pmc-gpg-keys.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/developers/retirement-plan-plugins.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/retirement-plan-plugins.html (original)
+++ websites/staging/maven/trunk/content/developers/retirement-plan-plugins.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../general.html" title="FAQ (official)">
+                          <a href="../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/developers/website/deploy-component-reference-documentation.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/website/deploy-component-reference-documentation.html (original)
+++ websites/staging/maven/trunk/content/developers/website/deploy-component-reference-documentation.html Sun May 10 10:48:04 2015
@@ -183,16 +183,9 @@ Hervé Boutemy" />
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/developers/website/deploy-maven-website.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/website/deploy-maven-website.html (original)
+++ websites/staging/maven/trunk/content/developers/website/deploy-maven-website.html Sun May 10 10:48:04 2015
@@ -183,16 +183,9 @@ Hervé Boutemy" />
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/developers/website/index.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/website/index.html (original)
+++ websites/staging/maven/trunk/content/developers/website/index.html Sun May 10 10:48:04 2015
@@ -183,16 +183,9 @@ Hervé Boutemy" />
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/developers/website/website-overview.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/website/website-overview.html (original)
+++ websites/staging/maven/trunk/content/developers/website/website-overview.html Sun May 10 10:48:04 2015
@@ -183,16 +183,9 @@ Hervé Boutemy" />
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/developers/welcome-to-new-committers.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/welcome-to-new-committers.html (original)
+++ websites/staging/maven/trunk/content/developers/welcome-to-new-committers.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../general.html" title="FAQ (official)">
+                          <a href="../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs-required.html
==============================================================================
--- websites/staging/maven/trunk/content/docs-required.html (original)
+++ websites/staging/maven/trunk/content/docs-required.html Sun May 10 10:48:04 2015
@@ -181,16 +181,9 @@
                 
       <li>
   
-                          <a href="general.html" title="FAQ (official)">
+                          <a href="general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/2.0.1/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/2.0.1/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/2.0.1/release-notes.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/2.0.10/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/2.0.10/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/2.0.10/release-notes.html Sun May 10 10:48:04 2015
@@ -184,16 +184,9 @@ Brian Fox" />
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/2.0.11/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/2.0.11/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/2.0.11/release-notes.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/2.0.2/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/2.0.2/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/2.0.2/release-notes.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/2.0.3/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/2.0.3/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/2.0.3/release-notes.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/2.0.4/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/2.0.4/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/2.0.4/release-notes.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/2.0.5/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/2.0.5/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/2.0.5/release-notes.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/2.0.6/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/2.0.6/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/2.0.6/release-notes.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/2.0.7/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/2.0.7/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/2.0.7/release-notes.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/2.0.8/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/2.0.8/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/2.0.8/release-notes.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/2.0.9/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/2.0.9/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/2.0.9/release-notes.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/2.0/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/2.0/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/2.0/release-notes.html Sun May 10 10:48:04 2015
@@ -181,16 +181,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/2.1.0/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/2.1.0/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/2.1.0/release-notes.html Sun May 10 10:48:04 2015
@@ -184,16 +184,9 @@ Brian Fox" />
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/2.2.0/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/2.2.0/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/2.2.0/release-notes.html Sun May 10 10:48:04 2015
@@ -185,16 +185,9 @@ John Casey" />
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/2.2.1/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/2.2.1/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/2.2.1/release-notes.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/3.0-alpha-3/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/3.0-alpha-3/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/3.0-alpha-3/release-notes.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/3.0-alpha-4/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/3.0-alpha-4/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/3.0-alpha-4/release-notes.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/3.0-alpha-5/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/3.0-alpha-5/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/3.0-alpha-5/release-notes.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/3.0-alpha-6/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/3.0-alpha-6/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/3.0-alpha-6/release-notes.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/3.0-alpha-7/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/3.0-alpha-7/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/3.0-alpha-7/release-notes.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/3.0-beta-1/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/3.0-beta-1/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/3.0-beta-1/release-notes.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/3.0-beta-2/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/3.0-beta-2/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/3.0-beta-2/release-notes.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/3.0-beta-3/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/3.0-beta-3/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/3.0-beta-3/release-notes.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/3.0.1/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/3.0.1/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/3.0.1/release-notes.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/3.0.2/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/3.0.2/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/3.0.2/release-notes.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/3.0.3/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/3.0.3/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/3.0.3/release-notes.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/3.0.4/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/3.0.4/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/3.0.4/release-notes.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/3.0.5/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/3.0.5/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/3.0.5/release-notes.html Sun May 10 10:48:04 2015
@@ -180,16 +180,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/3.0/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/3.0/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/3.0/release-notes.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/3.1.0-alpha-1/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/3.1.0-alpha-1/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/3.1.0-alpha-1/release-notes.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/3.1.0/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/3.1.0/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/3.1.0/release-notes.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/3.1.1/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/3.1.1/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/3.1.1/release-notes.html Sun May 10 10:48:04 2015
@@ -180,16 +180,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/3.2.1/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/3.2.1/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/3.2.1/release-notes.html Sun May 10 10:48:04 2015
@@ -180,16 +180,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/3.2.2/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/3.2.2/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/3.2.2/release-notes.html Sun May 10 10:48:04 2015
@@ -180,16 +180,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/3.2.3/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/3.2.3/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/3.2.3/release-notes.html Sun May 10 10:48:04 2015
@@ -180,16 +180,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/3.2.5/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/3.2.5/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/3.2.5/release-notes.html Sun May 10 10:48:04 2015
@@ -178,16 +178,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/3.3.1/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/3.3.1/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/3.3.1/release-notes.html Sun May 10 10:48:04 2015
@@ -180,16 +180,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/3.3.3/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/3.3.3/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/3.3.3/release-notes.html Sun May 10 10:48:04 2015
@@ -178,16 +178,9 @@
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/docs/history.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/history.html (original)
+++ websites/staging/maven/trunk/content/docs/history.html Sun May 10 10:48:04 2015
@@ -178,16 +178,9 @@
                 
       <li>
   
-                          <a href="../general.html" title="FAQ (official)">
+                          <a href="../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/download.html
==============================================================================
--- websites/staging/maven/trunk/content/download.html (original)
+++ websites/staging/maven/trunk/content/download.html Sun May 10 10:48:04 2015
@@ -181,16 +181,9 @@
                 
       <li>
   
-                          <a href="general.html" title="FAQ (official)">
+                          <a href="general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/eclipse-plugin.html
==============================================================================
--- websites/staging/maven/trunk/content/eclipse-plugin.html (original)
+++ websites/staging/maven/trunk/content/eclipse-plugin.html Sun May 10 10:48:04 2015
@@ -178,16 +178,9 @@
                 
       <li>
   
-                          <a href="general.html" title="FAQ (official)">
+                          <a href="general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/errors/404.html
==============================================================================
--- websites/staging/maven/trunk/content/errors/404.html (original)
+++ websites/staging/maven/trunk/content/errors/404.html Sun May 10 10:48:04 2015
@@ -181,16 +181,9 @@
                 
       <li>
   
-                          <a href="../general.html" title="FAQ (official)">
+                          <a href="../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/examples/index.html
==============================================================================
--- websites/staging/maven/trunk/content/examples/index.html (original)
+++ websites/staging/maven/trunk/content/examples/index.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../general.html" title="FAQ (official)">
+                          <a href="../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/examples/injecting-properties-via-settings.html
==============================================================================
--- websites/staging/maven/trunk/content/examples/injecting-properties-via-settings.html (original)
+++ websites/staging/maven/trunk/content/examples/injecting-properties-via-settings.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../general.html" title="FAQ (official)">
+                          <a href="../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/examples/maven-3-lifecycle-extensions.html
==============================================================================
--- websites/staging/maven/trunk/content/examples/maven-3-lifecycle-extensions.html (original)
+++ websites/staging/maven/trunk/content/examples/maven-3-lifecycle-extensions.html Sun May 10 10:48:04 2015
@@ -182,16 +182,9 @@
                 
       <li>
   
-                          <a href="../general.html" title="FAQ (official)">
+                          <a href="../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/general.html
==============================================================================
--- websites/staging/maven/trunk/content/general.html (original)
+++ websites/staging/maven/trunk/content/general.html Sun May 10 10:48:04 2015
@@ -180,18 +180,11 @@
                 
       <li class="active">
   
-            <a href="#"><span class="none"></span>FAQ (official)</a>
+            <a href="#"><span class="none"></span>FAQ</a>
           </li>
                 
       <li>
   
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
-            </li>
-                
-      <li>
-  
                           <a href="support-and-training.html" title="Support and Training">
           <span class="none"></span>
         Support and Training</a>

Modified: websites/staging/maven/trunk/content/glossary.html
==============================================================================
--- websites/staging/maven/trunk/content/glossary.html (original)
+++ websites/staging/maven/trunk/content/glossary.html Sun May 10 10:48:04 2015
@@ -180,16 +180,9 @@
                 
       <li>
   
-                          <a href="general.html" title="FAQ (official)">
+                          <a href="general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>

Modified: websites/staging/maven/trunk/content/guides/development/guide-building-maven.html
==============================================================================
--- websites/staging/maven/trunk/content/guides/development/guide-building-maven.html (original)
+++ websites/staging/maven/trunk/content/guides/development/guide-building-maven.html Sun May 10 10:48:04 2015
@@ -183,16 +183,9 @@ Jason van Zyl" />
                 
       <li>
   
-                          <a href="../../general.html" title="FAQ (official)">
+                          <a href="../../general.html" title="FAQ">
           <span class="none"></span>
-        FAQ (official)</a>
-            </li>
-                
-      <li>
-  
-                          <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink" title="FAQ (unofficial)">
-          <span class="none"></span>
-        FAQ (unofficial)</a>
+        FAQ</a>
             </li>
                 
       <li>