Merged docs with upstream dev
authorDmitriy Morozov <dmitriy@mrzv.org>
Wed, 25 Aug 2010 14:31:36 -0700
branchdev
changeset 224 8f6fb2ad57f7
parent 223 3d54247cbccf (diff)
parent 222 fdfde7291a0f (current diff)
child 225 d4c3991a2462
Merged docs with upstream
--- a/doc/get-build-install.rst	Wed Aug 25 14:29:54 2010 -0700
+++ b/doc/get-build-install.rst	Wed Aug 25 14:31:36 2010 -0700
@@ -39,7 +39,7 @@
 
 Optional dependencies:
 
-  :CGAL_:               for alpha shapes and vineyards   (version :math:`\geq` 3.4)
+  :CGAL_:               for alpha shapes   (version :math:`\geq` 3.4)
   :CVXOPT_:             for :ref:`circle-valued parametrization <cohomology-parametrization>` using LSQR
   :PyX_:                :sfile:`tools/draw-diagram/draw.py` uses `PyX`_ to
                         produce a PDF of the diagram