Merge branch 'master' of github.com:diffpy/diffpy.srmise

Author: Ainamacar

README.rst

@@ -85,7 +85,7 @@ The simplest way to obtain diffpy.srmise on Unix, Linux, and Mac systems is
 using ``easy_install`` or ``pip`` to download and install the latest release 
 from the `Python Package Index <https://pypi.python.org>`_. :: 
 
-   sudo pip diffpy.srmise
+   sudo pip install diffpy.srmise
 
 If you prefer to install from sources, make sure all required software packages
 are in place and then run ::

doc/examples/Ag_multiplepeaks.py

@@ -81,8 +81,8 @@ def run(plot=True):
     # using the appropriate tuple of indices (i,j).  That is, (i,j) denotes
     # the jth parameter of the ith peak.  For example, the starred parameter
     # above is the area (index = 2) of the next nearest neighbor (index = 1)
-    # peak. Thus, this peak can be referenced as (1,2).  Several examples are
-    # presented below.
+    # peak. Thus, this parameter can be referenced as (1,2).  Several examples
+    # are presented below.
     print "\n------ Examples of accessing peak extraction results ------"
 
     # The value and uncertainties of the nearest-neighbor peak parameters.

doc/manual/source/extending.rst

@@ -137,7 +137,7 @@ following differences:
     Return peak parameters such that the value at ``r`` is scaled by ``scale``
     while the position of the peak's maxima remains unchanged.
 
-    :param pars: The parameters of the baseline.
+    :param pars: The parameters of the peak.
     :param r: Position where the peak will be rescaled.
     :param scale: A scale factor > 0.
     :type pars: `Sequence(float)`