Merge tag 'v1.6' into debian/sid

Added tag v1.6 for changeset 746517263955

1 files changed, 6 insertions, 4 deletions

diff --git a/python/README.rst b/python/README.rst
index 0c6c391..7de641d 100644
--- a/python/README.rst
+++ b/python/README.rst
@@ -70,7 +70,7 @@ Other configurations are untested.
 Please note that this package DOES NOT work with the Python 2.7.10 that ships with the operating
 system in Mac OS X. These words of wisdom from `python.org`_ are worth heeding:
 
-    The version of Python that ships with OS X is great for learning but it’s not good for development.
+    The version of Python that ships with OS X is great for learning but it is not good for development.
     The version shipped with OS X may be out of date from the official current Python release,
     which is considered the stable production version.
 
@@ -99,8 +99,10 @@ Now the code::
 
     import phat
 
-    # define a boundary matrix with the chosen internal representation
-    boundary_matrix = phat.boundary_matrix(representation = phat.representations.vector_vector)
+    boundary_matrix = phat.boundary_matrix()
+
+    # or define a boundary matrix with the chosen internal representation
+    # boundary_matrix = phat.boundary_matrix(representation = phat.representations.bit_tree_pivot_column)
 
     # set the respective columns -- (dimension, boundary) pairs
     boundary_matrix.columns = [ (0, []),
@@ -138,5 +140,5 @@ References:
 .. [3] C.Chen, M.Kerber: Persistent Homology Computation With a Twist. 27th European Workshop on Computational Geometry, 2011.
 .. [4] U.Bauer, M.Kerber, J.Reininghaus: Clear and Compress: Computing Persistent Homology in Chunks. arXiv:1303.0477_
 .. _arXiv:1303.0477: http://arxiv.org/pdf/1303.0477.pdf
-.. _`Persistent Homology Algorithm Toolkit`: https://bitbucket.org/phat/phat-code
+.. _`Persistent Homology Algorithm Toolbox`: https://bitbucket.org/phat/phat-code
 .. _`python.org`:http://docs.python-guide.org/en/latest/starting/install/osx/