Author: mmoser
Date: Fri Jul  3 18:44:11 2015
New Revision: 1689055

URL: http://svn.apache.org/r1689055
Log:
MNGSITE-245 - Revamped download and install steps
Submitted by: Manfred Moser

o removed old releases from download page
o removed old release list page
o new install page
o new configure page
o new run page
o consolidated IDE page
o trimmed down and cleaned up navigation
o adapted links all over as necessary
o numerous other fixes
o also addresses MNGSITE-239 and MNGSITE-150


Added:
    maven/site/trunk/content/markdown/configure.md
    maven/site/trunk/content/markdown/ide.md
    maven/site/trunk/content/markdown/install.md
    maven/site/trunk/content/markdown/run.md
Modified:
    maven/site/trunk/content/apt/docs/2.0.1/release-notes.apt.vm
    maven/site/trunk/content/apt/docs/2.0.10/release-notes.apt.vm
    maven/site/trunk/content/apt/docs/2.0.11/release-notes.apt.vm
    maven/site/trunk/content/apt/docs/2.0.2/release-notes.apt.vm
    maven/site/trunk/content/apt/docs/2.0.3/release-notes.apt.vm
    maven/site/trunk/content/apt/docs/2.0.4/release-notes.apt.vm
    maven/site/trunk/content/apt/docs/2.0.5/release-notes.apt.vm
    maven/site/trunk/content/apt/docs/2.0.6/release-notes.apt.vm
    maven/site/trunk/content/apt/docs/2.0.7/release-notes.apt.vm
    maven/site/trunk/content/apt/docs/2.0.8/release-notes.apt.vm
    maven/site/trunk/content/apt/docs/2.0.9/release-notes.apt.vm
    maven/site/trunk/content/apt/docs/2.1.0/release-notes.apt.vm
    maven/site/trunk/content/apt/docs/2.2.0/release-notes.apt.vm
    maven/site/trunk/content/apt/docs/2.2.1/release-notes.apt.vm
    maven/site/trunk/content/apt/docs/3.0-alpha-3/release-notes.apt.vm
    maven/site/trunk/content/apt/docs/3.0-alpha-4/release-notes.apt.vm
    maven/site/trunk/content/apt/docs/3.0-alpha-5/release-notes.apt.vm
    maven/site/trunk/content/apt/docs/3.0-alpha-6/release-notes.apt.vm
    maven/site/trunk/content/apt/docs/3.0-alpha-7/release-notes.apt.vm
    maven/site/trunk/content/apt/docs/3.0-beta-1/release-notes.apt.vm
    maven/site/trunk/content/apt/docs/3.0-beta-2/release-notes.apt.vm
    maven/site/trunk/content/apt/docs/3.0-beta-3/release-notes.apt.vm
    maven/site/trunk/content/apt/docs/3.0.1/release-notes.apt.vm
    maven/site/trunk/content/apt/docs/3.0.2/release-notes.apt.vm
    maven/site/trunk/content/apt/docs/3.0.3/release-notes.apt.vm
    maven/site/trunk/content/apt/docs/3.0.4/release-notes.apt.vm
    maven/site/trunk/content/apt/docs/3.0.5/release-notes.apt.vm
    maven/site/trunk/content/apt/docs/3.0/release-notes.apt.vm
    maven/site/trunk/content/apt/docs/3.1.0-alpha-1/release-notes.apt.vm
    maven/site/trunk/content/apt/docs/3.1.0/release-notes.apt.vm
    maven/site/trunk/content/apt/docs/3.1.1/release-notes.apt.vm
    maven/site/trunk/content/apt/guides/mini/guide-configuring-maven.apt
    maven/site/trunk/content/apt/netbeans-module.apt
    maven/site/trunk/content/apt/run-maven/index.apt
    maven/site/trunk/content/filtered-resources/.htaccess
    maven/site/trunk/content/markdown/docs/3.2.1/release-notes.md
    maven/site/trunk/content/markdown/docs/3.2.2/release-notes.md
    maven/site/trunk/content/markdown/docs/3.2.3/release-notes.md
    maven/site/trunk/content/markdown/docs/3.2.5/release-notes.md
    maven/site/trunk/content/markdown/docs/3.3.1/release-notes.md
    maven/site/trunk/content/markdown/docs/3.3.3/release-notes.md
    maven/site/trunk/content/markdown/docs/history.md.vm
    maven/site/trunk/content/markdown/repository-management.md
    maven/site/trunk/content/pdf.xml
    maven/site/trunk/content/site.xml
    maven/site/trunk/content/xdoc/download.xml.vm
    maven/site/trunk/content/xdoc/index.xml.vm

Modified: maven/site/trunk/content/apt/docs/2.0.1/release-notes.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/docs/2.0.1/release-notes.apt.vm?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/apt/docs/2.0.1/release-notes.apt.vm (original)
+++ maven/site/trunk/content/apt/docs/2.0.1/release-notes.apt.vm Fri Jul  3 
18:44:11 2015
@@ -34,8 +34,6 @@ Maven 2.0.1
 
 * Complete release notes
 
-    * See {{{../../release-notes-2.x.html}complete release notes for 2.x}}
-
-    * See {{{../../release-notes-all.html}complete release notes for all 
versions}}
+    * See {{{../../docs/history.html}complete release notes for all versions}}
 
   

Modified: maven/site/trunk/content/apt/docs/2.0.10/release-notes.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/docs/2.0.10/release-notes.apt.vm?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/apt/docs/2.0.10/release-notes.apt.vm (original)
+++ maven/site/trunk/content/apt/docs/2.0.10/release-notes.apt.vm Fri Jul  3 
18:44:11 2015
@@ -56,6 +56,4 @@ Maven 2.0.10
 
 * Complete release notes
 
-    * See {{{../../release-notes-2.x.html}complete release notes for 2.x}}
-
-    * See {{{../../release-notes-all.html}complete release notes for all 
versions}}
+    * See {{{../../docs/history.html}complete release notes for all versions}}

Modified: maven/site/trunk/content/apt/docs/2.0.11/release-notes.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/docs/2.0.11/release-notes.apt.vm?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/apt/docs/2.0.11/release-notes.apt.vm (original)
+++ maven/site/trunk/content/apt/docs/2.0.11/release-notes.apt.vm Fri Jul  3 
18:44:11 2015
@@ -54,7 +54,5 @@ Maven 2.0.11
   
 * Complete release notes
 
-    * See {{{../../release-notes-2.x.html}complete release notes for 2.x}}
-
-    * See {{{../../release-notes-all.html}complete release notes for all 
versions}}
+    * See {{{../../docs/history.html}complete release notes for all versions}}
 

Modified: maven/site/trunk/content/apt/docs/2.0.2/release-notes.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/docs/2.0.2/release-notes.apt.vm?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/apt/docs/2.0.2/release-notes.apt.vm (original)
+++ maven/site/trunk/content/apt/docs/2.0.2/release-notes.apt.vm Fri Jul  3 
18:44:11 2015
@@ -34,6 +34,4 @@ Maven 2.0.2
 
 * Complete release notes
 
-    * See {{{../../release-notes-2.x.html}complete release notes for 2.x}}
-
-    * See {{{../../release-notes-all.html}complete release notes for all 
versions}}
+    * See {{{../../docs/history.html}complete release notes for all versions}}

Modified: maven/site/trunk/content/apt/docs/2.0.3/release-notes.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/docs/2.0.3/release-notes.apt.vm?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/apt/docs/2.0.3/release-notes.apt.vm (original)
+++ maven/site/trunk/content/apt/docs/2.0.3/release-notes.apt.vm Fri Jul  3 
18:44:11 2015
@@ -34,6 +34,4 @@ Maven 2.0.3
 
 * Complete release notes
 
-    * See {{{../../release-notes-2.x.html}complete release notes for 2.x}}
-
-    * See {{{../../release-notes-all.html}complete release notes for all 
versions}}
+    * See {{{../../docs/history.html}complete release notes for all versions}}

Modified: maven/site/trunk/content/apt/docs/2.0.4/release-notes.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/docs/2.0.4/release-notes.apt.vm?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/apt/docs/2.0.4/release-notes.apt.vm (original)
+++ maven/site/trunk/content/apt/docs/2.0.4/release-notes.apt.vm Fri Jul  3 
18:44:11 2015
@@ -34,4 +34,4 @@ Maven 2.0.4
 
 * Complete release notes
 
-    * See {{{../../release-notes-all.html}complete release notes for all 
versions}}
+    * See {{{../../docs/history.html}complete release notes for all versions}}

Modified: maven/site/trunk/content/apt/docs/2.0.5/release-notes.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/docs/2.0.5/release-notes.apt.vm?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/apt/docs/2.0.5/release-notes.apt.vm (original)
+++ maven/site/trunk/content/apt/docs/2.0.5/release-notes.apt.vm Fri Jul  3 
18:44:11 2015
@@ -34,4 +34,4 @@ Maven 2.0.5
 
 * Complete release notes
 
-    * See {{{../../release-notes-all.html}complete release notes for all 
versions}}
+    * See {{{../../docs/history.html}complete release notes for all versions}}

Modified: maven/site/trunk/content/apt/docs/2.0.6/release-notes.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/docs/2.0.6/release-notes.apt.vm?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/apt/docs/2.0.6/release-notes.apt.vm (original)
+++ maven/site/trunk/content/apt/docs/2.0.6/release-notes.apt.vm Fri Jul  3 
18:44:11 2015
@@ -34,4 +34,4 @@ Maven 2.0.6
 
 * Complete release notes
 
-    * See {{{../../release-notes-all.html}complete release notes for all 
versions}}
+    * See {{{../../docs/history.html}complete release notes for all versions}}

