You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by bu...@apache.org on 2013/09/10 23:12:03 UTC
svn commit: r877967 - in /websites/staging/maven/trunk/content: ./
developers/website/deploy-maven-website.html maven-site-1.0-site.jar
Author: buildbot
Date: Tue Sep 10 21:12:02 2013
New Revision: 877967
Log:
Staging update by buildbot for maven
Modified:
websites/staging/maven/trunk/content/ (props changed)
websites/staging/maven/trunk/content/developers/website/deploy-maven-website.html
websites/staging/maven/trunk/content/maven-site-1.0-site.jar
Propchange: websites/staging/maven/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Sep 10 21:12:02 2013
@@ -1 +1 @@
-1521592
+1521646
Modified: websites/staging/maven/trunk/content/developers/website/deploy-maven-website.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/website/deploy-maven-website.html (original)
+++ websites/staging/maven/trunk/content/developers/website/deploy-maven-website.html Tue Sep 10 21:12:02 2013
@@ -240,21 +240,20 @@
<div id="contentBox">
<!-- Licensed to the Apache Software Foundation (ASF) under one --><!-- or more contributor license agreements. See the NOTICE file --><!-- distributed with this work for additional information --><!-- regarding copyright ownership. The ASF licenses this file --><!-- to you under the Apache License, Version 2.0 (the --><!-- "License"); you may not use this file except in compliance --><!-- with the License. You may obtain a copy of the License at --><!-- --><!-- http://www.apache.org/licenses/LICENSE-2.0 --><!-- --><!-- Unless required by applicable law or agreed to in writing, --><!-- software distributed under the License is distributed on an --><!-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY --><!-- KIND, either express or implied. See the License for the --><!-- specific language governing permissions and limitations --><!-- under the License. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/references/apt-
format.html --><div class="section">
<h2>Introduction<a name="Introduction"></a></h2>
-<p>This document gives step-by-step instructions for deploying the Maven website <a class="externalLink" href="http://maven.apache.org">http://maven.apache.org</a>.</p>
-<p>Since 10th December 2012, the main website use CMS mechanism. (see <a class="externalLink" href="https://cms.apache.org/maven/">https://cms.apache.org/maven/</a>).</p>
-<p>You can edit pages in two ways:</p>
+<p>This document gives step-by-step instructions for deploying the Maven <a class="externalLink" href="http://maven.apache.org">http://maven.apache.org</a> and Doxia <a class="externalLink" href="http://maven.apache.org/doxia">http://maven.apache.org/doxia</a> websites.</p>
+<p>Since 10th December 2012, the main website use CMS mechanism: see <a class="externalLink" href="https://cms.apache.org/maven/">https://cms.apache.org/maven/</a> and <a class="externalLink" href="https://cms.apache.org/maven-doxia/">https://cms.apache.org/maven-doxia/</a>.</p>
+<p>You can edit source trees (<a class="externalLink" href="https://svn.apache.org/repos/asf/maven/site/trunk/content/">Maven</a> and <a class="externalLink" href="https://svn.apache.org/repos/asf/maven/doxia/site/trunk/content/">Doxia</a>) in two ways:</p>
<ul>
-<li>use the CMS UI.</li>
-<li>checkout the content locally and modify manually.</li></ul></div>
+<li>use the CMS UI,</li>
+<li>checkout the content locally, modify locally and check-in.</li></ul></div>
<div class="section">
<h2>How it works<a name="How_it_works"></a></h2>
-<p>At least how a user understand that.</p>
-<p>All the content is located here https://svn.apache.org/repos/infra/websites/production/maven/content/ then synced to lives machines.</p>
-<p>For parts edited/build with CMS, two buildbot jobs build the content via using Maven site plugin:</p>
+<p>At least how a user understands that.</p>
+<p>All the HTML content is located in svn (<a class="externalLink" href="https://svn.apache.org/repos/infra/websites/production/maven/content/">Maven</a> and <a class="externalLink" href="https://svn.apache.org/repos/infra/websites/production/maven-doxia/content/">Doxia</a>) then synced to lives machines.</p>
+<p>When the content source tree is modified in svn (either locally or with CMS UI), two buildbot jobs build the content, using Maven site plugin:</p>
<ul>
<li><a class="externalLink" href="http://ci.apache.org/builders/maven-site-staging">http://ci.apache.org/builders/maven-site-staging</a></li>
<li><a class="externalLink" href="http://ci.apache.org/builders/maven-doxia-site-staging">http://ci.apache.org/builders/maven-doxia-site-staging</a></li></ul>
-<p>Other parts can committed to the content source tree.</p>
<p>As CMS will delete non build content, they must be ignored with adding paths in extpaths.txt file (located in site and doxia-site in path content/resources)</p>
<div class="section">
<h3>Modify Maven Website with CMS UI<a name="Modify_Maven_Website_with_CMS_UI"></a></h3>
@@ -262,17 +261,16 @@
<li>Go to <a class="externalLink" href="https://cms.apache.org/maven/">https://cms.apache.org/maven/</a>.</li>
<li>Click link "Get maven Working Copy".</li>
<li>Now navigate to the content you want to modify.</li>
-<li>Once you have modified the content, you can now commit with the button "Submit".</li></ul></div>
+<li>Once you have modified the content, you can commit with the button "Submit".</li></ul></div>
<div class="section">
<h3>Modify Maven Website with a local copy<a name="Modify_Maven_Website_with_a_local_copy"></a></h3>
-<ol style="list-style-type: decimal">
-<li>Do a fresh check out of the Maven site, for example:
+<p>Do a fresh check out of the Maven site, for example:</p>
<div class="source">
-<pre>$ svn checkout https://svn.apache.org/repos/asf/maven/site site</pre></div></li>
-<li>Execute the site goal
+<pre>$ svn checkout https://svn.apache.org/repos/asf/maven/site site</pre></div>
+<p>Once you have modified the content, you can commit with <tt>svn ci</tt>.</p>
+<p>You can generate the site to verify the documentation before committing:</p>
<div class="source">
-<pre>mvn site </pre></div></li>
-<li>Verify the documentation before committing</li></ol></div></div>
+<pre>mvn site </pre></div></div></div>
<div class="section">
<h2>Publish content<a name="Publish_content"></a></h2>
<ul>
Modified: websites/staging/maven/trunk/content/maven-site-1.0-site.jar
==============================================================================
Binary files - no diff available.