Merge branch 'master' into v0.1.1

ellisvalentiner · Oct 22, 2017 · ee9f78b · ee9f78b
2 parents b554c36 + b6171f2
commit ee9f78b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -2,8 +2,9 @@ Package: lubridateExtras
 Type: Package
 Title: Convenience functions for the lubridate package
 Version: 0.1.0
-Authors@R: person("Ellis", "Valentiner", email = "[email protected]",
-                  role = c("aut", "cre"))
+Authors@R: c(
+    person("Ellis", "Valentiner", email = "[email protected]", role = c("aut", "cre")),
+    person("Geoffrey", "Hannigan", email = "[email protected]", role = c("ctb")))
 Description: Provides extra functionality to lubridate. Largely consisting of
     convenience functions.
 License: MIT + file LICENSE
@@ -17,5 +18,6 @@ Imports:
 Remotes:
   tidyverse/lubridate,
   tidyverse/hms
+VignetteBuilder: knitr
 RoxygenNote: 6.0.1
 Suggests: testthat
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/lubridateExtras.Rproj b/lubridateExtras.Rproj
@@ -17,4 +17,4 @@ StripTrailingWhitespace: Yes
 BuildType: Package
 PackageUseDevtools: Yes
 PackageInstallArgs: --no-multiarch --with-keep.source
-PackageRoxygenize: rd,collate,namespace
+PackageRoxygenize: rd,collate,namespace,vignette
diff --git a/vignettes/intro.Rmd b/vignettes/intro.Rmd
@@ -14,8 +14,6 @@ suppressPackageStartupMessages(library(lubridate))
 library(lubridateExtras)
 ```
 
-lubridateExtras provides functions to improve code readability and increase laziness.
-
 ## Example
 
 Suppose you want to review transactions from the past 7 days.