Skip to content

Commit 1518159

Browse files
author
smeyer
committed
spelling/markup
git-svn-id: https://svn.r-project.org/R/trunk@87957 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent e9575ef commit 1518159

File tree

14 files changed

+58
-59
lines changed

14 files changed

+58
-59
lines changed

doc/NEWS.2.Rd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -971,7 +971,7 @@
971971
972972
\item \code{plot(<lm>, which=5)} now correctly labels the factor
973973
level combinations for the special case where all
974-
\eqn{h_ii}{h[i,i]} are the same. (\PR{14837})
974+
\eqn{h_{ii}}{h[i,i]} are the same. (\PR{14837})
975975
976976
\item \code{Sys.glob()} caused a segfault if the first element of
977977
\code{path} was \code{NA_character}. (\PR{14990})
@@ -4464,8 +4464,8 @@
44644464
\item \code{tools::texi2dvi()} gains an \code{index} argument,
44654465
mainly for use by \command{R CMD Rd2pdf}.
44664466
4467-
It avoids the use of \command{texindy} by \command{texinfo}'s
4468-
\command{texi2dvi >= 1.157}, since that does not emulate
4467+
It avoids the use of \command{texindy} by Texinfo's
4468+
\command{texi2dvi} >= 1.157, since that does not emulate
44694469
'makeindex' well enough to avoid problems with special characters
44704470
(such as \samp{(}, \samp{\{}, \samp{!}) in indices. % )
44714471
@@ -5479,7 +5479,7 @@
54795479
54805480
\item The \code{readline} completion backend no longer sorts
54815481
possible completions alphabetically (e.g., function argument
5482-
names) if \R was built with \code{readline >= 6}.
5482+
names) if \R was built with \code{readline} >= 6.
54835483
54845484
\item \code{select.list()} gains a \code{graphics} argument to
54855485
allow Windows/Mac users to choose the text interface. This

doc/NEWS.3.Rd

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -827,7 +827,7 @@
827827
828828
It now checks for duplicated vignette titles (also known as
829829
\sQuote{index entries}): they are used as hyperlinks on
830-
\abbr{CRAN} package pages and so do need to be unique.
830+
CRAN package pages and so do need to be unique.
831831
832832
\item \command{R CMD check} has more comprehensive checks on the
833833
\file{data} directory and the functioning of \code{data()} in a
@@ -1784,7 +1784,7 @@
17841784
possibility to set a \sQuote{timeout} (elapsed-time limit). For
17851785
serial installs this uses the \code{timeout} argument of
17861786
\code{system2()}: for parallel installs it requires the
1787-
\command{timeout} utility command from GNU \pkg{coreutils}.
1787+
\command{timeout} utility command from GNU coreutils.
17881788

