Corrected English grammar - keywords: "informations", "every" and "each"

rudder-core/src/main/scala/com/normation/rudder/domain/reports/bean/ExecutionBatch.scala

@@ -480,7 +480,7 @@ case class ConfigurationExecutionBatch(
       }.toSeq
   }
   /**
-   * Get the status of every components of the directive passed as a parameter
+   * Get the status of every component of the directive passed as a parameter
    * Parameters:
    * directiveId : Components we are looking for are contained in that directive
    * components  : Expected component report format

rudder-core/src/main/scala/com/normation/rudder/domain/servers/NodeBean.scala

@@ -35,7 +35,7 @@
 package com.normation.rudder.domain.servers
 
 /**
- * Class that holds the informations for the templates
+ * Class that holds the information for the templates
  * @author Nicolas CHARLES
  *
  *
@@ -60,4 +60,4 @@ class NodeBean(uuid:String, hostname:String, name:String, servingIp:Option[Strin
     servingIp.getOrElse(throw new Exception("Invalid server type " + uuid))
   }
 
-}
+}

rudder-core/src/main/scala/com/normation/rudder/services/nodes/QuickSearchService.scala

@@ -61,7 +61,7 @@ import scala.collection.JavaConversions._
 /**
  * A service that allows to query for
  * nodes based on a part of some of their
- * informations, typically the id, hostname, ip,
+ * information, typically the id, hostname, ip,
  * etc.
  *
  * That service is typically used in autocomplete

rudder-core/src/main/scala/com/normation/rudder/services/policies/SystemVariableService.scala

@@ -122,7 +122,7 @@ class SystemVariableServiceImpl(
 
     val clientList = collection.mutable.Set[String]()
 
-    // If we are facing a policy server, we have to allow each children to connect, plus the policy parent,
+    // If we are facing a policy server, we have to allow each child to connect, plus the policy parent,
     // else it's only the policy server
     if(nodeInfo.isPolicyServer) {
       val allowedNodeVarSpec = SystemVariableSpec(name = "${rudder.hasPolicyServer-" + nodeInfo.id.value + ".target.hostname}", description = "", multivalued = true)
@@ -177,4 +177,4 @@ class SystemVariableServiceImpl(
 
   }
 
-}
+}

rudder-core/src/main/scala/com/normation/rudder/services/queries/LdapQueryProcessor.scala

@@ -268,7 +268,7 @@ class InternalLDAPQueryProcessor(
      * - a composition type (and/or)
      * - a target object type to return with its own filters (not combined)
      * - criteria as a map of (dn type -->  map(object type name --> filters ))
-     *   (for each dnType, we have all the attribute that should return that dnType and their own filter not composed)
+     *   (for each dnType, we have all the attributes that should return that dnType and their own filter not composed)
      */
 
     /*
@@ -492,7 +492,7 @@ class InternalLDAPQueryProcessor(
 
        /*
         * Optimization : we limit query time/size. That means that perhaps we won't have all response.
-        * That DOES not change the validity of each final answer, just we may don't find ALL valid answer.
+        * That DOES not change the validity of each final answer, just we may don't find ALL valid answers.
         * (in the case of a and, a missing result here can lead to an empty set at the end)
         * TODO : this behaviour should be removable
         */

rudder-core/src/main/scala/com/normation/rudder/services/reports/ReportingServiceImpl.scala

