From: navarro Date: Thu, 25 Oct 2012 12:09:24 +0000 (+0200) Subject: Clean the gtut files. X-Git-Tag: v3_8~9 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/96e69d0914a643f29b18149036bbd8d33ff047d9?ds=sidebyside Clean the gtut files. --- diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index a73dd99666..7ce53ff1bf 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -686,9 +686,59 @@ set(USER_GUIDE_SOURCES doc/user_guide/doxygen/use.doc doc/user_guide/doxygen/stylesheet.css ) + +set(LISTE_GTUT + doc/gtut-files/gtut-tour-00-install.doc + doc/gtut-files/gtut-tour-01-bones.doc + doc/gtut-files/gtut-tour-02-simple.doc + doc/gtut-files/gtut-tour-03-args.doc + doc/gtut-files/gtut-tour-04-callback.doc + doc/gtut-files/gtut-tour-05-globals.doc + doc/gtut-files/gtut-tour-06-logs.doc + doc/gtut-files/gtut-tour-07-timers.doc + doc/gtut-files/gtut-tour-08-exceptions.doc + doc/gtut-files/gtut-tour-09-simpledata.doc + doc/gtut-files/gtut-tour-10-rpc.doc + doc/gtut-files/gtut-tour-11-explicitwait.doc + doc/gtut-files/gtut-tour-12-staticstruct.doc + doc/gtut-files/gtut-tour-13-pointers.doc + doc/gtut-files/gtut-tour-14-dynar.doc + doc/gtut-files/gtut-tour-15-manualdatadef.doc + doc/gtut-files/gtut-tour-16-exchangecb.doc + doc/gtut-files/gtut-tour.doc + doc/gtut-files/gtut-tour-recap-messages.doc + ) +set(EXTRA_LISTE_GTUT + doc/gtut-files/01-bones.output + doc/gtut-files/02-simple.output + doc/gtut-files/03-args.output + doc/gtut-files/03-args.xml + doc/gtut-files/04-callback.output + doc/gtut-files/05-globals.output + doc/gtut-files/06-logs.output + doc/gtut-files/06-logs.output.error + doc/gtut-files/06-logs.output.fmt + doc/gtut-files/06-logs.output.fmt-bt + doc/gtut-files/06-logs.output.verbose + doc/gtut-files/07-timers.output + doc/gtut-files/08-exceptions.output + doc/gtut-files/09-simpledata.output + doc/gtut-files/10-rpc.output + doc/gtut-files/11-explicitwait.output + doc/gtut-files/11-explicitwait.xml + doc/gtut-files/gtut-howto-design.doc + doc/gtut-files/gtut-howto.doc + doc/gtut-files/gtut-introduction.doc + doc/gtut-files/gtut-main.doc + doc/gtut-files/gtut-platform-3nodes.xml + doc/gtut-files/gtut-platform.xml + doc/gtut-files/README + doc/gtut-files/test.xml + ) + set(REF_GUIDE_SOURCES - doc/ref_guide/index-API.doc + doc/ref_guide/doxygen/index-API.doc doc/ref_guide/doxygen/footer.html doc/ref_guide/doxygen/header.html doc/ref_guide/doxygen/main.doc diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake index 4b63cd9b83..70faceb4f9 100644 --- a/buildtools/Cmake/Distrib.cmake +++ b/buildtools/Cmake/Distrib.cmake @@ -216,6 +216,8 @@ set(source_to_pack ${DOC_IMG} ${DOC_SOURCES} ${DOC_GTUT_SRC} + ${LISTE_GTUT} + ${EXTRA_LISTE_GTUT} ${DOC_TOOLS} ${DOC_SHARED_TAG} ${REF_GUIDE_SOURCES} diff --git a/buildtools/Cmake/GenerateDoc.cmake b/buildtools/Cmake/GenerateDoc.cmake index 0d46ff1760..18c0ae92a2 100644 --- a/buildtools/Cmake/GenerateDoc.cmake +++ b/buildtools/Cmake/GenerateDoc.cmake @@ -107,3 +107,101 @@ add_custom_target(sync-gforge-dtd COMMAND scp src/surf/simgrid.dtd scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid.dtd WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}" ) + +##############################################################################" +# GTUT FILES + +#message(STATUS "Check individual TOCs") + +#foreach(file_name ${LISTE_GTUT}) +# file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc) +# file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc) +# +# file(READ "${file_name}" file_content) +# string(REGEX MATCH "Table of Contents.*
" valeur_line "${file_content}") +# string(REPLACE "\n" ";" valeur_line "${valeur_line}") +# string(REPLACE "\n" ";" file_content "${file_content}") +# +# file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc "\n") # make sure it exists +# foreach(line ${file_content}) +# string(REGEX MATCH "[\\]s?u?b?s?u?b?section.*" line2 "${line}") +# string(REGEX MATCH ".*_toc.*" line3 "${line}") +# if(line2 AND NOT line3) +# string(REPLACE "\\section " "" line2 ${line2}) +# string(REPLACE "\\subsection " "subsection" line2 ${line2}) +# string(REPLACE "\\subsubsection " "subsubsection" line2 ${line2}) +# string(REGEX REPLACE " .*" "" line2 ${line2}) +# set(line2 " - \\ref ${line2}") +# string(REPLACE " - \\ref subsection" " - \\ref " line2 ${line2}) +# string(REPLACE " - \\ref subsubsection" " - \\ref " line2 ${line2}) +# file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc "${line2}\n") +# endif(line2 AND NOT line3) +# endforeach(line ${file_content}) +# +# file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc "\n") # make sure it exists +# foreach(line ${valeur_line}) +# string(REGEX MATCH ".*ref.*" line_ok ${line}) +# if(line_ok) +# file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc "${line_ok}\n") +# endif(line_ok) +# endforeach(line ${valeur_line}) +# +# exec_program("${CMAKE_COMMAND} -E compare_files ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc" OUTPUT_VARIABLE compare_files) +# if(compare_files) +# message(STATUS "Wrong toc for ${file_name}. Should be:") +# file(READ "${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc" file_content) +# message("${file_content}") +# exec_program("diff -u ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc") +# endif(compare_files) +#endforeach(file_name ${LISTE_GTUT}) +# +#file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc) +#file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc) +# +#message(STATUS "Check main TOC") +# +#foreach(file_name ${LISTE_GTUT}) +# file(READ "${file_name}" file_content) +# string(REGEX MATCH "Table of Contents.*
" valeur_line "${file_content}") +# string(REPLACE "\n" ";" valeur_line "${valeur_line}") +# string(REPLACE "\n" ";" file_content "${file_content}") +# +# foreach(line ${file_content}) +# string(REGEX MATCH ".*@page.*" line2 "${line}") +# if(line2) +# string(REPLACE "@page " "" line2 "${line2}") +# string(REGEX REPLACE " .*" "" line2 "${line2}") +# set(line2 " - \\ref ${line2}") +# file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc "${line2}\n") +# endif(line2) +# endforeach(line ${file_content}) +# +# foreach(line ${valeur_line}) +# string(REGEX MATCH ".*toc.*" line1 "${line}") +# string(REGEX MATCH ".*
.*" line2 "${line}") +# string(REGEX MATCH "^[ ]*$" line3 "${line}") +# string(REGEX MATCH "Table of Contents" line4 "${line}") +# if(NOT line1 AND NOT line2 AND NOT line3 AND NOT line4) +# file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc " ${line}\n") +# endif(NOT line1 AND NOT line2 AND NOT line3 AND NOT line4) +# endforeach(line ${valeur_line}) +#endforeach(file_name ${LISTE_GTUT}) +# +#file(READ "${CMAKE_HOME_DIRECTORY}/doc/doxygen/gtut-tour.doc" file_content) +#string(REPLACE "\n" ";" file_content "${file_content}") +#foreach(line ${file_content}) +# string(REGEX MATCH "^[ ]+.*\\ref" line1 "${line}") +# if(line1) +# file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc "${line}\n") +# endif(line1) +#endforeach(line ${file_content}) +# +#exec_program("${CMAKE_COMMAND} -E compare_files ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc" OUTPUT_VARIABLE compare_files) +#if(compare_files) +# message(STATUS "Wrong toc for gtut-tour.doc Right one is in tmp.realtoc") +# exec_program("diff -u ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc") +#else(compare_files) +# file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc) +#endif(compare_files) +# +#file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc) \ No newline at end of file diff --git a/buildtools/Cmake/GenerateUserGuide.cmake b/buildtools/Cmake/GenerateUserGuide.cmake index 9014e95186..72a3861517 100644 --- a/buildtools/Cmake/GenerateUserGuide.cmake +++ b/buildtools/Cmake/GenerateUserGuide.cmake @@ -82,123 +82,6 @@ else(FIG2DEV_PATH) endif(FIG2DEV_PATH) -##############################################################################" - -#message(STATUS "Check individual TOCs") -#set(LISTE_GTUT -# doc/user_guide/doxygen/gtut-tour-00-install.doc -# doc/user_guide/doxygen/gtut-tour-01-bones.doc -# doc/user_guide/doxygen/gtut-tour-02-simple.doc -# doc/user_guide/doxygen/gtut-tour-03-args.doc -# doc/user_guide/doxygen/gtut-tour-04-callback.doc -# doc/user_guide/doxygen/gtut-tour-05-globals.doc -# doc/user_guide/doxygen/gtut-tour-06-logs.doc -# doc/user_guide/doxygen/gtut-tour-07-timers.doc -# doc/user_guide/doxygen/gtut-tour-08-exceptions.doc -# doc/user_guide/doxygen/gtut-tour-09-simpledata.doc -# doc/user_guide/doxygen/gtut-tour-10-rpc.doc -# doc/user_guide/doxygen/gtut-tour-11-explicitwait.doc -# doc/user_guide/doxygen/gtut-tour-recap-messages.doc -# doc/user_guide/doxygen/gtut-tour-12-staticstruct.doc -# doc/user_guide/doxygen/gtut-tour-13-pointers.doc -# doc/user_guide/doxygen/gtut-tour-14-dynar.doc -# doc/user_guide/doxygen/gtut-tour-15-manualdatadef.doc -# doc/user_guide/doxygen/gtut-tour-16-exchangecb.doc -#) -# -#foreach(file_name ${LISTE_GTUT}) -# file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.curtoc) -# file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.realtoc) -# -# file(READ "${file_name}" file_content) -# string(REGEX MATCH "Table of Contents.*
" valeur_line "${file_content}") -# string(REPLACE "\n" ";" valeur_line "${valeur_line}") -# string(REPLACE "\n" ";" file_content "${file_content}") -# -# file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.realtoc "\n") # make sure it exists -# foreach(line ${file_content}) -# string(REGEX MATCH "[\\]s?u?b?s?u?b?section.*" line2 "${line}") -# string(REGEX MATCH ".*_toc.*" line3 "${line}") -# if(line2 AND NOT line3) -# string(REPLACE "\\section " "" line2 ${line2}) -# string(REPLACE "\\subsection " "subsection" line2 ${line2}) -# string(REPLACE "\\subsubsection " "subsubsection" line2 ${line2}) -# string(REGEX REPLACE " .*" "" line2 ${line2}) -# set(line2 " - \\ref ${line2}") -# string(REPLACE " - \\ref subsection" " - \\ref " line2 ${line2}) -# string(REPLACE " - \\ref subsubsection" " - \\ref " line2 ${line2}) -# file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.realtoc "${line2}\n") -# endif(line2 AND NOT line3) -# endforeach(line ${file_content}) -# -# file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.curtoc "\n") # make sure it exists -# foreach(line ${valeur_line}) -# string(REGEX MATCH ".*ref.*" line_ok ${line}) -# if(line_ok) -# file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.curtoc "${line_ok}\n") -# endif(line_ok) -# endforeach(line ${valeur_line}) -# -# exec_program("${CMAKE_COMMAND} -E compare_files ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.realtoc" OUTPUT_VARIABLE compare_files) -# if(compare_files) -# message(STATUS "Wrong toc for ${file_name}. Should be:") -# file(READ "${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.realtoc" file_content) -# message("${file_content}") -# exec_program("diff -u ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.realtoc") -# endif(compare_files) -#endforeach(file_name ${LISTE_GTUT}) -# -#file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.curtoc) -#file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.realtoc) -# -#message(STATUS "Check main TOC") -# -#foreach(file_name ${LISTE_GTUT}) -# file(READ "${file_name}" file_content) -# string(REGEX MATCH "Table of Contents.*
" valeur_line "${file_content}") -# string(REPLACE "\n" ";" valeur_line "${valeur_line}") -# string(REPLACE "\n" ";" file_content "${file_content}") -# -# foreach(line ${file_content}) -# string(REGEX MATCH ".*@page.*" line2 "${line}") -# if(line2) -# string(REPLACE "@page " "" line2 "${line2}") -# string(REGEX REPLACE " .*" "" line2 "${line2}") -# set(line2 " - \\ref ${line2}") -# file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.realtoc "${line2}\n") -# endif(line2) -# endforeach(line ${file_content}) -# -# foreach(line ${valeur_line}) -# string(REGEX MATCH ".*toc.*" line1 "${line}") -# string(REGEX MATCH ".*
.*" line2 "${line}") -# string(REGEX MATCH "^[ ]*$" line3 "${line}") -# string(REGEX MATCH "Table of Contents" line4 "${line}") -# if(NOT line1 AND NOT line2 AND NOT line3 AND NOT line4) -# file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.realtoc " ${line}\n") -# endif(NOT line1 AND NOT line2 AND NOT line3 AND NOT line4) -# endforeach(line ${valeur_line}) -#endforeach(file_name ${LISTE_GTUT}) -# -#file(READ "${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/gtut-tour.doc" file_content) -#string(REPLACE "\n" ";" file_content "${file_content}") -#foreach(line ${file_content}) -# string(REGEX MATCH "^[ ]+.*\\ref" line1 "${line}") -# if(line1) -# file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.curtoc "${line}\n") -# endif(line1) -#endforeach(line ${file_content}) -# -#exec_program("${CMAKE_COMMAND} -E compare_files ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.realtoc" OUTPUT_VARIABLE compare_files) -#if(compare_files) -# message(STATUS "Wrong toc for gtut-tour.doc Right one is in tmp.realtoc") -# exec_program("diff -u ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.realtoc") -#else(compare_files) -# file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.realtoc) -#endif(compare_files) -# -#file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.curtoc) - ADD_CUSTOM_TARGET(user_guide_pdf COMMAND ${CMAKE_COMMAND} -E echo "XX First pass simgrid_user_guide.pdf" COMMAND make clean diff --git a/doc/user_guide/doxygen/gtut-files/gtut-howto-design.doc b/doc/gtut-files/gtut-howto-design.doc similarity index 100% rename from doc/user_guide/doxygen/gtut-files/gtut-howto-design.doc rename to doc/gtut-files/gtut-howto-design.doc diff --git a/doc/user_guide/doxygen/gtut-files/gtut-howto.doc b/doc/gtut-files/gtut-howto.doc similarity index 100% rename from doc/user_guide/doxygen/gtut-files/gtut-howto.doc rename to doc/gtut-files/gtut-howto.doc diff --git a/doc/user_guide/doxygen/gtut-files/gtut-introduction.doc b/doc/gtut-files/gtut-introduction.doc similarity index 100% rename from doc/user_guide/doxygen/gtut-files/gtut-introduction.doc rename to doc/gtut-files/gtut-introduction.doc diff --git a/doc/user_guide/doxygen/gtut-files/gtut-main.doc b/doc/gtut-files/gtut-main.doc similarity index 100% rename from doc/user_guide/doxygen/gtut-files/gtut-main.doc rename to doc/gtut-files/gtut-main.doc diff --git a/doc/user_guide/doxygen/gtut-files/gtut-tour-00-install.doc b/doc/gtut-files/gtut-tour-00-install.doc similarity index 100% rename from doc/user_guide/doxygen/gtut-files/gtut-tour-00-install.doc rename to doc/gtut-files/gtut-tour-00-install.doc diff --git a/doc/user_guide/doxygen/gtut-files/gtut-tour-01-bones.doc b/doc/gtut-files/gtut-tour-01-bones.doc similarity index 100% rename from doc/user_guide/doxygen/gtut-files/gtut-tour-01-bones.doc rename to doc/gtut-files/gtut-tour-01-bones.doc diff --git a/doc/user_guide/doxygen/gtut-files/gtut-tour-02-simple.doc b/doc/gtut-files/gtut-tour-02-simple.doc similarity index 100% rename from doc/user_guide/doxygen/gtut-files/gtut-tour-02-simple.doc rename to doc/gtut-files/gtut-tour-02-simple.doc diff --git a/doc/user_guide/doxygen/gtut-files/gtut-tour-03-args.doc b/doc/gtut-files/gtut-tour-03-args.doc similarity index 100% rename from doc/user_guide/doxygen/gtut-files/gtut-tour-03-args.doc rename to doc/gtut-files/gtut-tour-03-args.doc diff --git a/doc/user_guide/doxygen/gtut-files/gtut-tour-04-callback.doc b/doc/gtut-files/gtut-tour-04-callback.doc similarity index 100% rename from doc/user_guide/doxygen/gtut-files/gtut-tour-04-callback.doc rename to doc/gtut-files/gtut-tour-04-callback.doc diff --git a/doc/user_guide/doxygen/gtut-files/gtut-tour-05-globals.doc b/doc/gtut-files/gtut-tour-05-globals.doc similarity index 100% rename from doc/user_guide/doxygen/gtut-files/gtut-tour-05-globals.doc rename to doc/gtut-files/gtut-tour-05-globals.doc diff --git a/doc/user_guide/doxygen/gtut-files/gtut-tour-06-logs.doc b/doc/gtut-files/gtut-tour-06-logs.doc similarity index 100% rename from doc/user_guide/doxygen/gtut-files/gtut-tour-06-logs.doc rename to doc/gtut-files/gtut-tour-06-logs.doc diff --git a/doc/user_guide/doxygen/gtut-files/gtut-tour-07-timers.doc b/doc/gtut-files/gtut-tour-07-timers.doc similarity index 100% rename from doc/user_guide/doxygen/gtut-files/gtut-tour-07-timers.doc rename to doc/gtut-files/gtut-tour-07-timers.doc diff --git a/doc/user_guide/doxygen/gtut-files/gtut-tour-08-exceptions.doc b/doc/gtut-files/gtut-tour-08-exceptions.doc similarity index 100% rename from doc/user_guide/doxygen/gtut-files/gtut-tour-08-exceptions.doc rename to doc/gtut-files/gtut-tour-08-exceptions.doc diff --git a/doc/user_guide/doxygen/gtut-files/gtut-tour-09-simpledata.doc b/doc/gtut-files/gtut-tour-09-simpledata.doc similarity index 100% rename from doc/user_guide/doxygen/gtut-files/gtut-tour-09-simpledata.doc rename to doc/gtut-files/gtut-tour-09-simpledata.doc diff --git a/doc/user_guide/doxygen/gtut-files/gtut-tour-10-rpc.doc b/doc/gtut-files/gtut-tour-10-rpc.doc similarity index 100% rename from doc/user_guide/doxygen/gtut-files/gtut-tour-10-rpc.doc rename to doc/gtut-files/gtut-tour-10-rpc.doc diff --git a/doc/user_guide/doxygen/gtut-files/gtut-tour-11-explicitwait.doc b/doc/gtut-files/gtut-tour-11-explicitwait.doc similarity index 100% rename from doc/user_guide/doxygen/gtut-files/gtut-tour-11-explicitwait.doc rename to doc/gtut-files/gtut-tour-11-explicitwait.doc diff --git a/doc/user_guide/doxygen/gtut-files/gtut-tour-12-staticstruct.doc b/doc/gtut-files/gtut-tour-12-staticstruct.doc similarity index 100% rename from doc/user_guide/doxygen/gtut-files/gtut-tour-12-staticstruct.doc rename to doc/gtut-files/gtut-tour-12-staticstruct.doc diff --git a/doc/user_guide/doxygen/gtut-files/gtut-tour-13-pointers.doc b/doc/gtut-files/gtut-tour-13-pointers.doc similarity index 100% rename from doc/user_guide/doxygen/gtut-files/gtut-tour-13-pointers.doc rename to doc/gtut-files/gtut-tour-13-pointers.doc diff --git a/doc/user_guide/doxygen/gtut-files/gtut-tour-14-dynar.doc b/doc/gtut-files/gtut-tour-14-dynar.doc similarity index 100% rename from doc/user_guide/doxygen/gtut-files/gtut-tour-14-dynar.doc rename to doc/gtut-files/gtut-tour-14-dynar.doc diff --git a/doc/user_guide/doxygen/gtut-files/gtut-tour-15-manualdatadef.doc b/doc/gtut-files/gtut-tour-15-manualdatadef.doc similarity index 100% rename from doc/user_guide/doxygen/gtut-files/gtut-tour-15-manualdatadef.doc rename to doc/gtut-files/gtut-tour-15-manualdatadef.doc diff --git a/doc/user_guide/doxygen/gtut-files/gtut-tour-16-exchangecb.doc b/doc/gtut-files/gtut-tour-16-exchangecb.doc similarity index 100% rename from doc/user_guide/doxygen/gtut-files/gtut-tour-16-exchangecb.doc rename to doc/gtut-files/gtut-tour-16-exchangecb.doc diff --git a/doc/user_guide/doxygen/gtut-files/gtut-tour-recap-messages.doc b/doc/gtut-files/gtut-tour-recap-messages.doc similarity index 100% rename from doc/user_guide/doxygen/gtut-files/gtut-tour-recap-messages.doc rename to doc/gtut-files/gtut-tour-recap-messages.doc diff --git a/doc/user_guide/doxygen/gtut-files/gtut-tour.doc b/doc/gtut-files/gtut-tour.doc similarity index 100% rename from doc/user_guide/doxygen/gtut-files/gtut-tour.doc rename to doc/gtut-files/gtut-tour.doc