Merge remote-tracking branch 'ungleich/master'

cdist/conf/type/__cron/man.text

@@ -42,7 +42,7 @@ raw::
    See crontab(5) for the extensions if any that your cron implementation
    implements.
 raw_command::
-   Take whatever the user has given in the commmand and ignore everything else.
+   Take whatever the user has given in the command and ignore everything else.
    If given, the command will be added to crontab.
    Can for example be used to define variables like SHELL or MAILTO.
 

cdist/conf/type/__directory/man.text

@@ -59,7 +59,7 @@ create::
 remove::
     Directory exists, but state is absent, directory will be removed by generated code.
 remove non directory::
-    Someting other than a directory with the same name exists and was removed prior to create.
+    Something other than a directory with the same name exists and was removed prior to create.
 
 
 EXAMPLES

cdist/conf/type/__group/man.text

@@ -45,7 +45,7 @@ remove::
 change <property> <new_value> <current_value>::
     Changed group property from current_value to new_value
 set <property> <new_value>::
-    set property to new value, property was not set bevore
+    set property to new value, property was not set before
 
 
 EXAMPLES

cdist/conf/type/__key_value/man.text

@@ -19,7 +19,7 @@ REQUIRED PARAMETERS
 file::
    The file to operate on.
 delimiter::
-   The delimiter which seperates the key from the value.
+   The delimiter which separates the key from the value.
 
 
 OPTIONAL PARAMETERS

cdist/conf/type/__zypper_repo/man.text

@@ -22,11 +22,11 @@ OPTIONAL PARAMETERS
 -------------------
 state::
     Either "present" or "absent" or "enabled" or "disabled", defaults to "present" + 
-    #present#  - make sure that the repo is aviable, needs uri and repo_desc + 
+    #present#  - make sure that the repo is available, needs uri and repo_desc +
          for all following states, the repo can be searched via repo_id or uri + 
     #absent#   - drop the repo if found + 
     #enabled#  - a repo can have state disabled if installed via zypper service (ris), in this case, you can enable the repo + 
-    #disabled# - instead of absent (drop), a repo can also set to disabled, wich makes it inaccessible + 
+    #disabled# - instead of absent (drop), a repo can also set to disabled, which makes it inaccessible +
 
 uri::
     If supplied, use the uri and not the object id as repo uri.

docs/man/cdist-reference.text.sh

@@ -183,7 +183,7 @@ files::
     (for instance to store template results).
 changed::
     This empty file exists in an object directory, if the object has
-    code to be excuted (either remote or local)
+    code to be executed (either remote or local)
 stdin::
     This file exists and contains data, if data was provided on stdin 
     when the type was called.

docs/man/man7/cdist-best-practice.text

@@ -88,7 +88,7 @@ MAINTAINING MULTIPLE CONFIGURATIONS
 -----------------------------------
 When you need to manage multiple sites with cdist, like company_a, company_b
 and private for instance, you can easily use git for this purpose.
-Including a possible common base that is reused accross the different sites:
+Including a possible common base that is reused across the different sites:
 
 --------------------------------------------------------------------------------
 # create branches

docs/man/man7/cdist-manifest.text

@@ -181,11 +181,11 @@ OVERRIDES
 ---------
 In some special cases, you would like to create an already defined object 
 with different parameters. In normal situations this leads to an error in cdist.
-If you whish, you can setup the environment variable CDIST_OVERRIDE
+If you wish, you can setup the environment variable CDIST_OVERRIDE
 (any value or even empty is ok) to tell cdist, that this object override is 
 wanted and should be accepted.
 ATTENTION: Only use this feature if you are 100% sure in which order 
-cdist encounters the affected objects, otherwhise this results 
+cdist encounters the affected objects, otherwise this results
 in an undefined situation. 
 
 If CDIST_OVERRIDE and CDIST_ORDER_DEPENDENCY are set for an object,