You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by de...@apache.org on 2010/01/14 23:28:07 UTC

svn commit: r899444 - in /continuum/branches/continuum-1.3.x/continuum-docs: ./ src/site/ src/site/apt/ src/site/apt/administrator_guides/ src/site/apt/installation/ src/site/apt/user_guides/building_project/ src/site/apt/user_guides/notification/

Author: dennisl
Date: Thu Jan 14 22:28:06 2010
New Revision: 899444

URL: http://svn.apache.org/viewvc?rev=899444&view=rev
Log:
Sync in changes from trunk.

Modified:
    continuum/branches/continuum-1.3.x/continuum-docs/pom.xml
    continuum/branches/continuum-1.3.x/continuum-docs/src/site/apt/administrator_guides/index.apt
    continuum/branches/continuum-1.3.x/continuum-docs/src/site/apt/administrator_guides/projectgroup.apt
    continuum/branches/continuum-1.3.x/continuum-docs/src/site/apt/index.apt
    continuum/branches/continuum-1.3.x/continuum-docs/src/site/apt/installation/build-agent.apt
    continuum/branches/continuum-1.3.x/continuum-docs/src/site/apt/user_guides/building_project/build_results.apt
    continuum/branches/continuum-1.3.x/continuum-docs/src/site/apt/user_guides/notification/mail.apt
    continuum/branches/continuum-1.3.x/continuum-docs/src/site/pdf.xml
    continuum/branches/continuum-1.3.x/continuum-docs/src/site/site.xml

Modified: continuum/branches/continuum-1.3.x/continuum-docs/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-docs/pom.xml?rev=899444&r1=899443&r2=899444&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-docs/pom.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-docs/pom.xml Thu Jan 14 22:28:06 2010
@@ -44,6 +44,23 @@
           <template>continuum-site.vm</template>
         </configuration>
       </plugin>
+      <plugin>
+        <artifactId>maven-pdf-plugin</artifactId>
+        <!-- TODO: remove version once it is inherited from Continuum parent pom version 3 -->
+        <version>1.0</version>
+        <executions>
+          <execution>
+            <id>site-pdf</id>
+            <phase>site</phase>
+            <goals>
+              <goal>pdf</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.reporting.outputDirectory}</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   <reporting>
@@ -73,28 +90,4 @@
       </plugin>
     </plugins>
   </reporting>
-  <profiles>
-    <profile>
-      <id>pdf</id>
-      <build>
-          <plugins>
-            <plugin>
-              <artifactId>maven-pdf-plugin</artifactId>
-              <executions>
-                <execution>
-                  <id>site-pdf</id>
-                  <phase>site</phase>
-                  <goals>
-                    <goal>pdf</goal>
-                  </goals>
-                  <configuration>
-                    <outputDirectory>${project.reporting.outputDirectory}</outputDirectory>
-                  </configuration>
-                </execution>
-              </executions>
-            </plugin>
-          </plugins>
-        </build>
-    </profile>
-  </profiles>
 </project>

Modified: continuum/branches/continuum-1.3.x/continuum-docs/src/site/apt/administrator_guides/index.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-docs/src/site/apt/administrator_guides/index.apt?rev=899444&r1=899443&r2=899444&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-docs/src/site/apt/administrator_guides/index.apt (original)
+++ continuum/branches/continuum-1.3.x/continuum-docs/src/site/apt/administrator_guides/index.apt Thu Jan 14 22:28:06 2010
@@ -10,7 +10,7 @@
 
  * {{{security/index.html}Managing Users and Security}}
 
- * {{{projectgroup.html}Adding a Project Group}}
+ * {{{projectgroup.html}Managing Project Groups}}
 
  * {{{builder.html}Managing Builders}}
 

Modified: continuum/branches/continuum-1.3.x/continuum-docs/src/site/apt/administrator_guides/projectgroup.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-docs/src/site/apt/administrator_guides/projectgroup.apt?rev=899444&r1=899443&r2=899444&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-docs/src/site/apt/administrator_guides/projectgroup.apt (original)
+++ continuum/branches/continuum-1.3.x/continuum-docs/src/site/apt/administrator_guides/projectgroup.apt Thu Jan 14 22:28:06 2010
@@ -25,7 +25,7 @@
   * Project Group Name
     
   * Project Group Id
-
+  
   []
 
 * Editing a Project Group
@@ -54,7 +54,7 @@
   []
   
   And, projects can be moved to another project group.
-  
+
 * Deleting a Project Group
 
   There are two ways to delete a project group.
@@ -68,4 +68,4 @@
   Note that user roles for this project group will not be removed.  This is intentional so that if you are
   sharing a user database among several Continuum instances, users will still be able to access the same
   group on a different server.
-  
+

