Merge branch 'release/0.1.5'0.1.5

7 files changed, 16 insertions, 15 deletions

diff --git a/README.rst b/README.rst
index 65e741d..a3d16a7 100644
--- a/README.rst
+++ b/README.rst
@@ -33,16 +33,9 @@ Getting started
 
 To highlight using colors:
 
-.. code:: python
-
-    from ansicolor import green
-    from ansicolor import red
-    from ansicolor import white
+.. literalinclude:: snippets/getting_started_1.py
 
-    print("Let's try two colors: %s and %s!" % (red("red"), green("green")))
-    print("It's also easy to produce text in %s," % (red("bold", bold=True)))
-    print("...%s," % (green("reverse", reverse=True)))
-    print("...and %s." % (cyan("bold and reverse", bold=True, reverse=True)))
+.. figure:: snippets/getting_started_1.png
 
 
 This will emit ansi escapes into the string: one when starting a color, another
diff --git a/ansicolor/__init__.py b/ansicolor/__init__.py
index a1a43c9..bf6cd9f 100644
--- a/ansicolor/__init__.py
+++ b/ansicolor/__init__.py
@@ -32,5 +32,5 @@ __all__ = [
 ]
 
 __major_version__ = "0.1"
-__release__ = "4"
+__release__ = "5"
 __version__ = "%s.%s" % (__major_version__, __release__)
diff --git a/docs/README.rst b/docs/README.rst
new file mode 120000
index 0000000..89a0106
--- /dev/null
+++ b/docs/README.rst
@@ -0,0 +1 @@
+../README.rst
\ No newline at end of file
diff --git a/docs/conf.py b/docs/conf.py
index afcc661..a8b8082 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -55,7 +55,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = ansicolor.__name__
-copyright = u'2010-2014, %s' % author
+copyright = u'2008-2014, %s' % author
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -275,7 +275,7 @@ texinfo_documents = [
 epub_title = ansicolor.__name__
 epub_author = author
 epub_publisher = author
-epub_copyright = u'2010-2014, %s' % author
+epub_copyright = u'2008-2014, %s' % author
 
 # The basename for the epub file. It defaults to the project name.
 #epub_basename = u'ansicolor'
diff --git a/docs/index.rst b/docs/index.rst
index 2dc5b38..e0e71d1 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -6,11 +6,10 @@
 Welcome to ansicolor's documentation!
 =====================================
 
-Contents:
-
 .. toctree::
    :maxdepth: 4
 
+   README.rst
    ansicolor
 
 
@@ -20,4 +19,3 @@ Indices and tables
 * :ref:`genindex`
 * :ref:`modindex`
 * :ref:`search`
-
diff --git a/docs/snippets/getting_started_1.png b/docs/snippets/getting_started_1.png
new file mode 100644
index 0000000..d34261f
--- /dev/null
+++ b/docs/snippets/getting_started_1.png
diff --git a/docs/snippets/getting_started_1.py b/docs/snippets/getting_started_1.py
new file mode 100644
index 0000000..dd76ab7
--- /dev/null
+++ b/docs/snippets/getting_started_1.py
@@ -0,0 +1,9 @@
+from ansicolor import cyan
+from ansicolor import green
+from ansicolor import red
+from ansicolor import white
+
+print("Let's try two colors: %s and %s!" % (red("red"), green("green")))
+print("It's also easy to produce text in %s," % (red("bold", bold=True)))
+print("...%s," % (green("reverse", reverse=True)))
+print("...and %s." % (cyan("bold and reverse", bold=True, reverse=True)))