From 52feca2cda2edd985d76117836e2a522178e9ab3 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 9 Apr 2011 23:05:22 +0200 Subject: [PATCH] maint: change "can not" to "cannot" But do not change the occurrences in maintain.texi or in build-aux/po/Makefile.in.in, which I presume comes from gettext. * doc/gnulib-tool.texi: s/can not/cannot/ * doc/posix-functions/accept.texi (accept): Likewise. * doc/posix-functions/socket.texi (socket): Likewise. * lib/mbrtowc.c: Likewise. --- ChangeLog | 8 ++++++++ doc/gnulib-tool.texi | 2 +- doc/posix-functions/accept.texi | 4 ++-- doc/posix-functions/socket.texi | 4 ++-- lib/mbrtowc.c | 2 +- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 003ebede51..e01dd6b58d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2011-04-09 Jim Meyering + maint: change "can not" to "cannot" + But do not change the occurrences in maintain.texi or in + build-aux/po/Makefile.in.in, which I presume comes from gettext. + * doc/gnulib-tool.texi: s/can not/cannot/ + * doc/posix-functions/accept.texi (accept): Likewise. + * doc/posix-functions/socket.texi (socket): Likewise. + * lib/mbrtowc.c: Likewise. + maint.mk: prohibit use of "can not" * top/maint.mk (sc_prohibit_can_not): New rule. Writing "can not" (rather than "cannot") is too common. Prohibit it. diff --git a/doc/gnulib-tool.texi b/doc/gnulib-tool.texi index 8e38c38e99..443cbc216e 100644 --- a/doc/gnulib-tool.texi +++ b/doc/gnulib-tool.texi @@ -287,7 +287,7 @@ Also, on some platforms macros like @samp{_FILE_OFFSET_BITS} and @samp{_GNU_SOURCE} may be ineffective, or may have only a limited effect, if defined after the first system header file is included. -Finally, note that you can not use @code{AC_LIBOBJ} or +Finally, note that you cannot use @code{AC_LIBOBJ} or @code{AC_REPLACE_FUNCS} in your @file{configure.ac} and expect the resulting object files to be automatically added to @file{lib/libgnu.a}. This is because your @code{AC_LIBOBJ} and @code{AC_REPLACE_FUNCS} invocations diff --git a/doc/posix-functions/accept.texi b/doc/posix-functions/accept.texi index 61b009345c..b937e15f00 100644 --- a/doc/posix-functions/accept.texi +++ b/doc/posix-functions/accept.texi @@ -10,7 +10,7 @@ Portability problems fixed by Gnulib: @itemize @item On Windows platforms (excluding Cygwin), the descriptors returned by -the @code{accept} function can not be used in calls to @code{read}, +the @code{accept} function cannot be used in calls to @code{read}, @code{write}, and @code{close}; you have to use @code{recv}, @code{send}, @code{closesocket} in these cases instead. @item @@ -22,7 +22,7 @@ used instead. Portability problems not fixed by Gnulib: @itemize @item -On BeOS, the descriptors returned by the @code{accept} function can not be used +On BeOS, the descriptors returned by the @code{accept} function cannot be used in calls to @code{read}, @code{write}, and @code{close}; you have to use @code{recv}, @code{send}, @code{closesocket} in these cases instead. @item diff --git a/doc/posix-functions/socket.texi b/doc/posix-functions/socket.texi index bc3ee0f719..a91ebd6d76 100644 --- a/doc/posix-functions/socket.texi +++ b/doc/posix-functions/socket.texi @@ -10,7 +10,7 @@ Portability problems fixed by Gnulib: @itemize @item On Windows platforms (excluding Cygwin), the descriptors returned by -the @code{socket} function can not be used in calls to @code{read}, +the @code{socket} function cannot be used in calls to @code{read}, @code{write}, and @code{close}; you have to use @code{recv}, @code{send}, @code{closesocket} in these cases instead. @item @@ -22,7 +22,7 @@ used instead. Portability problems not fixed by Gnulib: @itemize @item -On BeOS, the descriptors returned by the @code{socket} function can not be used +On BeOS, the descriptors returned by the @code{socket} function cannot be used in calls to @code{read}, @code{write}, and @code{close}; you have to use @code{recv}, @code{send}, @code{closesocket} in these cases instead. @end itemize diff --git a/lib/mbrtowc.c b/lib/mbrtowc.c index d9c25cced6..7a8e5996d0 100644 --- a/lib/mbrtowc.c +++ b/lib/mbrtowc.c @@ -335,7 +335,7 @@ rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) { static mbstate_t internal_state; - /* Override mbrtowc's internal state. We can not call mbsinit() on the + /* Override mbrtowc's internal state. We cannot call mbsinit() on the hidden internal state, but we can call it on our variable. */ if (ps == NULL) ps = &internal_state; -- 2.30.2