Modified: maven/site/trunk/content/apt/docs/2.0.7/release-notes.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/docs/2.0.7/release-notes.apt.vm?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/apt/docs/2.0.7/release-notes.apt.vm (original)
+++ maven/site/trunk/content/apt/docs/2.0.7/release-notes.apt.vm Fri Jul  3 
18:44:11 2015
@@ -34,4 +34,4 @@ Maven 2.0.7
 
 * Complete release notes
 
-    * See {{{../../release-notes-all.html}complete release notes for all 
versions}}
+    * See {{{../../docs/history.html}complete release notes for all versions}}

Modified: maven/site/trunk/content/apt/docs/2.0.8/release-notes.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/docs/2.0.8/release-notes.apt.vm?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/apt/docs/2.0.8/release-notes.apt.vm (original)
+++ maven/site/trunk/content/apt/docs/2.0.8/release-notes.apt.vm Fri Jul  3 
18:44:11 2015
@@ -34,4 +34,4 @@ Maven 2.0.8
 
 * Complete release notes
 
-    * See {{{../../release-notes-all.html}complete release notes for all 
versions}}
+    * See {{{../../docs/history.html}complete release notes for all versions}}

Modified: maven/site/trunk/content/apt/docs/2.0.9/release-notes.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/docs/2.0.9/release-notes.apt.vm?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/apt/docs/2.0.9/release-notes.apt.vm (original)
+++ maven/site/trunk/content/apt/docs/2.0.9/release-notes.apt.vm Fri Jul  3 
18:44:11 2015
@@ -34,4 +34,4 @@ Maven 2.0.9
 
 * Complete release notes
 
-    * See {{{../../release-notes-all.html}complete release notes for all 
versions}}
+    * See {{{../../docs/history.html}complete release notes for all versions}}

Modified: maven/site/trunk/content/apt/docs/2.1.0/release-notes.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/docs/2.1.0/release-notes.apt.vm?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/apt/docs/2.1.0/release-notes.apt.vm (original)
+++ maven/site/trunk/content/apt/docs/2.1.0/release-notes.apt.vm Fri Jul  3 
18:44:11 2015
@@ -52,4 +52,4 @@ Maven 2.1.0
 
 * Complete release notes
 
-    * See {{{../../release-notes-all.html}complete release notes for all 
versions}}
+    * See {{{../../docs/history.html}complete release notes for all versions}}

Modified: maven/site/trunk/content/apt/docs/2.2.0/release-notes.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/docs/2.2.0/release-notes.apt.vm?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/apt/docs/2.2.0/release-notes.apt.vm (original)
+++ maven/site/trunk/content/apt/docs/2.2.0/release-notes.apt.vm Fri Jul  3 
18:44:11 2015
@@ -53,4 +53,4 @@ Maven 2.2.0
 
 * Complete release notes
 
-    * See {{{../../release-notes-all.html}complete release notes for all 
versions}}
+    * See {{{../../docs/history.html}complete release notes for all versions}}

Modified: maven/site/trunk/content/apt/docs/2.2.1/release-notes.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/docs/2.2.1/release-notes.apt.vm?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/apt/docs/2.2.1/release-notes.apt.vm (original)
+++ maven/site/trunk/content/apt/docs/2.2.1/release-notes.apt.vm Fri Jul  3 
18:44:11 2015
@@ -50,4 +50,4 @@ Maven 2.2.1
 
 * Complete release notes
 
-    * See {{{../../release-notes-all.html}complete release notes for all 
versions}}
+    * See {{{../../docs/history.html}complete release notes for all versions}}

Modified: maven/site/trunk/content/apt/docs/3.0-alpha-3/release-notes.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/docs/3.0-alpha-3/release-notes.apt.vm?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/apt/docs/3.0-alpha-3/release-notes.apt.vm 
(original)
+++ maven/site/trunk/content/apt/docs/3.0-alpha-3/release-notes.apt.vm Fri Jul  
3 18:44:11 2015
@@ -53,4 +53,4 @@ Maven 3.0-alpha-3
 
 * Complete Release Notes
 
-    * See {{{../../release-notes-all.html}complete release notes for all 
versions}}
+    * See {{{../../docs/history.html}complete release notes for all versions}}

Modified: maven/site/trunk/content/apt/docs/3.0-alpha-4/release-notes.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/docs/3.0-alpha-4/release-notes.apt.vm?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/apt/docs/3.0-alpha-4/release-notes.apt.vm 
(original)
+++ maven/site/trunk/content/apt/docs/3.0-alpha-4/release-notes.apt.vm Fri Jul  
3 18:44:11 2015
@@ -53,4 +53,4 @@ Maven 3.0-alpha-4
 
 * Complete Release Notes
 
-    * See {{{../../release-notes-all.html}complete release notes for all 
versions}}
+    * See {{{../../docs/history.html}complete release notes for all versions}}

Modified: maven/site/trunk/content/apt/docs/3.0-alpha-5/release-notes.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/docs/3.0-alpha-5/release-notes.apt.vm?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/apt/docs/3.0-alpha-5/release-notes.apt.vm 
(original)
+++ maven/site/trunk/content/apt/docs/3.0-alpha-5/release-notes.apt.vm Fri Jul  
3 18:44:11 2015
@@ -53,4 +53,4 @@ Maven 3.0-alpha-5
 
 * Complete Release Notes
 
-    * See {{{../../release-notes-all.html}complete release notes for all 
versions}}
+    * See {{{../../docs/history.html}complete release notes for all versions}}

Modified: maven/site/trunk/content/apt/docs/3.0-alpha-6/release-notes.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/docs/3.0-alpha-6/release-notes.apt.vm?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/apt/docs/3.0-alpha-6/release-notes.apt.vm 
(original)
+++ maven/site/trunk/content/apt/docs/3.0-alpha-6/release-notes.apt.vm Fri Jul  
3 18:44:11 2015
@@ -53,4 +53,4 @@ Maven 3.0-alpha-6
 
 * Complete Release Notes
 
-    * See {{{../../release-notes-all.html}complete release notes for all 
versions}}
+    * See {{{../../docs/history.html}complete release notes for all versions}}

Modified: maven/site/trunk/content/apt/docs/3.0-alpha-7/release-notes.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/docs/3.0-alpha-7/release-notes.apt.vm?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/apt/docs/3.0-alpha-7/release-notes.apt.vm 
(original)
+++ maven/site/trunk/content/apt/docs/3.0-alpha-7/release-notes.apt.vm Fri Jul  
3 18:44:11 2015
@@ -53,4 +53,4 @@ Maven 3.0-alpha-7
 
 * Complete Release Notes
 
-    * See {{{../../release-notes-all.html}complete release notes for all 
versions}}
+    * See {{{../../docs/history.html}complete release notes for all versions}}

Modified: maven/site/trunk/content/apt/docs/3.0-beta-1/release-notes.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/docs/3.0-beta-1/release-notes.apt.vm?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/apt/docs/3.0-beta-1/release-notes.apt.vm (original)
+++ maven/site/trunk/content/apt/docs/3.0-beta-1/release-notes.apt.vm Fri Jul  
3 18:44:11 2015
@@ -53,4 +53,4 @@ Maven 3.0-beta-1
 
 * Complete Release Notes
 
-    * See {{{../../release-notes-all.html}complete release notes for all 
versions}}
+    * See {{{../../docs/history.html}complete release notes for all versions}}

Modified: maven/site/trunk/content/apt/docs/3.0-beta-2/release-notes.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/docs/3.0-beta-2/release-notes.apt.vm?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/apt/docs/3.0-beta-2/release-notes.apt.vm (original)
+++ maven/site/trunk/content/apt/docs/3.0-beta-2/release-notes.apt.vm Fri Jul  
3 18:44:11 2015
@@ -53,4 +53,4 @@ Maven 3.0-beta-2
 
 * Complete Release Notes
 
-    * See {{{../../release-notes-all.html}complete release notes for all 
versions}}
+    * See {{{../../docs/history.html}complete release notes for all versions}}

Modified: maven/site/trunk/content/apt/docs/3.0-beta-3/release-notes.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/docs/3.0-beta-3/release-notes.apt.vm?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/apt/docs/3.0-beta-3/release-notes.apt.vm (original)
+++ maven/site/trunk/content/apt/docs/3.0-beta-3/release-notes.apt.vm Fri Jul  
3 18:44:11 2015
@@ -53,4 +53,4 @@ Maven 3.0-beta-3
 
 * Complete Release Notes
 
-    * See {{{../../release-notes-all.html}complete release notes for all 
versions}}
+    * See {{{../../docs/history.html}complete release notes for all versions}}

Modified: maven/site/trunk/content/apt/docs/3.0.1/release-notes.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/docs/3.0.1/release-notes.apt.vm?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/apt/docs/3.0.1/release-notes.apt.vm (original)
+++ maven/site/trunk/content/apt/docs/3.0.1/release-notes.apt.vm Fri Jul  3 
18:44:11 2015
@@ -53,4 +53,4 @@ Maven 3.0.1
 
 * Complete Release Notes
 
-    * See {{{../../release-notes-all.html}complete release notes for all 
versions}}
+    * See {{{../../docs/history.html}complete release notes for all versions}}

Modified: maven/site/trunk/content/apt/docs/3.0.2/release-notes.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/docs/3.0.2/release-notes.apt.vm?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/apt/docs/3.0.2/release-notes.apt.vm (original)
+++ maven/site/trunk/content/apt/docs/3.0.2/release-notes.apt.vm Fri Jul  3 
18:44:11 2015
@@ -53,4 +53,4 @@ Maven 3.0.2
 
 * Complete Release Notes
 
-    * See {{{../../release-notes-all.html}complete release notes for all 
versions}}
+    * See {{{../../docs/history.html}complete release notes for all versions}}

