From c14ad97fedf2e07a67ca860b5bf47cb4e4373494 Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Wed, 13 Apr 2011 21:56:07 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5936
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 doc/atom_style.html |  2 +-
 doc/atom_style.txt  |  2 +-
 doc/dump.html       | 28 ++++++++++++++++------------
 doc/dump.txt        | 28 ++++++++++++++++------------
 4 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/doc/atom_style.html b/doc/atom_style.html
index 3d7a434d6e..355f42c6a1 100644
--- a/doc/atom_style.html
+++ b/doc/atom_style.html
@@ -15,7 +15,7 @@
 </P>
 <PRE>atom_style style args 
 </PRE>
-<UL><LI>style = <I>angle</I> or <I>atomic</I> or <I>bond</I> or <I>charge</I> or <I>colloid</I> or <I>dipole</I> or         <I>electron</I> or <I>ellipsoid</I> or <I>full</I> or <I>molecular</I> or 	<I>peri</I> or <I>sphere</I> or <I>hybrid</I> 
+<UL><LI>style = <I>angle</I> or <I>atomic</I> or <I>bond</I> or <I>charge</I> or <I>dipole</I> or         <I>electron</I> or <I>ellipsoid</I> or <I>full</I> or <I>molecular</I> or 	<I>peri</I> or <I>sphere</I> or <I>hybrid</I> 
 </UL>
 <PRE>  args = none for any style except <I>hybrid</I>
   <I>hybrid</I> args = list of one or more sub-styles 
diff --git a/doc/atom_style.txt b/doc/atom_style.txt
index 972903a1ba..da9231f172 100644
--- a/doc/atom_style.txt
+++ b/doc/atom_style.txt
@@ -12,7 +12,7 @@ atom_style command :h3
 
 atom_style style args :pre
 
-style = {angle} or {atomic} or {bond} or {charge} or {colloid} or {dipole} or \
+style = {angle} or {atomic} or {bond} or {charge} or {dipole} or \
         {electron} or {ellipsoid} or {full} or {molecular} or \
 	{peri} or {sphere} or {hybrid} :ul
   args = none for any style except {hybrid}
diff --git a/doc/dump.html b/doc/dump.html
index 7face3a9e0..0b155e3514 100644
--- a/doc/dump.html
+++ b/doc/dump.html
@@ -163,29 +163,33 @@ zlo zhi
 <P>where xlo,xhi are the maximum extents of the simulation box in the
 x-dimension, and similarly for y and z.  The "xx yy zz" represent 6
 characters that encode the style of boundary for each of the 6
-simulation box boundaries (xlo,xhi and ylo,yhi and zlo,zhi).  Each
-flag is either p = periodic, f = fixed, s = shrink wrap, or m = shrink
-wrapped with a minimum value.  See the <A HREF = "doc/boundary.html">boundary</A>
-command for details.
+simulation box boundaries (xlo,xhi and ylo,yhi and zlo,zhi).  Each of
+the 6 characters is either p = periodic, f = fixed, s = shrink wrap,
+or m = shrink wrapped with a minimum value.  See the
+<A HREF = "doc/boundary.html">boundary</A> command for details.
 </P>
 <P>For triclinic simulation boxes (non-orthogonal), an orthogonal
 bounding box which encloses the triclinic simulation box is output,
 along with the 3 tilt factors (xy, xz, yz) of the triclinic box,
 formatted as follows:
 </P>
-<PRE>ITEM: BOX BOUNDS xx yy zz xy xz yz
+<PRE>ITEM: BOX BOUNDS xy xz yz xx yy zz 
 xlo_bound xhi_bound xy
 ylo_bound yhi_bound xz
 zlo_bound zhi_bound yz 
 </PRE>
-<P>This bounding box is convenient for many visualization programs.
+<P>The presence of the text "xy xz yz" in the ITEM line indicates that
+the 3 tilt factors will be included on each of the 3 following lines.
+This bounding box is convenient for many visualization programs.  The
+meaning of the 6 character flags for "xx yy zz" is the same as above.
 </P>
