misc indention+newline corrections

This commit is contained in:
Matthias Bartelmeß 2012-07-09 16:19:25 +02:00
parent 7dba42c4c9
commit 2fd7a44c86

View file

@ -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 ip : 0.0.0.0
port : 9001 port : 9001
# The Type of the database. You can choose between dirty, postgres, sqlite and mysql
#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
#You shouldn't use "dirty" for for anything else than testing or development
dbType : dirty dbType : dirty
#the database specific settings #the database specific settings
dbSettings : dbSettings :
filename : var/dirty.db filename : var/dirty.db
# An Example of MySQL Configuration # An Example of MySQL Configuration
# dbType" : "mysql" # dbType : mysql
# dbSettings" : # dbSettings :
# user : root # user : root
# host : localhost # host : localhost
# password : # password :
# database : store # database : store
# The default text of a pad
#the default text of a pad
defaultPadText : | defaultPadText : |
Welcome to Etherpad Lite! 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! 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. # 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 editOnly : false
# If true, all css & js will be minified before sending to the client. This will improve the loading performance massivly,
# 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
# but makes it impossible to debug the javascript/css
minify : true minify : true
# How long may clients use served javascript code (in seconds)? Without versioning this # 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 # 60 * 60 * 6 = 6 hours
maxAge : 21600 maxAge : 21600
# This is the path to the Abiword executable. Setting it to null, disables abiword. # 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 abiword : null
# This setting is used if you require authentication of all users. # This setting is used if you require authentication of all users.
# Note: /admin always requires authentication. # Note: /admin always requires authentication.
requireAuthentication : false requireAuthentication : false
# Require authorization by a module, or a user with is_admin set, see below. # Require authorization by a module, or a user with is_admin set, see below.
requireAuthorization : false requireAuthorization : false
# Users for basic authentication. is_admin = true gives access to /admin. # 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: # users:
# admin: { # admin: {
# password : changeme1, # password : changeme1,
# is_admin : true # is_admin : true
# user : # user :
# password : changeme1, # password : changeme1,
# is_admin : false # is_admin : false
# The log level we are using, can be: DEBUG, INFO, WARN, ERROR # The log level we are using, can be: DEBUG, INFO, WARN, ERROR
loglevel : INFO loglevel : INFO