From b4d7a13984960eddb339b80aef389c1469ff6596 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 1 Feb 2016 18:59:47 +0100 Subject: [PATCH] cosmetics: rename some documentation files, just for clarity --- doc/Doxyfile.in | 4 ++-- doc/doxygen/getting_started.doc | 16 ++++++++-------- doc/doxygen/index.doc | 10 +++++++--- doc/doxygen/{internals.doc => inside.doc} | 2 +- doc/doxygen/inside_tests.doc | 6 ++++-- doc/doxygen/install.doc | 2 +- doc/doxygen/{introduction.doc => tutorial.doc} | 2 +- include/xbt/cunit.h | 4 ++-- tools/cmake/DefinePackages.cmake | 4 ++-- 9 files changed, 28 insertions(+), 22 deletions(-) rename doc/doxygen/{internals.doc => inside.doc} (98%) rename doc/doxygen/{introduction.doc => tutorial.doc} (99%) diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index fed3b985af..a81b2bf791 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -645,7 +645,7 @@ WARN_LOGFILE = INPUT = doxygen/index.doc \ doxygen/getting_started.doc \ doxygen/getting_started_index.doc \ - doxygen/introduction.doc \ + doxygen/tutorial.doc \ doxygen/install.doc \ doxygen/examples.doc \ doxygen/platform.doc \ @@ -655,7 +655,7 @@ INPUT = doxygen/index.doc \ doxygen/advanced.doc \ doxygen/pls.doc \ doxygen/bindings.doc \ - doxygen/internals.doc \ + doxygen/inside.doc \ doxygen/inside_doxygen.doc \ doxygen/inside_extending.doc \ doxygen/inside_cmake.doc \ diff --git a/doc/doxygen/getting_started.doc b/doc/doxygen/getting_started.doc index 6b86b9bef3..2a4dac169a 100644 --- a/doc/doxygen/getting_started.doc +++ b/doc/doxygen/getting_started.doc @@ -16,18 +16,18 @@ own needs. This page gives you a brief overview of available resources. \section gs_introduction Introduction, Installation and how we can help -| Document name | Description | -| ----------------- | ------------------------------------------------- | -| \ref introduction | Introduces the user to basic features of SimGrid. | -| \ref install | Explains how SimGrid can be installed; this covers Windows as well as Linux; plus, it shows how to install from a package or how to install from source. | -| \ref FAQ | Our FAQ | -| \ref help | There are many ways to find answers to your questions. This document lists them. | +| Document name | Description | +| --------------- | ------------------------------------------------- | +| \ref tutorial | Introduces the user to basic features of SimGrid. | +| \ref install | Explains how SimGrid can be installed; this covers Windows as well as Linux; plus, it shows how to install from a package or how to install from source. | +| \ref FAQ | Our FAQ | +| \ref help | There are many ways to find answers to your questions. This document lists them. | \section gs_new_users Documentation for new users | Document name | Description | | ----------------- | ------------------------------------------------- | -| \ref introduction | Introduces the user to basic features of SimGrid. | +| \ref tutorial | Introduces the user to basic features of SimGrid. | | \ref install | Explains how SimGrid can be installed; this covers Windows as well as Linux; plus, it shows how to install from a package or how to install from source. | | [Tutorials](http://simgrid.gforge.inria.fr/tutorials.html) | These tutorials cover most of the basics and might be valuable for what you want to do, especially the [SimGrid User 101](http://simgrid.gforge.inria.fr/tutorials/simgrid-use-101.pdf). | | \ref MSG_examples | This document explains several tests that we wrote for MSG; these tests are working simulations and you may learn something from looking at them. | @@ -45,7 +45,7 @@ In order to actually use SimGrid, three steps are necessary: | \ref tracing | Shows how the behavior of a program can be written to a file so that it can be analyzed. | | \ref bindings | SimGrid supports many different bindings for languages such as Lua, Ruby, Java, ... You can run your simulations with those! | | \ref pls | Although SimGrid is not a packet level simulator, it does have bindings to two such simulators. | -| \ref internals | If you want to contribute or obtain a deeper understanding of SimGrid, this is the right location. | +| \ref inside | If you want to contribute or obtain a deeper understanding of SimGrid, this is the right location. | \section gs_examples Examples shipped with SimGrid diff --git a/doc/doxygen/index.doc b/doc/doxygen/index.doc index e84a1a2306..87311a8714 100644 --- a/doc/doxygen/index.doc +++ b/doc/doxygen/index.doc @@ -10,7 +10,7 @@ @endhtmlonly -- @subpage introduction +- @subpage tutorial - @subpage platform - @subpage options - @subpage deployment @@ -19,9 +19,13 @@ - @ref bindings - @ref pls - @ref tracing - - @ref contributing - @subpage FAQ -- @subpage internals +- @subpage inside + - @ref inside_tests + - @ref inside_doxygen + - @ref inside_extending + - @ref inside_cmake + - @ref inside_release - @subpage contributing @htmlonly diff --git a/doc/doxygen/internals.doc b/doc/doxygen/inside.doc similarity index 98% rename from doc/doxygen/internals.doc rename to doc/doxygen/inside.doc index d6462287f9..0cdb36e7b3 100644 --- a/doc/doxygen/internals.doc +++ b/doc/doxygen/inside.doc @@ -1,4 +1,4 @@ -/*! @page internals SimGrid Developer Guide +/*! @page inside SimGrid Developer Guide This page does not exist yet, sorry. We are currently refurbishing the user documentation -- the internal documentation will follow (FIXME). diff --git a/doc/doxygen/inside_tests.doc b/doc/doxygen/inside_tests.doc index bd1c5f89ef..56593f6d6f 100644 --- a/doc/doxygen/inside_tests.doc +++ b/doc/doxygen/inside_tests.doc @@ -100,8 +100,10 @@ any other) to see how it works in practice. Do not hesitate to stress test your code this way, but make sure that it runs reasonably fast, or nobody will run "ctest" before commiting code. -For more details on how the tests are extracted from the module -source, check the tools/sg_unit_extractor.pl script directly. +For more details on the macro used to write unit tests, see their +reference guide: @ref XBT_cunit. For details on on how the tests are +extracted from the module source, check the tools/sg_unit_extractor.pl +script directly. \section inside_tests_add_integration Adding integration tests diff --git a/doc/doxygen/install.doc b/doc/doxygen/install.doc index d65e4ed447..5611e64665 100644 --- a/doc/doxygen/install.doc +++ b/doc/doxygen/install.doc @@ -325,7 +325,7 @@ make VERBOSE=1 Once everything is built, you may want to test the result. SimGrid comes with an extensive set of regression tests (see @ref -inside_cmake_addtest "that page of the insider manual" for more +inside_tests "that page of the insider manual" for more details). Running the tests is done using the ctest binary that comes with cmake. These tests are run for every commit and the result is publicly available. diff --git a/doc/doxygen/introduction.doc b/doc/doxygen/tutorial.doc similarity index 99% rename from doc/doxygen/introduction.doc rename to doc/doxygen/tutorial.doc index 54752bdcc9..7b8347ec49 100644 --- a/doc/doxygen/introduction.doc +++ b/doc/doxygen/tutorial.doc @@ -1,4 +1,4 @@ -/*! @page introduction Introduction to SimGrid +/*! @page tutorial SimGrid First Tutorial [SimGrid](http://simgrid.gforge.inria.fr/) is a toolkit diff --git a/include/xbt/cunit.h b/include/xbt/cunit.h index 9da1a246b0..f462e067bc 100644 --- a/include/xbt/cunit.h +++ b/include/xbt/cunit.h @@ -76,9 +76,9 @@ XBT_PUBLIC(void) xbt_test_exit(void); * Note that if you want to test a full binary (such as an example), * you want to use our integration testing mechanism, not our unit * testing one. Please refer to Section \ref - * inside_cmake_addtest_integration + * inside_tests_add_integration * - * Some more information on our unit testing is available in Section @ref inside_cmake_addtest_unit. + * Some more information on our unit testing is available in Section @ref inside_tests_add_units. * * All code intended to be executed as a unit test will be extracted * by a script (tools/sg_unit_extract.pl), and must thus be protected diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index b5af8fe838..a95227f46e 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -877,14 +877,14 @@ set(DOC_SOURCES doc/doxygen/header.html doc/doxygen/help.doc doc/doxygen/index.doc + doc/doxygen/inside.doc doc/doxygen/inside_tests.doc doc/doxygen/inside_cmake.doc doc/doxygen/inside_doxygen.doc doc/doxygen/inside_extending.doc doc/doxygen/inside_release.doc doc/doxygen/install.doc - doc/doxygen/internals.doc - doc/doxygen/introduction.doc + doc/doxygen/tutorial.doc doc/doxygen/module-msg.doc doc/doxygen/module-sd.doc doc/doxygen/module-simix.doc -- 2.20.1