diff --git a/Core/Documentation/Doxygen/Concepts/Concepts.dox b/Core/Documentation/Doxygen/Concepts/Concepts.dox
index 472ba9b4f2..3fba1e09a9 100644
--- a/Core/Documentation/Doxygen/Concepts/Concepts.dox
+++ b/Core/Documentation/Doxygen/Concepts/Concepts.dox
@@ -1,30 +1,27 @@
/**
\page Concepts MITK Concepts
The following items describe some issues about MITK on a more abstract level.
-# \subpage OverviewPage
-# \subpage CodingPage "Coding Concepts"
-# \ref CodingPageGeneral
-# \ref CodingPageStyle
-# \ref CodingPageMITKMacros
-# \subpage MicroServices_Overview
-# Data Concepts
-# \subpage DataManagementPage
-# \subpage MitkImagePage
-# \subpage PropertiesPage
-# \subpage GeometryOverviewPage
-# \subpage PipelineingConceptPage
-# \subpage QVTKRendering
-# \subpage InteractionPage
-# \subpage LoggingPage
-# \subpage ExceptionPage
--# Testing Concept
- -# \subpage GeneralTests
- -# \subpage RenderingTests
-# \subpage ModularizationPage "Modularization Concept"
-# \ref ModularizationPageOverview
-# \ref ModularizationPageHowTo
If you want to start using MITK, you also want to see the chapter \ref Development.
*/
diff --git a/Documentation/Doxygen/API/DevelopmentAPI.dox b/Documentation/Doxygen/API/DevelopmentAPI.dox
deleted file mode 100644
index d5c296f00f..0000000000
--- a/Documentation/Doxygen/API/DevelopmentAPI.dox
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
-\page DevelopmentAPI API-Documentation
-
-*/
diff --git a/Documentation/Doxygen/DeveloperManual/DeveloperManual.dox b/Documentation/Doxygen/DeveloperManual/DeveloperManualPortal.dox
similarity index 79%
rename from Documentation/Doxygen/DeveloperManual/DeveloperManual.dox
rename to Documentation/Doxygen/DeveloperManual/DeveloperManualPortal.dox
index 403350d65f..ec44916cba 100644
--- a/Documentation/Doxygen/DeveloperManual/DeveloperManual.dox
+++ b/Documentation/Doxygen/DeveloperManual/DeveloperManualPortal.dox
@@ -1,31 +1,33 @@
/**
-\page DeveloperManual Developer Manual
+\page DeveloperManualPortal MITK: Developer Manual
Development with MITK can happen under several disctinct conditions. Depending on whether you are using the Toolkit or the entire application, different sections may apply to you. In case you are unsure about what you need, please refer to \link Architecture The Architecture of MITK text\endlink. An extensive Introduction to MITK is available under \link StartingDevelopment Starting your MITK Development\endlink.
Depending on whether you are working with the \link DevelopmentToolkit Toolkit\endlink or the \link DevelopmentApplication Application\endlink, you can refer to their respective pages. Generated API-Documentation can be found \link DevelopmentAPI here\endlink.
\section DeveloperManualStarting Starting your MITK Development
- \subpage StartingDevelopment
- \ref Architecture
- \ref SettingUpMITK
- \ref GettingToKnowMITK
- - \ref FirstSteps
- - \ref Testing
+ - \ref FirstSteps
+ - \ref AboutTestingPage
+ - \subpage DevelopmentToolkit
- - \ref DevelopmentToolkit
- - \ref DevelopmentApplication
+ - \ref Concepts
+ - \ref MITKModuleManualsListPage
+
+ - \subpage DevelopmentApplication
- \ref mitkExtPointsIndex
- \ref DeploymentPage
- \ref BlueBerryExamples
- \ref BlueBerryIntro
- - \subpage DevelopmentAPI
*/
diff --git a/Documentation/Doxygen/DeveloperManual/Starting/AboutTesting/AboutTestingPage.dox b/Documentation/Doxygen/DeveloperManual/Starting/AboutTesting/AboutTestingPage.dox
new file mode 100644
index 0000000000..a0231fc98d
--- /dev/null
+++ b/Documentation/Doxygen/DeveloperManual/Starting/AboutTesting/AboutTestingPage.dox
@@ -0,0 +1,9 @@
+/**
+\page AboutTestingPage Testing
+
+TODO
+\subpage GeneralTests
+\subpage RenderingTests
+\subpage DICOMTesting
+
+*/
diff --git a/Documentation/Doxygen/DeveloperManual/Starting/Starting.dox b/Documentation/Doxygen/DeveloperManual/Starting/Starting.dox
index 60b44fe824..fa78a1bb8d 100644
--- a/Documentation/Doxygen/DeveloperManual/Starting/Starting.dox
+++ b/Documentation/Doxygen/DeveloperManual/Starting/Starting.dox
@@ -1,38 +1,37 @@
/**
\page StartingDevelopment Starting your MITK Development
This Introduction will acquaint you with the most important workflows to get you started with your MITK Development.
- \subpage Architecture
- \subpage SettingUpMITK
- \ref SupportedPlatformsPage
- \ref BuildInstructionsPage
- \ref thirdpartylibs
- - \ref HowToNewProject
- - \ref Testing
+ - \ref HowToNewProject
- \subpage GettingToKnowMITK
- \ref DirectoryStructurePage
- \ref TutorialPage
- \ref CMAKE_FAQ
- \ref StyleGuideAndNotesPage
- \ref DocumentationGuide
- \ref CodingPage
- \ref KnownProblemsPage
- \subpage FirstSteps
- \ref NewPluginPage
- \ref NewModulePage
- \ref StatemachineEditor
- - \subpage Testing
+ - \subpage AboutTestingPage
*/
diff --git a/Documentation/Doxygen/DeveloperManual/Starting/Testing/Testing.dox b/Documentation/Doxygen/DeveloperManual/Starting/Testing/Testing.dox
deleted file mode 100644
index 2551574251..0000000000
--- a/Documentation/Doxygen/DeveloperManual/Starting/Testing/Testing.dox
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
-\page Testing Testing
-
-TODO
-*/
diff --git a/Documentation/Doxygen/MainPage.dox.in b/Documentation/Doxygen/MainPage.dox.in
index 4fe57a1f1e..ed93fcfd62 100644
--- a/Documentation/Doxygen/MainPage.dox.in
+++ b/Documentation/Doxygen/MainPage.dox.in
@@ -1,17 +1,17 @@
/**
\mainpage Medical Imaging Interaction Toolkit - Documentation Portal
\image html mitkLogo.jpg
This page acts as a portal to the three different parts of the MITK-Documentation.
-If this is your first time around here and you are interested in learning more about MITK, please read \ref Overview
+If this is your first time around here and you are interested in learning more about MITK, please read \subpage Overview
-If you are a MITK end-user, please refer to the \ref UserManual
+If you are a MITK end-user, please refer to the \subpage UserManualPortal
-If you are a developer looking for a developer's guide, please see \ref DeveloperManual
+If you are a developer looking for a developer's guide, please see \subpage DeveloperManualPortal
*/
diff --git a/Documentation/Doxygen/UserManual/Applications.dox b/Documentation/Doxygen/UserManual/Applications.dox
index 2a6b7db404..7620fc8046 100644
--- a/Documentation/Doxygen/UserManual/Applications.dox
+++ b/Documentation/Doxygen/UserManual/Applications.dox
@@ -1,30 +1,30 @@
/**
\page ApplicationsPage Using MITK and Applications
Available sections:
- \ref ApplicationsPageUsingMITK
- \ref ApplicationsPageApplications
- \ref ApplicationsPageApplicationsList
\section ApplicationsPageUsingMITK Using MITK
Many of the applications created with the use of MITK share common basic functionalities. Due to this, there is one manual which explains the basic usage of MITK. For more information on the use of the advanced features of an application please take a look the \ref ApplicationsPageApplicationsList , whereas if you are interested in a certain view further information can be found in \ref PluginListPage .
-The basic usage information on MITK can be found in \subpage MITKUserManualPage .
+The basic usage information on MITK can be found in \ref MITKUserManualPage .
\section ApplicationsPageApplications What are Applications?
Applications are executables, which contain a certain configuration of views and perspectives. Usually they are aimed at a selective audience or solving a particular problem. As such they focus on certain capabilities of MITK, while ignoring others. The main reason for this is to supply the users of the application with the power of MITK for solving their tasks, without daunting them with an overwhelming number of menus and options. At the same time, this allows, together with the use of perspectives, the creation of sleek and elegant workflows, which are easily comprehensible.
A typical example of this would be an application which contains only views related to the analysis of the human brain (particular question) or one which contains only what is necessary for displaying medical data in the classroom (specific audience).
\section ApplicationsPageApplicationsList List of Applications
If you are interested in using a specific application, currently developed by the MITK team you might want to take a look first at the \ref MITKUserManualPage . Further information on any application can be found here:
- \subpage org_mitkworkbench
- \subpage org_dti_atlas_application
- \subpage org_mitk_gui_qt_diffusionimagingapp
*/
\ No newline at end of file
diff --git a/Documentation/Doxygen/UserManual/MITKPluginManualsList.dox b/Documentation/Doxygen/UserManual/MITKPluginManualsList.dox
index 26c53b8a28..2612bc0aec 100644
--- a/Documentation/Doxygen/UserManual/MITKPluginManualsList.dox
+++ b/Documentation/Doxygen/UserManual/MITKPluginManualsList.dox
@@ -1,37 +1,38 @@
/**
\page PluginListPage MITK Plugin Manuals
\section PluginListPageOverview Overview
The plugins and bundles provide much of the extended functionality of MITK. Each encapsulates a solution to a problem and associated features. This way one can easily assemble the necessary capabilites for a workflow without adding a lot of bloat, by combining plugins as needed.
The distinction between developer and end user use is for convenience only and mainly distinguishes which group a plugin is primarily aimed at.
\section PluginListPageEndUserPluginList List of Plugins for End User Use
\li \subpage org_mitk_views_basicimageprocessing
\li \subpage org_mitk_views_datamanager
\li \subpage org_mitk_gui_qt_diffusionimaging
\li \subpage org_mitk_views_imagecropper
\li \subpage org_mitk_views_imagenavigator
\li \subpage org_mitk_gui_qt_measurementtoolbox
\li \subpage org_mitk_views_moviemaker
\li \subpage org_mitk_views_meshdecimation
\li \subpage org_mitk_views_pointsetinteraction
\li \subpage org_mitk_gui_qt_registration
\li \subpage org_mitk_views_segmentation
\li \subpage org_mitk_views_volumevisualization
\li \subpage org_mitk_gui_qt_dicom
\li \subpage org_mitk_gui_qt_ultrasound
+ \li \subpage org_mitk_views_fiberfoxview
\section PluginListPageDevPluginList List of Plugins for Developer Use and Examples
\li \subpage org_surfacematerialeditor
\li \subpage org_toftutorial
\li \subpage org_mitk_gui_qt_examples
\li \subpage org_mitkexamplesopencv
\li \ref org_mitk_gui_qt_igtexample
\li \ref org_mitk_gui_qt_igttracking
*/
diff --git a/Documentation/Doxygen/UserManual/UserManualPortal.dox b/Documentation/Doxygen/UserManual/UserManualPortal.dox
index b2f30fce1f..83d3a73e5b 100644
--- a/Documentation/Doxygen/UserManual/UserManualPortal.dox
+++ b/Documentation/Doxygen/UserManual/UserManualPortal.dox
@@ -1,5 +1,9 @@
/**
\page UserManualPortal MITK: User Manual
-
+
+ - \subpage ApplicationsPage
+ - \subpage MITKUserManualPage
+ - \subpage PluginListPage
+
*/
\ No newline at end of file