From 7f520befbc8418c442bc9bac3c30accbd73ac9ed Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 14 Sep 2020 21:31:26 +0200 Subject: [PATCH] doc: fix more broken links --- docs/source/app_s4u.rst | 2 +- docs/source/conf.py | 48 +++++++++++++++++++++++++++++------------ 2 files changed, 35 insertions(+), 15 deletions(-) diff --git a/docs/source/app_s4u.rst b/docs/source/app_s4u.rst index 5a5fe01ebf..9e9be4ed83 100644 --- a/docs/source/app_s4u.rst +++ b/docs/source/app_s4u.rst @@ -635,7 +635,7 @@ Querying info .. autodoxymethod:: simgrid::s4u::this_actor::is_maestro() .. autodoxymethod:: simgrid::s4u::this_actor::get_host() - .. autodoxymethod:: simgrid::s4u::this_actor::set_host(Host *new_host) + .. autodoxymethod:: simgrid::s4u::this_actor::set_host(simgrid::s4u::Host *new_host) .. group-tab:: Python diff --git a/docs/source/conf.py b/docs/source/conf.py index d931437de3..e06332da96 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -68,27 +68,47 @@ breathe_default_project = "simgrid" # Setup the autodoxy extension doxygen_xml = os.path.join(os.path.dirname(__file__), "..", "build", "xml") autodoxy_requalified_identifiers = [ # The first element will be substituted into the second one if it's starting an element or preceded by a space - ("ActorPtr", "simgrid::s4u::ActorPtr"), - ("Actor", "simgrid::s4u::Actor"), - ("CommPtr", "simgrid::s4u::CommPtr"), - ("Disk", "simgrid::s4u::Disk"), - ("ExecPtr", "simgrid::s4u::ExecPtr"), - ("Host", "simgrid::s4u::Host"), - ("s4u::Host", "simgrid::s4u::Host"), - ("Engine", "simgrid::s4u::Engine"), - ("Link", "simgrid::s4u::Link"), - ("Mailbox", "simgrid::s4u::Mailbox"), - ("Mutex", "simgrid::s4u::Mutex"), - ("s4u::Mutex", "simgrid::s4u::Mutex"), - ("NetZone", "simgrid::s4u::NetZone"), - ("Semaphore", "simgrid::s4u::Semaphore"), + ("Activity", "simgrid::s4u::Activity"), + ("Actor", "simgrid::s4u::Actor"), + ("ActorPtr", "simgrid::s4u::ActorPtr"), + ("Barrier", "simgrid::s4u::Barrier"), + ("BarrierPtr", "simgrid::s4u::BarrierPtr"), + ("Comm", "simgrid::s4u::Comm"), + ("CommPtr", "simgrid::s4u::CommPtr"), + ("ConditionVariable", "simgrid::s4u::ConditionVariable"), + ("ConditionVariablePtr", "simgrid::s4u::ConditionVariablePtr"), + ("Disk", "simgrid::s4u::Disk"), + ("Exec", "simgrid::s4u::Exec"), + ("ExecPtr", "simgrid::s4u::ExecPtr"), + ("Host", "simgrid::s4u::Host"), + ("s4u::Host", "simgrid::s4u::Host"), + ("Engine", "simgrid::s4u::Engine"), + ("Io", "simgrid::s4u::Io"), + ("Link", "simgrid::s4u::Link"), + ("Mailbox", "simgrid::s4u::Mailbox"), + ("Mutex", "simgrid::s4u::Mutex"), + ("s4u::Mutex", "simgrid::s4u::Mutex"), + ("s4u::MutexPtr", "simgrid::s4u::MutexPtr"), + ("NetZone", "simgrid::s4u::NetZone"), + ("Semaphore", "simgrid::s4u::Semaphore"), + ("VirtualMachine", "simgrid::s4u::VirtualMachine"), ] # Generate a warning for all a cross-reference (such as :func:`myfunc`) that cannot be found nitpicky = True nitpick_ignore = [ ('cpp:identifier', 'boost'), + ('cpp:identifier', 'boost::intrusive_ptr'), + ('cpp:identifier', 'boost::intrusive_ptr'), + ('cpp:identifier', 'boost::intrusive_ptr'), + ('cpp:identifier', 'boost::intrusive_ptr'), + ('cpp:identifier', 'boost::intrusive_ptr'), + ('cpp:identifier', 'boost::intrusive_ptr'), ('cpp:identifier', 'kernel'), + ('cpp:identifier', 'kernel::activity'), + ('cpp:identifier', 'kernel::profile'), + ('cpp:identifier', 'kernel::resource'), + ('cpp:identifier', 'kernel::routing'), ('cpp:identifier', 'simgrid'), ('cpp:identifier', 'simgrid::s4u'), ('cpp:identifier', 'this_actor'), -- 2.20.1