From b6b09747fcd4194f6acf95b82c8cebc8e7d62d6b Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Mon, 9 Sep 2013 14:56:22 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10733
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 doc/velocity.html | 18 ++++++++----------
 doc/velocity.txt  | 18 ++++++++----------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/doc/velocity.html b/doc/velocity.html
index b35497fc46..372b008ca7 100644
--- a/doc/velocity.html
+++ b/doc/velocity.html
@@ -112,15 +112,6 @@ angular will set the angular momentum of each rigid body to zero.
 This is done by adjusting the velocities of the atoms in each rigid
 body.
 </P>
-<P>IMPORTANT NOTE: When using the <I>rigid</I> option with the <I>zero</I> style,
-only the velocities of atoms that are in the group specified with the
-velocity command will be adjusted, and likewise contribute to the
-calculation of the center-of-mass velocity or angular momentum of each
-rigid body.  This allows you to zero out the momenta of a subset of
-the rigid bodies, but you will get incomplete zeroing if you specify a
-group that includes only a subset of the atoms in one or more of the
-rigid bodies.
-</P>
 <P>All temperatures specified in the velocity command are in temperature
 units; see the <A HREF = "units.html">units</A> command.  The units of velocities and
 coordinates depend on whether the <I>units</I> keyword is set to <I>box</I> or
@@ -200,6 +191,12 @@ stored on a particular machine.
 </P>
 <HR>
 
+<P>The <I>rigid</I> option only has meaning when used with the <I>zero</I> style.
+It allows specification of a fix-ID for one of the <A HREF = "fix_rigid.html">rigid-body
+fix</A> variants which defines a set of rigid bodies.  The
+zeroing of linear or angular momentum is then performed for each rigid
+body defined by the fix, as described above.
+</P>
 <P>The <I>units</I> option is used by <I>set</I> and <I>ramp</I>.  If units = box, 
 the velocities and coordinates specified in the velocity command are
 in the standard units described by the <A HREF = "units.html">units</A> command
@@ -217,6 +214,7 @@ command must have been previously used to define the lattice spacing.
 <P><B>Default:</B>
 </P>
 <P>The option defaults are dist = uniform, sum = no, mom = yes, rot = no,
-temp = full style on group-ID, loop = all, and units = lattice.
+temp = full style on group-ID, loop = all, and units = lattice.  The
+rigid option is not defined by default.
 </P>
 </HTML>
diff --git a/doc/velocity.txt b/doc/velocity.txt
index 4e4129e504..8e8615e4dc 100644
--- a/doc/velocity.txt
+++ b/doc/velocity.txt
@@ -104,15 +104,6 @@ angular will set the angular momentum of each rigid body to zero.
 This is done by adjusting the velocities of the atoms in each rigid
 body.
 
-IMPORTANT NOTE: When using the {rigid} option with the {zero} style,
-only the velocities of atoms that are in the group specified with the
-velocity command will be adjusted, and likewise contribute to the
-calculation of the center-of-mass velocity or angular momentum of each
-rigid body.  This allows you to zero out the momenta of a subset of
-the rigid bodies, but you will get incomplete zeroing if you specify a
-group that includes only a subset of the atoms in one or more of the
-rigid bodies.
-
 All temperatures specified in the velocity command are in temperature
 units; see the "units"_units.html command.  The units of velocities and
 coordinates depend on whether the {units} keyword is set to {box} or
@@ -192,6 +183,12 @@ stored on a particular machine.
 
 :line
 
+The {rigid} option only has meaning when used with the {zero} style.
+It allows specification of a fix-ID for one of the "rigid-body
+fix"_fix_rigid.html variants which defines a set of rigid bodies.  The
+zeroing of linear or angular momentum is then performed for each rigid
+body defined by the fix, as described above.
+
 The {units} option is used by {set} and {ramp}.  If units = box, 
 the velocities and coordinates specified in the velocity command are
 in the standard units described by the "units"_units.html command
@@ -209,4 +206,5 @@ command must have been previously used to define the lattice spacing.
 [Default:]
 
 The option defaults are dist = uniform, sum = no, mom = yes, rot = no,
-temp = full style on group-ID, loop = all, and units = lattice.
+temp = full style on group-ID, loop = all, and units = lattice.  The
+rigid option is not defined by default.