Author: hboutemy
Date: Sun Mar 11 15:49:35 2018
New Revision: 1826445

URL: http://svn.apache.org/viewvc?rev=1826445&view=rev
Log:
menu improvements: simplification, addition of many docs including mini guides

Added:
    maven/site/trunk/content/apt/guides/index.apt.vm
      - copied, changed from r1826444, 
maven/site/trunk/content/apt/guides/index.apt
    maven/site/trunk/content/apt/guides/mini/index.apt.vm
      - copied, changed from r1826428, 
maven/site/trunk/content/apt/guides/mini/index.apt
    maven/site/trunk/content/apt/guides/mini/index.txt   (with props)
Removed:
    maven/site/trunk/content/apt/guides/index.apt
    maven/site/trunk/content/apt/guides/mini/index.apt
Modified:
    maven/site/trunk/content/site.xml

Copied: maven/site/trunk/content/apt/guides/index.apt.vm (from r1826444, 
maven/site/trunk/content/apt/guides/index.apt)
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/index.apt.vm?p2=maven/site/trunk/content/apt/guides/index.apt.vm&p1=maven/site/trunk/content/apt/guides/index.apt&r1=1826444&r2=1826445&rev=1826445&view=diff
==============================================================================
--- maven/site/trunk/content/apt/guides/index.apt (original)
+++ maven/site/trunk/content/apt/guides/index.apt.vm Sun Mar 11 15:49:35 2018
@@ -49,7 +49,7 @@ Documentation
 
  * {{{./introduction/introduction-to-dependency-mechanism.html}The Dependency 
Mechanism}}
 
- * {{{./introduction/introduction-to-optional-and-excludes-dependencies.html} 
Optional Dependencies and Dependency Exclusions}}
+   * 
{{{./introduction/introduction-to-optional-and-excludes-dependencies.html} 
Optional Dependencies and Dependency Exclusions}}
 
 ** Plugins
 
@@ -94,54 +94,8 @@ Documentation
 
 * Guides
 
- * {{{./mini/guide-assemblies.html}Creating Assemblies}}
-
- * {{{./mini/guide-archive-configuration.html}Configuring Archive Plugins}}
-
- * {{{./mini/guide-configuring-maven.html}Configuring Maven}}
-
- * {{{./mini/guide-mirror-settings.html}Mirror Settings}}
-
- * {{{./mini/guide-deployment-security-settings.html}Deployment and Security 
Settings}}
-
- * {{{./mini/guide-generating-sources.html}Generating Sources}}
-
- * {{{./mini/guide-manifest.html}Working with Manifests}}
-
- * {{{./mini/guide-maven-classloading.html}Maven Classloading}}
-
- * {{{./mini/guide-multiple-modules.html}Using Multiple Modules in a Build}}
-
- * {{{./mini/guide-multiple-repositories.html}Using Multiple Repositories}}
-
- * {{{./mini/guide-proxies.html}Using Proxies}}
-
- * {{{./mini/guide-releasing.html}Using the Release Plugin}}
-
- * {{{./mini/guide-using-ant.html}Using Ant with Maven}}
-
- * {{{./mini/guide-using-modello.html}Using Modello}}
-
- * {{{./mini/guide-using-extensions.html}Using Extensions}}
-
- * {{{./mini/guide-building-for-different-environments.html}Building For 
Different Environments with Maven 2}}
-
- * {{{./mini/guide-using-toolchains.html}Using Toolchains}}
-
- * {{{./mini/guide-encryption.html} Encrypting passwords in settings.xml}}
-
- * {{{./mini/guide-http-settings.html} Guide to HTTP Connection Settings}}
-
- * {{{./mini/guide-wagon-providers.html} Guide to Selecting Alternative Wagon 
Providers}}
-
- * {{{./mini/guide-building-jdk14-on-jdk15.html} Guide to Building JDK 1.4 
Projects Using JDK 1.5}}
-
- * {{{./mini/guide-default-execution-ids.html} Guide to Configuring Default 
Mojo Executions}}
-
-
-~~ ** Testing
-
-~~ * {{{./mini/guide-attached-tests.html}Reusable Test JARs}}
+#set( $prefix = './mini' )
+#parse( "mini/index.txt" )
 
 ** Maven Tools and IDE Integration
 

Copied: maven/site/trunk/content/apt/guides/mini/index.apt.vm (from r1826428, 
maven/site/trunk/content/apt/guides/mini/index.apt)
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/mini/index.apt.vm?p2=maven/site/trunk/content/apt/guides/mini/index.apt.vm&p1=maven/site/trunk/content/apt/guides/mini/index.apt&r1=1826428&r2=1826445&rev=1826445&view=diff
==============================================================================
--- maven/site/trunk/content/apt/guides/mini/index.apt (original)
+++ maven/site/trunk/content/apt/guides/mini/index.apt.vm Sun Mar 11 15:49:35 
2018
@@ -27,3 +27,6 @@
 ~~ http://maven.apache.org/doxia/references/apt-format.html
 
 Maven Mini Guides
