Merge pull request OpenSCAP#1794 from henrich/maint-1.3

Fix misspelling

docs/manual/manual.adoc

@@ -694,7 +694,7 @@ STIG by DISA. When evaluating a STIG provided by DISA using `oscap`, use the
 
 == Remediating system
 
-OpenSCAP allows to automatically remediate systems that have been found in a
+OpenSCAP allows one to automatically remediate systems that have been found in a
 non-compliant state. For system remediation the rules in SCAP content need to
 have a remediation script attached. For example, the SCAP source data streams in
 the `scap-security-guide` package contain rules with remediation fix scripts.

schemas/ocil/2.0/ocil-2.0.xsd

@@ -1589,7 +1589,7 @@ OR 	|| 0   | 0+ | 1+ | 0+ | 0+ | 0+ || Error
       </xsd:enumeration>
       <xsd:enumeration value="ERROR">
         <xsd:annotation>
-          <xsd:documentation>An ERROR value indicates that an error occured
+          <xsd:documentation>An ERROR value indicates that an error occurred
                   while processing the check.</xsd:documentation>
           <xsd:documentation> Among other causes, this can indicate an
                   unexpected response. </xsd:documentation>

src/DS/sds.c

@@ -793,7 +793,7 @@ static int ds_sds_compose_catalog_has_uri(xmlDocPtr doc, xmlNodePtr catalog, con
 
 	if (xpathObj == NULL)
 	{
-		oscap_seterr(OSCAP_EFAMILY_XML, "Error: Unable to evalute XPath expression.");
+		oscap_seterr(OSCAP_EFAMILY_XML, "Error: Unable to evaluate XPath expression.");
 		xmlXPathFreeContext(xpathCtx);
 
 		return -1;
@@ -882,7 +882,7 @@ static int ds_sds_compose_add_component_dependencies(xmlDocPtr doc, xmlNodePtr d
 			xpathCtx);
 	if (xpathObj == NULL)
 	{
-		oscap_seterr(OSCAP_EFAMILY_XML, "Error: Unable to evalute XPath expression.");
+		oscap_seterr(OSCAP_EFAMILY_XML, "Error: Unable to evaluate XPath expression.");
 		xmlXPathFreeContext(xpathCtx);
 
 		return -1;
@@ -1014,7 +1014,7 @@ static int ds_sds_compose_has_component_ref(xmlDocPtr doc, xmlNodePtr datastream
 
 	if (xpathObj == NULL)
 	{
-		oscap_seterr(OSCAP_EFAMILY_XML, "Error: Unable to evalute XPath expression.");
+		oscap_seterr(OSCAP_EFAMILY_XML, "Error: Unable to evaluate XPath expression.");
 		xmlXPathFreeContext(xpathCtx);
 
 		return -1;

src/OVAL/adt/oval_collection.c

@@ -207,7 +207,7 @@ void oval_collection_iterator_add(struct oval_iterator *iterator, void *item)
 
 	struct _oval_collection_item_frame *newframe =
 	    (struct _oval_collection_item_frame *)malloc(sizeof(_oval_collection_item_frame_t));
-	if (newframe == NULL)	/* We don't have any information that error occured ! */
+	if (newframe == NULL)	/* We don't have any information that error occurred ! */
 		return;
 
 	newframe->next = iterator->item_iterator_frame;

src/OVAL/oval_variable.c

@@ -966,7 +966,7 @@ int oval_variable_bind_ext_var(struct oval_variable *var, struct oval_variable_m
 	oval_variable_EXTERNAL_t *evar;
 
 	if (var->type != OVAL_VARIABLE_EXTERNAL) {
-		dW("Attemp to bind a non-external variable, id: %s, type: %s.", var->id, oval_variable_type_get_text(var->type));
+		dW("Attempt to bind a non-external variable, id: %s, type: %s.", var->id, oval_variable_type_get_text(var->type));
 		return 2;
 	}
 

src/OVAL/probes/probe/input_handler.c

@@ -172,7 +172,7 @@ void *probe_input_handler(void *arg)
 							*/
 						dW("Attempt to evaluate an object "
 							"(ID=%u) " // TODO: 64b IDs
-							"which is already being evaluated by an other thread.", pair->pth->sid);
+							"which is already being evaluated by another thread.", pair->pth->sid);
 
 						free(pair->pth);
 						free(pair);

src/OVAL/results/oval_resultTest.c

@@ -416,7 +416,7 @@ static inline oval_result_t _evaluate_sysent_with_variable(struct oval_syschar_m
 
 			var_val_res = oval_str_cmp_str(state_entity_val_text, state_entity_val_datatype, sys_data, state_entity_operation);
 			if (var_val_res == OVAL_RESULT_ERROR) {
-				dE("Error occured when comparing a variable '%s' value '%s' with collected item entity = '%s'",
+				dE("Error occurred when comparing a variable '%s' value '%s' with collected item entity = '%s'",
 					oval_variable_get_id(state_entity_var), state_entity_val_text, sys_data);
 			}
 			ores_add_res(&var_ores, var_val_res);
@@ -924,7 +924,7 @@ _oval_result_test_evaluate_items(struct oval_test *test, struct oval_syschar *sy
 
 	switch (flag) {
 	case SYSCHAR_FLAG_ERROR:
-		dI("An error occured while collecting items matching object '%s'. (flag=%s)", object_id, flag_text);
+		dI("An error occurred while collecting items matching object '%s'. (flag=%s)", object_id, flag_text);
 		if (test_check_existence == OVAL_ANY_EXIST
 		    && !hasstate) {
 			result = OVAL_RESULT_TRUE;

src/XCCDF_POLICY/xccdf_policy.c

@@ -2029,7 +2029,7 @@ static void xccdf_policy_add_final_setvalues(struct xccdf_policy *policy, struct
 
 /**
  * Evaluate XCCDF Policy
- * Iterate through Benchmark items and evalute one by one by calling 
+ * Iterate through Benchmark items and evaluate one by one by calling
  * callback for checking system that is defined by particular rules
  * Callbacks for checking systems have to be defined before calling this function, otherwise 
  * rules would not be evaluated and process ends with error.

src/XCCDF_POLICY/xccdf_policy_substitute.c

@@ -216,7 +216,7 @@ char* xccdf_policy_substitute(const char *text, struct xccdf_policy *policy) {
 
 	char *resolved_text = NULL;
 	if (xml_iterate_dfs(text, &resolved_text, _xccdf_text_substitution_cb, &data) != 0) {
-		// Either warning or error occured. Since prototype of this function
+		// Either warning or error occurred. Since prototype of this function
 		// does not make possible warning notification -> We better scratch that.
 		free(resolved_text);
 		resolved_text = NULL;

src/common/public/oscap_debug.h

@@ -51,7 +51,7 @@ OSCAP_API void __oscap_dlprintf(int level, const char *file, const char *fn, siz
  * @param verbosity_level Verbosity level
  * @param filename Name of file used as output file for store debugging
  *                 and other additional information.
- * @return When an error occured, returns false, otherwise true.
+ * @return When an error occurred, returns false, otherwise true.
  */
 OSCAP_API bool oscap_set_verbose(const char *verbosity_level, const char *filename);
 

src/common/public/oscap_error.h

@@ -24,7 +24,7 @@
  * @{
  * @addtogroup ERRORS
  * @{
- * Error checking mechanism. Purse of this mechanism is to inform user about problems that occured 
+ * Error checking mechanism. Purse of this mechanism is to inform user about problems that occurred
  * during executaion of library functions. Mechanism is similar to linux errno variable. When the problem 
  * raise, the information about it is stored in library buffer. This information consists of error family,
  * and textual description. Example of usage:
@@ -86,7 +86,7 @@ OSCAP_API oscap_errfamily_t oscap_err_family(void);
 OSCAP_API const char *oscap_err_desc(void);
 
 /**
- * Get the full description for all the errors which has occured in this
+ * Get the full description for all the errors which has occurred in this
  * thread since the last call of this function or \ref oscap_clearerr.
  * This function is destructive. Subsequent call shall return NULL.
  * @returns zero terminated string describing these errors, which shall

tests/API/OVAL/results-good.xml

@@ -3536,7 +3536,7 @@
             <message level="info">This type of object (textfilecontent54_object) is not currently supported by this OVAL Definition Interpreter data collector.</message>
           </object>
           <object id="oval:gov.irs.rhel5:obj:135" version="1" flag="error">
-            <message level="fatal">An unknown error occured while collecting data.</message>
+            <message level="fatal">An unknown error occurred while collecting data.</message>
           </object>
           <object id="oval:gov.irs.rhel5:obj:136" version="1" flag="not collected">
             <message level="info">This type of object (textfilecontent54_object) is not currently supported by this OVAL Definition Interpreter data collector.</message>
@@ -4063,7 +4063,7 @@
             <reference item_ref="136"/>
           </object>
           <object id="oval:gov.irs.rhel5:obj:33" version="1" flag="error">
-            <message level="fatal">An unknown error occured while collecting data.</message>
+            <message level="fatal">An unknown error occurred while collecting data.</message>
           </object>
           <object id="oval:gov.irs.rhel5:obj:330" version="1" flag="complete">
             <reference item_ref="137"/>

tests/API/OVAL/results.xml

@@ -13707,7 +13707,7 @@
             <reference item_ref="137"/>
           </object>
           <object id="oval:gov.irs.rhel5:obj:33" version="1" flag="error">
-            <message level="fatal">An unknown error occured while collecting data.</message>
+            <message level="fatal">An unknown error occurred while collecting data.</message>
           </object>
           <object id="oval:gov.irs.rhel5:obj:329" version="1" flag="complete">
             <reference item_ref="136"/>
@@ -14234,7 +14234,7 @@
             <message level="info">This type of object (textfilecontent54_object) is not currently supported by this OVAL Definition Interpreter data collector.</message>
           </object>
           <object id="oval:gov.irs.rhel5:obj:135" version="1" flag="error">
-            <message level="fatal">An unknown error occured while collecting data.</message>
+            <message level="fatal">An unknown error occurred while collecting data.</message>
           </object>
           <object id="oval:gov.irs.rhel5:obj:134" version="1" flag="not collected">
             <message level="info">This type of object (textfilecontent54_object) is not currently supported by this OVAL Definition Interpreter data collector.</message>

utils/oscap-ssh.8

@@ -3,7 +3,7 @@
 oscap-ssh \- Tool for running oscap over SSH and collecting results.
 .SH DESCRIPTION
 oscap-ssh runs oscap tool on a remote system through SSH connection. The input files are
-transfered to the target system and after the scan finishes result files are transfered
+transferred to the target system and after the scan finishes result files are transferred
 back. No temporary data remains on the remote machine.
 
 The tool requires bash, ssh, scp and mktemp to perform OVAL and XCCDF evaluation of remote

utils/oscap-tool.c

@@ -189,7 +189,7 @@ static const char *common_opts_help =
 	"Common options:\n"
 	"   --verbose <verbosity_level>   - Turn on verbose mode at specified verbosity level.\n"
 	"                                   Verbosity level must be one of: DEVEL, INFO, WARNING, ERROR.\n"
-	"   --verbose-log-file <file>     - Write verbose informations into file.\n";
+	"   --verbose-log-file <file>     - Write verbose information into file.\n";
 
 static void oscap_module_print_help(struct oscap_module *module, FILE *out)
 {

utils/oscap-tool.h

@@ -75,7 +75,7 @@ struct oscap_module {
 // standard oscap CLI exit statuses
 enum oscap_exitcode {
     OSCAP_OK             =   0, // successful exit
-    OSCAP_ERROR          =   1, // an error occured
+    OSCAP_ERROR          =   1, // an error occurred
     OSCAP_FAIL           =   2, // a process (e.g. scan or validation) failed
     OSCAP_ERR_FETCH      =   1, // cold not fetch input file (same as error for now)
     OSCAP_BADARGS        = 100, // bad commandline arguments

utils/oscap.8

@@ -178,7 +178,7 @@ Uses a data stream with that particular ID from the given data stream collection
 .TP
 \fB\-\-xccdf-id ID\fR
 .RS
-Takes component ref with given ID from checklists. This allows to select a particular XCCDF component even in cases where there are 2 XCCDFs in one data stream. If none is given, the first component from the checklists element is used.
+Takes component ref with given ID from checklists. This allows one to select a particular XCCDF component even in cases where there are multiple XCCDFs in a single data stream. If none is given, the first component from the checklists element is used.
 .RE
 .TP
 \fB\-\-benchmark-id ID\fR
@@ -335,7 +335,7 @@ Uses a data stream with that particular ID from the given data stream collection
 .TP
 \fB\-\-xccdf-id ID\fR
 .RS
-Takes component ref with given ID from checklists. This allows to select a particular XCCDF component even in cases where there are 2 XCCDFs in one data stream.
+Takes component ref with given ID from checklists. This allows one to select a particular XCCDF component even in cases where there are 2 XCCDFs in one data stream.
 .RE
 .TP
 \fB\-\-benchmark-id ID\fR
@@ -372,7 +372,7 @@ This option has no effect and is kept only for backward compatibility purposes.
 Selects a component ref from any datastream that references a component with XCCDF Benchmark such that its @id attribute matches given string exactly.
 .TP
 \fB\-\-xccdf-id ID\fR
-Takes component ref with given ID from checklists. This allows to select a particular XCCDF component even in cases where there are 2 XCCDFs in one data stream. If none is given, the first component from the checklists element is used.
+Takes component ref with given ID from checklists. This allows one to select a particular XCCDF component even in cases where there are multiple XCCDFs in a single data stream. If none is given, the first component from the checklists element is used.
 .TP
 \fB\-\-tailoring-file TAILORING_FILE\fR
 Use given file for XCCDF tailoring. Select profile from tailoring file to apply using --profile. If both --tailoring-file and --tailoring-id are specified, --tailoring-file takes priority.
@@ -425,7 +425,7 @@ Fixes will be generated for failed rule-results of the specified TestResult.
 Template to be used to generate the script. If it contains a dot '.' it is interpreted as a location of a file with the template definition. Otherwise it identifies a template from standard set which currently includes: \fIbash\fR (default if no --template switch present). Brief explanation of the process of writing your own templates is in the XSL file \fIxsl/legacy-fix.xsl\fR in the openscap data directory. You can also take a look at the default template \fIxsl/legacy-fixtpl-bash.xml\fR.
 .TP
 \fB\-\-xccdf-id ID\fR
-Takes component ref with given ID from checklists. This allows to select a particular XCCDF component even in cases where there are 2 XCCDFs in one data stream. If none is given, the first component from the checklists element is used.
+Takes component ref with given ID from checklists. This allows one to select a particular XCCDF component even in cases where there are multiple XCCDFs in a single data stream. If none is given, the first component from the checklists element is used.
 .TP
 \fB\-\-benchmark-id ID\fR
 Selects a component ref from any data stream that references a component with XCCDF Benchmark such that its @id attribute matches given string exactly.
@@ -486,7 +486,7 @@ Create human readable (HTML) report from OVAL Results.
 Uses a data stream with that particular ID from the given data stream collection. If not given the first data stream is used. Only applies if you give source data stream in place of an OVAL file.
 .TP
 \fB\-\-oval-id ID\fR
-Takes component ref with given ID from checks. This allows to select a particular OVAL component even in cases where there are 2 OVALs in one data stream.
+Takes component ref with given ID from checks. This allows one to select a particular OVAL component even in cases where there are multiple OVALs in a single data stream.
 .TP
 \fB\-\-skip-valid\fR, \fB\-\-skip-validation\fR
 Do not validate input/output files.
@@ -650,7 +650,7 @@ Splits given source data stream into multiple files and stores all the files in
 Uses a data stream with that particular ID from the given data stream collection. If not given the first data stream is used.
 .TP
 \fB\-\-xccdf-id XCCDF_ID\fR
-Takes component ref with given ID from checklists. This allows to select a particular XCCDF component even in cases where there are 2 XCCDFs in one data stream.
+Takes component ref with given ID from checklists. This allows one to select a particular XCCDF component even in cases where there are multiple XCCDFs in a single data stream.
 .TP
 \fB\-\-skip-valid, \fB\-\-skip-validation
 Do not validate input/output files.

xsl/xccdf-report-oval-details.xsl

@@ -119,7 +119,7 @@ Authors:
             </xsl:if>
         </xsl:when>
         <xsl:otherwise>
-            <!-- Applies when tested object doesn't exist or an error occured
+            <!-- Applies when tested object doesn't exist or an error occurred
                  while acessing object (permission denied etc.) -->
             <xsl:variable name='object_id' select='key("oval-testdef", @test_id)/*[local-name()="object"]/@object_ref'/>
             <xsl:variable name='object_info' select='key("oval-objectdef",$object_id)'/>