diff options
Diffstat (limited to 'deployment')
| -rw-r--r-- | deployment/access_classes/manifests/committers.pp | 2 | ||||
| -rw-r--r-- | deployment/common/manifests/i18n.pp | 2 | ||||
| -rw-r--r-- | deployment/mgagit/files/git_multimail.py | 4 | ||||
| -rwxr-xr-x | deployment/mgagit/templates/git-post-receive-hook | 2 | ||||
| -rw-r--r-- | deployment/mgagit/templates/gitolite.rc | 2 | ||||
| -rw-r--r-- | deployment/tld_redirections/manifests/init.pp | 2 | ||||
| -rw-r--r-- | deployment/websites/templates/vhost_www.conf | 2 |
7 files changed, 8 insertions, 8 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] |