Merge branch 'development' of github.com:dtolabs/rundeck into develop…

…ment
rundeck · Dec 7, 2010 · 770e57a · 770e57a
2 parents 1382d46 + abb2dc0
commit 770e57a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/docs/en/01-getting-started/01-chapter1.md b/docs/en/01-getting-started/01-chapter1.md
@@ -27,7 +27,7 @@ node resources meeting specified filtering criteria and then
 performs the distributed command execution. The command executes in a data
 context that contains information about the Node resource. Besides
 node filtering, dispatcher options include parameters to control
-parrallel execution, ordering and error handling.
+parallel execution, ordering and error handling.
 
 The command dispatcher supports two methods of command execution:
 

diff --git a/docs/en/02-basics/02-chapter1.md b/docs/en/02-basics/02-chapter1.md
@@ -449,10 +449,6 @@ After execution completes, the command will have a status:
   an error is displayed. The page will also contain a link "Retry
   Failed Nodes..." in case you would like to retry the command.
 
-A URL also exists for this page which can be used later to refer to
-this execution:
-
-     http://rundeckserver/execution/show/{EID}
 
 You can download the entire output as a text file from this
 page. Press the "Download" link to retrieve the file to your desk top.
@@ -488,7 +484,8 @@ dispatch to fail unless the keepgoing flag is set.
     [alexh@strongbad dispatch][INFO] done.
     [ctier@centos54 dispatch][INFO] not listening on 4440
     error: Remote command failed with exit status 1
-    The script failed on centos54 and caused dispatch to error out immediately.
+
+The script failed on centos54 and caused dispatch to error out immediately.
 
 Running the command again, but this time with the "-K" keepgoing flag
 will cause dispatch to continue and print on which nodes the script
@@ -582,7 +579,7 @@ job. Specify execution ID using the "-e" option:
 ## History
 
 History for queued ad-hoc commands, as well as, temporary and
-saved Job executions  is stored in by the RunDeck server. History data
+saved Job executions  is stored by the RunDeck server. History data
 can be filtered and viewed inside the "History" page of the graphical
 console.
 

diff --git a/docs/en/04-job-workflows/04-chapter1.md b/docs/en/04-job-workflows/04-chapter1.md
@@ -144,7 +144,7 @@ commandline arguments text field.
 
 This is simililar to calling the other Job with <code>run</code>:
 
-    dispatch [filter-options] -j group/jobname
+    run [filter-options] -j group/jobname
 
 ## Reordering steps
 

diff --git a/docs/en/06-examples/06-chapter1.md b/docs/en/06-examples/06-chapter1.md
@@ -186,7 +186,7 @@ Two sets of scripts are already in use to manage the startup and shutdown
 procedures. Rather than force the issue as to
 which one is correct or superior, the administrator focuses on
 creating a skeleton to more easily present how scripts can be
-encapsulated by the job workflow. After examplesnstrating this simple
+encapsulated by the job workflow. After demonstrating this simple
 framework, the administrator can discuss how to incorporate the best
 of both script implementations into the Job definitions.
 

diff --git a/docs/en/07-administration/07-chapter1.md b/docs/en/07-administration/07-chapter1.md
@@ -157,7 +157,7 @@ loglevel, datasource configuration, [role mapping](#role-mapping), and
 
 ## Logs
 
-Dependeing on the installer used, the log files will be under a base
+Depending on the installer used, the log files will be under a base
 directory:
 
 *   RPM: `/var/log/rundeck`