Skip to content

Commit

Permalink
Merge branch 'feature/9571_UsageExamples' into develop
Browse files Browse the repository at this point in the history
re #9571
Conflicts:
	Code/Mantid/docs/CMakeLists.txt
	Code/Mantid/docs/source/algorithms/GeneratePeaks-v1.rst
  • Loading branch information
NickDraper committed Jun 30, 2014
2 parents 474c54f + 94570d3 commit ed2ee51
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion Code/Mantid/docs/source/algorithms/GeneratePeaks-v1.rst
@@ -1,4 +1,4 @@
.. algorithm::
.. algorithm::

.. summary::

Expand All @@ -15,6 +15,7 @@ parameters are given in a `TableWorkspace <http://www.mantidproject.org/TableWor
Peak Parameters
###############


Peak parameters must have the following columns, which are case
sensitive in input `TableWorkspace <http://www.mantidproject.org/TableWorkspace>`_

Expand Down Expand Up @@ -43,6 +44,7 @@ The background is a quadratic function

.. math:: \mbox{A0}+\mbox{A1}*x+\mbox{A2}*x^2


Output
######

Expand Down

0 comments on commit ed2ee51

Please sign in to comment.