Merge remote-tracking branch 'upstream/master'

* upstream/master: (70 commits) corrected argument to `install_github` Add note to NEWS Handle 'no measure.variables' case; closes hadley#46 Bump version Fix license typo Bump version Add r cmd check notes Tweak news Code outside link, not inside :( Re-document Use new testthat structure Preserve order of dimnames. Closes hadley#19 Update urls Use dcast, not cast, in recast. Closes hadley#45 Depend on plyr 1.8.1. Closes hadley#44 Make sure OBJECT bit is set when 'value' is a factor Update NEWS Use $ instead of [[ Include updated args in melt_check roxygen Some more tweaks + robustness ... Conflicts: DESCRIPTION man/guess_value.Rd man/margins.Rd man/melt.array.Rd
duncandoo · Jun 23, 2014 · cf3f646 · cf3f646
2 parents 45382fd + 379036a
commit cf3f646
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -13,8 +13,8 @@ LinkingTo: Rcpp
 Imports:
     plyr (>= 1.8.1),
     stringr,
-    lattice,
     Rcpp
+Roxygen: list(wrap = FALSE)
 Suggests:
     testthat (>= 0.8.0),
     lattice

diff --git a/man/guess_value.Rd b/man/guess_value.Rd
@@ -1,16 +1,18 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
 \name{guess_value}
 \alias{guess_value}
 \title{Guess name of value column}
 \usage{
-  guess_value(df)
+guess_value(df)
 }
 \arguments{
 \item{df}{data frame to guess value column from}
 }
 \description{
-  Strategy: \enumerate{ \item Is value or 'all_' column
-  present? If so, use that \item Otherwise, guess that last
-  column is the value column }
+Strategy:
+\enumerate{
+  \item Is value or (all) column present? If so, use that
+  \item Otherwise, guess that last column is the value column
 }
 }
 \keyword{internal}

diff --git a/man/margins.Rd b/man/margins.Rd
@@ -13,9 +13,9 @@ dimension}
 \code{TRUE} will compute all possible margins.}
 }
 \value{
-  list of margining combinations, or \code{NULL} if none.
-  These are the combinations of variables that should have
-  their values set to \code{all_}
+list of margining combinations, or \code{NULL} if none. These are
+  the combinations of variables that should have their values set to
+  \code{(all)}
 }
 \description{
 Given the variables that form the rows and columns, and a set of desired

diff --git a/man/melt.array.Rd b/man/melt.array.Rd
@@ -48,7 +48,7 @@ melt(a)
 \code{\link{cast}}
 
 Other melt.methods: \code{\link{melt.data.frame}};
-\code{\link{melt.default}}; \code{\link{melt.list}}
+  \code{\link{melt.default}}; \code{\link{melt.list}}
 }
 \keyword{manip}