Some small changes (typo, punctuation fix) to the NEWS file, and some
suggested changes to download.file.Rd (I found some of the phrasing
awkward/hard to parse, and got carried away). (I *think* .txt
attachments are OK on the list?)
FWIW I started fixing the download.file man page because I went there
to understand/be horrified by the following (documented!) infelicity:
with the default settings (on Unix at least), failing to download what
is intended to be a new version of a file will wipe out the original,
leaving an empty file. So, for example, a temporary network problem can
lead to a pipeline being unworkable (because a critical file has been
emptied) until the network comes back ... I don't suppose there's any
chance this behaviour could be changed ... ??
> What happens to the destination file(s) in the case of error
depends on the method and R version. Currently the ‘"internal"’,
‘"wininet"’ and ‘"libcurl"’ methods will remove the file if there
the URL is unavailable except when ‘mode’ specifies appending when
the file should be unchanged.
Obligatory xkcd: https://xkcd.com/293/
cheers
Ben Bolker
Index: doc/NEWS.Rd
===================================================================
--- doc/NEWS.Rd (revision 75424)
+++ doc/NEWS.Rd (working copy)
@@ -141,7 +141,7 @@
i.e., all help pages. show platform-independent information (rather
than Windows or Unix-alike specifics visible only on that platform).
Consequently, the Windows version of \code{X11()} / \code{x11()}
- got identical formal arguments the unix one.
+ now has identical formal arguments to the Unix version.
\item \code{sessionInfo()$running} has been factored out in a new
variable \code{osVersion}. % precomputed at utils namespace load time
@@ -283,7 +283,7 @@
\item The documentation for \code{identify()} incorrectly claimed
that the indices of identified points were returned in the order
- that the points were selected.. \code{identify()} now has a new
+ that the points were selected. \code{identify()} now has a new
argument \code{order} to allow the return value to include the
order in which points were identified; the documentation has been
updated. Reported by Richard Rowe and Samuel Granjeaud.
Index: src/library/utils/man/download.file.Rd
===================================================================
--- src/library/utils/man/download.file.Rd (revision 75424)
+++ src/library/utils/man/download.file.Rd (working copy)
@@ -133,15 +133,16 @@
\code{"libcurl"} method values of the option less than 2 give verbose
output.
- A progress bar tracks the transfer platform specifically:
+ A progress bar tracks the transfer, with behavior depending on the
+ platform:
\describe{
\item{On Windows}{If the file length is known, the
full width of the bar is the known length. Otherwise the initial
width represents 100 Kbytes and is doubled whenever the current width
- is exceeded. (In non-interactive use this uses a text version. If the
- file length is known, an equals sign represents 2\% of the transfer
- completed: otherwise a dot represents 10Kb.)}
- \item{On a unix-alike}{If the file length is known, an
+ is exceeded. (In non-interactive use the progress bar uses
+ a text version which follows the Unix-alike behavior described
+ below.)}
+ \item{On a Unix-alike}{If the file length is known, an
equals sign represents 2\% of the transfer completed: otherwise a dot
represents 10Kb.}
}
@@ -248,7 +249,7 @@
Note that the root certificates used by \R may or may not be the same
as used in a browser, and indeed different browsers may use different
certificate bundles (there is typically a build option to choose
- either their own or the system ones).
+ either their own or those from the system).
}
\section{FTP sites}{
\samp{ftp:} URLs are accessed using the FTP protocol which has a
@@ -284,8 +285,8 @@
What happens to the destination file(s) in the case of error depends
on the method and \R{} version. Currently the \code{"internal"},
\code{"wininet"} and \code{"libcurl"} methods will remove the file if
- there the URL is unavailable except when \code{mode} specifies
- appending when the file should be unchanged.
+ the URL is unavailable except when \code{mode} specifies
+ appending, in which case the file will not be changed.
}
\seealso{
\code{\link{options}} to set the \code{HTTPUserAgent}, \code{timeout}
Index: src/main/eval.c
===================================================================
--- src/main/eval.c (revision 75424)
+++ src/main/eval.c (working copy)
@@ -1,4 +1,4 @@
-/*
+ /*
* R : A Computer Language for Statistical Data Analysis
* Copyright (C) 1998--2018 The R Core Team.
* Copyright (C) 1995, 1996 Robert Gentleman and Ross Ihaka
______________________________________________
[email protected] mailing list
https://stat.ethz.ch/mailman/listinfo/r-devel