From 4d3ebe2ebeea296793953ff41cbad2bb682814bb Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Wed, 19 Mar 2014 19:01:07 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11647
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 doc/fix_temp_csvr.html | 14 +++-----------
 doc/fix_temp_csvr.txt  | 14 +++-----------
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/doc/fix_temp_csvr.html b/doc/fix_temp_csvr.html
index e04add593c..7d8e4bc17b 100644
--- a/doc/fix_temp_csvr.html
+++ b/doc/fix_temp_csvr.html
@@ -125,23 +125,15 @@ you have defined to this fix which will be used in its thermostatting
 procedure, as described above.  For consistency, the group used by
 this fix and by the compute should be the same.
 </P>
-<P>The <A HREF = "fix_modify.html">fix_modify</A> <I>energy</I> option is supported by this
-fix to add the energy change implied by a velocity rescaling to the
-system's potential energy as part of <A HREF = "thermo_style.html">thermodynamic
-output</A>.
-</P>
-<P>This fix computes a global scalar which can be accessed by various
-<A HREF = "Section_howto.html#howto_15">output commands</A>.  The scalar is the
-cummulative energy change due to this fix.  The scalar value
-calculated by this fix is "extensive".
-</P>
 <P>This fix can ramp its target temperature over multiple runs, using the
 <I>start</I> and <I>stop</I> keywords of the <A HREF = "run.html">run</A> command.  See the
 <A HREF = "run.html">run</A> command for details of how to do this.
 </P>
 <P>This fix is not invoked during <A HREF = "minimize.html">energy minimization</A>.
 </P>
-<P><B>Restrictions:</B> none
+<P><B>Restrictions:</B>
+</P>
+<P>This fix is not compatible with <A HREF = "fix_shake.html">fix shake</A>.
 </P>
 <P><B>Related commands:</B>
 </P>
diff --git a/doc/fix_temp_csvr.txt b/doc/fix_temp_csvr.txt
index 872c304618..daa2136638 100644
--- a/doc/fix_temp_csvr.txt
+++ b/doc/fix_temp_csvr.txt
@@ -117,23 +117,15 @@ you have defined to this fix which will be used in its thermostatting
 procedure, as described above.  For consistency, the group used by
 this fix and by the compute should be the same.
 
-The "fix_modify"_fix_modify.html {energy} option is supported by this
-fix to add the energy change implied by a velocity rescaling to the
-system's potential energy as part of "thermodynamic
-output"_thermo_style.html.
-
-This fix computes a global scalar which can be accessed by various
-"output commands"_Section_howto.html#howto_15.  The scalar is the
-cummulative energy change due to this fix.  The scalar value
-calculated by this fix is "extensive".
-
 This fix can ramp its target temperature over multiple runs, using the
 {start} and {stop} keywords of the "run"_run.html command.  See the
 "run"_run.html command for details of how to do this.
 
 This fix is not invoked during "energy minimization"_minimize.html.
 
-[Restrictions:] none
+[Restrictions:]
+
+This fix is not compatible with "fix shake"_fix_shake.html.
 
 [Related commands:]