[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] maint: grammar fixes: s/all these/all of these/
From: |
Jim Meyering |
Subject: |
[PATCH] maint: grammar fixes: s/all these/all of these/ |
Date: |
Sun, 10 Jun 2012 22:08:43 +0200 |
I stumbled across one of these, so fixed all of them and added a new
syntax-check rule in gnulib's maint.mk to discourage recurrence:
http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/30912
>From fa0cd34b38729a59a40fa946fc621df3ef0924cd Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sun, 10 Jun 2012 22:03:49 +0200
Subject: [PATCH] maint: grammar fixes: s/all these/all of these/
Run this command:
git grep -li '\<all.these\>' \
|xargs perl -pi -e 's/\b([Aa])ll these\b/${1}ll of these/'
---
NEWS | 2 +-
doc/automake-history.texi | 6 +++---
doc/automake.texi | 24 ++++++++++++------------
doc/fdl.texi | 2 +-
lib/texinfo.tex | 2 +-
old/ChangeLog.01 | 2 +-
old/ChangeLog.11 | 2 +-
t/tap-whitespace-normalization.sh | 2 +-
8 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/NEWS b/NEWS
index cf45836..fd52dea 100644
--- a/NEWS
+++ b/NEWS
@@ -1632,7 +1632,7 @@ New in 1.8:
rule for this target. Running `automake -Woverride' will diagnose
all such overriding definitions.
- It should be noted that almost all these targets support a *-local
+ It should be noted that almost all of these targets support a *-local
variant that is meant to supplement the automake-defined rule
(See node `Extending' in the manual). The above rule should
be rewritten as
diff --git a/doc/automake-history.texi b/doc/automake-history.texi
index 5cb3685..7bbdeb4 100644
--- a/doc/automake-history.texi
+++ b/doc/automake-history.texi
@@ -560,7 +560,7 @@ Timeline
It's only the beginning: in two months he will send 192 patches. Then
he would slow down so Tom can catch up and review all this. Initially
-Tom actually read all these patches, then he probably trustingly
+Tom actually read all of these patches, then he probably trustingly
answered OK to most of them, and finally gave up and let Akim apply
whatever he wanted. There was no way to keep up with that patch rate.
@@ -570,7 +570,7 @@ Timeline
been moved :) -- Alexandre Duret-Lutz
@end quotation
-All these patches were sent to and discussed on
+All of these patches were sent to and discussed on
@email{automake@@gnu.org}, so subscribed users were literally drowning in
technical mails. Eventually, the @email{automake-patches@@gnu.org}
mailing list was created in May.
@@ -581,7 +581,7 @@ Timeline
various places in the @command{automake} script itself; this does not
help ensuring a consistent treatment of these rules (for instance
making sure that user-defined rules override Automake's own rules).
-One of Akim's goal was moving all these hard-coded rules to separate
+One of Akim's goal was moving all of these hard-coded rules to separate
@file{Makefile} fragments, so the logic could be centralized in a
@file{Makefile} fragment processor.
diff --git a/doc/automake.texi b/doc/automake.texi
index 939fe44..120dbea 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -540,7 +540,7 @@ Use Cases
@cindex @file{amhello-1.0.tar.gz}, use cases
In this section we explore several use cases for the GNU Build System.
-You can replay all these examples on the @file{amhello-1.0.tar.gz}
+You can replay all of these examples on the @file{amhello-1.0.tar.gz}
package distributed with Automake. If Automake is installed on your
system, you should find a copy of this file in
@address@hidden/share/doc/automake/amhello-1.0.tar.gz}, where
@@ -1567,7 +1567,7 @@ Creating amhello
@command{autoreconf} is a script that calls @command{autoconf},
@command{automake}, and a bunch of other commands in the right order.
If you are beginning with these tools, it is not important to figure
-out in which order all these tools should be invoked and why. However,
+out in which order all of these tools should be invoked and why. However,
because Autoconf and Automake have separate manuals, the important
point to understand is that @command{autoconf} is in charge of
creating @file{configure} from @file{configure.ac}, while
@@ -2868,7 +2868,7 @@ Requirements
that is compatible with @command{make}'s syntax) and furthermore use
@code{AC_SUBST} to ensure that @address@hidden@}} is meaningful in a
@file{Makefile}, then @command{automake} will be able to use
address@hidden@address@hidden to generate all these rules. For instance, here
is
address@hidden@address@hidden to generate all of these rules. For instance,
here is
how the Automake package itself generates versioned scripts for its
test suite:
@@ -3560,7 +3560,7 @@ Extending aclocal
and many third party macros are underquoted; and we have to apologize
for this temporary inconvenience. The reason we have to be stricter
is that a future implementation of @command{aclocal} (@pxref{Future of
-aclocal}) will have to temporarily include all these third party
+aclocal}) will have to temporarily include all of these third party
@file{.m4} files, maybe several times, including even files that are
not actually needed. Doing so should alleviate many problems of the
current implementation, however it requires a stricter style from the
@@ -3626,7 +3626,7 @@ Local Macros
@vindex ACLOCAL_AMFLAGS
The second possibility, which we do recommend, is to write each macro
-in its own file and gather all these files in a directory. This
+in its own file and gather all of these files in a directory. This
directory is usually called @file{m4/}. To build @file{aclocal.m4},
one should therefore instruct @command{aclocal} to scan @file{m4/}.
From the command line, this is done with @samp{aclocal -I m4}. The
@@ -7790,7 +7790,7 @@ Python
@samp{$(pyexecdir)/$(PACKAGE)}.
@end vtable
-All these directory variables have values that start with either
+All of these directory variables have values that start with either
@address@hidden@}} or @address@hidden@}} unexpanded. This works
fine in @file{Makefiles}, but it makes these variables hard to use in
@file{configure}. This is mandated by the GNU coding standards, so
@@ -7856,7 +7856,7 @@ Texinfo
documentation installed by default as well as all the above optional
formats.
-All these targets can be extended using @samp{-local} rules
+All of these targets can be extended using @samp{-local} rules
(@pxref{Extending}).
@cindex Texinfo flag, @code{VERSION}
@@ -11410,7 +11410,7 @@ Third-Party Makefiles
how third-party @file{Makefile}s can be used with Automake. The
@file{Makefile}s @command{gettextize} puts in the @file{po/} and
@file{intl/} directories are handwritten @file{Makefile}s that
-implement all these targets. That way they can be added to
+implement all of these targets. That way they can be added to
@code{SUBDIRS} in Automake packages.
Directories that are only listed in @code{DIST_SUBDIRS} but not in
@@ -11611,7 +11611,7 @@ Upgrading
definitions of the M4 macros put in @file{aclocal.m4} as well as the
behavior of the auxiliary tools installed.
-Because all these files are closely related, it is important to
+Because all of these files are closely related, it is important to
regenerate all of them when upgrading to a newer Automake release.
The usual way to do that is
@@ -11631,7 +11631,7 @@ Upgrading
The use of @option{--force-missing} ensures that auxiliary tools will be
overridden by new versions (@pxref{automake Invocation}).
-It is important to regenerate all these files each time Automake is
+It is important to regenerate all of these files each time Automake is
upgraded, even between bug fixes releases. For instance, it is not
unusual for a bug fix to involve changes to both the rules generated
in @file{Makefile.in} and the supporting M4 macros copied to
@@ -11768,7 +11768,7 @@ CVS
folks have such a script).
@item
Or @file{configure.ac} uses @code{AM_MAINTAINER_MODE}, which will
-disable all these rebuild rules by default. This is further discussed
+disable all of these rebuild rules by default. This is further discussed
in @ref{maintainer-mode}.
@end itemize
@@ -12398,7 +12398,7 @@ Flag Variables Ordering
Using variables like this gives you full control over the ordering of
the flags. For instance, if there is a flag in $(WARNINGCFLAGS) that
you want to negate for a particular target, you can use something like
address@hidden = $(AM_CFLAGS) -no-flag}. If all these flags had
address@hidden = $(AM_CFLAGS) -no-flag}. If all of these flags had
been forcefully appended to @code{CFLAGS}, there would be no way to
disable one flag. Yet another reason to leave user variables to
users.
diff --git a/doc/fdl.texi b/doc/fdl.texi
index 38bfdd2..d9d28ea 100644
--- a/doc/fdl.texi
+++ b/doc/fdl.texi
@@ -151,7 +151,7 @@
If you publish printed copies (or copies in media that commonly have
printed covers) of the Document, numbering more than 100, and the
Document's license notice requires Cover Texts, you must enclose the
-copies in covers that carry, clearly and legibly, all these Cover
+copies in covers that carry, clearly and legibly, all of these Cover
Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
the back cover. Both covers must also clearly and legibly identify
you as the publisher of these copies. The front cover must present
diff --git a/lib/texinfo.tex b/lib/texinfo.tex
index 0f3a096..c2901b9 100644
--- a/lib/texinfo.tex
+++ b/lib/texinfo.tex
@@ -6150,7 +6150,7 @@ end
% Same as \defaultparindent.
\newdimen\tocindent \tocindent = 15pt
-% Now for the actual typesetting. In all these, #1 is the text and #2 is the
+% Now for the actual typesetting. In all of these, #1 is the text and #2 is the
% page number.
%
% If the toc has to be broken over pages, we want it to be at chapters
diff --git a/old/ChangeLog.01 b/old/ChangeLog.01
index cb7b37a..f8b413f 100644
--- a/old/ChangeLog.01
+++ b/old/ChangeLog.01
@@ -4558,7 +4558,7 @@
contents.
(dist-all, dist-bzip2, dist-zip, dist-tarZ): New conditional
targets.
- And BTW, all these guys are phony.
+ And BTW, all of these guys are phony.
* automake.in (&handle_dist_worker): As its name doesn't indicate,
output distributions.
(&handle_dist): As its name doesn't indicate, don't.
diff --git a/old/ChangeLog.11 b/old/ChangeLog.11
index ce9d2b8..f6a1454 100644
--- a/old/ChangeLog.11
+++ b/old/ChangeLog.11
@@ -9096,7 +9096,7 @@
tests: optimize `instspc-*.test' for speed
After the split of `instspc.test' into various generated tests,
the running time of the testsuite has noticeably increased, since
- all these new generated tests must run aclocal, autoconf and
+ all of these new generated tests must run aclocal, autoconf and
automake, whereas previously they were run only once (at the
beginning of `instspc.test'). But luckily, since the new tests
share the same input files for the autotools, this situation can
diff --git a/t/tap-whitespace-normalization.sh
b/t/tap-whitespace-normalization.sh
index a43d29a..3108fc6 100755
--- a/t/tap-whitespace-normalization.sh
+++ b/t/tap-whitespace-normalization.sh
@@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# TAP support: whitespace normalization (or lack thereof) in the testsuite
-# progress output on console. We keep all these checks here in a single
+# progress output on console. We keep all of these checks here in a single
# script so that a potential cosmetic change in the output format won't
# force us to tweak dozens of other tests (hopefully).
# See also related test 'tap-todo-skip-whitespace.test'.
--
1.7.11.rc2
- [PATCH] maint: grammar fixes: s/all these/all of these/,
Jim Meyering <=