@@ -126,7 +126,7 @@ class ReportingServiceImpl(
 
     val expanded = confToCreate.map { case ExpandedRuleVal(ruleId, configs, serial) =>
       configs.toSeq.map { case (nodeId, directives) =>
-        // each directive are converted into Seq[DirectiveExpectedReports]
+        // each directive is converted into Seq[DirectiveExpectedReports]
         val directiveExpected = directives.map { directive =>
 	          val seq = getCardinality(directive)
 
@@ -205,7 +205,7 @@ class ReportingServiceImpl(
     val rulesAndSerials = nonEmptyExpected.map(x => (x.ruleId, x.serial))
     val allReports = reportsRepository.findLastReportsByRules(rulesAndSerials)
 
-    // Here we go over each elements of the map [ruleId, Box[ExpectedReports], and reconcile the
+    // Here we go over each element of the map [ruleId, Box[ExpectedReports], and reconcile the
     // entries with the batches
     expectedReports.map { case (ruleId, status) =>
       val executionBatch = status match {

rudder-core/src/main/scala/com/normation/rudder/services/servers/NewNodeManager.scala

@@ -99,7 +99,7 @@ trait NewNodeManager {
 /**
  * Default implementation: a new server manager composed with a sequence of
  * "unit" accept, one by main goals of what it means to accept a server;
- * Each unit accept provides its main logic of accepting a server, optionnaly
+ * Each unit accept provides its main logic of accepting a server, optionally
  * a global post accept task, and a rollback mechanism.
  * Rollback is always a "best effort" task.
  */

rudder-core/src/main/scala/com/normation/rudder/services/servers/NodeConfigurationService.scala

@@ -52,7 +52,7 @@ trait NodeConfigurationService {
   /**
    * Update a node configuration using a targetNodeConfiguration :
    * update the directives and the node context, as well as the agentsName
-   * (well, every fields actually)
+   * (well, every field actually)
    * @param target
    * @return
    */

rudder-core/src/main/scala/com/normation/rudder/services/servers/NodeConfigurationServiceImpl.scala

@@ -82,7 +82,7 @@ class NodeConfigurationServiceImpl(
   /**
    * Update a node configuration using a targetNodeConfiguration :
    * update the directives and the node context, as well as the agentsName
-   * (well, every fields actually)
+   * (well, every field actually)
    * @param target
    * @return
    */

rudder-web/src/main/resources/logback.xml

@@ -142,7 +142,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/agpl.html>.
     Display AJAX information of the Web interface
     =============================================
     Whatever the root logger level is, you are likely
-    to not wanting these information. 
+    to not wanting this information. 
     Set the level to debug if you are really interested
     in AJAX-related debug messages.
   -->
@@ -158,9 +158,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/agpl.html>.
   <logger name="org.springframework" level="warn" />
 
   <!-- 
-    We don't need to have a timing information for each 
+    We don't need to have timing information for each 
     HTTP request.
-    If you want to have these information, set the log
+    If you want to have this information, set the log
     level for that logger to (at least) "info"
    -->
   <logger name="net.liftweb.util.TimeHelpers" level="warn" />

rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNode.scala

@@ -679,7 +679,7 @@ def jsInit(nodeId:NodeId, softIds:Seq[SoftwareUuid], salt:String="", tabContaine
     <div class="simplemodal-content">
       <div>
           <img src="/images/icWarn.png" alt="Warning!" height="32" width="32" class="warnicon"/>
-          <h2>If you choose to remove this node from Rudder, it won't be managed anymore, and all informations about it will be removed from the application</h2>
+          <h2>If you choose to remove this node from Rudder, it won't be managed anymore, and all information about it will be removed from the application</h2>
       </div>
       <hr class="spacer"/>
      </div>
@@ -720,7 +720,7 @@ def jsInit(nodeId:NodeId, softIds:Seq[SoftwareUuid], salt:String="", tabContaine
           <b>Are you sure you want to delete this node?</b>
       </div>
       <div style="margin-top:7px">If you choose to remove this node from Rudder, it won't be managed anymore,
-       and all informations about it will be removed from the application.</div>
+       and all information about it will be removed from the application.</div>
      </div>
     <div>
       <div style="margin-top:7px">

rudder-web/src/main/webapp/templates-hidden/components/ComponentRuleEditForm.html

@@ -85,7 +85,7 @@
 <div id="details" class="object-details">
 	<div class="groupedEditZone">
 	  <fieldset>
-    <legend>Rule informations</legend>
+    <legend>Rule information</legend>
 		<div id="nameField">
 		Here comes the name field
 		</div>

rudder-web/src/test/resources/logback-test.xml

@@ -44,7 +44,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/agpl.html>.
     ===================================================================
     Our default configuration : log on stdout appender so that our logs
     are managed by the container log system (and so, if Tomcat/Jetty/etc
-    logs are stored in files and rotated, so are our log information).
+    logs are stored in files and rotated, so is our log information).
 
     Log format is:
     - date/time/thread of the log on 30 chars (fixed)
@@ -130,7 +130,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/agpl.html>.
     Display AJAX information of the Web interface
     =============================================
     Whatever the root logger level is, you are likely
-    to not wanting these information. 
+    to not wanting this information. 
     Set the level to debug if you are really interested
     in AJAX-related debug messages.
   -->
@@ -146,9 +146,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/agpl.html>.
   <logger name="org.springframework" level="warn" />
 
   <!-- 
-    We don't need to have a timing information for each 
+    We don't need to have timing information for each 
     HTTP request.
-    If you want to have these information, set the log
+    If you want to have this information, set the log
     level for that logger to (at least) "info"
    -->
   <logger name="net.liftweb.util.TimeHelpers" level="warn" />

scripts/script-hudson_install-node1-package.sh

@@ -54,6 +54,6 @@ set -e
 ##Start cfengine deamon
 /etc/init.d/rudder-agent start
 
-##Force send informations
+##Force send information
 /opt/rudder/sbin/cf-agent -IK