Modified: maven/site/trunk/content/apt/docs/3.0.3/release-notes.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/docs/3.0.3/release-notes.apt.vm?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/apt/docs/3.0.3/release-notes.apt.vm (original)
+++ maven/site/trunk/content/apt/docs/3.0.3/release-notes.apt.vm Fri Jul  3 
18:44:11 2015
@@ -53,4 +53,4 @@ Maven 3.0.3
 
 * Complete Release Notes
 
-    * See {{{../../release-notes-all.html}complete release notes for all 
versions}}
+    * See {{{../../docs/history.html}complete release notes for all versions}}

Modified: maven/site/trunk/content/apt/docs/3.0.4/release-notes.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/docs/3.0.4/release-notes.apt.vm?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/apt/docs/3.0.4/release-notes.apt.vm (original)
+++ maven/site/trunk/content/apt/docs/3.0.4/release-notes.apt.vm Fri Jul  3 
18:44:11 2015
@@ -66,4 +66,4 @@ Maven 3.0.4
 
 * Complete Release Notes
 
-    * See {{{../../release-notes-all.html}complete release notes for all 
versions}}
+    * See {{{../../docs/history.html}complete release notes for all versions}}

Modified: maven/site/trunk/content/apt/docs/3.0.5/release-notes.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/docs/3.0.5/release-notes.apt.vm?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/apt/docs/3.0.5/release-notes.apt.vm (original)
+++ maven/site/trunk/content/apt/docs/3.0.5/release-notes.apt.vm Fri Jul  3 
18:44:11 2015
@@ -55,4 +55,4 @@ Apache Maven 3.0.5
 
 * Complete Release Notes
 
-    * See {{{../../release-notes-all.html}complete release notes for all 
versions}}
+    * See {{{../../docs/history.html}complete release notes for all versions}}

Modified: maven/site/trunk/content/apt/docs/3.0/release-notes.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/docs/3.0/release-notes.apt.vm?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/apt/docs/3.0/release-notes.apt.vm (original)
+++ maven/site/trunk/content/apt/docs/3.0/release-notes.apt.vm Fri Jul  3 
18:44:11 2015
@@ -53,4 +53,4 @@ Maven 3.0
 
 * Complete Release Notes
 
-    * See {{{../../release-notes-all.html}complete release notes for all 
versions}}
+    * See {{{../../docs/history.html}complete release notes for all versions}}

Modified: maven/site/trunk/content/apt/docs/3.1.0-alpha-1/release-notes.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/docs/3.1.0-alpha-1/release-notes.apt.vm?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/apt/docs/3.1.0-alpha-1/release-notes.apt.vm 
(original)
+++ maven/site/trunk/content/apt/docs/3.1.0-alpha-1/release-notes.apt.vm Fri 
Jul  3 18:44:11 2015
@@ -55,4 +55,4 @@ Maven 3.1.0-alpha-1
 
 * Complete Release Notes
 
-    * See {{{../../release-notes-all.html}complete release notes for all 
versions}}
+    * See {{{../../docs/history.html}complete release notes for all versions}}

Modified: maven/site/trunk/content/apt/docs/3.1.0/release-notes.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/docs/3.1.0/release-notes.apt.vm?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/apt/docs/3.1.0/release-notes.apt.vm (original)
+++ maven/site/trunk/content/apt/docs/3.1.0/release-notes.apt.vm Fri Jul  3 
18:44:11 2015
@@ -55,4 +55,4 @@ Maven 3.1.0
 
 * Complete Release Notes
 
-    * See {{{../../release-notes-all.html}complete release notes for all 
versions}}
+    * See {{{../../docs/history.html}complete release notes for all versions}}

Modified: maven/site/trunk/content/apt/docs/3.1.1/release-notes.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/docs/3.1.1/release-notes.apt.vm?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/apt/docs/3.1.1/release-notes.apt.vm (original)
+++ maven/site/trunk/content/apt/docs/3.1.1/release-notes.apt.vm Fri Jul  3 
18:44:11 2015
@@ -55,4 +55,4 @@ Maven 3.1.1
 
 * Complete Release Notes
 
-    * See {{{../../release-notes-all.html}complete release notes for all 
versions}}
+    * See {{{../../docs/history.html}complete release notes for all versions}}

Modified: maven/site/trunk/content/apt/guides/mini/guide-configuring-maven.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/mini/guide-configuring-maven.apt?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/apt/guides/mini/guide-configuring-maven.apt 
(original)
+++ maven/site/trunk/content/apt/guides/mini/guide-configuring-maven.apt Fri 
Jul  3 18:44:11 2015
@@ -134,3 +134,48 @@ export MAVEN_OPTS=-Dmaven.artifact.threa
  Repository configuration can also be put into a profile. You can have multiple
  profiles, with one set to active so that you can easily switch environments.
  Read more about profiles in 
{{{../introduction/introduction-to-profiles.html}Introduction to Build 
Profiles}}.
+ 
+ 
+ 
+ 
+       <subsection name="Optional configuration">
+
+        <p>Maven will work for most tasks with the above configuration, 
however if you have any environmental specific configuration outside of 
individual
+        projects then you will need to configure settings. The following 
sections refer to what is available.</p>
+
+
+        <subsection name="Settings">
+
+        Maven has a settings file located in the Maven installation and/or 
user home directory that configure environmental specifics such as:
+
+        <ul>
+          <li>HTTP proxy server</li>
+
+          <li>repository manager location</li>
+
+          <li>server authentication and passwords</li>
+
+          <li>other configuration properties</li>
+        </ul>
+          For information on this file, see the <a 
href="./settings.html">Settings reference</a>
+        </subsection>
+
+        <subsection name="Security">
+          <p>
+          As of Maven 2.1.0+, you can encrypt passwords in your settings file, 
however you must first configure a master password. For more information on
+          both server passwords and the master password, see the <a 
href="./guides/mini/guide-encryption.html">Guide to Password Encryption</a>.
+        </p>
+        </subsection>
+
+        <subsection name="Toolchains">
+          <p>
+            As of Maven 2.0.9+, you can build a project using a specific 
version of JDK independent from the one Maven is running with.
+            For more information, see the <a 
href="./guides/mini/guide-using-toolchains.html">Guide to Using Toolchains</a>.
+          </p>
+        </subsection>
+
+
+      </subsection>
+ 
+ 
+ 

Modified: maven/site/trunk/content/apt/netbeans-module.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/netbeans-module.apt?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/apt/netbeans-module.apt (original)
+++ maven/site/trunk/content/apt/netbeans-module.apt Fri Jul  3 18:44:11 2015
@@ -28,7 +28,4 @@
 
 Maven Support for NetBeans
 
