Fix typos in comments

This should result in no difference in configuration.

47 files changed, 76 insertions, 76 deletions

diff --git a/deployment/access_classes/manifests/committers.pp b/deployment/access_classes/manifests/committers.pp
index cf73f373..37c0e266 100644
--- a/deployment/access_classes/manifests/committers.pp
+++ b/deployment/access_classes/manifests/committers.pp
@@ -5,7 +5,7 @@ class access_classes::committers {
     # user, and erase the password ( see pam_auth.c in openssh code,
     # seek badpw )
     # so the file must exist
-    # permission to use svn, git, etc must be added separatly
+    # permission to use svn, git, etc must be added separately
 
     class { 'pam::multiple_ldap_access':
         access_classes   => ['mga-shell_access'],
diff --git a/deployment/common/manifests/i18n.pp b/deployment/common/manifests/i18n.pp
index 7df46089..43b1fc3a 100644
--- a/deployment/common/manifests/i18n.pp
+++ b/deployment/common/manifests/i18n.pp
@@ -1,7 +1,7 @@
 class common::i18n {
     package { 'locales-en': }
 
-    # push the locale everywhere, as it affect facter
+    # push the locale everywhere, as it affects facter
     file { '/etc/sysconfig/i18n':
         content => template('common/i18n'),
     }
diff --git a/deployment/mgagit/files/git_multimail.py b/deployment/mgagit/files/git_multimail.py
index 39aa1458..0c5c8d7b 100644
--- a/deployment/mgagit/files/git_multimail.py
+++ b/deployment/mgagit/files/git_multimail.py
@@ -2571,7 +2571,7 @@ class Environment(object):
 
     def get_default_ref_ignore_regex(self):
         # The commit messages of git notes are essentially meaningless
-        # and "filenames" in git notes commits are an implementational
+        # and "filenames" in git notes commits are an implementation
         # detail that might surprise users at first.  As such, we
         # would need a completely different method for handling emails
         # of git notes in order for them to be of benefit for users,
@@ -3097,7 +3097,7 @@ class ConfigRecipientsEnvironmentMixin(
             lines = config.get_all(name)
             if lines is not None:
                 lines = [line.strip() for line in lines]
-                # Single "none" is a special value equivalen to empty string.
+                # Single "none" is a special value equivalence to empty string.
                 if lines == ['none']:
                     lines = ['']
                 return ', '.join(lines)
diff --git a/deployment/mgagit/templates/git-post-receive-hook b/deployment/mgagit/templates/git-post-receive-hook
index b72094b3..68da3200 100755
--- a/deployment/mgagit/templates/git-post-receive-hook
+++ b/deployment/mgagit/templates/git-post-receive-hook
@@ -90,7 +90,7 @@ def repo_shortname():
         return basename
 
 
-# Override the Environment class to generate an apporpriate short name which is
+# Override the Environment class to generate an appropriate short name which is
 # used in git links and as an email prefix
 class MageiaEnvironment(git_multimail.Environment):
     def get_repo_shortname(self):
diff --git a/deployment/mgagit/templates/gitolite.rc b/deployment/mgagit/templates/gitolite.rc
index 07bbc244..c4c925e6 100644
--- a/deployment/mgagit/templates/gitolite.rc
+++ b/deployment/mgagit/templates/gitolite.rc
@@ -83,7 +83,7 @@
             # essential (unless you're using smart-http mode)
             'ssh-authkeys',
 
-            # creates git-config enties from gitolite.conf file entries like 'config foo.bar = baz'
+            # creates git-config entities from gitolite.conf file entries like 'config foo.bar = baz'
             'git-config',
 
             # creates git-daemon-export-ok files; if you don't use git-daemon, comment this out
diff --git a/deployment/tld_redirections/manifests/init.pp b/deployment/tld_redirections/manifests/init.pp
index 9815367c..18db541c 100644
--- a/deployment/tld_redirections/manifests/init.pp
+++ b/deployment/tld_redirections/manifests/init.pp
@@ -18,7 +18,7 @@ class tld_redirections {
         }
     }
 
-    # domaine owned by Florin Catalin Russen
+    # domain owned by Florin Catalin Russen
     redirection { "ro": }
 
     # domain owned by the association
diff --git a/deployment/websites/templates/vhost_www.conf b/deployment/websites/templates/vhost_www.conf
index 79ac0ee1..399681be 100644
--- a/deployment/websites/templates/vhost_www.conf
+++ b/deployment/websites/templates/vhost_www.conf
@@ -1,6 +1,6 @@
 Redirect /wiki https://wiki.mageia.org/#
 
-# Everything under /g/ is static content to be served by a seconday host
+# Everything under /g/ is static content to be served by a secondary host
 RewriteEngine On
 RewriteRule ^g/(.+)$    https://static.mageia.org/g/$1 [R,L,QSA]
 
diff --git a/external/concat/manifests/init.pp b/external/concat/manifests/init.pp
index e7b2f4b1..c2039349 100644
--- a/external/concat/manifests/init.pp
+++ b/external/concat/manifests/init.pp
@@ -86,7 +86,7 @@
 #
 # ALIASES:
 #  - The exec can notified using Exec["concat_/path/to/file"] or Exec["concat_/path/to/directory"]
-#  - The final file can be referened as File["/path/to/file"] or File["concat_/path/to/file"]
+#  - The final file can be referenced as File["/path/to/file"] or File["concat_/path/to/file"]
 define concat($mode = 0644, $owner = "root", $group = "root", $warn = "false", $force = "false", $backup = "puppet") {
     $safe_name   = regsubst($name, '/', '_', 'G')
     $concatdir   = $concat::setup::concatdir
diff --git a/external/sshkeys/README.rst b/external/sshkeys/README.rst
index f770e4bf..73b136d6 100644
--- a/external/sshkeys/README.rst
+++ b/external/sshkeys/README.rst
@@ -25,13 +25,13 @@ the `sshkeys::keymaster` class on the puppet master node::
   include sshkeys::keymaster
 
 Before installing the key, we need to create it. This is done with the
-`create_key` ressource, on the puppet master node. We can create the key
+`create_key` resource, on the puppet master node. We can create the key
 `key1`::
 
   sshkeys::create_key{key1: }
 
 If we want to install the `key1` key pair for user `user1`, we can use
-the `set_client_key_pair` ressource::
+the `set_client_key_pair` resource::
 
   sshkeys::set_client_key_pair{'key1-for-user1':
     keyname => 'key1',
@@ -40,10 +40,10 @@ the `set_client_key_pair` ressource::
   }
 
 The `key1` private and public keys should now be installed for user
-`user1` on the node on which we created this ressource.
+`user1` on the node on which we created this resource.
 
 If we want to allow the key `key1` to connect to the `user2` account,
-we use the `set_authorized_keys` ressource::
+we use the `set_authorized_keys` resource::
 
   sshkeys::set_authorized_keys{'key1-to-user2':
     keyname => 'key1',
diff --git a/modules/amavis/templates/amavisd.conf b/modules/amavis/templates/amavisd.conf
index def495a9..e00bc511 100644
--- a/modules/amavis/templates/amavisd.conf
+++ b/modules/amavis/templates/amavisd.conf
@@ -444,7 +444,7 @@ $banned_filename_re = new_RE(
 #    qr/(?:INFECTED|WARNING|SUSPICION|SUSPICIOUS) (.+)/m,
 #  ],
   # NOTE: one may prefer [0],[2,3,4,5], depending on how suspicious,
-  # currupted or protected archives are to be handled
+  # corrupted or protected archives are to be handled
 
   ### http://www.kaspersky.com/
 #  ['KasperskyLab AntiViral Toolkit Pro (AVP)', ['avp'],
diff --git a/modules/apache/templates/mod/wsgi.conf b/modules/apache/templates/mod/wsgi.conf
index 347affc6..18678bc6 100644
--- a/modules/apache/templates/mod/wsgi.conf
+++ b/modules/apache/templates/mod/wsgi.conf
@@ -7,6 +7,6 @@ WSGIRestrictStdout Off
 # WSGIRestrictSignal Off 
 # reenabled, as this prevent apache from restarting properly
 
-# make sure transifex client work fine, as we need wsgi to pass autorisation
+# make sure transifex client work fine, as we need wsgi to pass authorisation
 # header to django ( otherwise, this just show error 401 )
 WSGIPassAuthorization On
diff --git a/modules/auto_installation/manifests/init.pp b/modules/auto_installation/manifests/init.pp
index 062f7f4e..642cddfd 100644
--- a/modules/auto_installation/manifests/init.pp
+++ b/modules/auto_installation/manifests/init.pp
@@ -5,7 +5,7 @@
 #   - others ? ( for testing package ? )
 
 # install a server
-#   - by name, with a valstart clone
+#   - by name, with a valstar clone
 
 class auto_installation {
     class variables {
@@ -39,7 +39,7 @@ class auto_installation {
         file { "${pxe_dir}/pxelinux.cfg":
             ensure => directory,
         }
-        # m for menu, there is some limitation on the path lenght so I
+        # m for menu, there is some limitation on the path length so I
         # prefer to
         file { "${pxe_menu_dir}":
             ensure => directory,
@@ -47,7 +47,7 @@ class auto_installation {
 
         # TODO make it tag aware
         $menu_entries = list_exported_ressources('Auto_installation::Pxe_menu_base')
-        # default file should have exported ressources
+        # default file should have exported resources
         file { "${pxe_dir}/pxelinux.cfg/default":
             ensure  => present,
             content => template('auto_installation/default'),
diff --git a/modules/blog/templates/check_new-blog-post.sh b/modules/blog/templates/check_new-blog-post.sh
index 50bc082d..eb95d65d 100755
--- a/modules/blog/templates/check_new-blog-post.sh
+++ b/modules/blog/templates/check_new-blog-post.sh
@@ -32,7 +32,7 @@ if [ "$tmp_old" = "$tmp_new" ]
 		tmp_old=$(cat $PATH_TO_FILE"/last_entry" | sed -n '2p')
 		if [ "$tmp_old" != "$tmp_new" ]
 			then 
-				# Modification on lastest post
+				# Modification on latest post
 				echo "YES - Modification" >> $PATH_TO_FILE"/last_check"
 				echo -e "The latest blog post has been modified and needs to be checked!\n\nTitle:\t$last_title\nAuthor:\t$last_creator\n-- \nMail sent by the script '$0' on `hostname`" | /bin/mail -r '<%= blog_newpost_email_from %>' -s "Modification of the lastest entry on English Blog" <%= blog_newpost_email_to %>
 				echo $DATE
diff --git a/modules/buildsystem/manifests/mgarepo.pp b/modules/buildsystem/manifests/mgarepo.pp
index 2b314d3d..14e11e1a 100644
--- a/modules/buildsystem/manifests/mgarepo.pp
+++ b/modules/buildsystem/manifests/mgarepo.pp
@@ -27,7 +27,7 @@ class buildsystem::mgarepo {
         require => File["${sched_home_dir}/repsys"],
     }
 
-    # FIXME: disabled temporarly as upload dir is a symlink to /var/lib/repsys/uploads
+    # FIXME: disabled temporarily as upload dir is a symlink to /var/lib/repsys/uploads
     #file { "${sched_home_dir}/uploads":
     #    ensure  => "directory",
     #    owner   => $sched_login,
diff --git a/modules/buildsystem/manifests/scheduler.pp b/modules/buildsystem/manifests/scheduler.pp
index 7c186a19..53b248fc 100644
--- a/modules/buildsystem/manifests/scheduler.pp
+++ b/modules/buildsystem/manifests/scheduler.pp
@@ -1,5 +1,5 @@
 class buildsystem::scheduler {
-        # until ulri is splitted from main iurt rpm
+        # until ulri is split from main iurt rpm
         include buildsystem::iurt::packages
         include buildsystem::iurt::upload
         include buildsystem::var::scheduler
diff --git a/modules/buildsystem/manifests/var/distros.pp b/modules/buildsystem/manifests/var/distros.pp
index 0299c87c..9e45e2c2 100644
--- a/modules/buildsystem/manifests/var/distros.pp
+++ b/modules/buildsystem/manifests/var/distros.pp
@@ -5,7 +5,7 @@
 #   list of IP or domains allowed to access the repository. If you don't want to
 #   filter allowed IPs, don't those values.
 # $distros:
-#   a hash variable containing distributions informations indexed by
+#   a hash variable containing distributions information indexed by
 #   distribution name. Each distribution is itself an hash containing
 #   the following infos:
 #    {
diff --git a/modules/buildsystem/manifests/var/youri.pp b/modules/buildsystem/manifests/var/youri.pp
index fa8a3a1d..f20b6c7b 100644
--- a/modules/buildsystem/manifests/var/youri.pp
+++ b/modules/buildsystem/manifests/var/youri.pp
@@ -1,7 +1,7 @@
-# The youri configuration files are created using informations from 3
+# The youri configuration files are created using information from 3
 # different hash variables :
 # - the $youri_conf_default variable defined in this class, containing
-#   the default configuration for youri. It contais the repository
+#   the default configuration for youri. It contains the repository
 #   configuration, and the definitions of the checks, actions and posts.
 # - the $youri_conf parameter passed to this class. The values defined
 #   in this hash override the values defined in the default configuration.
@@ -17,7 +17,7 @@
 #
 # Parameters :
 # $tmpl_youri_upload_conf:
-#   template file for youri submi-upload.conf
+#   template file for youri submit-upload.conf
 # $tmpl_youri_todo_conf:
 #   template file for youri submit-todo.conf
 # $packages_archivedir:
diff --git a/modules/cgit/templates/cgitrc b/modules/cgit/templates/cgitrc
index d063e4f6..1e1a399c 100644
--- a/modules/cgit/templates/cgitrc
+++ b/modules/cgit/templates/cgitrc
@@ -85,7 +85,7 @@ mimetype.png=image/png
 mimetype.svg=image/svg+xml
 
 
-# Highlight source code with python pygments-based highligher
+# Highlight source code with python pygments-based highlighter
 source-filter=/usr/libexec/cgit/filters/syntax-highlighting.sh
 
 # Format markdown, restructuredtext, manpages, text files, and html files
@@ -108,7 +108,7 @@ readme=:INSTALL.html
 readme=:INSTALL.txt
 readme=:INSTALL
 
-# Special Case mainly for initscrpipts git repo where we cannot write to master
+# Special Case mainly for initscripts git repo where we cannot write to master
 readme=distro/mga:README.md
 
 ##
diff --git a/modules/django_application/manifests/init.pp b/modules/django_application/manifests/init.pp
index 2f209a54..f56f73ef 100644
--- a/modules/django_application/manifests/init.pp
+++ b/modules/django_application/manifests/init.pp
@@ -1,5 +1,5 @@
 # this class hold the common stuff for all django applications
-# as we cannot declare the same ressource twice ( ie,
+# as we cannot declare the same resource twice ( ie,
 # python-psycopg2 for example )
 # it is required to place this in a common class
 class django_application {
diff --git a/modules/git/manifests/snapshot.pp b/modules/git/manifests/snapshot.pp
index 1156928e..06473efe 100644
--- a/modules/git/manifests/snapshot.pp
+++ b/modules/git/manifests/snapshot.pp
@@ -6,7 +6,7 @@ define git::snapshot( $source,
     #TODO
     # should handle branch -> clone -n + branch + checkout
     # create a script
-    # Idealy, should be handled by vcsrepo
+    # Ideally, should be handled by vcsrepo
     # https://github.com/bruce/puppet-vcsrepo
     # once it is merged in puppet
     exec { "/usr/bin/git clone -b ${branch} ${source} ${name}":
diff --git a/modules/gitmirror/files/on-the-pull b/modules/gitmirror/files/on-the-pull
index ec2f979b..fb1c410d 100755
--- a/modules/gitmirror/files/on-the-pull
+++ b/modules/gitmirror/files/on-the-pull
@@ -176,7 +176,7 @@ class GitUpdater(Thread):
                     raise Exception(f"Clone folder '{clonefolder}' appears to be a file :s")
 
                 if changed and self.cmd:
-                    # Udate the info/web/last-modified file as used by cgit
+                    # Update the info/web/last-modified file as used by cgit
                     os.chdir(clonefolder)
                     command = [self.cmd, repo]
                     if treeish:
diff --git a/modules/icecream/templates/sysconfig b/modules/icecream/templates/sysconfig
index a3ae80c8..36c511f2 100644
--- a/modules/icecream/templates/sysconfig
+++ b/modules/icecream/templates/sysconfig
@@ -12,7 +12,7 @@ ICECREAM_NICE_LEVEL="5"
 #
 ## Type: string
 ## Path: Applications/icecream
-## Defaut: /var/log/iceccd
+## Default: /var/log/iceccd
 #
 # icecream daemon log file
 #
@@ -21,7 +21,7 @@ ICECREAM_LOG_FILE="/var/log/icecream.log"
 #
 ## Type: string
 ## Path: Applications/icecream
-## Defaut: no
+## Default: no
 #
 # Start also the scheduler?
 #
@@ -30,7 +30,7 @@ ICECREAM_RUN_SCHEDULER="no"
 #
 ## Type: string
 ## Path: Applications/icecream
-## Defaut: /var/log/icecc_scheduler
+## Default: /var/log/icecc_scheduler
 #
 # icecream scheduler log file
 #
@@ -39,7 +39,7 @@ ICECREAM_SCHEDULER_LOG_FILE="/var/log/scheduler.log"
 #
 ## Type: string
 ## Path: Applications/icecream
-## Defaut: ""
+## Default: ""
 #
 # Identification for the network the scheduler and daemon run on. 
 # You can have several distinct icecream networks in the same LAN
@@ -50,7 +50,7 @@ ICECREAM_NETNAME=""
 #
 ## Type: string
 ## Path: Applications/icecream
-## Defaut: ""
+## Default: ""
 #
 # If the daemon can't find the scheduler by broadcast (e.g. because 
 # of a firewall) you can specify it.
@@ -60,7 +60,7 @@ ICECREAM_SCHEDULER_HOST="<%= host %>"
 #
 ## Type: string
 ## Path: Applications/icecream
-## Defaut: ""
+## Default: ""
 ## Type: integer
 # 
 # You can overwrite here the number of jobs to run in parallel. Per
diff --git a/modules/ii/manifests/init.pp b/modules/ii/manifests/init.pp
index 9f58b785..2947c75d 100644
--- a/modules/ii/manifests/init.pp
+++ b/modules/ii/manifests/init.pp
@@ -15,7 +15,7 @@ class ii {
         $nick = $name
 
         include ii::base
-        # a custom wrappper is needed since ii do not fork in the
+        # a custom wrapper is needed since ii does not fork in the
         # background, and bash is not able to properly do it
         mga_common::local_script { "ii_${nick}":
             content => template('ii/ii_wrapper.pl'),
diff --git a/modules/mediawiki/templates/LocalSettings.php b/modules/mediawiki/templates/LocalSettings.php
index 39e749f6..36b3054f 100644
--- a/modules/mediawiki/templates/LocalSettings.php
+++ b/modules/mediawiki/templates/LocalSettings.php
@@ -93,7 +93,7 @@ $wgShellLocale = "en_US.UTF-8";
 
 ## Set $wgCacheDirectory to a writable directory on the web server
 ## to make your wiki go slightly faster. The directory should not
-## be publically accessible from the web.
+## be publicly accessible from the web.
 # This seems actually mandatory to get the Vector skin to work properly
 # https://serverfault.com/a/744059
 # FIXME: Dehardcode that path (maybe via ${wiki_root} if exposed?)
diff --git a/modules/openldap/manifests/slave_instance.pp b/modules/openldap/manifests/slave_instance.pp
index 0d66d607..fbf998c6 100644
--- a/modules/openldap/manifests/slave_instance.pp
+++ b/modules/openldap/manifests/slave_instance.pp
@@ -1,5 +1,5 @@
 # TODO create the user for sync in ldap
-# this define is mainly syntaxic sugar
+# this define is mainly syntactic sugar
 define openldap::slave_instance($rid) {
     include openldap
     class { 'openldap::slave':
diff --git a/modules/openldap/templates/mandriva-dit-access.conf b/modules/openldap/templates/mandriva-dit-access.conf
index f9b7a98d..361d956b 100644
--- a/modules/openldap/templates/mandriva-dit-access.conf
+++ b/modules/openldap/templates/mandriva-dit-access.conf
@@ -66,7 +66,7 @@ access to dn.subtree="<%= dc_suffix %>"
 	by self write
 	by * none
 # password history attribute
-# pwdHistory is read-only, but ACL is simplier with it here
+# pwdHistory is read-only, but ACL is simpler with it here
 access to dn.subtree="<%= dc_suffix %>"
 	attrs=sambaPasswordHistory,pwdHistory
 	by self read
diff --git a/modules/openldap/templates/slapd.conf b/modules/openldap/templates/slapd.conf
index 20ecc944..d82fe088 100644
--- a/modules/openldap/templates/slapd.conf
+++ b/modules/openldap/templates/slapd.conf
@@ -68,7 +68,7 @@ access to dn.subtree="cn=Monitor"
 database	bdb
 <% else %>
 database	mdb
-# mdb defaults to 10MB max DB, so we need to hardocde some better value :(
+# mdb defaults to 10MB max DB, so we need to hardcode some better value :(
 maxsize         500000000
 <% end %>
 suffix		"<%= dc_suffix %>"
diff --git a/modules/phpbb/manifests/instance.pp b/modules/phpbb/manifests/instance.pp
index d688b019..e300d9e0 100644
--- a/modules/phpbb/manifests/instance.pp
+++ b/modules/phpbb/manifests/instance.pp
@@ -18,7 +18,7 @@ define phpbb::instance() {
     }
 
     # remove this or the forum will not work ( 'board disabled' )
-    # maybe it would be better to move this elsehwere, I
+    # maybe it would be better to move this elsewhere, I
     # am not sure ( and in any case, that's still in git )
     exec { "rm_install ${lang}":
         command => "rm -Rf ${forums_dir}/${lang}/phpBB/install",
diff --git a/modules/postfix/manifests/server/primary.pp b/modules/postfix/manifests/server/primary.pp
index 45b8fda6..78a95018 100644
--- a/modules/postfix/manifests/server/primary.pp
+++ b/modules/postfix/manifests/server/primary.pp
@@ -5,7 +5,7 @@ class postfix::server::primary inherits postfix::server {
     # council is here until we fully decide who has aliases in com team,
 
     # see https://bugs.mageia.org/show_bug.cgi?id=1345
-    # alumini is a special group for tracking previous members of
+    # alumni is a special group for tracking previous members of
     # the project, so they keep their aliases for a time
     $aliases_group = ['mga-founders',
                       'mga-packagers',
diff --git a/modules/postgresql/manifests/database.pp b/modules/postgresql/manifests/database.pp
index e984c145..34cee2a6 100644
--- a/modules/postgresql/manifests/database.pp
+++ b/modules/postgresql/manifests/database.pp
@@ -12,7 +12,7 @@ define postgresql::database($description = '',
     # this is fetched by the manifest asking the database creation,
     # once the db have been created
     # FIXME proper ordering ?
-    # FIXME In puppet >3.0 word 'tag' is reserved, so it have to berenamed
+    # FIXME In puppet >3.0 word 'tag' is reserved, so it has to be renamed
     @@postgresql::database_callback { $name:
         tag             => $name,
         callback_notify => $callback_notify,
diff --git a/modules/postgresql/manifests/remote_database.pp b/modules/postgresql/manifests/remote_database.pp
index a9fb1a59..15b54651 100644
--- a/modules/postgresql/manifests/remote_database.pp
+++ b/modules/postgresql/manifests/remote_database.pp
@@ -1,4 +1,4 @@
-# FIXME: In puppet >3.0 word 'tag' is reserved, so it have to berenamed
+# FIXME: In puppet >3.0 word 'tag' is reserved, so it has to be renamed
 define postgresql::remote_database($description = '',
                                    $user = 'postgresql',
                                    $callback_notify = '',
diff --git a/modules/postgresql/manifests/remote_db_and_user.pp b/modules/postgresql/manifests/remote_db_and_user.pp
index eedeaa17..07e3ea23 100644
--- a/modules/postgresql/manifests/remote_db_and_user.pp
+++ b/modules/postgresql/manifests/remote_db_and_user.pp
@@ -11,7 +11,7 @@ define postgresql::remote_db_and_user($password,
         password        => $password,
     }
 
-    # fetch the exported ressources that should have been exported
+    # fetch the exported resources that should have been exported
     # once the db was created, and trigger a notify to the object
     # passed as callback_notify
     Postgresql::Database_callback <<| tag == $name |>>
diff --git a/modules/postgresql/templates/pg_hba.conf b/modules/postgresql/templates/pg_hba.conf
index 4305c2c1..e4232a4e 100644
--- a/modules/postgresql/templates/pg_hba.conf
+++ b/modules/postgresql/templates/pg_hba.conf
@@ -120,7 +120,7 @@ host      template1        bugs            ::1/128                 md5
 hostssl   template1        bugs            212.85.158.146/32       md5
 hostssl   template1        bugs            2a02:2178:2:7::2/128    md5
 
-# Allow youri-ckeck on rabbit to access the results db
+# Allow youri-check on rabbit to access the results db
 hostssl	youri_check	youri	88.190.12.224/32	md5
 # Allow local access too
 hostssl	youri_check	youri	212.85.158.151/32	md5
diff --git a/modules/postgresql/templates/postgresql.conf b/modules/postgresql/templates/postgresql.conf
index 6f210636..bc5caa09 100644
--- a/modules/postgresql/templates/postgresql.conf
+++ b/modules/postgresql/templates/postgresql.conf
@@ -144,7 +144,7 @@ shared_buffers = 24MB			# min 128kB
 
 #bgwriter_delay = 200ms			# 10-10000ms between rounds
 #bgwriter_lru_maxpages = 100		# 0-1000 max buffers written/round
-#bgwriter_lru_multiplier = 2.0		# 0-10.0 multipler on buffers scanned/round
+#bgwriter_lru_multiplier = 2.0		# 0-10.0 multiplier on buffers scanned/round
 
 # - Asynchronous Behavior -
 
diff --git a/modules/puppet/manifests/stored_config.pp b/modules/puppet/manifests/stored_config.pp
index 9b19702b..51820d83 100644
--- a/modules/puppet/manifests/stored_config.pp
+++ b/modules/puppet/manifests/stored_config.pp
@@ -9,7 +9,7 @@ class puppet::stored_config {
 #
 #    if ($::environment == 'production') {
 #        # FIXME not really elegant, but we do not have much choice
-#        # this make servers not bootstrapable for now
+#        # this make servers not bootstrappable for now
 #        $pgsql_password = extlookup('puppet_pgsql','x')
 #
 #        postgresql::remote_db_and_user { 'bugs':
diff --git a/modules/puppet/templates/apache_proxy_vhost.conf b/modules/puppet/templates/apache_proxy_vhost.conf
index 607998c4..89157fc2 100644
--- a/modules/puppet/templates/apache_proxy_vhost.conf
+++ b/modules/puppet/templates/apache_proxy_vhost.conf
@@ -1,7 +1,7 @@
 ProxyRequests Off
 
 <Proxy balancer://puppet>
-# TODO dynamically ajust that with a variable
+# TODO dynamically adjust that with a variable
     BalancerMember http://127.0.0.1:18140
     BalancerMember http://127.0.0.1:18141
     BalancerMember http://127.0.0.1:18142
diff --git a/modules/puppet/templates/puppet.agent.conf b/modules/puppet/templates/puppet.agent.conf
index b08a903b..44dfedb7 100644
--- a/modules/puppet/templates/puppet.agent.conf
+++ b/modules/puppet/templates/puppet.agent.conf
@@ -15,7 +15,7 @@
     environment = <%= environment %>
 <% end %>
     # The file in which puppetd stores a list of the classes
-    # associated with the retrieved configuratiion.  Can be loaded in
+    # associated with the retrieved configuration.  Can be loaded in
     # the separate ``puppet`` executable using the ``--loadclasses``
     # option.
     # The default value is '$confdir/classes.txt'.
diff --git a/modules/rsyncd/templates/xinetd b/modules/rsyncd/templates/xinetd
index 3359ca84..b477e413 100644
--- a/modules/rsyncd/templates/xinetd
+++ b/modules/rsyncd/templates/xinetd
@@ -8,8 +8,8 @@ service rsync
         server_args     = --daemon
         log_on_failure  += USERID
         flags		= IPv6
-        # some mirorrs do not seems to use lock when downloading from
-        # us and try to download the same stuff 15 time in a row
+        # some mirrors do not seems to use locks when downloading from
+        # us and try to download the same stuff 15 times in a row
         per_source  = 4
 }
 
diff --git a/modules/subversion/manifests/repository.pp b/modules/subversion/manifests/repository.pp
index 77b32765..b223e6ae 100644
--- a/modules/subversion/manifests/repository.pp
+++ b/modules/subversion/manifests/repository.pp
@@ -28,7 +28,7 @@ define subversion::repository($group = 'svn',
     # $name ==> directory of the repo
     include subversion::server
     # TODO set umask -> requires puppet 2.7.0
-    # unfortunatly, umask is required
+    # unfortunately, umask is required
     # https://projects.puppetlabs.com/issues/4424
     exec { "/usr/local/bin/create_svn_repo.sh ${name}":
         user    => 'root',
diff --git a/modules/subversion/templates/no_binary b/modules/subversion/templates/no_binary
index a7f2eb94..284642e5 100644
--- a/modules/subversion/templates/no_binary
+++ b/modules/subversion/templates/no_binary
@@ -3,7 +3,7 @@
 REP="$1"
 TXN="$2"
 
-# Filter some binary files based on common filename extentions.
+# Filter some binary files based on common filename extensions.
 # It does not fully prevent commit of binary files, this script is only
 # here to avoid simple mistakes
 if svnlook changed -t "$TXN" "$REP" | grep -qi '\.\(gz\|bz2\|xz\|lzma\|Z\|7z\|tar\|tgz\|zip\|jpg\|gif\|png\|ogg\|mp3\|wav\|rar\|pdf\)$'
diff --git a/modules/sympa/manifests/server.pp b/modules/sympa/manifests/server.pp
index b43e1077..e0fb71ef 100644
--- a/modules/sympa/manifests/server.pp
+++ b/modules/sympa/manifests/server.pp
@@ -10,7 +10,7 @@ class sympa::server(
               'perl-CGI-Fast',
               'perl-Socket6']: }
 
-    # sympa script start 5 differents script, I am not
+    # sympa script starts 5 different scripts; I am not
     # sure that puppet will correctly handle this
     service { 'sympa':
         subscribe => [ Package['sympa'], File['/etc/sympa/sympa.conf']]
@@ -30,8 +30,8 @@ class sympa::server(
 
     $vhost = $sympa::variable::vhost
     file { '/etc/sympa/sympa.conf':
-    # should be cleaner to have it root owned, but puppet do not support acl
-    # and in any case, config will be reset if it change
+    # should be cleaner to have it root owned, but puppet does not support acls
+    # and in any case, config will be reset if it changes
         owner   => 'sympa',
         group   => 'apache',
         mode    => '0640',
diff --git a/modules/sympa/templates/sympa.conf b/modules/sympa/templates/sympa.conf
index eff7749b..edfaba15 100644
--- a/modules/sympa/templates/sympa.conf
+++ b/modules/sympa/templates/sympa.conf
@@ -409,7 +409,7 @@ bounce_path	/var/lib/sympa/bounce
 ## prevented.
 arc_path	/var/lib/sympa/arc
 
-###\\\\ Miscelaneous ////###
+###\\\\ Miscellaneous ////###
 
 ## Local part of Sympa email address
 ## Local part (the part preceding the "@" sign) of the address by which mail
@@ -496,7 +496,7 @@ review_page_size	25
 ## page.
 viewlogs_page_size	25
 
-###\\\\ Web interface parameters: Miscelaneous ////###
+###\\\\ Web interface parameters: Miscellaneous ////###
 
 ## HTTP cookies validity domain
 ## If beginning with a dot ("."), the cookie is available within the specified
diff --git a/modules/viewvc/templates/viewvc.conf b/modules/viewvc/templates/viewvc.conf
index 920aa9ed..dec74771 100644
--- a/modules/viewvc/templates/viewvc.conf
+++ b/modules/viewvc/templates/viewvc.conf
@@ -113,7 +113,7 @@
 ## repositories may reside.  Rather than force you to add a new entry
 ## to 'cvs_roots' or 'svn_roots' each time you create a new repository,
 ## ViewVC rewards you for organising all your repositories under a few
-## parent directories by allowing you to simply specifiy just those
+## parent directories by allowing you to simply specify just those
 ## parent directories.  ViewVC will then notice each repository in that
 ## directory as a new root whose name is the subdirectory of the parent
 ## path in which that repository lives.
@@ -326,7 +326,7 @@ mime_types_files = /etc/viewvc/mimetypes.conf, /etc/httpd/conf/mime.types
 #checkout_magic = 0
 
 ## allowed_views: List the ViewVC views which are enabled.  Views not
-## in this comma-delited list will not be served (or, will return an
+## in this comma-delimited list will not be served (or, will return an
 ## error on attempted access).
 ## Possible values: "annotate", "co", "diff", "markup", "roots", "tar"
 ##
@@ -484,7 +484,7 @@ http_expiration_time = 600
 ##
 #hr_funout = 0
 
-## hr_ignore_white: Ignore whitespace (indendation and stuff) for human
+## hr_ignore_white: Ignore whitespace (indentation and stuff) for human
 ## readable diffs.
 ## ('-w' option to diff)
 ##
@@ -650,7 +650,7 @@ log_pagesize = 100
 ## directory specified by the "template_dir" configuration option (see
 ## the documentation for that option for details).  But if you want to
 ## use a different template for a particular view, simply uncomment the
-## appropriate option below and specify the currect location of the EZT
+## appropriate option below and specify the correct location of the EZT
 ## template file you wish to use for that view.
 ## 
 ## Templates are specified relative to the configured template
diff --git a/modules/xymon/manifests/client.pp b/modules/xymon/manifests/client.pp
index 890430c6..c7883841 100644
--- a/modules/xymon/manifests/client.pp
+++ b/modules/xymon/manifests/client.pp
@@ -13,7 +13,7 @@ class xymon::client {
         require   => Package['xymon-client'],
     }
 
-    # TODO replace with a exported ressource
+    # TODO replace with a exported resource
     $server = extlookup('hobbit_server','x')
     file { '/etc/sysconfig/xymon-client':
         content => template('xymon/xymon-client'),
diff --git a/modules/xymon/templates/hobbit-alerts.cfg b/modules/xymon/templates/hobbit-alerts.cfg
index 10906fe8..763e253d 100644
--- a/modules/xymon/templates/hobbit-alerts.cfg
+++ b/modules/xymon/templates/hobbit-alerts.cfg
@@ -74,10 +74,10 @@
 #    TIME      - rule matching an alert by the time-of-day. This
 #                is specified as the DOWNTIME timespecification
 #                in the bb-hosts file (see bb-hosts(5)).
-#    DURATION  - Rule matcing an alert if the event has lasted
+#    DURATION  - Rule matching an alert if the event has lasted
 #                longer/shorter than the given duration. E.g.
 #                DURATION>10 (lasted longer than 10 minutes) or
-#                DURARION<30 (only sends alerts the first 30 minutes).
+#                DURATION<30 (only sends alerts the first 30 minutes).
 #    RECOVERED - Rule matches if the alert has recovered from an 
 #                alert state.
 #    NOTICE    - Rule matches if the message is a "notify" message
diff --git a/modules/xymon/templates/hobbit-clients.cfg b/modules/xymon/templates/hobbit-clients.cfg
index 8460280d..ff010681 100644
--- a/modules/xymon/templates/hobbit-clients.cfg
+++ b/modules/xymon/templates/hobbit-clients.cfg
@@ -102,7 +102,7 @@
 #             show up in the "ps" listing as a command. The scanner will find
 #             a ps-listing of e.g. "/usr/sbin/cron" if you only specify "processname"
 #             as "cron".
-#             "processname" can also be a Perl-compatiable regular expression, e.g.
+#             "processname" can also be a Perl-compatible regular expression, e.g.
 #             "%java.*inst[0123]" can be used to find entries in the ps-listing for
 #             "java -Xmx512m inst2" and "java -Xmx256 inst3". In that case, 
 #             "processname" must begin with "%" followed by the reg.expression.
@@ -253,7 +253,7 @@
 #             the output from netstat. This is typically "10.0.0.1:80" for the IP 
 #             10.0.0.1, port 80. Or "*:80" for any local address, port 80.
 #             NB: The Xymon clients normally report only the numeric data for
-#                 IP-adresses and port-numbers, so you must specify the port
+#                 IP-addresses and port-numbers, so you must specify the port
 #                 number (e.g. "80") instead of the service name ("www").
 #             "state" causes only the sockets in the specified state to be included;
 #             it is usually LISTEN or ESTABLISHED.
@@ -265,7 +265,7 @@
 #
 #             "addr" and "state" can be a simple strings, in which case these string must 
 #             show up in the "netstat" at the appropriate column.
-#             "addr" and "state" can also be a Perl-compatiable regular expression, e.g.
+#             "addr" and "state" can also be a Perl-compatible regular expression, e.g.
 #             "LOCAL=%(:80|:443)" can be used to find entries in the netstat local port for
 #             both http (port 80) and https (port 443). In that case, portname or state must 
 #             begin with "%" followed by the reg.expression.
diff --git a/modules/xymon/templates/xymon-client b/modules/xymon/templates/xymon-client
index 6bbdd836..ae54b2f3 100644
--- a/modules/xymon/templates/xymon-client
+++ b/modules/xymon/templates/xymon-client
@@ -2,13 +2,13 @@
 
 # You MUST set the list of Hobbit servers that this
 # client reports to.
-# It is good to use IP-adresses here instead of DNS 
+# It is good to use IP-addresses here instead of DNS
 # names - DNS might not work if there's a problem.
 #
 # E.g. (a single Hobbit server)
-#   HOBBITSERVERS="192.168.1.1" 
+#   HOBBITSERVERS="192.168.1.1"
 # or (multiple servers)
-#   HOBBITSERVERS="10.0.0.1 192.168.1.1" 
+#   HOBBITSERVERS="10.0.0.1 192.168.1.1"
 
 <% if scope.function_versioncmp([lsbdistrelease, '5']) >= 0 %>
 XYMONSERVERS="<%= server %>"
@@ -16,9 +16,9 @@ XYMONSERVERS="<%= server %>"
 HOBBITSERVERS="<%= server %>"
 <% end %>
 
-# The defaults usually suffice for the rest of this file, 
-# but you can tweak the hostname that the client reports 
-# data with, and the OS name used (typically needed only on 
+# The defaults usually suffice for the rest of this file,
+# but you can tweak the hostname that the client reports
+# data with, and the OS name used (typically needed only on
 # RHEL or RHAS servers).
 
 # CLIENTHOSTNAME=""