Merge remote branch 'johns/master'

This commit is contained in:
HansPinckaers 2011-04-06 19:31:23 +02:00
commit 9eb1fecfa7
16 changed files with 1329 additions and 2561 deletions

View file

@ -25,7 +25,7 @@ var AttributePoolFactory = require("./AttributePoolFactory");
/**
* The initial Text of a Pad
*/
exports.startText = "Hello World\nGoodbye Etherpad";
exports.startText = "Welcome to Etherpad Lite. This pad text is synchronized as you type, so that everyone viewing this page sees the same text.";
/**
* A Array with all known Pads