Merge branch 'develop' into release

issp-center-dev · Dec 25, 2017 · 818308b · 818308b
2 parents 81e7fad + 52ffadb
commit 818308b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/doc/about.rst b/doc/about.rst
@@ -4,6 +4,10 @@ License
 The DCore package is published under the 
 `GNU General Public License, version 3 <http://www.gnu.org/licenses/gpl.html>`_.
 
+Copyright (C) 2017 The University of Tokyo
+
+This package is developed under the support of "Project for advancement of software usability in materials science" by The Institute for Solid State Physics, The University of Tokyo.
+
 Authors & Quotation
 ===================
 
@@ -21,13 +25,7 @@ In addition to the above two libraries, you may use impurity solvers listed belo
 * `TRIQS/cthyb <https://triqs.ipht.cnrs.fr/applications/cthyb/about.html>`_
 * `TRIQS/hubbardI <https://triqs.ipht.cnrs.fr/1.x/applications/hubbardI/about.html>`_
 
-This application is a part of our scientific work and we would appreciate if
-projects using it will include a citation to the above relevant papers.  In
-order to help you, we provide a BibTeX entry for each paper.
-
-If you find the application useful, giving proper reference and citation is
-indeed a simple way to help convincing funding sources that such projects are
-useful for our community and should be supported.
+These applications are scientific works by triqs's team. In order to help you, they provide a BibTeX entry for each paper in the above cites.
 
 Disclaimer
 ==========

diff --git a/doc/basicnotions/structure.rst b/doc/basicnotions/structure.rst
@@ -5,7 +5,7 @@
    :align: center
 
 DCore is a DMFT (Dynamical Mean Field Theory) driver which works together with other
-first-principles program package.
+first-principles program packages.
 DCore supports input hopping parameters as the wannier90 format.
 It can also perform calculation of simple preset models (such as the Bethe lattice);
 it can be used for the practice of this code.

diff --git a/doc/install.rst b/doc/install.rst
@@ -40,7 +40,7 @@ Version compatibility
 --------------------- 
 
 Be careful that the version of the TRIQS library and of the dft tools must be 
-compatible (more information on the :ref:`TRIQS website <triqslibs:welcome>`. 
+compatible (more information on the :ref:`TRIQS website <triqslibs:welcome>`). 
 If you want to use a version of the dft tools that is not the latest one, go
 into the directory with the sources and look at all available versions:: 
 

diff --git a/doc/tutorial/square.rst b/doc/tutorial/square.rst
@@ -46,7 +46,7 @@ You can run it with the following command, if X window system is available:
 
    $ dcore_check dmft_square.ini
 
-If X is not available or you prefer plotting in a file, use ``--output`` option to specify output file name
+If X window is not available or you prefer plotting in a file, use ``--output`` option to specify output file name
 
 .. code-block:: bash
 
@@ -56,7 +56,7 @@ The extension can be eps, jpg, etc.
 
 .. We can find the following standard output.
 
-``dcore_check`` program prints the value of the chemical potential in each iterations on the standard output:
+``dcore_check`` program prints the value of the chemical potential at each iteration on the standard output:
 
 ::
 
@@ -82,7 +82,7 @@ The extension can be eps, jpg, etc.
    :width: 500
    :align: center
 
-If those results are not converged, one can repeat the DMFT iteration using the same ini file. ``dcore`` program automatically finds results in the previous run and continue iteration.
+If those results are not converged, one can repeat the DMFT iteration using the same ini file. ``dcore`` program automatically finds results in the previous run and continue iterations.
 
 Spectral function : ``dcore_post``
 ----------------------------------