Upgrade roxygen2

Author: hadley

DESCRIPTION

@@ -209,3 +209,4 @@ Collate:
     'zxx.r'
     'zzz.r'
 VignetteBuilder: knitr
+RoxygenNote: 5.0.0

NAMESPACE

@@ -1,4 +1,4 @@
-# Generated by roxygen2 (4.1.1): do not edit by hand
+# Generated by roxygen2: do not edit by hand
 
 S3method("$",ggproto)
 S3method("$",ggproto_parent)

R/fortify-lm.r

@@ -3,7 +3,6 @@
 #' If you have missing values in your model data, you may need to refit
 #' the model with \code{na.action = na.exclude}.
 #'
-#'
 #' @return The original data with extra columns:
 #'   \item{.hat}{Diagonal of the hat matrix}
 #'   \item{.sigma}{Estimate of residual standard deviation when

R/plot-construction.r

@@ -57,9 +57,7 @@
 #'
 #' @param e1 An object of class \code{ggplot} or \code{theme}
 #' @param e2 A component to add to \code{e1}
-#'
 #' @export
-#'
 #' @seealso \code{\link{theme}}
 #' @method + gg
 #' @rdname gg-add

R/scale-discrete-.r

@@ -6,7 +6,6 @@
 #' level, and increasing by one for each level (i.e. the labels are placed
 #' at integer positions).  This is what allows jittering to work.
 #'
-#'
 #' @param ... common discrete scale parameters: \code{name}, \code{breaks},
 #'  \code{labels}, \code{na.value}, \code{limits} and \code{guide}.  See
 #'  \code{\link{discrete_scale}} for more details

R/stat-count.r

@@ -12,7 +12,7 @@
 #'   \code{\link{stat_bin}} requires continuous x data, whereas
 #'   \code{stat_count} can be used for both discrete and continuous x data.
 #'
-#'  @export
+#' @export
 #' @rdname geom_bar
 stat_count <- function(mapping = NULL, data = NULL, geom = "bar",
                      position = "stack", width = NULL, ...,

R/utilities-grid.r

@@ -1,14 +1,8 @@
-#' unit & arrow functions from grid.
-#'
-#' See \code{\link[grid]{arrow}} and \code{\link[grid]{unit}} for more details.
-#' These functions are re-exported from grid by ggplot2 since they are
-#' so commonly used.
-#'
-#' @name ggplot2-grid
-#' @export unit arrow
-#' @aliases unit arrow
-#' @keywords internal
-NULL
+#' @export
+grid::unit
+
+#' @export
+grid::arrow
 
 # Name ggplot grid object
 # Convenience function to name grid objects

R/utilities.r

@@ -1,14 +1,11 @@
-#' Create a transparent colour.
-#'
-#' @name alpha
 #' @export
 #' @examples
 #' ggplot(mpg, aes(displ, hwy)) +
 #'   geom_point(alpha = 0.5, colour = "blue")
 #'
 #' ggplot(mpg, aes(displ, hwy)) +
 #'   geom_point(colour = alpha("blue", 0.5))
-NULL
+scales::alpha
 
 "%||%" <- function(a, b) {
   if (!is.null(a)) a else b