Merge branch 'master' into release-1.2.1

Conflicts:
	doc/source/intro.rst

README.rst

@@ -45,7 +45,7 @@ The call arguments are:
 * `resNorms`, array to return the residual norms of the found eigenpairs; and
 * `primme`, structure that specify the matrix problem, which eigenvalues are wanted and several method options.
 
-See documentation in `readme.txt` and `doc.pdf`.
+See documentation in `readme.txt` file and in ``doc`` directory.
 
 Citing this code 
 ----------------
@@ -100,6 +100,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 Contact Information 
 -------------------
 
-For reporting bugs or questions about functionality contact `Andreas Stathopoulos`_
+For reporting bugs or questions about functionality contact `Andreas Stathopoulos`_ by
+email, `andreas` at `cs.wm.edu`. See further information in
+the webpage http://www.cs.wm.edu/~andreas/software .
 
-.. _`Andreas Stathopoulos`: http://www.cs.wm.edu/~andreas/
+.. _`Andreas Stathopoulos`: http://www.cs.wm.edu/~andreas/software

doc/readme.html

@@ -49,7 +49,7 @@ <h2>PRIMME: PReconditioned Iterative MultiMethod Eigensolver<a class="headerlink
 PRIMME is written in C99, but complete interfaces are provided for Fortran 77 and MATLAB.</p>
 <div class="section" id="changelog">
 <h3>Changelog<a class="headerlink" href="#changelog" title="Permalink to this headline">¶</a></h3>
-<p>Changes in PRIMME 1.2.1 (released on September 7th, 2015):</p>
+<p>Changes in PRIMME 1.2.1 (released on September 7, 2015):</p>
 <ul class="simple">
 <li>Added MATLAB interface to full PRIMME functionality.</li>
 <li>Support for <a class="reference external" href="http://www.netlib.org/blas/">BLAS</a>/<a class="reference external" href="http://www.netlib.org/lapack/">LAPACK</a> with 64bits integers (<code class="docutils literal"><span class="pre">-DPRIMME_BLASINT_SIZE=64</span></code>).</li>
@@ -66,7 +66,7 @@ <h3>Changelog<a class="headerlink" href="#changelog" title="Permalink to this he
 <li>Fixed a few minor bugs and improved documentation (especially the F77 interface).</li>
 <li>Using <a class="reference external" href="http://sphinx-doc.org/">Sphinx</a> to manage documentation.</li>
 </ul>
-<p>Changes in PRIMME 1.2 (released on December 21st, 2014):</p>
+<p>Changes in PRIMME 1.2 (released on December 21, 2014):</p>
 <ul>
 <li><p class="first">A Fortran compiler is no longer required for building the PRIMME library.
 Fortran programs can still be linked to PRIMME&#8217;s F77 interface.</p>

readme.txt

@@ -91,7 +91,7 @@ and MATLAB.
 Changelog
 =========
 
-Changes in PRIMME 1.2.1 (released on September 7th, 2015):
+Changes in PRIMME 1.2.1 (released on September 7, 2015):
 
 * Added MATLAB interface to full PRIMME functionality.
 
@@ -117,7 +117,7 @@ Changes in PRIMME 1.2.1 (released on September 7th, 2015):
 
 * Using Sphinx to manage documentation.
 
-Changes in PRIMME 1.2 (released on December 21st, 2014):
+Changes in PRIMME 1.2 (released on December 21, 2014):
 
 * A Fortran compiler is no longer required for building the PRIMME
   library. Fortran programs can still be linked to PRIMME's F77