-<P>See <A HREF = "Section_howto.html#4_12">this section</A> of the doc pages for a
-geometric description of triclinic boxes, as defined by LAMMPS, simple
-formulas for how the 6 bounding box extents (xlo_bound,xhi_bound,etc)
-are calculated from the triclinic parameters, and how to transform
-those parameters to and from other commonly used triclinic
-representations.
+<P>Note that the first two numbers on each line are now xlo_bound instead
+of xlo, etc, since they repesent a bounding box.  See <A HREF = "Section_howto.html#4_12">this
+section</A> of the doc pages for a geometric
+description of triclinic boxes, as defined by LAMMPS, simple formulas
+for how the 6 bounding box extents (xlo_bound,xhi_bound,etc) are
+calculated from the triclinic parameters, and how to transform those
+parameters to and from other commonly used triclinic representations.
 </P>
 <P>The "ITEM: ATOMS" line in each snapshot lists column descriptors for
 the per-atom lines that follow.  For example, the descriptors would be
diff --git a/doc/dump.txt b/doc/dump.txt
index 8cae1f02ac..cc496e9b6e 100644
--- a/doc/dump.txt
+++ b/doc/dump.txt
@@ -152,29 +152,33 @@ zlo zhi :pre
 where xlo,xhi are the maximum extents of the simulation box in the
 x-dimension, and similarly for y and z.  The "xx yy zz" represent 6
 characters that encode the style of boundary for each of the 6
-simulation box boundaries (xlo,xhi and ylo,yhi and zlo,zhi).  Each
-flag is either p = periodic, f = fixed, s = shrink wrap, or m = shrink
-wrapped with a minimum value.  See the "boundary"_doc/boundary.html
-command for details.
+simulation box boundaries (xlo,xhi and ylo,yhi and zlo,zhi).  Each of
+the 6 characters is either p = periodic, f = fixed, s = shrink wrap,
+or m = shrink wrapped with a minimum value.  See the
+"boundary"_doc/boundary.html command for details.
 
 For triclinic simulation boxes (non-orthogonal), an orthogonal
 bounding box which encloses the triclinic simulation box is output,
 along with the 3 tilt factors (xy, xz, yz) of the triclinic box,
 formatted as follows:
 
-ITEM: BOX BOUNDS xx yy zz xy xz yz
+ITEM: BOX BOUNDS xy xz yz xx yy zz 
 xlo_bound xhi_bound xy
 ylo_bound yhi_bound xz
 zlo_bound zhi_bound yz :pre
 
-This bounding box is convenient for many visualization programs.
+The presence of the text "xy xz yz" in the ITEM line indicates that
+the 3 tilt factors will be included on each of the 3 following lines.
+This bounding box is convenient for many visualization programs.  The
+meaning of the 6 character flags for "xx yy zz" is the same as above.
 
-See "this section"_Section_howto.html#4_12 of the doc pages for a
-geometric description of triclinic boxes, as defined by LAMMPS, simple
-formulas for how the 6 bounding box extents (xlo_bound,xhi_bound,etc)
-are calculated from the triclinic parameters, and how to transform
-those parameters to and from other commonly used triclinic
-representations.
+Note that the first two numbers on each line are now xlo_bound instead
+of xlo, etc, since they repesent a bounding box.  See "this
+section"_Section_howto.html#4_12 of the doc pages for a geometric
+description of triclinic boxes, as defined by LAMMPS, simple formulas
+for how the 6 bounding box extents (xlo_bound,xhi_bound,etc) are
+calculated from the triclinic parameters, and how to transform those
+parameters to and from other commonly used triclinic representations.
 
 The "ITEM: ATOMS" line in each snapshot lists column descriptors for
 the per-atom lines that follow.  For example, the descriptors would be