# HG changeset patch
# User Amine SEHILI <amine.sehili@gmail.com>
# Date 1463173289 -7200
# Node ID c75a79b86c98078be19f1b827b4d9daf43fad691
# Parent  fec5a439eb668f46e96e796f4b78e9688b4982c6# Parent  ccff9ac72d278db0050c1483e8d823e3b76bb296
Merge branch 'master' of https://github.com/amsehili/auditok

diff -r fec5a439eb66 -r c75a79b86c98 auditok/io.py
--- a/auditok/io.py	Fri May 13 23:00:29 2016 +0200
+++ b/auditok/io.py	Fri May 13 23:01:29 2016 +0200
@@ -97,7 +97,7 @@
             
         :Returns:
             
-            Audio data as a string of length 'N' * 'smaple_width' * 'channels', where 'N' is:
+            Audio data as a string of length 'N' * 'sample_width' * 'channels', where 'N' is:
             
             - `size` if `size` < 'left_samples'
             
diff -r fec5a439eb66 -r c75a79b86c98 auditok/util.py
--- a/auditok/util.py	Fri May 13 23:00:29 2016 +0200
+++ b/auditok/util.py	Fri May 13 23:01:29 2016 +0200
@@ -866,7 +866,7 @@
             `data` is converted into a numerical array using the `sample_width`
             given in the constructor.
         
-        :Retruns:
+        :Returns:
         
         True if `log_energy` >= `energy_threshold`, False otherwise.
         """