* doc/automake.texi (renamed objects, CVS): Typos.

diff --git a/ChangeLog b/ChangeLog
index e09b70220e1e63f829a3e81914ff626da05ae136..4b7275989fa885d25f7418684e2e6e0c2283d5f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-05  Stepan Kasal  <kasal@ucw.cz>
+
+       * doc/automake.texi (renamed objects, CVS): Typos.
+
 2004-12-05  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * doc/automake.texi (Flag Variables Ordering): New section.

diff --git a/doc/automake.texi b/doc/automake.texi
index f08867ed9ef8d5e3d435f1cfa4f74d04a0c5740a..588b78d9ad654479883cb3a397ea5918a2cfdaf9 100644 (file)
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -7437,7 +7437,7 @@ However, during @command{cvs update}, files will have the date of the
 update, not the original timestamp of this revision.  This is meant to
 make sure that @command{make} notices sources files have been updated.
 
-This times tamp shift is troublesome when both sources and generated
+This timestamp shift is troublesome when both sources and generated
 files are kept under CVS.  Because CVS processes files in alphabetical
 order, @file{configure.ac} will appear older than @file{configure}
 after a @command{cvs update} that updates both files, even if
@@ -8104,12 +8104,12 @@ false_CPPFLAGS = -DEXIT_CODE=1
 @noindent
 Obviously the two programs are built from the same source, but it
 would be bad if they shared the same object, because @file{generic.o}
-cannot be built with both @code{-DEXIT_CODE=0} *and*
+cannot be built with both @code{-DEXIT_CODE=0} @emph{and}
 @code{-DEXIT_CODE=1}.  Therefore @command{automake} outputs rules to
 build two different objects: @file{true-generic.o} and
 @file{false-generic.o}.
 
-@command{automake} doesn't actually look whether sources files are
+@command{automake} doesn't actually look whether source files are
 shared to decide if it must rename objects.  It will just rename all
 objects of a target as soon as it sees per-target compilation flags
 are used.