diff --git a/docs/source/building.rst b/docs/source/building.rst
index 77a81c08a..9ae6c890c 100644
--- a/docs/source/building.rst
+++ b/docs/source/building.rst
@@ -50,10 +50,10 @@ significantly faster than ``CXSparse``.
7. `BLAS `_ and `LAPACK
`_ routines are needed by
-SuiteSparse. We recommend either `GotoBlas2
-`_ or `ATLAS
-`_ , both of which ship with BLAS
-and LAPACK routines.
+SuiteSparse. We recommend either `OpenBLAS
+`_ or `ATLAS `_, both of which ship with BLAS and LAPACK
+routines.
8. `protobuf `_ is used for
serializing and deserializing linear least squares problems to
@@ -83,6 +83,8 @@ platform. Start by installing all the dependencies.
./configure --with-gflags=/usr/local/
make
sudo make install
+ # BLAS & LAPACK
+ sudo apt-get install libopenblas-dev
# Eigen3
sudo apt-get install libeigen3-dev
# SuiteSparse and CXSparse
@@ -95,10 +97,10 @@ the exact path to the ``libglog.a`` and ``libgflag.a``.
.. code-block:: bash
- tar zxf ceres-solver-1.5.0.tar.gz
+ tar zxf ceres-solver-1.6.0.tar.gz
mkdir ceres-bin
cd ceres-bin
- cmake ../ceres-solver-1.5.0
+ cmake ../ceres-solver-1.6.0
make -j3
make test
@@ -109,7 +111,7 @@ dataset [Agarwal]_.
.. code-block:: bash
bin/simple_bundle_adjuster \
- ../ceres-solver-1.5.0/data/problem-16-22106-pre.txt \
+ ../ceres-solver-1.6.0/data/problem-16-22106-pre.txt \
This runs Ceres for a maximum of 10 iterations using the
``DENSE_SCHUR`` linear solver. The output should look something like
@@ -171,7 +173,10 @@ Building on Mac OS X
On OS X, we recommend using the `homebrew
`_ package manager. Start by
-installing all the dependencies.
+installing all the dependencies. OS X ships with well optimized BLAS
+and LAPACK routines as part of the `vecLib
+`_
+framework.
.. code-block:: bash
@@ -179,7 +184,7 @@ installing all the dependencies.
brew install cmake
# google-glog and gflags
brew install glog
- # Eigen2
+ # Eigen3
brew install eigen
# SuiteSparse and CXSparse
brew install suite-sparse
@@ -191,10 +196,10 @@ We are now ready to build and test Ceres.
.. code-block:: bash
- tar zxf ceres-solver-1.5.0.tar.gz
+ tar zxf ceres-solver-1.6.0.tar.gz
mkdir ceres-bin
cd ceres-bin
- cmake ../ceres-solver-1.5.0
+ cmake ../ceres-solver-1.6.0
make -j3
make test
diff --git a/docs/source/citation.rst b/docs/source/citation.rst
new file mode 100644
index 000000000..ad735777d
--- /dev/null
+++ b/docs/source/citation.rst
@@ -0,0 +1,12 @@
+========
+Citation
+========
+
+If you use Ceres Solver for an academic publication, please cite this
+manual. e.g., ::
+
+ @manual{ceres-manual,
+ Author = {Sameer Agarwal and Keir Mierle},
+ Title = {Ceres Solver: Tutorial \& Reference},
+ Organization = {Google Inc.}
+ }
diff --git a/docs/source/conf.py b/docs/source/conf.py
index e11430168..99301edb3 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -48,9 +48,9 @@ copyright = u'2013, Google Inc.'
# built documents.
#
# The short X.Y version.
-version = '1.5'
+version = '1.6'
# The full version, including alpha/beta/rc tags.
-release = '1.5.0'
+release = '1.6.0'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/docs/source/contributing.rst b/docs/source/contributing.rst
index 090bddc34..50f2b2a40 100644
--- a/docs/source/contributing.rst
+++ b/docs/source/contributing.rst
@@ -18,10 +18,9 @@ to make a suggestion or three.
We follow Google's `C++ Style Guide
`_ and
-use `git
-`_ for
-version control. We use the Gerrit code review system to collaborate
-and review changes to Ceres. Gerrit enables pre-commit reviews so that
+use `git `_ for version control. We use the
+`Gerrit `_ to collaborate and
+review changes to Ceres. Gerrit enables pre-commit reviews so that
Ceres can maintain a linear history with clean, reviewed commits, and
no merges.
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 9d73cca72..f272bb177 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -1,4 +1,4 @@
-.. Ceres Solver documentation master file, created by
+.. Ceres Solver documentation master file, crea`%ted by
sphinx-quickstart on Sat Jan 19 00:07:33 2013.
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
@@ -11,7 +11,7 @@ Ceres Solver is a portable C++ library for solving non-linear least
squares problems.
* Download the latest stable `release
- `_
+ `_
or clone the `repository
`_
@@ -19,8 +19,9 @@ squares problems.
* Browse the :ref:`chapter-modeling` and :ref:`chapter-solving`
-* Ask questions and join the discussion on the `mailing list
- `_.
+* Join the `mailing list
+ `_
+ and ask questions.
* File bugs, feature requests in the `issue tracker
`_.
@@ -41,3 +42,4 @@ squares problems.
version_history
bibliography
license
+ citation
diff --git a/docs/source/license.rst b/docs/source/license.rst
index 9e99cc74e..58d70df07 100644
--- a/docs/source/license.rst
+++ b/docs/source/license.rst
@@ -28,15 +28,3 @@ profits; or business interruption) however caused and on any theory of
liability, whether in contract, strict liability, or tort (including negligence
or otherwise) arising in any way out of the use of this software, even if
advised of the possibility of such damage.
-
-Citation
-========
-
-If you use Ceres Solver for an academic publication, please cite this
-manual. e.g., ::
-
- @manual{ceres-manual,
- Author = {Sameer Agarwal and Keir Mierle},
- Title = {Ceres Solver: Tutorial \& Reference},
- Organization = {Google Inc.}
- }