refs #9799 conflicts with develop

Merge branch 'feature/9799_SphinxDocs' into develop Conflicts: Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDParent.cpp
mantidproject · Jul 6, 2014 · 17adb18 · 17adb18
2 parents 599c624 + 202415f
commit 17adb18
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDMinMaxGlobal.cpp b/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDMinMaxGlobal.cpp
@@ -74,7 +74,7 @@ namespace MDAlgorithms
       declareProperty("QDimensions",Q_modes[0],boost::make_shared<StringListValidator>(Q_modes),
  "String, describing MD-analysis modes, this algorithm can process. "
  "There are 3 modes currently available and described in details on" 
- "`MD Transformation factory <http://www.mantidproject.org/MD_Transformation_factory>`_ page. "
+ "*MD Transformation factory* page. "
  "The modes names are **CopyToMD**, **|Q|** and **Q3D**",
                       Direction::InOut);
       /// temporary, until dEMode is not properly defined on Workspace
@@ -83,7 +83,7 @@ namespace MDAlgorithms
  "You can analyze neutron energy transfer in **Direct**, **Indirect** or **Elastic** mode. "
  "The analysis mode has to correspond to experimental set up. Selecting inelastic mode increases "
  "the number of the target workspace dimensions by one. See "
- "`MD Transformation factory <http://www.mantidproject.org/MD_Transformation_factory>`_ for further details.",
+ "*MD Transformation factory* for further details.",
                       Direction::InOut);
 
       setPropertySettings("dEAnalysisMode",

diff --git a/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDParent.cpp b/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDParent.cpp
@@ -56,15 +56,15 @@ namespace Mantid
      /// this variable describes default possible ID-s for Q-dimensions   
      declareProperty("QDimensions",Q_modes[0],boost::make_shared<StringListValidator>(Q_modes),
         "String, describing available analysis modes, registered with MD Transformation factory."
-        "There are 3 modes currently available and described in details on `MD Transformation factory <http://www.mantidproject.org/MD_Transformation_factory>`_ page."
+        "There are 3 modes currently available and described in details on *MD Transformation factory* page."
         "The modes names are **CopyToMD**, **|Q|** and **Q3D**",
                      Direction::InOut);
      /// temporary, until dEMode is not properly defined on Workspace
      std::vector<std::string> dE_modes = Kernel::DeltaEMode().availableTypes();
      declareProperty("dEAnalysisMode",dE_modes[Kernel::DeltaEMode::Direct],boost::make_shared<StringListValidator>(dE_modes),
         "You can analyze neutron energy transfer in **Direct**, **Indirect** or **Elastic** mode."
         "The analysis mode has to correspond to experimental set up. Selecting inelastic mode increases"
-        "the number of the target workspace dimensions by one. See `MD Transformation factory <http://www.mantidproject.org/MD_Transformation_factory>`_ for further details.",
+        "the number of the target workspace dimensions by one. See *MD Transformation factory* for further details.",
                      Direction::InOut);
 
     MDEvents::MDWSTransform QSclAndFrames;