# HG changeset patch
# User timeless@gmail.com
# Date 2016-05-03 07:01:51
# Node ID e9c9f2e07de8a7508885e06938e04e7a53bd57bd
# Parent  8d0770c7db399cd7e99dcbac975ea2281f801044

spelling: additional

diff --git a/development.ini b/development.ini
--- a/development.ini
+++ b/development.ini
@@ -426,7 +426,7 @@ errormator.slow_requests = true
 ## (saves API quota for intensive logging)
 errormator.logging_on_error = false
 
-## list of additonal keywords that should be grabbed from environ object
+## list of additional keywords that should be grabbed from environ object
 ## can be string with comma separated list of words in lowercase
 ## (by default client will always send following info:
 ## 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that
diff --git a/kallithea/bin/template.ini.mako b/kallithea/bin/template.ini.mako
--- a/kallithea/bin/template.ini.mako
+++ b/kallithea/bin/template.ini.mako
@@ -424,7 +424,7 @@ errormator.slow_requests = true
 <%text>## (saves API quota for intensive logging)</%text>
 errormator.logging_on_error = false
 
-<%text>## list of additonal keywords that should be grabbed from environ object</%text>
+<%text>## list of additional keywords that should be grabbed from environ object</%text>
 <%text>## can be string with comma separated list of words in lowercase</%text>
 <%text>## (by default client will always send following info:</%text>
 <%text>## 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that</%text>
diff --git a/kallithea/config/deployment.ini_tmpl b/kallithea/config/deployment.ini_tmpl
--- a/kallithea/config/deployment.ini_tmpl
+++ b/kallithea/config/deployment.ini_tmpl
@@ -419,7 +419,7 @@ errormator.slow_requests = true
 ## (saves API quota for intensive logging)
 errormator.logging_on_error = false
 
-## list of additonal keywords that should be grabbed from environ object
+## list of additional keywords that should be grabbed from environ object
 ## can be string with comma separated list of words in lowercase
 ## (by default client will always send following info:
 ## 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that
diff --git a/kallithea/tests/models/test_users.py b/kallithea/tests/models/test_users.py
--- a/kallithea/tests/models/test_users.py
+++ b/kallithea/tests/models/test_users.py
@@ -44,7 +44,7 @@ class TestUser(TestControllerPytest):
 
         self.assertEqual(UserGroupMember.query().all(), [])
 
-    def test_additonal_email_as_main(self):
+    def test_additional_email_as_main(self):
         usr = UserModel().create_or_update(username=u'test_user',
                                            password=u'qweqwe',
                                      email=u'main_email@example.com',
diff --git a/kallithea/tests/test.ini b/kallithea/tests/test.ini
--- a/kallithea/tests/test.ini
+++ b/kallithea/tests/test.ini
@@ -426,7 +426,7 @@ errormator.slow_requests = true
 ## (saves API quota for intensive logging)
 errormator.logging_on_error = false
 
-## list of additonal keywords that should be grabbed from environ object
+## list of additional keywords that should be grabbed from environ object
 ## can be string with comma separated list of words in lowercase
 ## (by default client will always send following info:
 ## 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that