Merge pull request pyne#781 from ohnemax/inline-doc

Small changes in documentation
gonuke · Nov 18, 2015 · 04d61c8 · 04d61c8
2 parents 3c2bf70 + be37f3a
commit 04d61c8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pyne/material.pyx b/pyne/material.pyx
@@ -686,14 +686,14 @@ cdef class _Material:
         return newmat
 
     def collapse_elements(self, nucset):
-        """collapse_elements(self)
+        """collapse_elements(self, nucset)
         Collapses the elements in the material, excluding the nucids in 
-	paramater set. This function returns a copy of the material.
+	the set nucset. This function returns a copy of the material.
 
         Returns
         -------
         newmat : Material
-            A copied and collapseed material.
+            A copied and collapsed material.
 
         """
         cdef _Material newmat = Material()