Merge release-2019 into master

[alexxy/gromacs.git] / docs / user-guide / mdp-options.rst

diff --git a/docs/user-guide/mdp-options.rst b/docs/user-guide/mdp-options.rst
index 137a2718de64b468844a9ea05bd304b648b53b80..8ae3921743ec42be9b1014437929645d4614fefb 100644 (file)
--- a/docs/user-guide/mdp-options.rst
+++ b/docs/user-guide/mdp-options.rst
@@ -622,16 +622,6 @@ Electrostatics
       :mdp:`epsilon-rf`. The dielectric constant can be set to
       infinity by setting :mdp:`epsilon-rf` =0.
 
-   .. mdp-value:: Generalized-Reaction-Field
-
-      Generalized reaction field with Coulomb cut-off
-      :mdp:`rcoulomb`, where :mdp:`rlist` >= :mdp:`rcoulomb`. The
-      dielectric constant beyond the cut-off is
-      :mdp:`epsilon-rf`. The ionic strength is computed from the
-      number of charged (*i.e.* with non zero charge) charge
-      groups. The temperature for the GRF potential is set with
-      :mdp:`ref-t`.
-
    .. mdp-value:: Reaction-Field-zero
 
       In |Gromacs|, normal reaction-field electrostatics with
@@ -1075,7 +1065,7 @@ Temperature coupling
    integrators, the leap-frog :mdp-value:`integrator=md` integrator
    only supports 1. Data for the NH chain variables is not printed
    to the :ref:`edr` file by default, but can be turned on with the
-   :mdp:`print-nose-hoover-chains` option.
+   :mdp:`print-nose-hoover-chain-variables` option.
 
 .. mdp:: print-nose-hoover-chain-variables