- NetBeans includes full Maven support since 6.7, including Maven 3 support in 
7.0+.
- You can open any Maven project in the IDE and start coding immediately.
-
- For more information see the {{{http://wiki.netbeans.org/Maven}NetBeans.org 
wiki page}}.
+ 
\ No newline at end of file

Modified: maven/site/trunk/content/apt/run-maven/index.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/run-maven/index.apt?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/apt/run-maven/index.apt (original)
+++ maven/site/trunk/content/apt/run-maven/index.apt Fri Jul  3 18:44:11 2015
@@ -28,36 +28,6 @@
 
 Building a Project with Maven
 
-  This document centre is for those that have the source code to a project 
that builds with Maven, and would like to
-  know how to use Maven to build it (or perform other common tasks).
-
-  The documents here are also helpful to new Maven users.
-
-~~TODO: tasks as buttons?
-
-  * {{{../download.html} Download and Install Maven}} - Download the latest 
version of Maven and install it
-
-  * {{{Quick_Start} Quick Start}} - Get started building the project quickly
-
-  * {{{../users/index.html} Use Maven}} - Learn how to use Maven on your own 
project
-
-~~TODO: command line reference?
-
-* {Quick Start}
-
-** Configuring Maven
-
-  Maven will run with sensible defaults, so you can get right into it. 
However, if you are operating under a
-  restricted environment or behind a firewall, you might need to prepare to 
run Maven, as it requires write access to
-  the home directory (<<<~/.m2>>> on Unix/Mac OS X and <<<C:\Documents and 
Settings\username\.m2>>> on Windows) and
-  network access to download binary dependencies.
-
-   * {{{../guides/mini/guide-configuring-maven.html} Configuring Maven}}
-
-   * {{{../guides/mini/guide-proxies.html} Configuring a HTTP Proxy}}
-
-** Building a Project
-
   The vast majority of Maven-built projects can be built with the following 
command:
 
 ----
@@ -77,16 +47,16 @@ mvn clean install
   While this will build most projects and Maven encourages this standard 
convention, builds can be customisable. If this
   does not suffice, please consult the project's documentation.
 
-** More than just the Build
+* More than just the Build
 
   Maven can do more than just build software - it can assist with testing, run 
web applications and produce reports on
   projects, as well as any number of other tasks provided by plug-ins.
 
-** When Things go Wrong
+* When Things go Wrong
 
   The following are some common problems when building with Maven, and how to 
resolve them.
 
-*** Missing Dependencies
+** Missing Dependencies
 
   A missing dependency presents with an error like the following:
 
@@ -129,5 +99,3 @@ from the specified remote repositories:
   In other cases, it may be an incorrectly declared dependency (like the typo 
in the example above) which the project
   would need to fix, like a compilation error.
 
-  ~~TODO: compilation errors
-  ~~TODO: what are other common problems?

Modified: maven/site/trunk/content/filtered-resources/.htaccess
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/filtered-resources/.htaccess?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/filtered-resources/.htaccess (original)
+++ maven/site/trunk/content/filtered-resources/.htaccess Fri Jul  3 18:44:11 
2015
@@ -1,7 +1,7 @@
 IndexOptions +SuppressIcon
 ErrorDocument 404 /errors/404.html
 
-Redirect Permanent /release-notes.html 
http://maven.apache.org/release-notes-all.html
+Redirect Permanent /release-notes.html 
http://maven.apache.org/docs/history.html
 Redirect Permanent /download.html /download.cgi
 RedirectMatch permanent ^/(.*)/download.html$ 
http://maven.apache.org/$1/download.cgi
 

Added: maven/site/trunk/content/markdown/configure.md
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/markdown/configure.md?rev=1689055&view=auto
==============================================================================
--- maven/site/trunk/content/markdown/configure.md (added)
+++ maven/site/trunk/content/markdown/configure.md Fri Jul  3 18:44:11 2015
@@ -0,0 +1,30 @@
+# Configuring Apache Maven
+
+The configuration for Apache Maven usage itself and projects built with 
resides 
+in a number of places: 
+
+* `MAVEN_OPTS` environment variable:
+
+This variable contains parameters used to start up the JVM running Maven and 
can 
+be used to supply additional options to globally to Maven. E.g. JVM memory 
+settings could be defined with the value `-Xms256m -Xmx512m`.
+
+* `settings.xml` file:
+
+Located in USER_HOME/.m2 the settings files is designed to contain any
+configuration for Maven usage across projects.
+
+* `.mvn` folder:
+
+Located with in the projects top level folder, the files `maven.config` and 
`extensions.xml`
+contain project specific configuration for running Maven.
+
+
+The following guides contain further information to specific configuration 
aspects:
+
+* [Recommended Best Practice - Using a Repository 
Manager](./repository-management.html)
+* [Documentation for settings.xml](./settings.html)
+* [Configuring a HTTP Proxy](./guides/mini/guide-proxies.html)
+* [Configuring a repository mirror](./guides/mini/guide-mirror-settings.html)
+* [Various Tips for Configuring 
Maven](./guides/mini/guide-configuring-maven.html)
+* [Password Encryption](./guides/mini/guide-encryption.html)

Modified: maven/site/trunk/content/markdown/docs/3.2.1/release-notes.md
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/markdown/docs/3.2.1/release-notes.md?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/markdown/docs/3.2.1/release-notes.md (original)
+++ maven/site/trunk/content/markdown/docs/3.2.1/release-notes.md Fri Jul  3 
18:44:11 2015
@@ -106,7 +106,7 @@ See [complete release notes for all vers
 [1]: ../../plugins/index.html
 [2]: http://maven.apache.org/
 [4]: 
https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12316922&amp;version=12330185
-[5]: ../../release-notes-all.html
+[5]: ../../docs/history.html
 [MNG-2315]: https://issues.apache.org/jira/browse/MNG-2315
 [MNG-5578]: https://issues.apache.org/jira/browse/MNG-5578
 [MNG-5582]: https://issues.apache.org/jira/browse/MNG-5582

Modified: maven/site/trunk/content/markdown/docs/3.2.2/release-notes.md
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/markdown/docs/3.2.2/release-notes.md?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/markdown/docs/3.2.2/release-notes.md (original)
+++ maven/site/trunk/content/markdown/docs/3.2.2/release-notes.md Fri Jul  3 
18:44:11 2015
@@ -122,7 +122,7 @@ See [complete release notes for all vers
 [1]: ../../plugins/index.html
 [2]: http://maven.apache.org/
 [4]: 
https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12316922&amp;version=12330186
-[5]: ../../release-notes-all.html
+[5]: ../../docs/history.html
 [MNG-2199]: https://issues.apache.org/jira/browse/MNG-2199
 [MNG-4565]: https://issues.apache.org/jira/browse/MNG-4565
 [MNG-5346]: https://issues.apache.org/jira/browse/MNG-5346

Modified: maven/site/trunk/content/markdown/docs/3.2.3/release-notes.md
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/markdown/docs/3.2.3/release-notes.md?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/markdown/docs/3.2.3/release-notes.md (original)
+++ maven/site/trunk/content/markdown/docs/3.2.3/release-notes.md Fri Jul  3 
18:44:11 2015
@@ -58,7 +58,7 @@ See [complete release notes for all vers
 [1]: ../../plugins/index.html
 [2]: http://maven.apache.org/
 [4]: 
https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12316922&amp;version=12330187
-[5]: ../../release-notes-all.html
+[5]: ../../docs/history.html
 [MNG-5672]: https://issues.apache.org/jira/browse/MNG-5672
 [MNG-4565]: https://issues.apache.org/jira/browse/MNG-4565
 [MNG-5346]: https://issues.apache.org/jira/browse/MNG-5346

Modified: maven/site/trunk/content/markdown/docs/3.2.5/release-notes.md
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/markdown/docs/3.2.5/release-notes.md?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/markdown/docs/3.2.5/release-notes.md (original)
+++ maven/site/trunk/content/markdown/docs/3.2.5/release-notes.md Fri Jul  3 
18:44:11 2015
@@ -52,4 +52,4 @@ See [complete release notes for all vers
 [1]: ../../plugins/index.html
 [2]: http://maven.apache.org/
 [4]: 
https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12316922&amp;version=12330189
-[5]: ../../release-notes-all.html
+[5]: ../../docs/history.html

Modified: maven/site/trunk/content/markdown/docs/3.3.1/release-notes.md
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/markdown/docs/3.3.1/release-notes.md?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/markdown/docs/3.3.1/release-notes.md (original)
+++ maven/site/trunk/content/markdown/docs/3.3.1/release-notes.md Fri Jul  3 
18:44:11 2015
@@ -54,4 +54,4 @@ See [complete release notes for all vers
 [1]: ../../plugins/index.html
 [2]: http://maven.apache.org/
 [4]: 
https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12316922&amp;version=12330193
-[5]: ../../release-notes-all.html
+[5]: ../../docs/history.html

Modified: maven/site/trunk/content/markdown/docs/3.3.3/release-notes.md
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/markdown/docs/3.3.3/release-notes.md?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/markdown/docs/3.3.3/release-notes.md (original)
+++ maven/site/trunk/content/markdown/docs/3.3.3/release-notes.md Fri Jul  3 
18:44:11 2015
@@ -52,4 +52,4 @@ See [complete release notes for all vers
 [1]: ../../plugins/index.html
 [2]: http://maven.apache.org/
 [4]: 
https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12316922&amp;version=12332054
-[5]: ../../release-notes-all.html
+[5]: ../../docs/history.html

Modified: maven/site/trunk/content/markdown/docs/history.md.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/markdown/docs/history.md.vm?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/markdown/docs/history.md.vm (original)
+++ maven/site/trunk/content/markdown/docs/history.md.vm Fri Jul  3 18:44:11 
2015
@@ -57,6 +57,11 @@ Date format is: YYYY-MM-DD
 
 <h3><a name="Maven_3">Maven 3</a></h3>
 <table>
+<tr><td>Release Date</td>
+<td>Version</td>
+<td>Required Java Version</td>
+<td>Links</td>
+</tr>
 
 #release( "2015-04-28" "3.3.3" 
"users/201504.mbox/%3C4B6DEAE5-A0C1-40F0-A290-FAF9B67753D2%40takari.io%3E" 
"true" "Java 7" "2" )
 #release( "2015-03-18" "3.3.1" 
"users/201503.mbox/%3CC490F64B-BB4A-48F9-98DD-4352A7FAE378%40takari.io%3E" "" 
"" "" )

Added: maven/site/trunk/content/markdown/ide.md
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/markdown/ide.md?rev=1689055&view=auto
==============================================================================
--- maven/site/trunk/content/markdown/ide.md (added)
+++ maven/site/trunk/content/markdown/ide.md Fri Jul  3 18:44:11 2015
@@ -0,0 +1,36 @@
+# Apache Maven IDE Integration
+
+All popular development environments for the Java platform and beyond support 
+Apache Maven with numerous features out of the box. The following list 
iterates 
+popular IDEs in alphabetical order:
+
+## Eclipse IDE - M2Eclipse
+
+  [M2Eclipse ](http://www.eclipse.org/m2e/) is 
+  the official Eclipse project for Maven integration for the Eclipse IDE.
+  
+Features include:
+
+- Launching Maven builds from within Eclipse
+- Dependency management for Eclipse build path based on Maven's pom.xml
+- Resolving Maven dependencies from the Eclipse workspace without installing 
to local Maven repository
+- Automatic downloading of the required dependencies and sources from the 
remote Maven repositories
+- Wizards for creating new Maven projects, pom.xml and to enable Maven support 
on existing projects
+- Quick search for dependencies in remote Maven repositories
+- Quick fixes in the Java editor for looking up required dependencies/jars by 
the class or package name
+- Integration with other Eclipse tools, such as WTP, AJDT, Mylyn, Subclipse 
and others.
+
+M2E dynamically integrates with your Maven projects with Eclipse while you 
make changes in the IDE. As 
+you change dependencies, or configurations of Maven plugins in your POMs M2E, 
will synchronize the 
+Eclipse workspace with those changes.
+
+## JetBrains IntelliJ IDEA
+
+Intelli IDEA has a [feature-rich integration for 
Maven](https://www.jetbrains.com/idea/help/maven.html). 
+
+## Netbeans IDE
+
+NetBeans includes full Maven support since 6.7, including Maven 3 support in 
7.0+. 
+You can open any Maven project in the IDE and start coding immediately.
+
+For more information see the [NetBeans.org wiki 
page](http://wiki.netbeans.org/Maven).

Added: maven/site/trunk/content/markdown/install.md
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/markdown/install.md?rev=1689055&view=auto
==============================================================================
--- maven/site/trunk/content/markdown/install.md (added)
+++ maven/site/trunk/content/markdown/install.md Fri Jul  3 18:44:11 2015
@@ -0,0 +1,63 @@
+# Installing Apache Maven
+
+The installation of Apache Maven is a simple process of extracting the archive 
+and adding the `bin` folder with the `mvn` command to the `PATH`.
+
+Detailed steps are:
+
+* Ensure `JAVA_HOME` environment variable is set and points to your JDK 
installation
+
+* Extract distribution archive in any directory 
+
+
+    unzip apache-maven-${currentStableVersion}-bin.zip
+
+or
+
+    tar xfvz apache-maven-${currentStableVersion}-bin.zip
+
+Alternatively use your preferred archive extraction tool.
+
+* Add the `bin` directory of the created directory 
`apache-maven-${currentStableVersion}` to 
+the `PATH` environment variable
+
+* Confirm with `mvn -v` in a new shell. The result should look similar to
+
+
+    Apache Maven 3.3.3 (7994120775791599e205a5524ec3e0dfe41d4a06; 
2015-04-22T04:57:37-07:00)
+    Maven home: /opt/apache-maven-3.3.3
+    Java version: 1.8.0_45, vendor: Oracle Corporation
+    Java home: 
/Library/Java/JavaVirtualMachines/jdk1.8.0_45.jdk/Contents/Home/jre
+    Default locale: en_US, platform encoding: UTF-8
+    OS name: "mac os x", version: "10.8.5", arch: "x86_64", family: "mac"
+
+
+## Windows Tips
+
+* Check environment variable value e.g.
+
+
+    echo %JAVA_HOME% 
+    C:\Program Files\Java\jdk1.7.0_51
+
+* Adding to `PATH`:  Add the unpacked distribution's bin directory to your 
user PATH environment variable 
+by opening up the system properties (WinKey + Pause), selecting the "Advanced" 
tab, and 
+the "Environment Variables" button, then adding or selecting the <i>PATH</i>
+variable in the user variables with the value `C:\Program 
Files\apache-maven-${currentStableVersion}\bin`.
+The same dialog can be used to set `JAVA_HOME` to the location of your JDK, 
e.g. `C:\Program Files\Java\jdk1.7.0_51`
+
+* Open a new command prompt (Winkey + R then type `cmd`) and run `mvn -v` to 
verify the installation.
+
+## Unix-based Operating System (Linux, Solaris and Mac OS X) Tips
+
+* Check environment variable value
+
+
+    echo $JAVA_HOME
+    /Library/Java/JavaVirtualMachines/jdk1.8.0_45.jdk/Contents/Home
+    
+* Adding to `PATH`
+
+
+    export PATH=/opt/apache-maven-${currentStableVersion}/bin:$PATH
+

Modified: maven/site/trunk/content/markdown/repository-management.md
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/markdown/repository-management.md?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/markdown/repository-management.md (original)
+++ maven/site/trunk/content/markdown/repository-management.md Fri Jul  3 
18:44:11 2015
@@ -30,9 +30,8 @@ your organization and beyond without the
 
 ### Available Repository Managers
 
-The following list of open source and commercial repository managers are known 
-to support the repository format used by Maven. Please refer to the respective 
-linked web sites for further information about repository management in 
general 
+The following list (alphabetical order) of open source and commercial 
repository
+ managers are known to support the repository format used by Maven. Please 
refer to the respective linked web sites for further information about 
repository management in general 
 and the features provided by these products.
 
 * <a href="http://archiva.apache.org/"; target="_blank" rel="nofollow">Apache 
Archiva</a> (open source)

Added: maven/site/trunk/content/markdown/run.md
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/markdown/run.md?rev=1689055&view=auto
==============================================================================
--- maven/site/trunk/content/markdown/run.md (added)
+++ maven/site/trunk/content/markdown/run.md Fri Jul  3 18:44:11 2015
@@ -0,0 +1,53 @@
+# Running Apache Maven
+
+The syntax for running Maven is as follows:
+
+    mvn [options] [<goal(s)>] [<phase(s)>]
+
+All available options are documented in the built in help that you can access 
with
+
+    mvn -h
+
+The typical invocation for building a Maven project uses a Maven life cycle 
phase. E.g.  
+
+    mvn package
+
+The built in life cycles and their phases are in order are:
+
+* clean - pre-clean, clean, post-clean
+
+* default - validate, initialize, generate-sources, process-sources, 
generate-resources, 
+process-resources, compile, process-classes, generate-test-sources, 
process-test-sources, 
+generate-test-resources, process-test-resources, test-compile, 
process-test-classes, 
+test, prepare-package, package, pre-integration-test, integration-test, 
post-integration-test, 
+verify, install, deploy
+
+* site - pre-site, site, post-site, site-deploy
+
+A fresh build of a project generating all packaged outputs and the 
documentation site
+and deploying it to a repository manager could be done with
+
+    mvn clean deploy site-deploy
+
+Just creating the package and installing it in the local repository for re-use 
from other projects can be done with
+
+    mvn clean install
+
+This is the most common build invocation for a Maven project.
+
+When not working with a project, and in some other use cases, you might want 
to invoke
+a specific task implemented by a part of Maven - this is called a goal of a 
plugin.
+E.g.:
+
+    mvn archetype:generate
+
+or
+
+    mvn checkstyle:check
+
+There are many different plugins avaiable and they all implement different 
goals.
+
+
+Further resources: 
+
+* [Building a Project with Maven](./run-maven/index.html)

Modified: maven/site/trunk/content/pdf.xml
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/pdf.xml?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/pdf.xml (original)
+++ maven/site/trunk/content/pdf.xml Fri Jul  3 18:44:11 2015
@@ -119,8 +119,6 @@
         <item name="Reusable Test JARs" 
ref="/guides/mini/guide-attached-tests.html" />
       </item>
 
-      <item name="Eclipse Integration" ref="/eclipse-plugin.html"/>
-      <item name="NetBeans Integration" ref="/netbeans-module.html"/>
     </item>
 
     <!-- Plugin Dev Documentation -->

Modified: maven/site/trunk/content/site.xml
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/site.xml?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/site.xml (original)
+++ maven/site/trunk/content/site.xml Fri Jul  3 18:44:11 2015
@@ -59,24 +59,13 @@ under the License.
 
     <menu name="Main">
       <item name="Welcome" href="/index.html"/>
-    </menu>
-    <menu name="Get Maven">
       <item name="Download" href="/download.html"/>
-      <item name="Releases History" href="/docs/history.html"/>
-      <item name="Release Notes (${currentStableVersion})" 
href="/docs/${currentStableVersion}/release-notes.html"/>
-      <item name="Release Notes (${current32xVersion})" 
href="/docs/${current32xVersion}/release-notes.html"/>
-      <item name="Release Notes (${current31xVersion})" 
href="/docs/${current31xVersion}/release-notes.html"/>
-      <item name="Release Notes (${current30xVersion})" 
href="/docs/${current30xVersion}/release-notes.html"/>
-      <item name="All Release Notes" href="/release-notes-all.html"/>
-      <item name="License" href="http://www.apache.org/licenses/"/>
-      <item name="Security" href="/security.html"/>
-    </menu>
-
-    <menu name="IDE Integration">
-      <item name="Eclipse" href="/eclipse-plugin.html"/>
-      <item name="NetBeans" href="/netbeans-module.html"/>
+      <item name="Install" href="/install.html"/>
+      <item name="Configure" href="/configure.html"/>
+      <item name="Run" href="/run.html"/>
+      <item name="IDE Integration" href="/ide.html"/>
     </menu>
-
+ 
     <menu name="About Maven">
       <item name="What is Maven?" href="/what-is-maven.html"/>
       <item name="Features" href="/maven-features.html"/>
@@ -108,6 +97,8 @@ under the License.
       </item>
       <item name="Maven Developer Centre" href="/developers/index.html"/>
       <item name="Books and Resources" href="/articles.html" />
+      <item name="License" href="http://www.apache.org/licenses/"/>
+      <item name="Security" href="/security.html"/>
     </menu>
 
     <menu name="Community">

Modified: maven/site/trunk/content/xdoc/download.xml.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/xdoc/download.xml.vm?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/xdoc/download.xml.vm (original)
+++ maven/site/trunk/content/xdoc/download.xml.vm Fri Jul  3 18:44:11 2015
@@ -25,43 +25,20 @@ under the License.
     <author>Brett Porter</author>
     <author>Jason van Zyl</author>
     <author>John Casey</author>
+    <author>Manfred Moser</author>
   </properties>
   <body>
-    <section name="Download Apache Maven ${currentStableVersion}">
+    <section name="Downloading Apache Maven ${currentStableVersion}">
 
-      <p>Maven is distributed in several formats for your convenience. Use a 
source archive if you intend to build Maven
-      yourself. Otherwise, simply pick a ready-made binary distribution and 
follow the installation instructions given
-      at the end of this document.</p>
-
-      <p>You will be prompted for a mirror - if the file is not found on 
yours, please be patient, as it may take 24
-      hours to reach all mirrors.<p/>
-
-      <p>In order to guard against corrupted downloads/installations, it is 
highly recommended to
-      <a 
href="http://www.apache.org/dev/release-signing#verifying-signature";>verify the 
signature</a>
-      of the release bundles against the public <a 
href="http://www.apache.org/dist/maven/KEYS";>KEYS</a> used by the Apache Maven
-      developers.</p>
-
-      <p>Maven is distributed under the <a 
href="http://www.apache.org/licenses/";>Apache License, version 2.0</a>.</p>
-
-      <p></p>We <b>strongly</b> encourage our users to configure a Maven 
repository mirror closer to their location, please read <a 
href="/guides/mini/guide-mirror-settings.html">How to Use Mirrors for 
Repositories</a>.</p>
-
-      <p>If you're upgrading from Maven 2.x, be sure to check the
-      <a 
href="https://cwiki.apache.org/confluence/display/MAVEN/Maven+3.x+Compatibility+Notes";>Maven
 3.x compatibility notes</a>
-      before using this version to avoid surprises: while Maven 3 aims to be 
backward-compatible with Maven 2.x to the
-      extent possible, there are still a few significant changes.
-      </p>
-
-      <a name="mirror"/>
-      <subsection name="Mirror">
-
-        <p>
+      <p>Apache Maven ${currentStableVersion} is the latest release and 
recommended version for all users.</p>
+      <p>
           [if-any logo]
           <a href="[link]">
             <img align="right" src="[logo]" border="0"
                  alt="logo"/>
           </a>
           [end]
-          The currently selected mirror is
+          The currently selected download mirror is
           <b>[preferred]</b>.
           If you encounter a problem with this mirror,
           please select another mirror.
@@ -69,6 +46,10 @@ under the License.
           <i>backup</i>
           mirrors
           (at the end of the mirrors list) that should be available.
+            You may also consult the
+          <a href="http://www.apache.org/mirrors/";>complete list of
+            mirrors.</a>
+        
         </p>
 
         <form action="[location]" method="get" id="SelectMirror">
@@ -92,19 +73,44 @@ under the License.
           </select>
           <input type="submit" value="Change"/>
         </form>
-
+      
+      <a name="Requirements"/>
+      <subsection name="System Requirements" id="Requirements">
         <p>
-          You may also consult the
-          <a href="http://www.apache.org/mirrors/";>complete list of
-            mirrors.</a>
+          <table>
+            <tr>
+              <td><b>Java Development Kit (JDK)</b></td>
+              <td>Maven 3.3 requires JDK 1.7 or above to execute - it still 
allows you to build against 1.3 and other JDK versions
+              <a href="/guides/mini/guide-using-toolchains.html">by Using 
Toolchains</a></td>
+            </tr>
+            <tr>
+              <td><b>Memory</b></td>
+              <td>No minimum requirement</td>
+            </tr>
+            <tr>
+              <td><b>Disk</b></td>
+              <td>Approximately 10MB is required for the Maven installation 
itself. In addition to that, additional disk space will
+              be used for your local Maven repository. The size of your local 
repository will vary depending on usage but expect at
+              least 500MB.</td>
+            </tr>
+            <tr>
+              <td><b>Operating System</b></td>
+              <td>No minimum requirement. Start up scripts are included as 
shell scripts and Windows batch files.</td>
+            </tr>
+          </table>
         </p>
-
       </subsection>
 
-      <subsection name="Maven ${currentStableVersion}">
-
-      <p>This is the current stable version of Maven.</p>
-
+      <subsection name="Files">
+      <p>Maven is distributed in several formats for your convenience. Simply 
pick a 
+      ready-made binary distribution archive and follow the <a 
href="./install.html">
+      installation instructions.</a>
+      Use a source archive if you intend to build Maven yourself.</p>
+      <p>
+      In order to guard against corrupted downloads/installations, it is 
highly recommended to
+      <a 
href="http://www.apache.org/dev/release-signing#verifying-signature";>verify the 
signature</a>
+      of the release bundles against the public <a 
href="http://www.apache.org/dist/maven/KEYS";>KEYS</a> used by the Apache Maven
+      developers.</p>
       <table>
         <thead>
           <tr>
@@ -116,348 +122,51 @@ under the License.
         </thead>
         <tbody>
           <tr>
-            <td>Maven ${currentStableVersion} (Binary tar.gz)</td>
+            <td>Binary tar.gz archive</td>
             <td><a 
href="[preferred]maven/maven-3/${currentStableVersion}/binaries/apache-maven-${currentStableVersion}-bin.tar.gz">apache-maven-${currentStableVersion}-bin.tar.gz</a></td>
             <td><a 
href="http://www.apache.org/dist/maven/maven-3/${currentStableVersion}/binaries/apache-maven-${currentStableVersion}-bin.tar.gz.md5";>apache-maven-${currentStableVersion}-bin.tar.gz.md5</a></td>
             <td><a 
href="http://www.apache.org/dist/maven/maven-3/${currentStableVersion}/binaries/apache-maven-${currentStableVersion}-bin.tar.gz.asc";>apache-maven-${currentStableVersion}-bin.tar.gz.asc</a></td>
           </tr>
           <tr>
-            <td>Maven ${currentStableVersion} (Binary zip)  </td>
+            <td>Binary zip archive</td>
             <td><a 
href="[preferred]maven/maven-3/${currentStableVersion}/binaries/apache-maven-${currentStableVersion}-bin.zip">apache-maven-${currentStableVersion}-bin.zip</a></td>
             <td><a 
href="http://www.apache.org/dist/maven/maven-3/${currentStableVersion}/binaries/apache-maven-${currentStableVersion}-bin.zip.md5";>apache-maven-${currentStableVersion}-bin.zip.md5</a></td>
             <td><a 
href="http://www.apache.org/dist/maven/maven-3/${currentStableVersion}/binaries/apache-maven-${currentStableVersion}-bin.zip.asc";>apache-maven-${currentStableVersion}-bin.zip.asc</a></td>
           </tr>
           <tr>
-            <td>Maven ${currentStableVersion} (Source tar.gz)</td>
+            <td>Source tar.gz archive</td>
             <td><a 
href="[preferred]maven/maven-3/${currentStableVersion}/source/apache-maven-${currentStableVersion}-src.tar.gz">apache-maven-${currentStableVersion}-src.tar.gz</a></td>
             <td><a 
href="http://www.apache.org/dist/maven/maven-3/${currentStableVersion}/source/apache-maven-${currentStableVersion}-src.tar.gz.md5";>apache-maven-${currentStableVersion}-src.tar.gz.md5</a></td>
             <td><a 
href="http://www.apache.org/dist/maven/maven-3/${currentStableVersion}/source/apache-maven-${currentStableVersion}-src.tar.gz.asc";>apache-maven-${currentStableVersion}-src.tar.gz.asc</a></td>
           </tr>
           <tr>
-            <td>Maven ${currentStableVersion} (Source zip) </td>
+            <td>Source zip archive </td>
             <td><a 
href="[preferred]maven/maven-3/${currentStableVersion}/source/apache-maven-${currentStableVersion}-src.zip">apache-maven-${currentStableVersion}-src.zip</a></td>
             <td><a 
href="http://www.apache.org/dist/maven/maven-3/${currentStableVersion}/source/apache-maven-${currentStableVersion}-src.zip.md5";>apache-maven-${currentStableVersion}-src.zip.md5</a></td>
             <td><a 
href="http://www.apache.org/dist/maven/maven-3/${currentStableVersion}/source/apache-maven-${currentStableVersion}-src.zip.asc";>apache-maven-${currentStableVersion}-src.zip.asc</a></td>
           </tr>
-          <tr>
-            <td>Release Notes</td>
-            <td><a 
href="./docs/${currentStableVersion}/release-notes.html">${currentStableVersion}</a></td>
-            <td></td>
-            <td></td>
-          </tr>
-          <tr>
-            <td>Release Reference Documentation</td>
-            <td><a 
href="./ref/${currentStableVersion}/">${currentStableVersion}</a></td>
-            <td></td>
-            <td></td>
-          </tr>
         </tbody>
       </table>
-      </subsection>
-
-      <p>You can also <a href="#Maven_Documentation">download the current 
documentation</a>, i.e. this website.</p>
-
-      <subsection name="Maven ${current32xVersion}">
-
-        <p>This is a stable version 3.2.x of Maven with Java 6 requirement, 
for projects that can't upgrade to Maven 3.3 yet.</p>
-        <p>Notice that <b>Maven Toolchains</b> provide a way for a project to 
be built using a specific version of JDK independent
-        from the one Maven is running with: see <a 
href="/guides/mini/guide-using-toolchains.html">Guide to Using 
Toolchains</a></p>
-
-        <table>
-          <thead>
-            <tr>
-              <th></th>
-              <th>Link</th>
-              <th>Checksum</th>
-              <th>Signature</th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr>
-              <td>Maven ${current32xVersion} (Binary tar.gz)</td>
-              <td><a 
href="[preferred]maven/maven-3/${current32xVersion}/binaries/apache-maven-${current32xVersion}-bin.tar.gz">apache-maven-${current32xVersion}-bin.tar.gz</a></td>
-              <td><a 
href="http://www.apache.org/dist//maven/maven-3/${current32xVersion}/binaries/apache-maven-${current32xVersion}-bin.tar.gz.md5";>apache-maven-${current32xVersion}-bin.tar.gz.md5</a></td>
-              <td><a 
href="http://www.apache.org/dist//maven/maven-3/${current32xVersion}/binaries/apache-maven-${current32xVersion}-bin.tar.gz.asc";>apache-maven-${current32xVersion}-bin.tar.gz.asc</a></td>
-            </tr>
-            <tr>
-              <td>Maven ${current32xVersion} (Binary zip)</td>
-              <td><a 
href="[preferred]maven/maven-3/${current32xVersion}/binaries/apache-maven-${current32xVersion}-bin.zip">apache-maven-${current32xVersion}-bin.zip</a></td>
-              <td><a 
href="http://www.apache.org/dist/maven/maven-3/${current32xVersion}/binaries/apache-maven-${current32xVersion}-bin.zip.md5";>apache-maven-${current32xVersion}-bin.zip.md5</a></td>
-              <td><a 
href="http://www.apache.org/dist/maven/maven-3/${current32xVersion}/binaries/apache-maven-${current32xVersion}-bin.zip.asc";>apache-maven-${current32xVersion}-bin.zip.asc</a></td>
-            </tr>
-            <tr>
-              <td>Maven ${current32xVersion} (Source tar.gz)</td>
-              <td><a 
href="[preferred]maven/maven-3/${current32xVersion}/source/apache-maven-${current32xVersion}-src.tar.gz">apache-maven-${current32xVersion}-src.tar.gz</a></td>
-              <td><a 
href="http://www.apache.org/dist/maven/maven-3/${current32xVersion}/source/apache-maven-${current32xVersion}-src.tar.gz.md5";>apache-maven-${current32xVersion}-src.tar.gz.md5</a></td>
-              <td><a 
href="http://www.apache.org/dist/maven/maven-3/${current32xVersion}/source/apache-maven-${current32xVersion}-src.tar.gz.asc";>apache-maven-${current32xVersion}-src.tar.gz.asc</a></td>
-            </tr>
-            <tr>
-              <td>Maven ${current32xVersion} (Source zip)</td>
-              <td><a 
href="[preferred]maven/maven-3/${current32xVersion}/source/apache-maven-${current32xVersion}-src.zip">apache-maven-${current32xVersion}-src.zip</a></td>
-              <td><a 
href="http://www.apache.org/dist/maven/maven-3/${current32xVersion}/source/apache-maven-${current32xVersion}-src.zip.md5";>apache-maven-${current32xVersion}-src.zip.md5</a></td>
-              <td><a 
href="http://www.apache.org/dist/maven/maven-3/${current32xVersion}/source/apache-maven-${current32xVersion}-src.zip.asc";>apache-maven-${current32xVersion}-src.zip.asc</a></td>
-            </tr>
-            <tr>
-              <td>Release Notes</td>
-              <td><a 
href="./docs/${current32xVersion}/release-notes.html">${current32xVersion}</a></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td>Release Reference Documentation</td>
-              <td><a 
href="./ref/${current32xVersion}/">${current32xVersion}</a></td>
-              <td></td>
-              <td></td>
-            </tr>
-          </tbody>
-        </table>
-      </subsection>
-
-      <subsection name="Maven ${current31xVersion}">
-
-        <p>This is a stable version 3.1.x of Maven with Java 5 requirement, 
for projects that can't upgrade to Maven 3.2 yet.</p>
-        <p>Notice that <b>Maven Toolchains</b> provide a way for a project to 
be built using a specific version of JDK independent
-        from the one Maven is running with: see <a 
href="/guides/mini/guide-using-toolchains.html">Guide to Using 
Toolchains</a></p>
-
-        <table>
-          <thead>
-            <tr>
-              <th></th>
-              <th>Link</th>
-              <th>Checksum</th>
-              <th>Signature</th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr>
-              <td>Maven ${current31xVersion} (Binary tar.gz)</td>
-              <td><a 
href="[preferred]maven/maven-3/${current31xVersion}/binaries/apache-maven-${current31xVersion}-bin.tar.gz">apache-maven-${current31xVersion}-bin.tar.gz</a></td>
-              <td><a 
href="http://www.apache.org/dist//maven/maven-3/${current31xVersion}/binaries/apache-maven-${current31xVersion}-bin.tar.gz.md5";>apache-maven-${current31xVersion}-bin.tar.gz.md5</a></td>
-              <td><a 
href="http://www.apache.org/dist//maven/maven-3/${current31xVersion}/binaries/apache-maven-${current31xVersion}-bin.tar.gz.asc";>apache-maven-${current31xVersion}-bin.tar.gz.asc</a></td>
-            </tr>
-            <tr>
-              <td>Maven ${current31xVersion} (Binary zip)</td>
-              <td><a 
href="[preferred]maven/maven-3/${current31xVersion}/binaries/apache-maven-${current31xVersion}-bin.zip">apache-maven-${current31xVersion}-bin.zip</a></td>
-              <td><a 
href="http://www.apache.org/dist/maven/maven-3/${current31xVersion}/binaries/apache-maven-${current31xVersion}-bin.zip.md5";>apache-maven-${current31xVersion}-bin.zip.md5</a></td>
-              <td><a 
href="http://www.apache.org/dist/maven/maven-3/${current31xVersion}/binaries/apache-maven-${current31xVersion}-bin.zip.asc";>apache-maven-${current31xVersion}-bin.zip.asc</a></td>
-            </tr>
-            <tr>
-              <td>Maven ${current31xVersion} (Source tar.gz)</td>
-              <td><a 
href="[preferred]maven/maven-3/${current31xVersion}/source/apache-maven-${current31xVersion}-src.tar.gz">apache-maven-${current31xVersion}-src.tar.gz</a></td>
-              <td><a 
href="http://www.apache.org/dist/maven/maven-3/${current31xVersion}/source/apache-maven-${current31xVersion}-src.tar.gz.md5";>apache-maven-${current31xVersion}-src.tar.gz.md5</a></td>
-              <td><a 
href="http://www.apache.org/dist/maven/maven-3/${current31xVersion}/source/apache-maven-${current31xVersion}-src.tar.gz.asc";>apache-maven-${current31xVersion}-src.tar.gz.asc</a></td>
-            </tr>
-            <tr>
-              <td>Maven ${current31xVersion} (Source zip)</td>
-              <td><a 
href="[preferred]maven/maven-3/${current31xVersion}/source/apache-maven-${current31xVersion}-src.zip">apache-maven-${current31xVersion}-src.zip</a></td>
-              <td><a 
href="http://www.apache.org/dist/maven/maven-3/${current31xVersion}/source/apache-maven-${current31xVersion}-src.zip.md5";>apache-maven-${current31xVersion}-src.zip.md5</a></td>
-              <td><a 
href="http://www.apache.org/dist/maven/maven-3/${current31xVersion}/source/apache-maven-${current31xVersion}-src.zip.asc";>apache-maven-${current31xVersion}-src.zip.asc</a></td>
-            </tr>
-            <tr>
-              <td>Release Notes</td>
-              <td><a 
href="./docs/${current31xVersion}/release-notes.html">${current31xVersion}</a></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td>Release Reference Documentation</td>
-              <td><a 
href="./ref/${current31xVersion}/">${current31xVersion}</a></td>
-              <td></td>
-              <td></td>
-            </tr>
-          </tbody>
-        </table>
-      </subsection>
-
-      <subsection name="Maven ${current30xVersion}">
-
-        <p>This is a stable version 3.0.x of Maven for projects that can't 
upgrade to Maven 3.2 yet.</p>
-
-        <table>
-          <thead>
-            <tr>
-              <th></th>
-              <th>Link</th>
-              <th>Checksum</th>
-              <th>Signature</th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr>
-              <td>Maven ${current30xVersion} (Binary tar.gz)</td>
-              <td><a 
href="[preferred]maven/maven-3/${current30xVersion}/binaries/apache-maven-${current30xVersion}-bin.tar.gz">apache-maven-${current30xVersion}-bin.tar.gz</a></td>
-              <td><a 
href="http://www.apache.org/dist//maven/maven-3/${current30xVersion}/binaries/apache-maven-${current30xVersion}-bin.tar.gz.md5";>apache-maven-${current30xVersion}-bin.tar.gz.md5</a></td>
-              <td><a 
href="http://www.apache.org/dist//maven/maven-3/${current30xVersion}/binaries/apache-maven-${current30xVersion}-bin.tar.gz.asc";>apache-maven-${current30xVersion}-bin.tar.gz.asc</a></td>
-            </tr>
-            <tr>
-              <td>Maven ${current30xVersion} (Binary zip)</td>
-              <td><a 
href="[preferred]maven/maven-3/${current30xVersion}/binaries/apache-maven-${current30xVersion}-bin.zip">apache-maven-${current30xVersion}-bin.zip</a></td>
-              <td><a 
href="http://www.apache.org/dist/maven/maven-3/${current30xVersion}/binaries/apache-maven-${current30xVersion}-bin.zip.md5";>apache-maven-${current30xVersion}-bin.zip.md5</a></td>
-              <td><a 
href="http://www.apache.org/dist/maven/maven-3/${current30xVersion}/binaries/apache-maven-${current30xVersion}-bin.zip.asc";>apache-maven-${current30xVersion}-bin.zip.asc</a></td>
-            </tr>
-            <tr>
-              <td>Maven ${current30xVersion} (Source tar.gz)</td>
-              <td><a 
href="[preferred]maven/maven-3/${current30xVersion}/source/apache-maven-${current30xVersion}-src.tar.gz">apache-maven-${current30xVersion}-src.tar.gz</a></td>
-              <td><a 
href="http://www.apache.org/dist/maven/maven-3/${current30xVersion}/source/apache-maven-${current30xVersion}-src.tar.gz.md5";>apache-maven-${current30xVersion}-src.tar.gz.md5</a></td>
-              <td><a 
href="http://www.apache.org/dist/maven/maven-3/${current30xVersion}/source/apache-maven-${current30xVersion}-src.tar.gz.asc";>apache-maven-${current30xVersion}-src.tar.gz.asc</a></td>
-            </tr>
-            <tr>
-              <td>Maven ${current30xVersion} (Source zip)</td>
-              <td><a 
href="[preferred]maven/maven-3/${current30xVersion}/source/apache-maven-${current30xVersion}-src.zip">apache-maven-${current30xVersion}-src.zip</a></td>
-              <td><a 
href="http://www.apache.org/dist/maven/maven-3/${current30xVersion}/source/apache-maven-${current30xVersion}-src.zip.md5";>apache-maven-${current30xVersion}-src.zip.md5</a></td>
-              <td><a 
href="http://www.apache.org/dist/maven/maven-3/${current30xVersion}/source/apache-maven-${current30xVersion}-src.zip.asc";>apache-maven-${current30xVersion}-src.zip.asc</a></td>
-            </tr>
-            <tr>
-              <td>Release Notes</td>
-              <td><a 
href="./docs/${current30xVersion}/release-notes.html">${current30xVersion}</a></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td>Release Reference Documentation</td>
-              <td><a 
href="./ref/${current30xVersion}/">${current30xVersion}</a></td>
-              <td></td>
-              <td></td>
-            </tr>
-          </tbody>
-        </table>
-      </subsection>
-
-      <a name="Maven_Documentation"/>
-      <subsection name="Maven Documentation">
-       <p>
-         You can download the current documentation, i.e. this website, as:
-         <ul>
-           <li>a <a href="./maven-site-1.0-site.jar">single jar file</a></li>
-<!-- not currently generated on the CMS due to the profile
+      <ul>
+        <li><a 
href="./docs/${currentStableVersion}/release-notes.html">Release Notes</a></li>
+        <li><a href="./ref/${currentStableVersion}/">Reference 
Documentation</a></li>
+        <li><a href="./maven-site-1.0-site.jar">Apache Maven Website As 
Documentation Archive</a></li>
+        <!-- not currently generated on the CMS due to the profile, probably 
also badly formattted
            <li>a <a href="./apache-maven.pdf">PDF file.</a></li>
--->
-         </ul>
-       </p>
-      </subsection>
-      <subsection name="Previous Releases">
-        <p>All previous releases of Maven can be found in the  <a 
href="http://archive.apache.org/dist/maven/maven-3/";>archives</a>
-        (or <a href="http://archive.apache.org/dist/maven/binaries/";>legacy 
archives</a> for versions before 3.0.4).</p>
-      </subsection>
-      <subsection name="All sources">
-        <p>All sources (plugins, shared librairies, scm, indexer etc..) can be 
downloaded from <a 
href="[preferred]/maven/">http://www.apache.org/dist/maven/</a></p>
-      </subsection>
-      <subsection name="System Requirements" id="Requirements">
-        <p>
-          <table>
-            <tr>
-              <td><b>JDK</b></td>
-              <td>Maven 3.3 requires JDK 1.7 or above, Maven 3.2 requires JDK 
1.6 or above, while Maven 3.0/3.1 requires JDK 1.5 or above (this is to execute 
Maven - it still allows you to build against 1.3 and prior JDK's:
-              see our <a href="/guides/mini/guide-using-toolchains.html">Guide 
to Using Toolchains</a>)</td>
-            </tr>
-            <tr>
-              <td><b>Memory</b></td>
-              <td>No minimum requirement</td>
-            </tr>
-            <tr>
-              <td><b>Disk</b></td>
-              <td>Approximately 10MB is required for the Maven installation 
itself. In addition to that, additional disk space will
-              be used for your local Maven repository. The size of your local 
repository will vary depending on usage but expect at
-              least 500MB.</td>
-            </tr>
-            <tr>
-              <td><b>Operating System</b></td>
-              <td>No minimum requirement. Start up scripts are included as 
shell scripts and Windows batch files.</td>
-            </tr>
-          </table>
-        </p>
+        -->
+        <li><a href="[preferred]/maven/">All sources (plugins, shared 
libraries,...) available at http://www.apache.org/dist/maven/</a></li>
+        <li>Distributed under the <a 
href="http://www.apache.org/licenses/";>Apache License, version 2.0</a></li>
+      </ul>
       </subsection>
 
-      <subsection name="Installation Instructions" id="Installation">
-        <p>
-          <i>Maven is a Java tool, so you must have <a 
href="http://www.oracle.com/technetwork/java/";>Java</a> installed in order to 
proceed. More precisely,
-          you need a Java Development Kit (JDK), the Java Runtime Environment 
(JRE) is not sufficient.</i>
-
-          Additional optional installation steps are listed after the platform 
specific instructions.
-        </p>
-        <subsection name="Windows">
-          <ol>
-          <li>Unzip the distribution archive, i.e. 
<i>apache-maven-${currentStableVersion}-bin.zip</i> to the directory you wish 
to install Maven ${currentStableVersion}.
-          These instructions assume you chose <i>C:\Program Files\Apache 
Software Foundation</i>.
-          The subdirectory <tt>apache-maven-${currentStableVersion}</tt> will 
be created from the archive.
-          </li>
-
-          <li>Add the unpacked distribution's <tt>bin</tt> directory
-          to your user <i>PATH</i> environment variable  by opening up the 
system properties (WinKey + Pause),
-          selecting the "Advanced" tab, and the "Environment Variables" 
button, then adding or selecting the <i>PATH</i>
-          variable in the user variables with the value
-          <tt>C:\Program Files\Apache Software 
Foundation\apache-maven-${currentStableVersion}\bin</tt>.
-          </li>
-
-          <li><b>Optional</b>: In the same dialog, add the <tt>MAVEN_OPTS</tt> 
environment variable in the user variables to specify JVM properties, e.g. the 
value
-          <tt>-Xms256m -Xmx512m</tt>. This environment variable can be used to 
supply extra options to Maven.</li>
-
-          <li>In the same dialog, make sure that <tt>JAVA_HOME</tt> exists in 
your user variables or in the system variables and it is set to the location of 
your JDK,
-          e.g. <tt>C:\Program Files\Java\jdk1.7.0_51</tt>.</li>
-
-          <li>Open a <i>new</i> command prompt (Winkey + R then type 
<tt>cmd</tt>) and run <tt>mvn --version</tt> to verify that it is correctly 
installed.</li>
-          </ol>
-        </subsection>
-      </subsection>
-      <subsection name="Unix-based Operating Systems (Linux, Solaris and Mac 
OS X)">
-        <ol>
-        <li>Extract the distribution archive, i.e. 
<tt>apache-maven-${currentStableVersion}-bin.tar.gz</tt> to the directory you 
wish to install Maven ${currentStableVersion}.
-        These instructions assume you chose <tt>/usr/local/apache-maven</tt>. 
The subdirectory <tt>apache-maven-${currentStableVersion}</tt> will
-        be created from the archive.</li>
-
-        <li>In a command terminal, add unpacked distribution's <tt>bin</tt> to 
your <i>PATH</i> environment variable,
-        e.g. <tt>export 
PATH=$PATH:/usr/local/apache-maven/apache-maven-${currentStableVersion}/bin</tt>.
-        </li>
-
-        <li><b>Optional</b>: Add the <tt>MAVEN_OPTS</tt> environment variable 
to specify JVM properties, e.g. <tt>export MAVEN_OPTS="-Xms256m -Xmx512m"</tt>.
-        This environment variable can be used to supply extra options to 
Maven.</li>
-
-        <li>Make sure that <tt>JAVA_HOME</tt> is set to the location of your 
JDK, e.g.
-        <tt>export JAVA_HOME=/usr/java/jdk1.7.0_51</tt> .</li>
-
-        <li>Run <tt>mvn --version</tt> to verify that it is correctly 
installed.</li>
-        </ol>
-      </subsection>
-
-      <subsection name="Optional configuration">
-
-        <p>Maven will work for most tasks with the above configuration, 
however if you have any environmental specific configuration outside of 
individual
-        projects then you will need to configure settings. The following 
sections refer to what is available.</p>
-
-
-        <subsection name="Settings">
-
-        Maven has a settings file located in the Maven installation and/or 
user home directory that configure environmental specifics such as:
-
-        <ul>
-          <li>HTTP proxy server</li>
-
-          <li>repository manager location</li>
-
-          <li>server authentication and passwords</li>
-
-          <li>other configuration properties</li>
-        </ul>
-          For information on this file, see the <a 
href="./settings.html">Settings reference</a>
-        </subsection>
-
-        <subsection name="Security">
-          <p>
-          As of Maven 2.1.0+, you can encrypt passwords in your settings file, 
however you must first configure a master password. For more information on
-          both server passwords and the master password, see the <a 
href="./guides/mini/guide-encryption.html">Guide to Password Encryption</a>.
-        </p>
-        </subsection>
-
-        <subsection name="Toolchains">
-          <p>
-            As of Maven 2.0.9+, you can build a project using a specific 
version of JDK independent from the one Maven is running with.
-            For more information, see the <a 
href="./guides/mini/guide-using-toolchains.html">Guide to Using Toolchains</a>.
-          </p>
-        </subsection>
-
-
+      <subsection name="Previous Releases">
+        <p>It is strongly recommended to use the latest release version of 
Apache Maven to take advantage of newest features and bug fixes.</p>
+        
+        <p>If you still want to use an old version you can find more 
information in the
+        <a href="./docs/history.html">Maven Releases History</a> and can 
download files from 
+        the  <a 
href="http://archive.apache.org/dist/maven/maven-3/";>archives</a> for versions 
3.0.4+
+        and <a href="http://archive.apache.org/dist/maven/binaries/";>legacy 
archives</a> for earlier releases.</p>
       </subsection>
-
     </section>
   </body>
 </document>

Modified: maven/site/trunk/content/xdoc/index.xml.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/xdoc/index.xml.vm?rev=1689055&r1=1689054&r2=1689055&view=diff
==============================================================================
--- maven/site/trunk/content/xdoc/index.xml.vm (original)
+++ maven/site/trunk/content/xdoc/index.xml.vm Fri Jul  3 18:44:11 2015
@@ -50,7 +50,7 @@ under the License.
       <ul>
         <li>
           <span style="white-space:nowrap; font-weight: bold; font-size: 
1.25em">
-            <a href="run-maven/index.html">Run Maven</a>
+            <a href="run.html">Run Maven</a>
           </span>
           <span style="display: block; margin-bottom: 0.5em">
             Information for those needing to build a project that uses Maven


Reply via email to