From 365afc39e703ad1592cdefe2ebfb670331691c54 Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Thu, 12 Feb 2015 00:25:20 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13093
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 doc/fix_nh.html   | 9 ++++-----
 doc/fix_nh.txt    | 9 ++++-----
 doc/fix_wall.html | 3 ++-
 doc/fix_wall.txt  | 3 ++-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/doc/fix_nh.html b/doc/fix_nh.html
index b2247082e4..103fc7321e 100644
--- a/doc/fix_nh.html
+++ b/doc/fix_nh.html
@@ -374,11 +374,10 @@ temp/berendsen</A> command which performs
 thermostatting but NO time integration, these fixes perform
 thermostatting/barostatting AND time integration.  Thus you should not
 use any other time integration fix, such as <A HREF = "fix_nve.html">fix nve</A> on
-atoms to which this fix is applied.  Likewise, the <I>temp</I> options for
-fix nvt and fix npt should not normally be used on atoms that also
-have their temperature controlled by another fix - e.g. by <A HREF = "fix_nh.html">fix
-langevin</A> or <A HREF = "fix_temp_rescale.html">fix temp/rescale</A>
-commands.
+atoms to which this fix is applied.  Likewise, fix nvt and fix npt
+should not normally be used on atoms that also have their temperature
+controlled by another fix - e.g. by <A HREF = "fix_nh.html">fix langevin</A> or <A HREF = "fix_temp_rescale.html">fix
+temp/rescale</A> commands.
 </P>
 <P>See <A HREF = "Section_howto.html#howto_16">this howto section</A> of the manual for
 a discussion of different ways to compute temperature and perform
diff --git a/doc/fix_nh.txt b/doc/fix_nh.txt
index aa46a30d45..38b5ed658b 100644
--- a/doc/fix_nh.txt
+++ b/doc/fix_nh.txt
@@ -361,11 +361,10 @@ temp/berendsen"_fix_temp_berendsen.html command which performs
 thermostatting but NO time integration, these fixes perform
 thermostatting/barostatting AND time integration.  Thus you should not
 use any other time integration fix, such as "fix nve"_fix_nve.html on
-atoms to which this fix is applied.  Likewise, the {temp} options for
-fix nvt and fix npt should not normally be used on atoms that also
-have their temperature controlled by another fix - e.g. by "fix
-langevin"_fix_nh.html or "fix temp/rescale"_fix_temp_rescale.html
-commands.
+atoms to which this fix is applied.  Likewise, fix nvt and fix npt
+should not normally be used on atoms that also have their temperature
+controlled by another fix - e.g. by "fix langevin"_fix_nh.html or "fix
+temp/rescale"_fix_temp_rescale.html commands.
 
 See "this howto section"_Section_howto.html#howto_16 of the manual for
 a discussion of different ways to compute temperature and perform
diff --git a/doc/fix_wall.html b/doc/fix_wall.html
index 7b3762f5ab..891863492f 100644
--- a/doc/fix_wall.html
+++ b/doc/fix_wall.html
@@ -304,6 +304,7 @@ being minimized), you MUST enable the <A HREF = "fix_modify.html">fix_modify</A>
 
 <A NAME = "Magda"></A>
 
-<P><B>(Magda)</B> Magda, Tirrell, Davis, J Chem Phys, 83, 1888-1901 (1985).
+<P><B>(Magda)</B> Magda, Tirrell, Davis, J Chem Phys, 83, 1888-1901 (1985);
+erratum in JCP 84, 2901 (1986).
 </P>
 </HTML>
diff --git a/doc/fix_wall.txt b/doc/fix_wall.txt
index 3fbbf80e48..4ba976551f 100644
--- a/doc/fix_wall.txt
+++ b/doc/fix_wall.txt
@@ -288,4 +288,5 @@ The option defaults units = lattice, fld = no, and pbc = no.
 :line
 
 :link(Magda)
-[(Magda)] Magda, Tirrell, Davis, J Chem Phys, 83, 1888-1901 (1985).
+[(Magda)] Magda, Tirrell, Davis, J Chem Phys, 83, 1888-1901 (1985);
+erratum in JCP 84, 2901 (1986).