Rolled back a bad merge

Makefile

@@ -22,6 +22,7 @@ docbuild: FORCE
 	$(MAKE) -C doc html
 	rm -rfr doc/_build
 	$(MAKE) -C doc html
-	rsync -rm --perms --chmod=ugo=rwX --delete  --filter="P .git" doc/_build/html/ ../gh-pages/
+	( cd ../gh-pages; git pull )
+	rsync -rcm --perms --chmod=ugo=rwX --delete  --filter="P .git" --filter="P .nojekyll" doc/_build/html/ ../gh-pages/
 
 FORCE:

Stoner/Core.py

@@ -2329,12 +2329,12 @@ def add_column(self, column_data, header=None, index=None, func_args=None, repla
         if index is None or isinstance(index,bool) and index:
             index = len(self.column_headers)
             replace = False
-            if column_header is None:
-                column_header = "Col" + str(index)
+            if header is None:
+                header = "Col" + str(index)
         else:
             index = self.find_col(index)
-            if column_header is None:
-                column_header = self.column_headers[index]
+            if header is None:
+                header = self.column_headers[index]
 
 # The following 2 lines make the array we are adding a
 # [1, x] array, i.e. a column by first making it 2d and
@@ -2376,7 +2376,7 @@ def add_column(self, column_data, header=None, index=None, func_args=None, repla
             else:
                 self.data = DataArray(_np_.insert(self.data, index, _np__data, 1),setas=self.data._setas)
         #Finally sort out column headers
-            self.column_headers[index] = column_header
+            self.column_headers[index] = header
 
         return self
 

Stoner/Plot.py

@@ -458,7 +458,7 @@ def add_column(self, column_data, header=None, index=None, func_args=None, repla
         else:
             index = self.find_col(index)
 
-        self.labels[index]=column_header
+        self.labels[index]=header
         return self
 
 

doc/UserGuide/analysisfile.rst

@@ -428,11 +428,11 @@ closely the spline follows the data points, with a *smoothing*=0.0 being a stric
 controls what the return value from the :py:meth:`AnalyseFile.spline` method reutrns. IF *replace* is True or a column
 index, then the new data is added as a column of the Data, possibly replacing the current y-data. If *replace* is False, then
 the new y-data is returned, but the existing data is unmodified. Finally, if *replace* is None, then the
-:py:meth:`AnalyseFile.spline` method returns a :py:class:`scipy.interpoalte.UnivararateSpline` object that can be used to
+:py:meth:`AnalyseFile.spline` method returns a :py:class:`scipy.interpolate.UnivararateSpline` object that can be used to
 evaluate the spline at arbitary locations, including extrapolating outside the range of the original x data.
 
 Extrapolation is, of course, a dangerous, operation when applied to data as it is essentially 'inventing' new data.
-Extrapolating fromt he spline function, whislt possible, is a little tricky and in many cases the :py:meth:`AnalyseFile.extrpoalte`
+Extrapolating fromt he spline function, whislt possible, is a little tricky and in many cases the :py:meth:`AnalyseFile.extrapolate`
 method is likely to be more successful. :py:meth:`AbnalyseFile.extrapolate` works by fitting a function over a window in the
 data and using the fit function to predict nearby values. Where the new values lie within the range of data, this is strictly
 a form of interpolation and the window of data fitted to the extrpolation function is centred around the new x-data point. As

doc/conf.py

@@ -280,9 +280,6 @@
 napoleon_use_param = False
 napoleon_use_rtype = False
 
-# Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'http://docs.python.org/': None}
-
 automodapi_toctreedirnm='classes'
 
 [extensions]