Modified: continuum/branches/continuum-1.3.x/continuum-docs/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-docs/src/site/apt/index.apt?rev=899444&r1=899443&r2=899444&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-docs/src/site/apt/index.apt (original)
+++ continuum/branches/continuum-1.3.x/continuum-docs/src/site/apt/index.apt Thu Jan 14 22:28:06 2010
@@ -59,5 +59,7 @@
       {{{http://apache-continuum.blogspot.com/}Blog}}
    
    []
+
+   This documentation is also available in {{{./apache-continuum.pdf}PDF}} format.
    
 

Modified: continuum/branches/continuum-1.3.x/continuum-docs/src/site/apt/installation/build-agent.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-docs/src/site/apt/installation/build-agent.apt?rev=899444&r1=899443&r2=899444&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-docs/src/site/apt/installation/build-agent.apt (original)
+++ continuum/branches/continuum-1.3.x/continuum-docs/src/site/apt/installation/build-agent.apt Thu Jan 14 22:28:06 2010
@@ -5,6 +5,10 @@
 
     First, {{{http://continuum.apache.org/download.html}download}} the Continuum Build Agent standalone
     distribution or webapp.
+    
+    <<Note>>: It is recommended to use build agents that come with the release of Continuum (Continuum Master) to be used.
+    While 1.3.x build agents can be used with 1.4.x Continuum (Continuum Master), using a later version of build agent than the
+    Continuum (Continuum Master) will not work.
 
 * Standalone
 
@@ -14,7 +18,7 @@
 
     The Build Agent runs on a specific port (defaulting to 8181), so it is possible
     to install multiple Build Agents in one machine.  It is also possible to
-    install Slaves in the same machine as the Master.  To configure the Build Agent
+    install Agents in the same machine as the Master.  To configure the Build Agent
     to run using a different port, edit the 
     <<<$CONTINUUM_BUILDAGENT_HOME/conf/jetty.xml>>> file.
 

Modified: continuum/branches/continuum-1.3.x/continuum-docs/src/site/apt/user_guides/building_project/build_results.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-docs/src/site/apt/user_guides/building_project/build_results.apt?rev=899444&r1=899443&r2=899444&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-docs/src/site/apt/user_guides/building_project/build_results.apt (original)
+++ continuum/branches/continuum-1.3.x/continuum-docs/src/site/apt/user_guides/building_project/build_results.apt Thu Jan 14 22:28:06 2010
@@ -27,6 +27,8 @@
     
     [[2]] Click on the build number under the <<Build>> column. You will be directed to the build result
     page as shown below.
+    
+    \ 
 
 [../../images/build_result-1.png] Build Results page
 

Modified: continuum/branches/continuum-1.3.x/continuum-docs/src/site/apt/user_guides/notification/mail.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-docs/src/site/apt/user_guides/notification/mail.apt?rev=899444&r1=899443&r2=899444&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-docs/src/site/apt/user_guides/notification/mail.apt (original)
+++ continuum/branches/continuum-1.3.x/continuum-docs/src/site/apt/user_guides/notification/mail.apt Thu Jan 14 22:28:06 2010
@@ -19,6 +19,7 @@
       <notifier>
         <configuration>
           <address>email adress</address>
+          <committers>true<committers/>
         </configuration>
       </notifier>
     </notifiers>

Modified: continuum/branches/continuum-1.3.x/continuum-docs/src/site/pdf.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-docs/src/site/pdf.xml?rev=899444&r1=899443&r2=899444&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-docs/src/site/pdf.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-docs/src/site/pdf.xml Thu Jan 14 22:28:06 2010
@@ -21,7 +21,7 @@
 <document outputName="apache-continuum">
 
  <meta>
-   <title>Apache Continuum</title>
+   <title>Apache Continuum ${project.version}</title>
    <author>The Apache Continuum Project</author>
  </meta>
 

Modified: continuum/branches/continuum-1.3.x/continuum-docs/src/site/site.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-docs/src/site/site.xml?rev=899444&r1=899443&r2=899444&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-docs/src/site/site.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-docs/src/site/site.xml Thu Jan 14 22:28:06 2010
@@ -36,7 +36,7 @@
           <item name="Geronimo" href="installation/geronimo.html"/>
           <item name="Glassfish" href="installation/glassfish.html"/>
         </item>
-        <item name="Release Notes" href="installation/release-notes.html"/>
+        <item name="Release Notes" href="release-notes.html"/>
         <item name="Upgrade" href="installation/upgrade.html"/>
       </item>
       <item name="User's Guides" collapse="true" href="user_guides/index.html">
@@ -108,6 +108,7 @@
         <!-- item name="Design" href="developer_guides/design.html"/ -->
         <item name="XML-RPC" href="developer_guides/xmlrpc.html"/>
       </item>
+      <item name="PDF" href="apache-continuum.pdf"/>
     </menu>
   </body>
 </project>