updated docs and conf_examples accordingly git-svn-id: svn://192.168.202.10@755 3d104415-ff17-0410-8863-d5cf3c621b8a