Merge branch 'hotfix/v0.7.4'

DESCRIPTION

@@ -1,11 +1,12 @@
 Package: phonics
 Type: Package
 Title: Phonetic Spelling Algorithms
-Version: 0.7.3
-Date: 2016-03-29
+Version: 0.7.4
+Date: 2016-06-04
 Encoding: UTF-8
-Authors@R: person(given = "James P.", family = "Howard, II",
-		          email = "jh@jameshoward.us", role = c("aut", "cre"))
+Authors@R: c(person(given = "James P.", family = "Howard, II",
+		                email = "jh@jameshoward.us", role = c("aut", "cre")),
+		         person(given = "Oliver", family = "Keyes", role = "ctb"))
 URL: https://jameshoward.us/software/phonics/,
     https://github.com/howardjp/phonics
 BugReports: https://github.com/howardjp/phonics/issues
@@ -19,4 +20,4 @@ Suggests:
     testthat
 LinkingTo: Rcpp,
     BH
-RoxygenNote: 5.0.1.9000
+RoxygenNote: 5.0.1

R/RcppExports.R

@@ -3,19 +3,19 @@
 
 #' @rdname metaphone
 #' @name metaphone
-#' @title Metaphone
+#' @title Generate phonetic versions of strings with Metaphone
 #'
 #' @description
-#' The Metaphone phonentic algorithm
+#' The function \code{metaphone} phonentically encodes the
+#' given string using the metaphone algorithm.
 #'
 #' @param word string or vector of strings to encode
 #' @param maxCodeLen  maximum length of the resulting encodings, in characters
 #'
-#' @details The function \code{metaphone} phonentically encodes the
-#' given string using the metaphone algorithm.  There is some discrepency
-#' with respect to how the metaphone algorithm actually works.  For
+#' @details There is some discrepency
+#' with respect to how the metaphone algorithm actually works. For
 #' instance, there is a version in the Java Apache Commons library.
-#' There is a version provided within PHP.  These do not provide the same
+#' There is a version provided within PHP. These do not provide the same
 #' results.  On the questionable theory that the implementation in PHP
 #' is probably more well known, this code should match it in output.
 #'
@@ -25,7 +25,8 @@
 #' The variable \code{maxCodeLen} is the limit on how long the returned
 #' metaphone should be.
 #'
-#' @return metaphone encoded character vector
+#' @return a character vector containing the metaphones of \code{word},
+#' or an NA if the \code{word} value is NA
 #'
 #' @family phonics
 #'

phonics.Rproj

@@ -18,4 +18,4 @@ StripTrailingWhitespace: Yes
 BuildType: Package
 PackageUseDevtools: Yes
 PackageInstallArgs: --no-multiarch --with-keep.source
-PackageRoxygenize: rd,namespace,vignette
+PackageRoxygenize: rd,collate,namespace,vignette