Author: brett
Date: Tue Jan  1 05:51:28 2013
New Revision: 1427308

URL: http://svn.apache.org/viewvc?rev=1427308&view=rev
Log:
fold in cancelling docs

Added:
    continuum/trunk/continuum-docs/src/site/apt/user_guides/building_project/cancelling_build.apt   (contents, props changed)
      - copied, changed from r1426388, continuum/trunk/continuum-docs/src/site/apt/user_guides/cancelling_build/cancelProjectBuild.apt
Removed:
    continuum/trunk/continuum-docs/src/site/apt/user_guides/cancelling_build/
Modified:
    continuum/trunk/continuum-docs/src/site/apt/user_guides/building_project/index.apt
    continuum/trunk/continuum-docs/src/site/apt/user_guides/index.apt

Copied: continuum/trunk/continuum-docs/src/site/apt/user_guides/building_project/cancelling_build.apt (from r1426388, continuum/trunk/continuum-docs/src/site/apt/user_guides/cancelling_build/cancelProjectBuild.apt)
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-docs/src/site/apt/user_guides/building_project/cancelling_build.apt?p2=continuum/trunk/continuum-docs/src/site/apt/user_guides/building_project/cancelling_build.apt&p1=continuum/trunk/continuum-docs/src/site/apt/user_guides/cancelling_build/cancelProjectBuild.apt&r1=1426388&r2=1427308&rev=1427308&view=diff
==============================================================================
--- continuum/trunk/continuum-docs/src/site/apt/user_guides/cancelling_build/cancelProjectBuild.apt (original)
+++ continuum/trunk/continuum-docs/src/site/apt/user_guides/building_project/cancelling_build.apt Tue Jan  1 05:51:28 2013
@@ -1,5 +1,5 @@
  ------
- Cancelling Project Build
+ Cancelling Builds
  ------
  Maria Catherine Tan
  ------
@@ -13,3 +13,11 @@ Cancelling Project Build
     To cancel the build for project, click the <<Cancel>> button of the project on the <<Project Group Summary>> page or on the <<Queues>> page.
 
 [../../images/cancelbuild.gif] Cancel Button
+
+Cancelling Project Group Build
+
+    This will cancel all builds of the project group and will also remove the projects from the build queue.
+
+    In the Project Group Summary page, click the
+
+[../../images/cancel-group-build.png] Cancel Group Build Button

Propchange: continuum/trunk/continuum-docs/src/site/apt/user_guides/building_project/cancelling_build.apt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: continuum/trunk/continuum-docs/src/site/apt/user_guides/building_project/index.apt
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-docs/src/site/apt/user_guides/building_project/index.apt?rev=1427308&r1=1427307&r2=1427308&view=diff
==============================================================================
--- continuum/trunk/continuum-docs/src/site/apt/user_guides/building_project/index.apt (original)
+++ continuum/trunk/continuum-docs/src/site/apt/user_guides/building_project/index.apt Tue Jan  1 05:51:28 2013
@@ -10,21 +10,21 @@ Building Projects
 
     For Ant and Maven builds the following system properties will be added via -D command line:
 
-    * <<<continuum.project.group.name>>>
+      * <<<continuum.project.group.name>>>
 
-    * <<<continuum.project.lastBuild.state>>> : last build state int flag
+      * <<<continuum.project.lastBuild.state>>> : last build state int flag
 
-    * <<<continuum.project.lastBuild.number>>>
+      * <<<continuum.project.lastBuild.number>>>
 
-    * <<<continuum.project.nextBuild.number>>>
+      * <<<continuum.project.nextBuild.number>>>
 
-    * <<<continuum.project.id>>>
+      * <<<continuum.project.id>>>
 
-    * <<<continuum.project.name>>>
+      * <<<continuum.project.name>>>
 
-    * <<<continuum.project.version>>>
+      * <<<continuum.project.version>>>
 
-    []
+      []
 
     When building projects, the build order is determined by the inter-dependency of the projects.
     This would mean that the dependencies of a project are built first.
@@ -34,18 +34,21 @@ Building Projects
 
     Projects can be built in two ways:
 
-    [[1]] {{{./schedule_build.html} Scheduled Builds}}
+      [[1]] {{{./schedule_build.html} Scheduled Builds}}
 
-    [[2]] {{{./forced_build.html} Forced Builds}}
+      [[2]] {{{./forced_build.html} Forced Builds}}
 
-    []
+      []
 
     Projects will have the <<in queue>> icon once the forced build or a scheduled build is triggered. This means that the project is either in the <<prepare build
     queue>> or in the <<build queue>>.
 
 [../../images/inqueue.gif]
 
-    []
-
     Checkout or update of projects takes longer with distributed builds enabled because after an SCM checkout or SCM update, an SCM changelog follows to get the "latest
     update date" needed to determine whether projects should build or not.
+
+* Cancelling builds
+
+    If a build has been started, you can cancel it before it completes. See
+    {{{./cancelling_build.html} Cancelling Builds}} for more information.
\ No newline at end of file

Modified: continuum/trunk/continuum-docs/src/site/apt/user_guides/index.apt
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-docs/src/site/apt/user_guides/index.apt?rev=1427308&r1=1427307&r2=1427308&view=diff
==============================================================================
--- continuum/trunk/continuum-docs/src/site/apt/user_guides/index.apt (original)
+++ continuum/trunk/continuum-docs/src/site/apt/user_guides/index.apt Tue Jan  1 05:51:28 2013
@@ -9,8 +9,6 @@ User's Guides
 
  * {{{./building_project/index.html}Building Projects}}
 
- * {{{./cancelling_build/index.html}Cancelling Builds}}
-
  * {{{./managing_builddef/index.html}Managing Build Definitions}}
 
  * {{{./managing_project/index.html}Managing Projects}}