svn commit: r154777 - forrest/trunk/site-author/content/xdocs/proposal-asf-forrestbot.xml forrest/trunk/site-author/content/xdocs/proposal-asf-publish.xml

[cr...@apache.org]

Author: crossley
Date: Mon Feb 21 20:00:10 2005
New Revision: 154777

URL: http://svn.apache.org/viewcvs?view=rev&rev=154777
Log:
Link to the demonstration on brutus.

Modified:
    forrest/trunk/site-author/content/xdocs/proposal-asf-forrestbot.xml
    forrest/trunk/site-author/content/xdocs/proposal-asf-publish.xml

Modified: forrest/trunk/site-author/content/xdocs/proposal-asf-forrestbot.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/site-author/content/xdocs/proposal-asf-forrestbot.xml?view=diff&r1=154776&r2=154777
==============================================================================
--- forrest/trunk/site-author/content/xdocs/proposal-asf-forrestbot.xml (original)
+++ forrest/trunk/site-author/content/xdocs/proposal-asf-forrestbot.xml Mon Feb 21 20:00:10 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2004 The Apache Software Foundation or its licensors,
+  Copyright 2004-2005 The Apache Software Foundation or its licensors,
   as applicable.
 
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -35,7 +35,9 @@
       </p>
       <p>A proposal is currently being discussed for
         <a href="proposal-asf-publish.html">ASF-wide documentation staging
-        and publishing</a>. The context of this Forrestbot proposal is at
+        and publishing</a>.
+      </p>
+      <p>The context of this Forrestbot proposal is at
         Item C through to Item G of that infrastructure, the "staging server".
         This does not preclude other mechanisms - some projects might choose
         to use Forrestbot.
@@ -69,6 +71,14 @@
         <a href="http://jakarta.apache.org/tomcat/">Apache Tomcat</a>) and
         an <a href="http://httpd.apache.org/">Apache HTTP Server</a> would be
         used to view the staging sites.
+      </p>
+    </section>
+
+    <section id="demo">
+      <title>Demonstration</title>
+      <p>There is a
+        <a href="http://brutus.apache.org:36366/forrestbot-webapp/">demonstration
+        forrestbot</a> on brutus.
       </p>
     </section>
   </body>

Modified: forrest/trunk/site-author/content/xdocs/proposal-asf-publish.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/site-author/content/xdocs/proposal-asf-publish.xml?view=diff&r1=154776&r2=154777
==============================================================================
--- forrest/trunk/site-author/content/xdocs/proposal-asf-publish.xml (original)
+++ forrest/trunk/site-author/content/xdocs/proposal-asf-publish.xml Mon Feb 21 20:00:10 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2004 The Apache Software Foundation or its licensors,
+  Copyright 2004-2005 The Apache Software Foundation or its licensors,
   as applicable.
 
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,13 +30,17 @@
      around 2004-07-29 which expanded on previous discussions.
     </warning>
 
+    <note>
+      There is nothing specific to Apache Forrest in this proposal.
+    </note>
+
     <section id="overview">
       <title>Overview</title>
       <p>All ASF projects need to be able to concentrate on their projects
         and the content of their websites, rather than get tangled up in
         arcane website publication procedures.
       </p>
-      <p>There is a "staging and publishing server" which is separate
+      <p>There would be a "staging and publishing server" which is separate
         from the live production web server. The project committers would
         commit their source changes, then trigger a "documentation build",
         then review the staging website.
@@ -242,6 +246,13 @@
           website maintenance.
         </li>
       </ul>
+    </section>
+
+    <section id="demo">
+      <title>Demonstration</title>
+      <p>
+      See <a href="http://brutus.apache.org/docs/">demonstration</a> on brutus.
+      </p>
     </section>
 
 <!--