port r39531 from trunk

git-svn-id: https://svn.r-project.org/R/branches/R-2-4-branch@39532 00db46b3-68df-0310-9c12-caf00c1e9a41

doc/manual/R-admin.texi

@@ -770,7 +770,12 @@ AthlonXP chips are available in the @file{windows/contrib/ATLAS} area on
 libraries are located.  You will need to make the libraries
 yourself@footnote{We do this using the Cygwin compilers, often with
 some difficulty.}: none of the binaries we have seen are compiled for
-the correct compiler.
+the correct compiler.  Since @R{} has its own @samp{xerbla} it is best
+to delete that in ATLAS by
+
+@example
+ar d /path/to/libf77blas.a xerbla.o
+@end example
 
 Another possibility is to use AMD's AMD Core Math Library (ACML)
 @url{http://www.amd.com/acml, @code{www.amd.com/@/acml}}.  To use the

src/library/base/man/colnames.Rd

@@ -31,7 +31,8 @@ colnames(x) <- value
   the first component is used as the row names, and the second component
   (if any) is used for the col names.  For a data frame, \code{rownames}
   and \code{colnames} are equivalent to \code{\link{row.names}} and
-  \code{\link{names}} respectively.
+  \code{\link{names}} respectively, but the latter are preferred (and
+  can be much faster).
 
   If \code{do.NULL} is \code{FALSE}, a character vector (of length
   \code{\link{NROW}(x)} or \code{\link{NCOL}(x)}) is returned in any

src/library/base/man/data.frame.Rd

@@ -86,7 +86,7 @@ default.stringsAsFactors()
   \code{\link{I}},
   \code{\link{plot.data.frame}},
   \code{\link{print.data.frame}},
-  \code{\link{row.names}},
+  \code{\link{row.names}}, \code{\link{names}} (for the column names),
   \code{\link{[.data.frame}} for subsetting methods,
   \code{\link{Math.data.frame}} etc, about
   \emph{Group} methods for \code{data.frame}s;

src/library/base/man/merge.Rd

@@ -18,7 +18,8 @@ merge(x, y, \dots)
       sort = TRUE, suffixes = c(".x",".y"), \dots)
 }
 \arguments{
-  \item{x, y}{data frames, or objects to be coerced to one}
+  \item{x, y}{data frames, or objects to be coerced to one.  Neither is
+    currently allowed to have zero rows.}
   \item{by, by.x, by.y}{specifications of the common columns. See Details.}
   \item{all}{logical; \code{all = L} is shorthand for \code{all.x = L} and
     \code{all.y = L}.}
@@ -68,7 +69,7 @@ merge(x, y, \dots)
   common columns, but for \code{sort=FALSE} are in an unspecified order.
   The columns are the common columns followed by the
   remaining columns in \code{x} and then those in \code{y}.  If the
-  matching involved row names, an extra character column
+  matching involved row names, an extra character column called
   \code{Row.names} is added at the left, and in all cases the result has
   no special row names.
 }