# HG changeset patch
# User Amine SEHILI <amine.sehili@gmail.com>
# Date 1485605017 -3600
# Node ID d52581cfc9b6aa014f55bc8fa285c87c96367e47
# Parent  a0843d57697b94feaf0c3057f86613daa39cc6f8# Parent  8e1ac2ebdcadf162cd71a7aa44b2cca6afc13bbc
Merge branch 'master' of https://github.com/amsehili/auditok into dev

diff -r a0843d57697b -r d52581cfc9b6 demos/audio_tokenize_demo.py
--- a/demos/audio_tokenize_demo.py	Sat Jan 28 12:54:02 2017 +0100
+++ b/demos/audio_tokenize_demo.py	Sat Jan 28 13:03:37 2017 +0100
@@ -13,7 +13,7 @@
 
    validator = AudioEnergyValidator(sample_width=asource.get_sample_width(), energy_threshold=65)
 
-   # Defalut analysis window is 10 ms (float(asource.get_block_size()) / asource.get_sampling_rate())
+   # Default analysis window is 10 ms (float(asource.get_block_size()) / asource.get_sampling_rate())
    # min_length=20 : minimum length of a valid audio activity is 20 * 10 == 200 ms
    # max_length=400 :  maximum length of a valid audio activity is 400 * 10 == 4000 ms == 4 seconds
    # max_continuous_silence=30 : maximum length of a tolerated  silence within a valid audio activity is 30 * 30 == 300 ms 
diff -r a0843d57697b -r d52581cfc9b6 doc/apitutorial.rst
--- a/doc/apitutorial.rst	Sat Jan 28 12:54:02 2017 +0100
+++ b/doc/apitutorial.rst	Sat Jan 28 13:03:37 2017 +0100
@@ -349,7 +349,7 @@
      
     validator = AudioEnergyValidator(sample_width=asource.get_sample_width(), energy_threshold=65)
     
-    # Defalut analysis window is 10 ms (float(asource.get_block_size()) / asource.get_sampling_rate())
+    # Default analysis window is 10 ms (float(asource.get_block_size()) / asource.get_sampling_rate())
     # min_length=20 : minimum length of a valid audio activity is 20 * 10 == 200 ms
     # max_length=4000 :  maximum length of a valid audio activity is 400 * 10 == 4000 ms == 4 seconds
     # max_continuous_silence=30 : maximum length of a tolerated  silence within a valid audio activity is 30 * 30 == 300 ms