diff --git a/conf/settings.xml.template b/conf/settings.xml.template
index 6d8a7dd2c..23df244da 100644
--- a/conf/settings.xml.template
+++ b/conf/settings.xml.template
@@ -22,7 +22,7 @@
     <!--
        - strictFormCheck: Strict form checking. If set to true, then all fields in the form will be checked for a value. If set to false, then (most) comments and keyword fields become optional. Comments are always required when submitting a review or overriding document status.
        - viewOnlineFileTypes: files with one of the following endings can be viewed online (USE ONLY LOWER CASE CHARACTERS)
-       - enableConverting: enable/disable converting of files XXX
+       - enableConverting: enable/disable converting of files (deprecated)
        - enableEmail: enable/disable automatic email notification
        - enableUsersView: enable/disable group and user view for all users
        - enableFullSearch: false to don't use fulltext search
@@ -34,12 +34,14 @@
        -                   2 to start with tree shown fully expanded
        - stopWordsFile: path to stop word file for indexer
        - sortUsersInList: how to sort users in lists ('fullname' or '' (default))
-       - enableDropUpload: XXX
-       - enableRecursiveCount: XXX
-       - maxRecursiveCount: XXX
-       - enableThemeSelector: XXX
+       - enableDropUpload: enable/disable uploading files by drag&drop
+       - enableRecursiveCount: enable/disable counting docs and folder recursively
+       - maxRecursiveCount: after this number of docs/folders precise counting will stop
+       - enableThemeSelector: enable/disable the theme selector on the login page
        - fullSearchEngine: Either "lucene" or "sqlitefts"
-       - sortFoldersDefault: XXX
+       - sortFoldersDefault: how to sort forders by default. u=unsorted, s=sequence, n=name
+       - defaultDocPosition: Default position for a new document. 'start', 'end', or ''
+       - defaultFolderPosition: Default position for a new folder. 'start', 'end', or ''
     -->
     <edition
       strictFormCheck = "false"
@@ -60,6 +62,8 @@
       enableThemeSelector = "false"
       fullSearchEngine = "lucene"
       sortFoldersDefault = "u"
+      defaultDocPosition = "end"
+      defaultFolderPosition = "end"
     />
     <!--
        - enableCalendar: enable/disable calendar