Fixed some links and typos

Author: rougier

01-preface.rst

@@ -95,8 +95,6 @@ should import numpy, scipy and glumpy as:
 .. code-block:: python
    
    import numpy as np
-   import scipy as sp
-   import glumpy as gp
 
 
 We'll use up-to-date versions (at the date of writing, i.e. August, 2017) of the

08-markers.rst

@@ -68,7 +68,7 @@ And we can check for the result using two circles (the shadertoy link for each
 example allows you to play online with them):
 
 
-.. figure:: images/chapter-08/CSG-intersection.png
+.. figure:: images/chapter-08/csg-intersection.png
    :figwidth: 30%
 
    Figure
@@ -78,7 +78,7 @@ example allows you to play online with them):
 
 __  https://www.shadertoy.com/view/XllyWn
 
-.. figure:: images/chapter-08/CSG-union.png
+.. figure:: images/chapter-08/csg-union.png
    :figwidth: 30%
 
    Figure
@@ -88,7 +88,7 @@ __  https://www.shadertoy.com/view/XllyWn
 
 __  https://www.shadertoy.com/view/4tlyWn
 
-.. figure:: images/chapter-08/CSG-mix.png
+.. figure:: images/chapter-08/csg-mix.png
    :figwidth: 30%
 
    Figure
@@ -100,7 +100,7 @@ __  https://www.shadertoy.com/view/MtfcDr
 
 ----
 
-.. figure:: images/chapter-08/CSG-exclusion.png
+.. figure:: images/chapter-08/csg-exclusion.png
    :figwidth: 30%
 
    Figure
@@ -111,7 +111,7 @@ __  https://www.shadertoy.com/view/MtfcDr
 __  https://www.shadertoy.com/view/4tsyWn
 
 
-.. figure:: images/chapter-08/CSG-difference-2.png
+.. figure:: images/chapter-08/csg-difference-2.png
    :figwidth: 30%
 
    Figure
@@ -121,7 +121,7 @@ __  https://www.shadertoy.com/view/4tsyWn
 
 __  https://www.shadertoy.com/view/XtsyWn
 
-.. figure:: images/chapter-08/CSG-difference-1.png
+.. figure:: images/chapter-08/csg-difference-1.png
    :figwidth: 30%
 
    Figure

README.rst

@@ -8,7 +8,7 @@ Python & OpenGL for Scientific Visualization
 
 Python and OpenGL have a long but complicated story. It used to be really easy
 to program something using the fixed-pipeline and libraries such as Pyglet but
-things have became more difficult with the introduction of the dynamic graphic
+things became more difficult with the introduction of the dynamic graphic
 pipeline in 2004. The goal of this book is to reconciliate Python programmers
 with OpenGL, providing both an introduction to modern OpenGL and a set of basic
 and advanced techniques in order to achieve both fast, scalable & beautiful

book.html

@@ -236,8 +236,6 @@ <h3><a class="toc-backref" href="#id1">Conventions</a></h3>
 should import numpy, scipy and glumpy as:</p>
 <pre class="code python literal-block">
 <span class="keyword namespace">import</span> <span class="name namespace">numpy</span> <span class="keyword namespace">as</span> <span class="name namespace">np</span>
-<span class="keyword namespace">import</span> <span class="name namespace">scipy</span> <span class="keyword namespace">as</span> <span class="name namespace">sp</span>
-<span class="keyword namespace">import</span> <span class="name namespace">glumpy</span> <span class="keyword namespace">as</span> <span class="name namespace">gp</span>
 </pre>
 <p>We'll use up-to-date versions (at the date of writing, i.e. August, 2017) of the
 different packages:</p>
@@ -1442,7 +1440,7 @@ <h3><a class="toc-backref" href="#id7">Varying color</a></h3>
 <!-- Animating
 +++++++++
 
-.. figure:: data/quad-scale.mp4
+.. figure:: movies/chapter-03/quad-scale.mp4
    :loop:
    :autoplay:
    :controls:
@@ -3444,8 +3442,8 @@ <h2><a class="toc-backref" href="#id29">Constructive Solid Geometry</a></h2>
 </pre>
 <p>And we can check for the result using two circles (the shadertoy link for each
 example allows you to play online with them):</p>