+
+#set( $prefix = '.' )
+#parse( "index.txt" )

Added: maven/site/trunk/content/apt/guides/mini/index.txt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/mini/index.txt?rev=1826445&view=auto
==============================================================================
--- maven/site/trunk/content/apt/guides/mini/index.txt (added)
+++ maven/site/trunk/content/apt/guides/mini/index.txt Sun Mar 11 15:49:35 2018
@@ -0,0 +1,47 @@
+ * {{{$prefix/guide-assemblies.html}Creating Assemblies}}
+
+ * {{{$prefix/guide-archive-configuration.html}Configuring Archive Plugins}}
+
+ * {{{$prefix/guide-configuring-maven.html}Configuring Maven}}
+
+ * {{{$prefix/guide-mirror-settings.html}Mirror Settings}}
+
+ * {{{$prefix/guide-deployment-security-settings.html}Deployment and Security 
Settings}}
+
+ * {{{$prefix/guide-generating-sources.html}Generating Sources}}
+
+ * {{{$prefix/guide-manifest.html}Working with Manifests}}
+
+ * {{{$prefix/guide-maven-classloading.html}Maven Classloading}}
+
+ * {{{$prefix/guide-multiple-modules.html}Using Multiple Modules in a Build}}
+
+ * {{{$prefix/guide-multiple-repositories.html}Using Multiple Repositories}}
+
+ * {{{$prefix/guide-proxies.html}Using Proxies}}
+
+ * {{{$prefix/guide-releasing.html}Using the Release Plugin}}
+
+ * {{{$prefix/guide-using-ant.html}Using Ant with Maven}}
+
+ * {{{$prefix/guide-using-modello.html}Using Modello}}
+
+ * {{{$prefix/guide-using-extensions.html}Using Extensions}}
+
+ * {{{$prefix/guide-building-for-different-environments.html}Building For 
Different Environments with Maven 2}}
+
+ * {{{$prefix/guide-using-toolchains.html}Using Toolchains}}
+
+ * {{{$prefix/guide-encryption.html} Encrypting passwords in settings.xml}}
+
+ * {{{$prefix/guide-http-settings.html} Guide to HTTP Connection Settings}}
+
+ * {{{$prefix/guide-wagon-providers.html} Guide to Selecting Alternative Wagon 
Providers}}
+
+ * {{{$prefix/guide-building-jdk14-on-jdk15.html} Guide to Building JDK 1.4 
Projects Using JDK 1.5}}
+
+ * {{{$prefix/guide-default-execution-ids.html} Guide to Configuring Default 
Mojo Executions}}
+
+~~ ** Testing
+
+~~ * {{{$prefix/guide-attached-tests.html}Reusable Test JARs}}

Propchange: maven/site/trunk/content/apt/guides/mini/index.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: maven/site/trunk/content/site.xml
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/site.xml?rev=1826445&r1=1826444&r2=1826445&view=diff
==============================================================================
--- maven/site/trunk/content/site.xml (original)
+++ maven/site/trunk/content/site.xml Sun Mar 11 15:49:35 2018
@@ -51,39 +51,90 @@ under the License.
       <item name="Maven"  href="https://maven.apache.org/index.html"; />
     </breadcrumbs>
 
-    <menu name="Main">
+    <menu>
       <item name="Welcome" href="/index.html"/>
       <item name="License" href="https://www.apache.org/licenses/"/>
-      <item name="Download" href="/download.html"/>
-      <item name="Release Notes" href="/docs/history.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"/>
-      <item name="History" href="/docs/history.html"/><!-- TODO remove since 
already in Release Notes entry? -->
-      <item name="FAQ" href="/general.html"/> <!-- TODO: check this is for 
non-users, not a technical FAQ -->
+      <item name="Download" href="/download.html"/>
+      <item name="Use" href="/users/index.html" collapse="true">
+        <item name="Install" href="/install.html"/>
+        <item name="Run" href="/run.html"/>
+        <item name="Configure" href="/configure.html"/>
+        <item name="IDE Integration" href="/ide.html"/>
+        <item name="Support and Training" href="/support-and-training.html"/>
+      </item>
+      <item name="Release Notes" href="/docs/history.html"/>
       <!--  <item name="Powered By" href="/powered-by-m2.html"/> -->
-      <item name="Support and Training" href="/support-and-training.html"/>
     </menu>
 
     <menu name="Documentation">
       <item name="Maven Plugins" href="/plugins/index.html" />
       <item name="Index (category)" href="/guides/index.html" />
-      <item name="Running Maven" href="/run-maven/index.html" />
+
       <item name="User Centre" href="/users/index.html" collapse="true">
         <item name="Maven in 5 Minutes" 
