Merge pull request #901 from zeroedin-bill/docs-build-improvements

Update docs dep script and readme to target Ubuntu 14.04

docs/README.md

 # Doctrine DBAL Documentation
 
-## How to Generate
+## How to Generate:
+Using Ubuntu 14.04 LTS:
 
 1. Run ./bin/install-dependencies.sh
 2. Run ./bin/generate-docs.sh
 
-It will generate the documentation into the build directory of the checkout.
\ No newline at end of file
+It will generate the documentation into the build directory of the checkout.
+
+
+## Theme issues
+
+If you get a "Theme error", check if the `en/_theme` subdirectory is empty,
+in which case you will need to run:
+
+1. git submodule init
+2. git submodule update
\ No newline at end of file

docs/bin/install-dependencies.sh

 #!/bin/bash
-sudo apt-get install python25 python25-dev texlive-full rubber
-sudo easy_install pygments
-sudo easy_install sphinx
\ No newline at end of file
+sudo apt-get update && sudo apt-get install -y python2.7 python-sphinx python-pygments
\ No newline at end of file

docs/en/conf.py

@@ -38,16 +38,16 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'Doctrine DBAL'
-copyright = u'2010, Roman Borschel, Guilherme Blanco, Benjamin Eberlei, Jonathan Wage'
+copyright = u'2010-2015, Roman Borschel, Guilherme Blanco, Benjamin Eberlei, Jonathan Wage'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '2.1'
+version = '2'
 # The full version, including alpha/beta/rc tags.
-release = '2.1.0'
+release = '2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.