17891789
\item It is now possible to set \sQuote{timeouts} (elapsed-time
17901790
limits) for most parts of \command{R CMD check} \emph{via}
@@ -2008,7 +2008,7 @@
20082008
\item Subassignment with zero length vectors now coerces as
20092009
documented (\PR{17344}).\cr
20102010
Further, \code{x <- numeric(); x[1] <- character()} now signals
2011-
an error \sQuote{\verb{replacement has length zero}} (or a
2011+
an error \samp{replacement has length zero} (or a
20122012
translation of that) instead of doing nothing.
20132013
20142014
\item (Package \pkg{parallel}.) \code{mclapply()}, \code{pvec()}
@@ -2200,7 +2200,7 @@
22002200

22012201
\item The default for \code{tools::write_PACKAGES(rds_compress=)}
22022202
has been changed to \code{"xz"} to match the compression used by
2203-
\abbr{CRAN}.
2203+
CRAN.
22042204

22052205
\item \code{c()} and \code{unlist()} are now more efficient in
22062206
constructing the \code{names(.)} of their return value, thanks to
@@ -2685,7 +2685,7 @@
26852685

26862686
\item Package \pkg{tools} now exports function
26872687
\code{CRAN_package_db()} for obtaining information about current
2688-
packages in the \abbr{CRAN} package repository, and several
2688+
packages in the CRAN package repository, and several
26892689
functions for obtaining the check status of these packages.
26902690

26912691
\item The (default) Stangle driver \code{Rtangle} allows
@@ -2735,15 +2735,15 @@
27352735
is unset.
27362736

27372737
NB: This can break reproducibility of output, and did for a
2738-
\abbr{CRAN} package.
2738+
CRAN package.
27392739

27402740
\item Methods \code{"wget"} and \code{"curl"} for
27412741
\code{download.file()} now give an \R error rather than a non-zero
27422742
return value when the external command has a non-zero status.
27432743

27442744
\item Encoding name \code{"utf8"} is mapped to \code{"UTF-8"}.
27452745
Many implementations of \code{iconv} accept \code{"utf8"}, but not
2746-
GNU \pkg{libiconv} (including the late 2016 version 1.15).
2746+
GNU \samp{libiconv} (including the late 2016 version 1.15).
27472747

27482748
\item \code{sessionInfo()} shows the full paths to the library or
27492749
executable files providing the BLAS/LAPACK implementations
@@ -2872,7 +2872,7 @@
28722872
adding native-symbol registration to a package. See its help and
28732873
§5.4.1 of \sQuote{Writing R Extensions} for how to use it. (At
28742874
the time it was added it successfully automated adding
2875-
registration to over 90\% of \abbr{CRAN} packages which lacked
2875+
registration to over 90\% of CRAN packages which lacked
28762876
it. Many of the failures were newly-detected bugs in the
28772877
packages, e.g.\sspace50 packages called entry points with varying
28782878
numbers of arguments and 65 packages called entry points not in
@@ -3353,7 +3353,7 @@
33533353

33543354
\item \code{findMethod()} failed if the active signature had
33553355
expanded beyond what a particular package used. (Example with
3356-
packages \CRANpkg{XR} and \CRANpkg{XRJulia} on \abbr{CRAN}.)
3356+
packages \CRANpkg{XR} and \CRANpkg{XRJulia} on CRAN.)
33573357

33583358
\item \code{qbeta()} underflowed too early in some very asymmetric
33593359
cases. (\PR{17178})
@@ -4208,7 +4208,7 @@
42084208
\item \code{smooth(x, *)} now also works for long vectors.
42094209
42104210
\item \code{tools::texi2dvi()} has a workaround for problems with
4211-
the \command{texi2dvi} script supplied by \pkg{texinfo 6.1}.
4211+
the \command{texi2dvi} script supplied by Texinfo 6.1.
42124212
42134213
It extracts more error messages from the LaTeX logs when in
42144214
emulation mode.
@@ -4574,7 +4574,7 @@
45744574
\item \code{cmdscale()} gets new option \code{list.} for increased
45754575
flexibility when a list should be returned.
45764576

4577-
\item \command{configure} now supports \code{texinfo} version 6.0,
4577+
\item \command{configure} now supports Texinfo version 6.0,
45784578
which (unlike the change from 4.x to 5.0) is a minor update.
45794579
(Wish of \PR{16456}.)
45804580

@@ -5205,15 +5205,15 @@
52055205
versions included in the \R sources if no system versions are
52065206
found or (unlikely) if they are too old.
52075207
5208-
Linux users should check that the \code{-devel} or \code{-dev}
5209-
versions of packages \pkg{zlib}, \pkg{bzip2}/\pkg{libbz2} and
5210-
\pkg{pcre} as well as \pkg{xz-devel}/\pkg{liblzma-dev} (or
5208+
Linux users should check that the \samp{-devel} or \samp{-dev}
5209+
versions of packages \samp{zlib}, \samp{bzip2}/\samp{libbz2} and
5210+
\samp{pcre} as well as \samp{xz-devel}/\samp{liblzma-dev} (or
52115211
similar names) are installed.
52125212
52135213
\item \command{configure} by default looks for the
5214-
\command{texi2any} script from \pkg{texinfo} 5.1 or later, rather
5214+
\command{texi2any} script from Texinfo 5.1 or later, rather
52155215
than the \command{makeinfo} program. (\command{makeinfo} is a
5216-
link to the Perl script \command{texi2any} in \pkg{texinfo} 5.x.)
5216+
link to the Perl script \command{texi2any} in Texinfo 5.x.)
52175217
52185218
\item \command{R CMD INSTALL} gains an option
52195219
\option{--built-timestamp=STAMP} allowing 100\% reproducible
@@ -5311,18 +5311,18 @@
53115311
The following are currently in place.
53125312
\itemize{
53135313
\item Installation using external binary distributions
5314-
of \pkg{zlib}, \pkg{bzip2}, \pkg{liblzma}, \pkg{pcre},
5315-
\pkg{libpng}, \pkg{jpeglib} and \pkg{libtiff} is now required,
5314+
of \samp{zlib}, \samp{bzip2}, \samp{liblzma}, \samp{pcre},
5315+
\samp{libpng}, \samp{jpeglib} and \samp{libtiff} is now required,
53165316
and the build instructions have been revised.
53175317

53185318
\item A new \command{make} target \code{rsync-extsoft} has been
53195319
added to obtain copies of the external libraries from
5320-
\abbr{CRAN}.
5320+
CRAN.
53215321

53225322
\item Building the manuals now requires \command{texi2any} from
5323-
\pkg{texinfo} 5.1 or later. \abbr{CRAN} binary builds include
5323+
Texinfo 5.1 or later. CRAN binary builds include
53245324
the manuals, but by default builds from source will not, and they
5325-
will be accessed from \abbr{CRAN}. See the comments in
5325+
will be accessed from CRAN. See the comments in
53265326
\file{src/gnuwin32/MkRules.dist} for how to specify the location
53275327
of \command{texi2any}.
53285328

@@ -5499,7 +5499,7 @@
54995499
\item The included version of PCRE has been updated to 8.36.
55005500

55015501
\item \command{configure} accepts \samp{MAKEINFO=texi2any} as
5502-
another way to ensure \pkg{texinfo} 5.x is used when both 5.x and
5502+
another way to ensure Texinfo 5.x is used when both 5.x and
55035503
4.x are installed.
55045504
}
55055505
}
@@ -5718,8 +5718,8 @@
57185718
\env{LDFLAGS} (and not in \sQuote{your system's library directory}
57195719
as documented). (Wish of \PR{15790}.)
57205720

5721-
\item LaTeX package \pkg{upquote} is no longer required for \R's
5722-
use of \pkg{inconsolata}.
5721+
\item LaTeX package \samp{upquote} is no longer required for \R's
5722+
use of \samp{inconsolata}.
57235723
57245724
\item (Windows only) If both 32- and 64-bit versions of \R are
57255725
installed, the \file{bin/R.exe} and \file{bin/Rscript.exe} executables
@@ -6457,7 +6457,7 @@
64576457
the default in the future.
64586458

64596459
\item There is a new option \option{--use-system-tre} to use a
6460-
suitable system \pkg{tre} library: at present this means a version
6460+
suitable system TRE library: at present this means a version
64616461
from their \command{git} repository, after corrections.
64626462
(Wish of \PR{15660}.)
64636463
}
@@ -6760,10 +6760,10 @@
67606760
\subsection{NEW FEATURES}{
67616761
\itemize{
67626762
\item On Windows there is support for making \file{.texi} manuals
6763-
using \command{texinfo} 5.0 or later: the setting is in file
6763+
using Texinfo 5.0 or later: the setting is in file
67646764
\file{src/gnuwin32/MkRules.dist}.
67656765
6766-
A packaging of the Perl script and modules for \command{texinfo}
6766+
A packaging of the Perl script and modules for Texinfo
67676767
5.2 has been made available at
67686768
\url{http://www.stats.ox.ac.uk/pub/Rtools/}.
67696769
@@ -6812,7 +6812,7 @@
68126812
UTF-8 French month names to be read on (French) Windows.
68136813
68146814
\item \code{iconv(to = "utf8")} is now accepted on all platforms
6815-
(some implementations did already, but GNU \pkg{libiconv} did not:
6815+
(some implementations did already, but GNU \samp{libiconv} did not:
68166816
however converted strings were not marked as being in UTF-8). The
68176817
official name, \code{"UTF-8"} is still preferred.
68186818
@@ -7252,9 +7252,8 @@
72527252

72537253
\subsection{INSTALLATION and INCLUDED SOFTWARE}{
72547254
\itemize{
7255-
\item The macros used for the texinfo manuals have been changed to
7256-
work better with the incompatible changes made in \command{texinfo
7257-
5.x}.
7255+
\item The macros used for the Texinfo manuals have been changed to
7256+
work better with the incompatible changes made in Texinfo 5.x.
72587257

72597258
\item The minimum version for a system \code{xz} library is now
72607259
5.0.3 (was 4.999). This is in part to avoid 5.0.2, which can
@@ -8071,7 +8070,7 @@
80718070
\item \code{untar()} has a new argument \code{restore_times} which
80728071
if false (not the default) discards the times in the tarball.
80738072
This is useful if they are incorrect (some tarballs submitted to
8074-
\abbr{CRAN} have times in a local time zone or many years in the
8073+
CRAN have times in a local time zone or many years in the
80758074
past even though the standard required them to be in UTC).
80768075
80778076
\item \code{replayplot()} cannot (and will not attempt to) replay
@@ -8313,7 +8312,7 @@
83138312
\samp{universal} or \samp{leopard}): it looks in
83148313
\file{bin/macosx/contrib/3.0} rather than
83158314
\file{bin/macosx/leopard/contrib/2.15}). This is the type used
8316-
for the \abbr{CRAN} binary distribution for OS X as from \R
8315+
for the CRAN binary distribution for OS X as from \R
83178316
3.0.0.
83188317

83198318
\item File \file{etc/Makeconf} makes more use of the macros

doc/NEWS.Rd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -314,8 +314,8 @@
314314
\item \code{getMethods(*, table = TRUE)} is deprecated.
315315

316316
\item Building with the bundled (and old) version of
317-
\code{libintl} is deprecated and now gives a \command{configure
318-
warning}. This should be selected only if neither the OS's
317+
\code{libintl} is deprecated and now gives a \command{configure}
318+
warning. This should be selected only if neither the OS's
319319
\code{libc} (as on GNU Linux) nor an external \code{libintl}
320320
library (as on Alpine Linux) provide suitable functions.
321321
@@ -430,7 +430,7 @@
430430

431431
\subsection{C-LEVEL API}{
432432
\itemize{
433-
\item The \sQuote{Writing R Extensions} \I{TexInfo} source now
433+
\item The \sQuote{Writing R Extensions} \I{Texinfo} source now
434434
contains very experimental annotations for more clearly
435435
identifying the API status of C entry points. These annotations
436436
are used to produce indices for API, experimental API, and

doc/manual/R-admin.texi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3313,7 +3313,7 @@ with new translations, but otherwise the version of the @code{gettext}
33133313
runtime contained in the R sources will be used if no suitable external
33143314
@code{gettext} is found (possibly from @code{libc}) and @R{} was not
33153315
configured with @option{--disable-nls}. Use of the bundled
3316-
@code{gettext} runtime is deprecated and will be reoved soon.
3316+
@code{gettext} runtime is deprecated and will be removed soon.
33173317

33183318
@cindex Cairo
33193319
@cindex @I{Pango}

doc/manual/R-exts.texi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1481,7 +1481,7 @@ the seed to obtain reproducible results (and it can be helpful to do so
14811481
in all cases, to avoid occasional failures when tests are run).
14821482

14831483
If directory @file{tests} has a subdirectory @file{Examples} containing
1484-
a file @code{@var{pkg}-Ex.Rout.save}, this is compared to the output
1484+
a file @file{@var{pkg}-Ex.Rout.save}, this is compared to the output
14851485
file for running the examples when the latter are checked. Reference
14861486
output should be produced without having the @option{--timings} option
14871487
set (and note that @option{--as-cran} sets it).

src/library/base/man/Bessel.Rd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ besselY(x, nu)
6262
\dQuote{Acknowledgement} and \dQuote{References}, a short summary of
6363
which is
6464
\describe{
65-
\item{besselI}{based on (code) by David J. Sookne, see Sookne (1973)\dots
65+
\item{\code{besselI}}{based on (code by) David J. Sookne, see Sookne (1973)\dots
6666
Modifications\dots An earlier version was published in Cody (1983).}
67-
\item{besselJ}{as \code{besselI}}
68-
\item{besselK}{based on (code) by J. B. Campbell (1980)\dots Modifications\dots}
69-
\item{besselY}{draws heavily on Temme's Algol program for
67+
\item{\code{besselJ}}{as \code{besselI}}
68+
\item{\code{besselK}}{based on (code by) J. B. Campbell (1980)\dots Modifications\dots}
69+
\item{\code{besselY}}{draws heavily on Temme's Algol program for
7070
\eqn{Y}\dots and on Campbell's programs for \eqn{Y_\nu(x)}
7171
\dots. \dots heavily modified.}
7272
}

src/library/base/man/gettext.Rd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ Sys.setLanguage(lang, unset = "en", C.vs.en = c("msg", "warn", "silent"),
9393
9494
\code{ngettext} is used where the message needs to vary by a single
9595
integer. Translating such messages is subject to very specific rules
96-
for different languages: see the GNU \I{Gettext} Manual. The string
96+
for different languages: see the GNU \verb{gettext} manual. The string
9797
will often contain a single instance of \code{\%d} to be used in
9898
\code{\link{sprintf}}. If English is used, \code{msg1} is returned if
9999
\code{n == 1} and \code{msg2} in all other cases.

src/library/base/man/library.Rd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ conflictRules(pkg, mask.ok = NULL, exclude = NULL)
9999
obtain just the names of all available packages, and
100100
\code{\link{installed.packages}()} for even more information.
101101

102-
\code{library(help = somename)} computes basic information about the
103-
package \pkg{somename}, and returns this in an object of class
102+
\code{library(help = \var{pkgname})} computes basic information about the
103+
package \pkg{\var{pkgname}}, and returns this in an object of class
104104
\code{"packageInfo"}. (The structure of this class may change in
105105
future versions.) When used with the default value (\code{NULL}) for
106106
\code{lib.loc}, the attached packages are searched before the libraries.

src/library/grDevices/man/grDevices-defunct.Rd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
\description{
1313
The functions or variables listed here are no longer part of \R as
14-
they are no loinger supported.
14+
they are no longer supported.
1515
}
1616
\usage{
1717
# Defunct in R 4.5.0

src/library/tools/man/texi2dvi.Rd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ texi2pdf(file, clean = FALSE, quiet = TRUE,
6262

6363
%% issues included not re-running latex in texinfo 6.1 and bashisms in
6464
%% the /bin/sh script in <= 6.0.
65-
A shell script \command{texi2dvi} is part of GNU's \pkg{texinfo}.
65+
A shell script \command{texi2dvi} is part of GNU \I{Texinfo}.
6666
Several issues have been seen with released versions, so if yours does
6767
not work correctly try \env{R_TEXI2DVICMD=emulation}.
6868
#endif

0 commit comments

Comments
 (0)