href="/guides/getting-started/maven-in-five-minutes.html" />
-        <item name="Getting Started Guide" 
href="/guides/getting-started/index.html" />
+        <item name="Getting Started Guide" 
href="/guides/getting-started/index.html" collapse="true">
+          <item name="The Build Lifecycle" 
href="/guides/introduction/introduction-to-the-lifecycle.html" />
+          <item name="The POM" 
href="/guides/introduction/introduction-to-the-pom.html" />
+          <item name="Profiles" 
href="/guides/introduction/introduction-to-profiles.html" />
+          <item name="Standard Directory Layout" 
href="/guides/introduction/introduction-to-the-standard-directory-layout.html" 
/>
+          <item name="Dependency Mechanism" 
href="/guides/introduction/introduction-to-dependency-mechanism.html" 
collapse="true">
+            <item name="Optional &amp; Exclusion" 
href="/guides/introduction/introduction-to-optional-and-excludes-dependencies.html"
 />
+          </item>
+        </item>
         <!--
         <item name="Build Cookbook" href="/users/cookbook/index.html"/>
         -->
         <item name="Getting Help" href="/users/getting-help.html"/>
+        <item name="Running Maven" href="/run-maven/index.html" />
+        <item name="Configuring Plugins" 
href="/guides/mini/guide-configuring-plugins.html" collapse="true">
+          <item name="Plugin Prefix Resolution" 
href="/guides/introduction/introduction-to-plugin-prefix-mapping.html" />
+        </item>
+        <item name="Creating a site" href="/guides/mini/guide-site.html" 
collapse="true">
+          <item name="Markup Formats" href="/doxia/references/index.html" />
+          <item name="Snippet Macro" 
href="/guides/mini/guide-snippet-macro.html" />
+        </item>
+        <item name="Archetypes" 
href="/guides/introduction/introduction-to-archetypes.html" collapse="true">
+          <item name="Creating Archetypes" 
href="/guides/mini/guide-creating-archetypes.html" />
+        </item>
+        <item name="Repositories" 
href="/guides/introduction/introduction-to-repositories.html" collapse="true">
+          <item name="Local" 
href="/guides/mini/guide-3rd-party-jars-local.html" />
+          <item name="Remote" 
href="/guides/mini/guide-3rd-party-jars-remote.html" />
+          <item name="SUN Jars" 
href="/guides/mini/guide-coping-with-sun-jars.html" />
+          <item name="Authenticated HTTPS" 
href="/guides/mini/guide-repository-ssl.html" />
+          <item name="Relocation" href="/guides/mini/guide-relocation.html" />
+        </item>
+        <item name="Guides" href="/guides/mini/index.html" collapse="true">
+          <item name="Creating Assemblies" 
href="/guides/mini/guide-assemblies.html" />
+          <item name="Configuring Archive Plugins" 
href="/guides/mini/guide-archive-configuration.html" />
+          <item name="Configuring Maven" 
href="/guides/mini/guide-configuring-maven.html" />
+          <item name="Mirror Settings" 
href="/guides/mini/guide-mirror-settings.html" />
+          <item name="Deployment and Security Settings" 
href="/guides/mini/guide-deployment-security-settings.html" />
+          <item name="Generating Sources" 
href="/guides/mini/guide-generating-sources.html" />
+          <item name="Working with Manifests" 
href="/guides/mini/guide-manifest.html" />
+          <item name="Maven Classloading" 
href="/guides/mini/guide-maven-classloading.html" />
+          <item name="Using Modules" 
href="/guides/mini/guide-multiple-modules.html" />
+          <item name="Using Repositories" 
href="/guides/mini/guide-multiple-repositories.html" />
+          <item name="Using Proxies" href="/guides/mini/guide-proxies.html" />
+          <item name="Using Release Plugin" 
href="/guides/mini/guide-releasing.html" />
+          <item name="Using Ant" href="/guides/mini/guide-using-ant.html" />
+          <item name="Using Modello" 
href="/guides/mini/guide-using-modello.html" />
+          <item name="Using Extensions" 
href="/guides/mini/guide-using-extensions.html" />
+          <item name="Building for Different Environments" 
href="/guides/mini/guide-building-for-different-environments.html" />
+          <item name="Using Toolchains" 
href="/guides/mini/guide-using-toolchains.html" />
+          <item name="Encrypting Passwords" 
href="/guides/mini/guide-encryption.html" />
+          <item name="HTTP Connection Settings" 
href="/guides/mini/guide-http-settings.html" />
+          <item name="Alternative Wagon Providers" 
href="/guides/mini/guide-wagon-providers.html" />
+          <item name="Building JDK 1.4 Projects Using JDK 1.5" 
href="/guides/mini/guide-building-jdk14-on-jdk15.html" />
+          <item name="Configuring Default Mojo Executions" 
href="/guides/mini/guide-default-execution-ids.html" />
+        </item>
         <item name="Settings Reference" href="/settings.html" /> <!-- TODO: 
all references should be collected under another area instead/as well, 
reconsider -->
         <item name="POM Reference" href="/pom.html" />
+        <item name="FAQ" href="/general.html"/>
       </item>
       <item name="Plugin Developer Centre" 
href="/plugin-developers/index.html" collapse="true">
         <item name="Introduction" 
href="/guides/introduction/introduction-to-plugins.html" />


Reply via email to