documentation merge with svn