incubator-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r331693 - in /incubator/public/trunk: forrest.properties site-author/guides/website.html site-publish/guides/website.html site-publish/guides/website.pdf
Date Tue, 08 Nov 2005 05:40:23 GMT
Author: crossley
Date: Mon Nov  7 21:40:15 2005
New Revision: 331693

URL: http://svn.apache.org/viewcvs?rev=331693&view=rev
Log:
Generate the documents directly into the "site-publish" directory.

Modified:
    incubator/public/trunk/forrest.properties
    incubator/public/trunk/site-author/guides/website.html
    incubator/public/trunk/site-publish/guides/website.html
    incubator/public/trunk/site-publish/guides/website.pdf

Modified: incubator/public/trunk/forrest.properties
URL: http://svn.apache.org/viewcvs/incubator/public/trunk/forrest.properties?rev=331693&r1=331692&r2=331693&view=diff
==============================================================================
--- incubator/public/trunk/forrest.properties (original)
+++ incubator/public/trunk/forrest.properties Mon Nov  7 21:40:15 2005
@@ -50,6 +50,7 @@
 #project.status=status.xml
 project.content-dir=site-author
 project.raw-content-dir=site-author/resources
+project.site-dir=${project.home}/site-publish
 #project.conf-dir=${project.content-dir}/conf
 #project.sitemap-dir=${project.content-dir}
 project.xdocs-dir=site-author

Modified: incubator/public/trunk/site-author/guides/website.html
URL: http://svn.apache.org/viewcvs/incubator/public/trunk/site-author/guides/website.html?rev=331693&r1=331692&r2=331693&view=diff
==============================================================================
--- incubator/public/trunk/site-author/guides/website.html (original)
+++ incubator/public/trunk/site-author/guides/website.html Mon Nov  7 21:40:15 2005
@@ -106,27 +106,17 @@
 <p>When you are satisifed, you will rebuild the whole site and
 add the changed documents to the "site-publish" directory ...
 </p>
-<p>In the top-level "incubator" SVN directory,
-do 'forrest' to
-render the HTML and PDF files into "build/site" directory.
-<p>If the site built without errors, you now need to synch the
-<span class="codefrag">incubator/build/site</span> directory with the
-<span class="codefrag">incubator/site-publish</span> directory.</p>
-<pre class="code">
-cd incubator
-svn update
-diff -rq build/site site-publish | grep -v "\.svn"
-... Ensure that the differences are what you expect.
-
-cp -Rf build/site/* site-publish
-... Now do the usual SVN stuff: 'svn status' 'svn add' 'svn diff' 'svn commit'
-           </pre>
+<p>In the top-level "incubator" SVN directory, do 'forrest site'
+(or just plain 'forrest') to render the HTML and PDF files into the
+"site-publish" directory. If the site built without errors, then do
+the usual SVN stuff: 'svn status' 'svn add' 'svn diff' 'svn commit'.
+</p>
 
 <p>To update the website, the "incubator/site-publish"
 SVN directory is checked-out on the server.
 </p>
 <pre class="code">
-ssh www.apache.org
+ssh people.apache.org
 cd /www/incubator.apache.org
 svn update
 </pre>

Modified: incubator/public/trunk/site-publish/guides/website.html
URL: http://svn.apache.org/viewcvs/incubator/public/trunk/site-publish/guides/website.html?rev=331693&r1=331692&r2=331693&view=diff
==============================================================================
--- incubator/public/trunk/site-publish/guides/website.html (original)
+++ incubator/public/trunk/site-publish/guides/website.html Mon Nov  7 21:40:15 2005
@@ -294,23 +294,14 @@
 <li>Edit the source docs in place at site-author/*.* and see changes in the browser
by re-loading the page.</li>
 </ul>
 <p>When you are satisifed, you will rebuild the whole site and add the changed documents
to the "site-publish" directory ...</p>
-<p>In the top-level "incubator" SVN directory, do 'forrest' to render the HTML and
PDF files into "build/site" directory.</p>
-<p>If the site built without errors, you now need to synch the incubator/build/site
directory with the incubator/site-publish directory.</p>
-<pre class="code">cd incubator
-svn update
-diff -rq build/site site-publish | grep -v "\.svn"
-... Ensure that the differences are what you expect.
-
-cp -Rf build/site/* site-publish
-... Now do the usual SVN stuff: 'svn status' 'svn add' 'svn diff' 'svn commit'
-          </pre>
+<p>In the top-level "incubator" SVN directory, do 'forrest site' (or just plain 'forrest')
to render the HTML and PDF files into the "site-publish" directory. If the site built without
errors, then do the usual SVN stuff: 'svn status' 'svn add' 'svn diff' 'svn commit'.</p>
 <p>To update the website, the "incubator/site-publish" SVN directory is checked-out
on the server.</p>
-<pre class="code">ssh www.apache.org
+<pre class="code">ssh people.apache.org
 cd /www/incubator.apache.org
 svn update
 </pre>
 </div>
-<a name="N1006F"></a><a name="other"></a>
+<a name="N1006A"></a><a name="other"></a>
 <h2 class="underlined_10">Other notes</h2>
 <div class="section">
 <p>Make sure that your subversion client is properly <a href="http://www.apache.org/dev/version-control.html#https-svn">configured</a>.
This vastly reduces the amount of traffic on the svn email commits, e.g. *.pdf</p>

Modified: incubator/public/trunk/site-publish/guides/website.pdf
URL: http://svn.apache.org/viewcvs/incubator/public/trunk/site-publish/guides/website.pdf?rev=331693&r1=331692&r2=331693&view=diff
==============================================================================
Binary files - no diff available.



---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@incubator.apache.org
For additional commands, e-mail: cvs-help@incubator.apache.org


Mime
View raw message