diff --git a/build/main/apps.properties b/build/main/apps.properties
index 3e6df16b..f130fa40 100644
--- a/build/main/apps.properties
+++ b/build/main/apps.properties
@@ -1,8 +1,30 @@
 # List of applications to start.
+# More information about this file is available at
+# http://helma.org/docs/guide/properties/apps.properties/ 
 
-base
-base.mountpoint = /
-base.static = static
-base.staticMountpoint = /static
+
+# Administrative application to manage all other apps on this server, 
+# accessible via its default mountpoint at http://<host>:<port>/manage 
 
 manage
+
+
+# Simple example of an application, accessible via its default  
+# mountpoint at http://<host>:<port>/test and using its default  
+# repository at apps/test
+
+test
+
+
+# More complex example of an application with custom configuration
+
+demo
+demo.mountpoint = /
+demo.repository.0 = modules/helmaLib.zip
+demo.repository.1 = modules/helmaTools.zip
+demo.repository.2 = apps/demo
+demo.static = static
+demo.staticMountpoint = /static
+demo.staticHome = index.html,default.html
+demo.staticIndex = false
+demo.uploadLimit = 2048
diff --git a/build/main/db.properties b/build/main/db.properties
index 9dc57b94..7530ed26 100644
--- a/build/main/db.properties
+++ b/build/main/db.properties
@@ -8,9 +8,11 @@
 # The actual mapping of types is done in the
 # type.properties file in the prototype directories.
 # 
+# More information about this file is available at
+# http://helma.org/docs/guide/properties/db.properties/
 
 # Properties of JDBC data sources
-myDataSource.url = jdbc:mysql://db.domain.com/space
-myDataSource.driver = org.gjt.mm.mysql.Driver
-myDataSource.user = username
-myDataSource.password = xyz
+#myDataSource.url = jdbc:mysql://db.domain.com/space
+#myDataSource.driver = org.gjt.mm.mysql.Driver
+#myDataSource.user = username
+#myDataSource.password = xyz
diff --git a/build/main/server.properties b/build/main/server.properties
index ce1ef12f..081e8886 100644
--- a/build/main/server.properties
+++ b/build/main/server.properties
@@ -1,6 +1,10 @@
-# The SMTP server to use for sending mails. Set and
-# uncomment this line before trying to send mails from
-# Helma applications.
+# Helma server configuration file.
+# More information about this file is available at
+# http://helma.org/docs/guide/properties/server.properties/ 
+
+
+# The SMTP server to use for sending mails. Set and uncomment the
+# following line before trying to send mails from Helma applications.
 #
 # smtp=mail.yourdomain.com
 
@@ -24,4 +28,3 @@
 
 # list ip addresses for admin-application here:
 allowAdmin=127.0.0.1, 192.168.0.1
-
diff --git a/db.properties b/db.properties
index 9dc57b94..7530ed26 100644
--- a/db.properties
+++ b/db.properties
@@ -8,9 +8,11 @@
 # The actual mapping of types is done in the
 # type.properties file in the prototype directories.
 # 
+# More information about this file is available at
+# http://helma.org/docs/guide/properties/db.properties/
 
 # Properties of JDBC data sources
-myDataSource.url = jdbc:mysql://db.domain.com/space
-myDataSource.driver = org.gjt.mm.mysql.Driver
-myDataSource.user = username
-myDataSource.password = xyz
+#myDataSource.url = jdbc:mysql://db.domain.com/space
+#myDataSource.driver = org.gjt.mm.mysql.Driver
+#myDataSource.user = username
+#myDataSource.password = xyz
diff --git a/server.properties b/server.properties
index ce1ef12f..081e8886 100644
--- a/server.properties
+++ b/server.properties
@@ -1,6 +1,10 @@
-# The SMTP server to use for sending mails. Set and
-# uncomment this line before trying to send mails from
-# Helma applications.
+# Helma server configuration file.
+# More information about this file is available at
+# http://helma.org/docs/guide/properties/server.properties/ 
+
+
+# The SMTP server to use for sending mails. Set and uncomment the
+# following line before trying to send mails from Helma applications.
 #
 # smtp=mail.yourdomain.com
 
@@ -24,4 +28,3 @@
 
 # list ip addresses for admin-application here:
 allowAdmin=127.0.0.1, 192.168.0.1
-