-<div class="right figure" id="figure-images/chapter-08/CSG-intersection.png" style="width: 30%">
-<img alt="images/chapter-08/CSG-intersection.png" src="images/chapter-08/CSG-intersection.png" />
+<div class="right figure" id="figure-images/chapter-08/csg-intersection.png" style="width: 30%">
+<img alt="images/chapter-08/csg-intersection.png" src="images/chapter-08/csg-intersection.png" />
 <p class="caption">Figure</p>
 <div class="legend">
 <div class="line-block">
@@ -3454,8 +3452,8 @@ <h2><a class="toc-backref" href="#id29">Constructive Solid Geometry</a></h2>
 </div>
 </div>
 </div>
-<div class="right figure" id="figure-images/chapter-08/CSG-union.png" style="width: 30%">
-<img alt="images/chapter-08/CSG-union.png" src="images/chapter-08/CSG-union.png" />
+<div class="right figure" id="figure-images/chapter-08/csg-union.png" style="width: 30%">
+<img alt="images/chapter-08/csg-union.png" src="images/chapter-08/csg-union.png" />
 <p class="caption">Figure</p>
 <div class="legend">
 <div class="line-block">
@@ -3464,8 +3462,8 @@ <h2><a class="toc-backref" href="#id29">Constructive Solid Geometry</a></h2>
 </div>
 </div>
 </div>
-<div class="right figure" id="figure-images/chapter-08/CSG-mix.png" style="width: 30%">
-<img alt="images/chapter-08/CSG-mix.png" src="images/chapter-08/CSG-mix.png" />
+<div class="right figure" id="figure-images/chapter-08/csg-mix.png" style="width: 30%">
+<img alt="images/chapter-08/csg-mix.png" src="images/chapter-08/csg-mix.png" />
 <p class="caption">Figure</p>
 <div class="legend">
 <div class="line-block">
@@ -3475,8 +3473,8 @@ <h2><a class="toc-backref" href="#id29">Constructive Solid Geometry</a></h2>
 </div>
 </div>
 <hr class="docutils" />
-<div class="right figure" id="figure-images/chapter-08/CSG-exclusion.png" style="width: 30%">
-<img alt="images/chapter-08/CSG-exclusion.png" src="images/chapter-08/CSG-exclusion.png" />
+<div class="right figure" id="figure-images/chapter-08/csg-exclusion.png" style="width: 30%">
+<img alt="images/chapter-08/csg-exclusion.png" src="images/chapter-08/csg-exclusion.png" />
 <p class="caption">Figure</p>
 <div class="legend">
 <div class="line-block">
@@ -3485,8 +3483,8 @@ <h2><a class="toc-backref" href="#id29">Constructive Solid Geometry</a></h2>
 </div>
 </div>
 </div>
-<div class="right figure" id="figure-images/chapter-08/CSG-difference-2.png" style="width: 30%">
-<img alt="images/chapter-08/CSG-difference-2.png" src="images/chapter-08/CSG-difference-2.png" />
+<div class="right figure" id="figure-images/chapter-08/csg-difference-2.png" style="width: 30%">
+<img alt="images/chapter-08/csg-difference-2.png" src="images/chapter-08/csg-difference-2.png" />
 <p class="caption">Figure</p>
 <div class="legend">
 <div class="line-block">
@@ -3495,8 +3493,8 @@ <h2><a class="toc-backref" href="#id29">Constructive Solid Geometry</a></h2>
 </div>
 </div>
 </div>
-<div class="right figure" id="figure-images/chapter-08/CSG-difference-1.png" style="width: 30%">
-<img alt="images/chapter-08/CSG-difference-1.png" src="images/chapter-08/CSG-difference-1.png" />
+<div class="right figure" id="figure-images/chapter-08/csg-difference-1.png" style="width: 30%">
+<img alt="images/chapter-08/csg-difference-1.png" src="images/chapter-08/csg-difference-1.png" />
 <p class="caption">Figure</p>
 <div class="legend">
 <div class="line-block">