diff --git a/Code/Mantid/Framework/Algorithms/src/Q1D.cpp b/Code/Mantid/Framework/Algorithms/src/Q1D.cpp
index 2ce2fcca92e4499f958a6e203219823dc3ebd3de..84f3f05fa7bb0ed6d525b293d1ff31a265e6def5 100644
--- a/Code/Mantid/Framework/Algorithms/src/Q1D.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/Q1D.cpp
@@ -50,9 +50,9 @@ From the equation it is possible to see that for pixels in <math>R > RadiusCut</
'''References'''
-[http://scripts.iucr.org/cgi-bin/paper?gk0158/R.P. Hjelm Jr. ''J. Appl. Cryst.'' (1988), 21, 618-628].
+[http://scripts.iucr.org/cgi-bin/paper?gk0158 R.P. Hjelm Jr. ''J. Appl. Cryst.'' (1988), 21, 618-628].
-[http://scripts.iucr.org/cgi-bin/paper?gk0573/P.A. Seeger & R.P. Hjelm Jr. ''J. Appl. Cryst.'' (1991), 24, 467-478].
+[http://scripts.iucr.org/cgi-bin/paper?gk0573 P.A. Seeger & R.P. Hjelm Jr. ''J. Appl. Cryst.'' (1991), 24, 467-478].
===Variations on applying the normalization===
It is possible to divide the input workspace by the WavelenghAdj and PixelAdj workspaces prior to calling this algorithm. The results will be same as if these workspaces were passed to Q1D instead when there are high numbers of particle counts. However, in this scheme the probabilities tend to converge on the true high count probabablities more slowly with increasing number of counts and so the result is less accuate.
diff --git a/Code/Mantid/Framework/Algorithms/src/Q1D2.cpp b/Code/Mantid/Framework/Algorithms/src/Q1D2.cpp
index aa28103c81e478bdc4dcbd7e72c1c525d5f36c70..13c85232558a193333a606debf1f809a6b43ef75 100644
--- a/Code/Mantid/Framework/Algorithms/src/Q1D2.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/Q1D2.cpp
@@ -50,9 +50,9 @@ From the equation it is possible to see that for pixels in <math>R > RadiusCut</
'''References'''
-[http://scripts.iucr.org/cgi-bin/paper?gk0158/R.P. Hjelm Jr. ''J. Appl. Cryst.'' (1988), 21, 618-628].
+[http://scripts.iucr.org/cgi-bin/paper?gk0158 R.P. Hjelm Jr. ''J. Appl. Cryst.'' (1988), 21, 618-628].
-[http://scripts.iucr.org/cgi-bin/paper?gk0573/P.A. Seeger & R.P. Hjelm Jr. ''J. Appl. Cryst.'' (1991), 24, 467-478].
+[http://scripts.iucr.org/cgi-bin/paper?gk0573 P.A. Seeger & R.P. Hjelm Jr. ''J. Appl. Cryst.'' (1991), 24, 467-478].
===Variations on applying the normalization===
It is possible to divide the input workspace by the WavelenghAdj and PixelAdj workspaces prior to calling this algorithm. The results will be same as if these workspaces were passed to Q1D instead when there are high numbers of particle counts. However, in this scheme the probabilities tend to converge on the true high count probabablities more slowly with increasing number of counts and so the result is less accuate.
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadLiveData.cpp b/Code/Mantid/Framework/DataHandling/src/LoadLiveData.cpp
index 7b2ec4a1cb4f56f6ffc70dc42be3ac3b9ce5e80d..6b7ad1fb1d1cfa312d83c60f8416162ddc3e71a0 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadLiveData.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadLiveData.cpp
@@ -4,7 +4,7 @@ This algorithm is called on a regular interval
by the [[MonitorLiveData]] algorithm.
'''It should not be necessary to call LoadLiveData directly.'''
-[[file:LoadLiveData_flow.png]]
+[[File:LoadLiveData_flow.png]]
=== Data Processing ===
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMD.cpp
index 49a8d3ff2b2fd83a7287c7ec0ac0925a5a6963e9..c0aab0bc25866effe11f2d5660a5e55408671053 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMD.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMD.cpp
@@ -89,7 +89,7 @@ plotSlice(RezWS, xydim=["[H,0,0]","[0,K,0]"], slicepoint=[0,0] )
=== Convert set of inelastic results obtained in Powder mode (direct) as function of temperature to a 3D workspace: ===
-The test example is based on MAR1011.nxspe data file, obtained by reducing test data from the MARI experiment. The data for the experiment can be located in [https://github.com/mantidproject/systemtests Mantid system test] folder. The text will produce 3-dimensional dataset, with temperature axis. The image does not change with temperature, as we have just cloned initial workspace without any changes to the experimental data.
+The test example is based on MAR1011.nxspe data file, obtained by reducing test data from the MARI experiment. The data for the experiment can be located in [http://github.com/mantidproject/systemtests Mantid system test] folder. The text will produce 3-dimensional dataset, with temperature axis. The image does not change with temperature, as we have just cloned initial workspace without any changes to the experimental data.
<div style="border:1pt dashed blue; background:#f9f9f9;padding: 1em 0;">
<source lang="python">
diff --git a/Code/Mantid/docs/qtassistant/parseLinks.py b/Code/Mantid/docs/qtassistant/parseLinks.py
index 11ca22188d9d66267acb52c6fb819f5f85db9770..cbe6fb5a54b2a0cd608a8683816fdf625a7c0c24 100644
--- a/Code/Mantid/docs/qtassistant/parseLinks.py
+++ b/Code/Mantid/docs/qtassistant/parseLinks.py
@@ -61,8 +61,8 @@ class fixLinks:
for item in self.explicitLinks:
if item.strip()[:4]=='http':
target=item.strip().split(' ')
- if len(target)==2:
- label=target[1]
+ if len(target)>1:
+ label=" ".join(target[1:])
link=target[0]
else:
label=item
@@ -88,11 +88,24 @@ class fixLinks:
linkpiece=link.split("ategory:")[1].strip(":")
formatted="<a href=\"AlgoCat_"+linkpiece+".html\">"+name+"</a>"
self.text=self.text.replace("[["+item+"]]",formatted)
-
+
+ def linkMedia(self):
+ for item in self.results:
+ #check for |
+ if item.count("|")==1:
+ link,name=item.split("|")
+ else:
+ name=item
+ link=item
+ if link.find('Media:')!=-1:
+ formatted= "<a href=\""+WEB_BASE+link.replace("Media:","File:").strip()+"\">"+name+"</a>"
+ self.text=self.text.replace("[["+item+"]]",formatted)
+
def parse(self):
self.linkAlgorithms()
self.linkFitFunctions()
self.linkMantidWiki()
self.linkExplicit()
self.linkCategories()
+ self.linkMedia()
return self.text