--- a/development.ini	Mon Jul 20 15:07:23 2015 +0200
+++ b/development.ini	Sun Sep 06 23:36:05 2015 +0200
@@ -16,23 +16,55 @@
 pdebug = false
 
 ################################################################################
-## Uncomment and replace with the address which should receive                ##
-## any error reports after application crash                                  ##
-## Additionally those settings will be used by Kallithea mailing system       ##
+## Email settings                                                             ##
+##                                                                            ##
+## Refer to the documentation ("Email settings") for more details.            ##
+##                                                                            ##
+## It is recommended to use a valid sender address that passes access         ##
+## validation and spam filtering in mail servers.                             ##
 ################################################################################
-#email_to = admin@localhost
-#error_email_from = paste_error@localhost
-#app_email_from = kallithea-noreply@localhost
-#error_message =
+
+## 'From' header for application emails. You can optionally add a name.
+## Default:
+#app_email_from = Kallithea
+## Examples:
+#app_email_from = Kallithea <kallithea-noreply@example.com>
+#app_email_from = kallithea-noreply@example.com
+
+## Subject prefix for application emails.
+## A space between this prefix and the real subject is automatically added.
+## Default:
+#email_prefix =
+## Example:
 #email_prefix = [Kallithea]
 
+## Recipients for error emails and fallback recipients of application mails.
+## Multiple addresses can be specified, space-separated.
+## Only addresses are allowed, do not add any name part.
+## Default:
+#email_to =
+## Examples:
+#email_to = admin@example.com
+#email_to = admin@example.com another_admin@example.com
+
+## 'From' header for error emails. You can optionally add a name.
+## Default:
+#error_email_from = pylons@yourapp.com
+## Examples:
+#error_email_from = Kallithea Errors <kallithea-noreply@example.com>
+#error_email_from = paste_error@example.com
+
+## SMTP server settings
+## Only smtp_server is mandatory. All other settings take the specified default
+## values.
 #smtp_server = mail.server.com
 #smtp_username =
 #smtp_password =
-#smtp_port =
+#smtp_port = 25
 #smtp_use_tls = false
-#smtp_use_ssl = true
-## Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
+#smtp_use_ssl = false
+## SMTP authentication parameters to use (e.g. LOGIN PLAIN CRAM-MD5, etc.).
+## If empty, use any of the authentication parameters supported by the server.
 #smtp_auth =
 
 [server:main]
@@ -99,11 +131,11 @@
 #max-requests = 1000
 
 ## enable large buffers
-#buffer-size=65535
+#buffer-size = 65535
 
 ## socket and http timeouts ##
-#http-timeout=3600
-#socket-timeout=3600
+#http-timeout = 3600
+#socket-timeout = 3600
 
 ## Log requests slower than the specified number of milliseconds.
 #log-slow = 10
@@ -134,7 +166,7 @@
 host = 0.0.0.0
 port = 5000
 
-## prefix middleware for rc
+## middleware for hosting the WSGI application under a URL prefix
 #[filter:proxy-prefix]
 #use = egg:PasteDeploy#prefix
 #prefix = /<your-prefix>
@@ -248,7 +280,6 @@
 #issue_server_link_wiki = https://mywiki.com/{id}
 #issue_prefix_wiki = WIKI-
 
-
 ## instance-id prefix
 ## a prefix key for this instance used for cache invalidation when running
 ## multiple instances of kallithea, make sure it's globally unique for
@@ -270,7 +301,6 @@
 ## allows to setup custom hooks in settings page
 allow_custom_hooks_settings = True
 
-
 ####################################
 ###        CELERY CONFIG        ####
 ####################################
@@ -303,79 +333,55 @@
 ###         BEAKER CACHE        ####
 ####################################
 
-beaker.cache.data_dir=%(here)s/data/cache/data
-beaker.cache.lock_dir=%(here)s/data/cache/lock
-
-beaker.cache.regions=super_short_term,short_term,long_term,sql_cache_short,sql_cache_med,sql_cache_long
+beaker.cache.data_dir = %(here)s/data/cache/data
+beaker.cache.lock_dir = %(here)s/data/cache/lock
 
-beaker.cache.super_short_term.type=memory
-beaker.cache.super_short_term.expire=10
-beaker.cache.super_short_term.key_length = 256
+beaker.cache.regions = short_term,long_term,sql_cache_short
 
-beaker.cache.short_term.type=memory
-beaker.cache.short_term.expire=60
+beaker.cache.short_term.type = memory
+beaker.cache.short_term.expire = 60
 beaker.cache.short_term.key_length = 256
 
-beaker.cache.long_term.type=memory
-beaker.cache.long_term.expire=36000
+beaker.cache.long_term.type = memory
+beaker.cache.long_term.expire = 36000
 beaker.cache.long_term.key_length = 256
 
-beaker.cache.sql_cache_short.type=memory
-beaker.cache.sql_cache_short.expire=10
+beaker.cache.sql_cache_short.type = memory
+beaker.cache.sql_cache_short.expire = 10
 beaker.cache.sql_cache_short.key_length = 256
 
