Merge pull request #8 from Zulko/master

pull from zulko
livingbio · Feb 16, 2017 · 1381b38 · 1381b38
2 parents ca009a3 + fb023fb
commit 1381b38
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/README.rst b/README.rst
@@ -12,7 +12,9 @@ MoviePy can read and write all the most common audio and video formats, includin
 Example
 --------
 
-In this example we open a video file, select the subclip between t=50s and t=60s, add a title at the center of the screen, and write the result to a new file: ::
+In this example we open a video file, select the subclip between t=50s and t=60s, add a title at the center of the screen, and write the result to a new file:
+
+.. code:: python
 
     from moviepy.editor import *
 

diff --git a/moviepy/video/compositing/concatenate.py b/moviepy/video/compositing/concatenate.py
@@ -120,4 +120,4 @@ def make_frame(t):
     return result
 
 
-concatenate = deprecated_version_of(concatenate_videoclips, "concatenate_videoclips")
+concatenate = deprecated_version_of(concatenate_videoclips, oldname="concatenate")