Index: doc/user/Makefile
===================================================================
--- doc/user/Makefile	(revision 28572e8dd00e45812a2e0f7e7d5a9ae785319485)
+++ doc/user/Makefile	(revision 16800728942a47f77748c1e6da52e1f54dd89756)
@@ -61,5 +61,5 @@
 
 ${BASE}.dvi : Makefile ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \
-		${Macros}/common.tex ${Macros}/lstlang.sty ${Macros}/indexstyle ../bibliography/pl.bib build/version | ${Build}
+		${Macros}/common.sty ${Macros}/lstlang.sty ${Macros}/indexstyle ../bibliography/pl.bib build/version | ${Build}
 	# Conditionally create an empty *.ind (index) file for inclusion until makeindex is run.
 	if [ ! -r ${basename $@}.ind ] ; then touch ${Build}/${basename $@}.ind ; fi
@@ -68,5 +68,5 @@
 	-${BibTeX} ${Build}/${basename $@}
 	# Some citations reference others so run again to resolve these citations
-	${LaTeX} ${basename $@}.tex
+#	${LaTeX} ${basename $@}.tex
 	-${BibTeX} ${Build}/${basename $@}
 	# Make index from *.aux entries and input index at end of document
@@ -75,5 +75,5 @@
 	${LaTeX} ${basename $@}.tex
 	# Run again to get index title into table of contents
-	${LaTeX} ${basename $@}.tex
+#	${LaTeX} ${basename $@}.tex
 
 ## Define the default recipes.
Index: doc/user/user.tex
===================================================================
--- doc/user/user.tex	(revision 28572e8dd00e45812a2e0f7e7d5a9ae785319485)
+++ doc/user/user.tex	(revision 16800728942a47f77748c1e6da52e1f54dd89756)
@@ -11,6 +11,6 @@
 %% Created On       : Wed Apr  6 14:53:29 2016
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Wed Apr 28 21:48:59 2021
-%% Update Count     : 5051
+%% Last Modified On : Sat May  8 08:51:33 2021
+%% Update Count     : 5062
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -65,5 +65,6 @@
 % keyword escape ¶...¶ (pilcrow symbol) emacs: C-q M-^
 % math escape $...$ (dollar symbol)
-\input{common}                                          % common CFA document macros
+\usepackage{common}										% common CFA document macros
+%\input{common}											% common CFA document macros
 \setlength{\gcolumnposn}{3in}
 \CFAStyle												% use default CFA format-style
@@ -585,5 +586,5 @@
 For example, the octal ©0© or hexadecimal ©0x© prefix may end with an underscore ©0_377© or ©0x_ff©;
 the exponent infix ©E© may start or end with an underscore ©1.0_E10©, ©1.0E_10© or ©1.0_E_10©;
-the type suffixes ©U©, ©L©, etc. may start with an underscore ©1_U©, ©1_ll© or ©1.0E10_f©.
+the type suffixes ©U©, ©L©, \etc may start with an underscore ©1_U©, ©1_ll© or ©1.0E10_f©.
 \end{enumerate}
 It is significantly easier to read and enter long constants when they are broken up into smaller groupings (many cultures use comma and/or period among digits for the same purpose).
@@ -1570,5 +1571,5 @@
 \end{cquote}
 
-All type qualifiers, \eg ©const©, ©volatile©, etc., are used in the normal way with the new declarations and also appear left to right, \eg:
+All type qualifiers, \eg ©const©, ©volatile©, \etc, are used in the normal way with the new declarations and also appear left to right, \eg:
 \begin{cquote}
 \begin{tabular}{@{}l@{\hspace{1em}}l@{\hspace{1em}}l@{}}
@@ -1590,5 +1591,5 @@
 \end{tabular}
 \end{cquote}
-All declaration qualifiers, \eg ©extern©, ©static©, etc., are used in the normal way with the new declarations but can only appear at the start of a \CFA routine declaration,\footnote{\label{StorageClassSpecifier}
+All declaration qualifiers, \eg ©extern©, ©static©, \etc, are used in the normal way with the new declarations but can only appear at the start of a \CFA routine declaration,\footnote{\label{StorageClassSpecifier}
 The placement of a storage-class specifier other than at the beginning of the declaration specifiers in a declaration is an obsolescent feature.~\cite[\S~6.11.5(1)]{C11}} \eg:
 \begin{cquote}
@@ -3147,5 +3148,5 @@
 also, it is unnecessary to specify all the fields of a struct in a multiple record-field tuple.
 
-Since tuple-index expressions are a form of member-access expression, it is possible to use tuple-index expressions in conjunction with member-access expressions to restructure a tuple (\eg, rearrange components, drop components, duplicate components, etc.).
+Since tuple-index expressions are a form of member-access expression, it is possible to use tuple-index expressions in conjunction with member-access expressions to restructure a tuple (\eg, rearrange components, drop components, duplicate components, \etc).
 \begin{cfa}
 [ int, int, long, double ] x;
@@ -3972,5 +3973,5 @@
 
 \item
-\Indexc{sepOn}\index{manipulator!sepOn@©sepOn©} and \Indexc{sepOff}\index{manipulator!sepOff@©sepOff©} toggle printing the separator with respect to the next printed item, and then return to the global seperator setting.
+\Indexc{sepOn}\index{manipulator!sepOn@©sepOn©} and \Indexc{sepOff}\index{manipulator!sepOff@©sepOff©} toggle printing the separator with respect to the next printed item, and then return to the global separator setting.
 \begin{cfa}[belowskip=0pt]
 sout | 1 | sepOff | 2 | 3; $\C{// turn off implicit separator for the next item}$
@@ -5659,7 +5660,7 @@
 \item
 Package: a container to organize modules for distribution; It has attributes like name, author,
-version, dependences, etc.
-\item
-Project: a working set for a \CFA project; It has attributes like name, author, version, dependences, etc.
+version, dependences, \etc.
+\item
+Project: a working set for a \CFA project; It has attributes like name, author, version, dependences, \etc.
 \end{itemize}
 
@@ -5798,5 +5799,5 @@
 
 A package is defined by putting a project description file, Do.prj, with one or more modules into a directory.
-This project description file contains the package's meta data, including package name, author, version, dependences, etc.
+This project description file contains the package's meta data, including package name, author, version, dependences, \etc.
 It should be in the root of the package directory.
 
@@ -5855,7 +5856,7 @@
 Module: a container to organize a set of related types and methods; It has a module name, and several interfaces visible from outside
 \item
-Package: a container to organize modules for distribution; It has attributes like name, author, version, dependences, etc.
-\item
-Project: a working set for a \CFA project; It has attributes like name, author, version, dependences, etc.
+Package: a container to organize modules for distribution; It has attributes like name, author, version, dependences, \etc.
+\item
+Project: a working set for a \CFA project; It has attributes like name, author, version, dependences, \etc.
 \end{itemize}
 