-beaker.cache.sql_cache_med.type=memory
-beaker.cache.sql_cache_med.expire=360
-beaker.cache.sql_cache_med.key_length = 256
-
-beaker.cache.sql_cache_long.type=file
-beaker.cache.sql_cache_long.expire=3600
-beaker.cache.sql_cache_long.key_length = 256
-
 ####################################
 ###       BEAKER SESSION        ####
 ####################################
+
+## Name of session cookie. Should be unique for a given host and path, even when running
+## on different ports. Otherwise, cookie sessions will be shared and messed up.
+beaker.session.key = kallithea
+## Sessions should always only be accessible by the browser, not directly by JavaScript.
+beaker.session.httponly = true
+## Session lifetime. 2592000 seconds is 30 days.
+beaker.session.timeout = 2592000
+
+## Server secret used with HMAC to ensure integrity of cookies.
+beaker.session.secret = development-not-secret
+## Further, encrypt the data with AES.
+#beaker.session.encrypt_key = <key_for_encryption>
+#beaker.session.validate_key = <validation_key>
+
 ## Type of storage used for the session, current types are
 ## dbm, file, memcached, database, and memory.
-## The storage uses the Container API
-## that is also used by the cache system.
+
+## File system storage of session data. (default)
+#beaker.session.type = file
 
-## db session ##
+## Cookie only, store all session data inside the cookie. Requires secure secrets.
+#beaker.session.type = cookie
+
+## Database storage of session data.
 #beaker.session.type = ext:database
 #beaker.session.sa.url = postgresql://postgres:qwe@localhost/kallithea
 #beaker.session.table_name = db_session
 
-## encrypted cookie client side session, good for many instances ##
-#beaker.session.type = cookie
-
-## file based cookies (default) ##
-#beaker.session.type = file
-
-## beaker.session.key should be unique for a given host, even when running
-## on different ports. Otherwise, cookie sessions will be shared and messed up.
-beaker.session.key = kallithea
-beaker.session.secret = development-not-secret
-
-## Secure encrypted cookie. Requires AES and AES python libraries
-## you must disable beaker.session.secret to use this
-#beaker.session.encrypt_key = <key_for_encryption>
-#beaker.session.validate_key = <validation_key>
-
-## sets session as invalid if it haven't been accessed for given amount of time
-beaker.session.timeout = 2592000
-beaker.session.httponly = true
-#beaker.session.cookie_path = /<your-prefix>
-
-## uncomment for https secure cookie
-beaker.session.secure = false
-
-## auto save the session to not to use .save()
-beaker.session.auto = False
-
-## default cookie expiration time in seconds `true` expire at browser close ##
-#beaker.session.cookie_expires = 3600
-
-
 ############################
 ## ERROR HANDLING SYSTEMS ##
 ############################
@@ -407,10 +413,10 @@
 errormator.slow_requests = true
 
 ## enable hooking to application loggers
-# errormator.logging = true
+#errormator.logging = true
 
 ## minimum log level for log capture
-# errormator.logging.level = WARNING
+#errormator.logging.level = WARNING
 
 ## send logs only from erroneous/slow requests
 ## (saves API quota for intensive logging)
@@ -423,7 +429,6 @@
 ## start with HTTP* this list be extended with additional keywords here
 errormator.environ_keys_whitelist =
 
-
 ## list of keywords that should be blanked from request object
 ## can be string with comma separated list of words in lowercase
 ## (by default client will always blank keys that contain following words
@@ -431,13 +436,11 @@
 ## this list be extended with additional keywords set here
 errormator.request_keys_blacklist =
 
-
 ## list of namespaces that should be ignores when gathering log entries
 ## can be string with comma separated list of namespaces
 ## (by default the client ignores own entries: errormator_client.client)
 errormator.log_namespace_blacklist =
 
-
 ################
 ### [sentry] ###
 ################
@@ -456,7 +459,6 @@
 sentry.include_paths =
 sentry.exclude_paths =
 
-
 ################################################################################
 ## WARNING: *THE LINE BELOW MUST BE UNCOMMENTED ON A PRODUCTION ENVIRONMENT*  ##
 ## Debug mode will enable the interactive debugging tool, allowing ANYONE to  ##
@@ -481,10 +483,10 @@
 sqlalchemy.db1.url = sqlite:///%(here)s/kallithea.db?timeout=60
 
 # POSTGRESQL
-# sqlalchemy.db1.url = postgresql://user:pass@localhost/kallithea
+#sqlalchemy.db1.url = postgresql://user:pass@localhost/kallithea
 
 # MySQL
-# sqlalchemy.db1.url = mysql://user:pass@localhost/kallithea
+#sqlalchemy.db1.url = mysql://user:pass@localhost/kallithea
 
 # see sqlalchemy docs for others
 
@@ -579,11 +581,11 @@
 datefmt = %Y-%m-%d %H:%M:%S
 
 [formatter_color_formatter]
-class=kallithea.lib.colored_formatter.ColorFormatter
-format= %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
+class = kallithea.lib.colored_formatter.ColorFormatter
+format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
 datefmt = %Y-%m-%d %H:%M:%S
 
 [formatter_color_formatter_sql]
-class=kallithea.lib.colored_formatter.ColorFormatterSql
-format= %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
+class = kallithea.lib.colored_formatter.ColorFormatterSql
+format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
 datefmt = %Y-%m-%d %H:%M:%S