Skip to content

Commit f4f2a2f

Browse files
author
maechler
committed
cosmetic changes, comments
git-svn-id: https://svn.r-project.org/R/trunk@87291 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent 4580ec3 commit f4f2a2f

File tree

16 files changed

+33
-29
lines changed

16 files changed

+33
-29
lines changed

etc/Makeconf.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# @configure_input@
1+
# @configure_input@ -*- Makefile -*-
22
#
33
# ${R_HOME}/etc/Makeconf
44
#

src/library/base/R/connections.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ textConnection <- function(object, open = "r", local = FALSE,
155155
env <- if (local) parent.frame() else .GlobalEnv
156156
type <- match(match.arg(encoding), c("", "bytes", "UTF-8"))
157157
if(!(is.character(name) && length(name) == 1))
158-
stop("'name' must be a single character string")
158+
stop(gettextf("'%s' must be a character string", "name"), domain = NA)
159159
.Internal(textConnection(name, object, open, env, type))
160160
}
161161

src/library/base/man/as.POSIXlt.Rd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
% File src/library/base/man/as.POSIXlt.Rd
22
% Part of the R package, https://www.R-project.org
3-
% Copyright 1995-2022 R Core Team
3+
% Copyright 1995-2024 R Core Team
44
% Distributed under GPL 2 or later
55

66
\name{as.POSIX*}
@@ -208,7 +208,7 @@ as.POSIXlt(Sys.time(), "Australia/Darwin")
208208
}
209209

210210
tab <- file.path(R.home("share"), "zoneinfo", "zone1970.tab")
211-
if(file.exists(tab)) { # typically on Windows; *not* on Linux
211+
if(file.exists(tab)) { # typically on Windows; on Linux when `configure --with-internal-tzcode`
212212
cols <- c("code", "coordinates", "TZ", "comments")
213213
tmp <- read.delim(tab,
214214
header = FALSE, comment.char = "#", col.names = cols)

src/library/base/man/format.Rd

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,16 @@
55
% Distributed under GPL 2 or later
66

77
\name{format}
8+
\title{Encode in a Common Format}
89
\alias{format}
910
\alias{format.AsIs}
1011
\alias{format.data.frame}
1112
\alias{format.default}
1213
\alias{format.factor}
1314
\description{
14-
Format an \R object for pretty printing.
15+
Format an \R object for pretty printing, notably encoding vector or
16+
column elements into a common format.
1517
}
16-
\title{Encode in a Common Format}
1718
\usage{
1819
format(x, \dots)
1920

src/library/base/man/list.Rd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
% File src/library/base/man/list.Rd
22
% Part of the R package, https://www.R-project.org
3-
% Copyright 1995-2022 R Core Team
3+
% Copyright 1995-2024 R Core Team
44
% Distributed under GPL 2 or later
55

66
\name{list}
@@ -73,7 +73,7 @@ alist(\dots)
7373
\code{is.list} returns \code{TRUE} if and only if its argument
7474
is a \code{list} \emph{or} a \code{pairlist} of \code{length} \eqn{> 0}.
7575
\code{is.pairlist} returns \code{TRUE} if and only if the argument
76-
is a pairlist or \code{NULL} (see below).
76+
is a pairlist (or \code{NULL} which \emph{is} a pairlist, see below).
7777

7878
The \code{"\link{environment}"} method for \code{as.list} copies the
7979
name-value pairs (for names not beginning with a dot) from an

src/library/base/man/qr.Rd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ as.qr(x)
9999
\value{
100100
The QR decomposition of the matrix as computed by LINPACK(*) or LAPACK.
101101
The components in the returned value correspond directly
102-
to the values returned by \I{DQRDC}(2)/\I{DGEQP3}/\I{ZGEQP3}.
102+
to the values returned by \I{DQRDC(2)}/\I{DGEQP3}/\I{ZGEQP3}.
103103
\item{qr}{a matrix with the same dimensions as \code{x}.
104104
The upper triangle contains the \eqn{\bold{R}} of the decomposition
105105
and the lower triangle contains information on the \eqn{\bold{Q}} of
106106
the decomposition (stored in compact form). Note that the storage
107-
used by \I{DQRDC} and \I{DGEQP3} differs.}
107+
used by \I{DQRDC} (LINPACK) and \I{DGEQP3} (LAPACK) differs.}
108108
\item{qraux}{a vector of length \code{ncol(x)} which contains
109109
additional information on \eqn{\bold{Q}}.}
110110
\item{rank}{the rank of \code{x} as computed by the decomposition(*):

src/library/base/man/source.Rd

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

1717
\code{withAutoprint(exprs)} is a wrapper for \code{source(exprs =
1818
exprs, ..)} with different defaults. Its main purpose is to evaluate
19-
and auto-print expressions as if in a toplevel context, e.g, as in the
19+
and auto-print expressions as if in a top-level context, e.g, as in the
2020
\R console.
2121
}
2222
\usage{

src/library/base/man/srcfile.Rd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
% File src/library/base/man/srcfile.Rd
22
% Part of the R package, https://www.R-project.org
3-
% Copyright 1995-2016 R Core Team
3+
% Copyright 1995-2024 R Core Team
44
% Distributed under GPL 2 or later
55

66
\name{srcfile}
@@ -155,8 +155,8 @@ srcref(srcfile, lloc)
155155
}
156156
\seealso{
157157
\code{\link{getSrcFilename}} for extracting information from a source
158-
reference, or \code{\link{removeSource}} to remove it from a
159-
(non-primitive) function (aka \sQuote{closure}).
158+
reference, or \code{\link{removeSource}} to remove it from a language
159+
object or a (non-primitive) function (aka \sQuote{closure}).
160160
}
161161
\author{Duncan Murdoch}
162162
\examples{

src/library/base/man/strsplit.Rd

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
% File src/library/base/man/strsplit.Rd
22
% Part of the R package, https://www.R-project.org
3-
% Copyright 1995-2023 R Core Team
3+
% Copyright 1995-2024 R Core Team
44
% Distributed under GPL 2 or later
55

66
\name{strsplit}
@@ -107,11 +107,12 @@ strsplit(x, split, fixed = FALSE, perl = FALSE, useBytes = FALSE)
107107
\seealso{
108108
\code{\link{paste}} for the reverse,
109109
\code{\link{grep}} and \code{\link{sub}} for string search and
110-
manipulation; also \code{\link{nchar}}, \code{\link{substr}}.
110+
manipulation; also \code{\link{nchar}}, \code{\link{substr}},
111+
\code{\link{startsWith}()}, and \code{endsWith()}.
111112

112113
\sQuote{\link{regular expression}} for the details of the pattern
113114
specification.
114-
115+
115116
Option \code{PCRE_use_JIT} controls the details when \code{perl = TRUE}.
116117
}
117118
\examples{

src/library/base/man/substr.Rd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ substring(text, first, last = 1000000L) <- value
8989
Wadsworth & Brooks/Cole. (\code{substring}.)
9090
}
9191
\seealso{
92+
\code{\link{startsWith}} and \code{endsWith()};
9293
\code{\link{strsplit}}, \code{\link{paste}}, \code{\link{nchar}}.
9394
}
9495
\examples{

0 commit comments

Comments
 (0)