From 2fd7a44c86c943ec6ff6a0a97828eccc3e863dfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= Date: Mon, 9 Jul 2012 16:19:25 +0200 Subject: [PATCH] misc indention+newline corrections --- settings.yml.example | 55 ++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 32 deletions(-) diff --git a/settings.yml.example b/settings.yml.example index 19f68c3be..c0b76971b 100644 --- a/settings.yml.example +++ b/settings.yml.example @@ -1,30 +1,26 @@ --- -#Ip and port which etherpad should bind at - +# Ip and port which etherpad should bind at ip : 0.0.0.0 port : 9001 - -#The Type of the database. You can choose between dirty, postgres, sqlite and mysql -#You shouldn't use "dirty" for for anything else than testing or development +# The Type of the database. You can choose between dirty, postgres, sqlite and mysql +# You shouldn't use "dirty" for for anything else than testing or development dbType : dirty - #the database specific settings dbSettings : filename : var/dirty.db # An Example of MySQL Configuration -# dbType" : "mysql" -# dbSettings" : -# user : root -# host : localhost -# password : -# database : store +# dbType : mysql +# dbSettings : +# user : root +# host : localhost +# password : +# database : store - -#the default text of a pad +# The default text of a pad defaultPadText : | Welcome to Etherpad Lite! This pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents! @@ -37,41 +33,36 @@ requireSession : false # Users may edit pads but not create new ones. Pad creation is only via the API. This applies both to group pads and regular pads. editOnly : false - -# if true, all css & js will be minified before sending to the client. This will improve the loading performance massivly, -# but makes it impossible to debug the javascript/css +# If true, all css & js will be minified before sending to the client. This will improve the loading performance massivly, +# but makes it impossible to debug the javascript/css minify : true - # How long may clients use served javascript code (in seconds)? Without versioning this -# may cause problems during deployment. Set to 0 to disable caching +# may cause problems during deployment. Set to 0 to disable caching # 60 * 60 * 6 = 6 hours maxAge : 21600 # This is the path to the Abiword executable. Setting it to null, disables abiword. -# Abiword is needed to enable the import/export of pads +# Abiword is needed to enable the import/export of pads abiword : null - # This setting is used if you require authentication of all users. -# Note: /admin always requires authentication. +# Note: /admin always requires authentication. requireAuthentication : false - # Require authorization by a module, or a user with is_admin set, see below. requireAuthorization : false - # Users for basic authentication. is_admin = true gives access to /admin. -# If you do not uncomment this, /admin will not be available! +# If you do not uncomment this, /admin will not be available! -# users: -# admin: { -# password : changeme1, -# is_admin : true -# user : -# password : changeme1, -# is_admin : false +# users: +# admin: { +# password : changeme1, +# is_admin : true +# user : +# password : changeme1, +# is_admin : false # The log level we are using, can be: DEBUG, INFO, WARN, ERROR loglevel : INFO