Merge branch 'nightly' of gitlab.mpcdf.mpg.de:ift/NIFTy into nightly

docs/howto.txt

+Required packages:
+sphinx
+numpydoc
+sphinx_rtd_theme
+
+
+#Two step creation of webpages:
+
+sphinx-apidoc -l -e -d 3 -o docs/source/mod/ nifty/ nifty/plotting/ nifty/spaces/power_space/power_indices.py nifty/spaces/power_space/power_index_factory.py nifty/config/ nifty/basic_arithmetics.py nifty/nifty_meta.py nifty/random.py nifty/version.py  nifty/field_types/ nifty/operators/fft_operator/transformations/rg_transforms.py
+
+
+#creates all .rst files neccesary for ModuleIndex excluding helper modules
+
+sphinx-build -b html docs/source/ docs/build/
+
+#generates html file and build directory

docs/howtogenerate.txt

-Two step creation of webpages:
-
-sphinx-apidoc -l -e -d 3 -o sphinx/source/mod/ nifty/ nifty/plotting/ nifty/spaces/power_space/power_indices.py nifty/spaces/power_space/power_index_factory.py nifty/config/ nifty/basic_arithmetics.py nifty/nifty_meta.py nifty/random.py nifty/version.py  nifty/field_types/ nifty/operators/fft_operator/transformations/rg_transforms.py
-
-
-creates all .rst files neccesary for ModuleIndex excluding helper modules
-
-sphinx-build -b html sphinx/source/ sphinx/build/
-
-generates html filel amd build directory

nifty/field.py

@@ -842,7 +842,7 @@ class Field(Loggable, Versionable, object):
 
     @property
     def real(self):
-        """ The real part of the field (data is not copied).
+        """ The real part of the field.
         """
         real_part = self.val.real
         result = self.copy_empty(dtype=real_part.dtype)
@@ -851,7 +851,7 @@ class Field(Loggable, Versionable, object):
 
     @property
     def imag(self):
-        """ The imaginary part of the field (data is not copied).
+        """ The imaginary part of the field.
         """
         imag_part = self.val.imag
         result = self.copy_empty(dtype=imag_part.dtype)