Skip to content

Commit 830d665

Browse files
committed
fix java and conda documents
1 parent 92ec9fb commit 830d665

7 files changed

Lines changed: 50 additions & 16 deletions

File tree

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Authors@R: c(person("Tal", "Galili", role = c("aut", "cre", "cph"), email =
3030
person("Tom", "Allard", email = "tallard@frb.gov", role = "ctb"),
3131
person("ChingChuan", "Chen", email = "zw12356@gmail.com", role = "ctb"),
3232
person("Jonathan", "Hill", email = "jon.mark.hill@gmail.com", role = "ctb"),
33-
person("Chan-Yub", "Park", comment = "https://github.com/mrchypark", role = "ctb")
33+
person("Chan-Yub", "Park", email = "mrchypark@gmail.com", comment = "https://github.com/mrchypark", role = "ctb")
3434
)
3535
Description: R is great for installing software. Through the 'installr'
3636
package you can automate the updating of R (on Windows, using updateR())

R/installConda.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
#'
2424
#' @return TRUE/FALSE - was the installation successful or not.
2525
#' @export
26-
#' @author Tal Galili and A. Jonathan R. Godfrey
26+
#' @author Tal Galili and A. Jonathan R. Godfrey and Chanyub Park
2727
#' @param version 2 or 3. Default is 3
28-
#' @param binNo 32 or 64. Defaults is "auto" to check system.
28+
#' @param bitNo 32 or 64. Defaults is "auto" to check system.
2929
#' @param ... extra parameters to pass to \link{install.URL}
3030
#' @examples
3131
#' \dontrun{

R/installNodejs.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#'
2525
#' @return TRUE/FALSE - was the installation successful or not.
2626
#' @export
27-
#' @author Tal Galili and A. Jonathan R. Godfrey
27+
#' @author Tal Galili and A. Jonathan R. Godfrey and Chanyub Park
2828
#' @param page_with_download_url a link to the list of download links for Nodejs
2929
#' @param version_number Either LTS or Current. Version LTS will lead to download of v6.11.X
3030
#' @param ... extra parameters to pass to \link{install.URL}

R/installOpenJdk.R

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
#' install openjdk 9 or 10 version for windows.
2222
#'
2323
#' @return TRUE/FALSE - was the installation successful or not.
24-
#' @export
25-
#' @author Tal Galili and A. Jonathan R. Godfrey
24+
#' @author Tal Galili and A. Jonathan R. Godfrey and Chanyub Park
2625
#' @param version 9 or 10 is passible. Default is 10.
2726
#' @param page_with_download_url where to download. Default is \url{http://jdk.java.net/java-se-ri/}
2827
#' @param path where to set java. Defulat path is C:/java
@@ -32,6 +31,11 @@
3231
#' install.java(version = 10)
3332
#' install.java(10)
3433
#' }
34+
#' @name install.java
35+
NULL
36+
37+
#' @export
38+
#' @rdname install.java
3539
install.java <- function(version = 10,
3640
page_with_download_url = "http://jdk.java.net/java-se-ri/",
3741
path = "C:/java") {
@@ -73,16 +77,21 @@ install.java <- function(version = 10,
7377
}
7478

7579
#' @export
76-
install.Java <- function(...) install.java(...)
80+
#' @rdname install.java
81+
install.Java <- install.java
7782

7883
#' @export
79-
install.jdk <- function(...) install.java(...)
84+
#' @rdname install.java
85+
install.jdk <- install.java
8086

8187
#' @export
82-
install.Jdk <- function(...) install.java(...)
88+
#' @rdname install.java
89+
install.Jdk <- install.java
8390

8491
#' @export
85-
install.openjdk <- function(...) install.java(...)
92+
#' @rdname install.java
93+
install.openjdk <- install.java
8694

8795
#' @export
88-
install.OpenJdk <- function(...) install.java(...)
96+
#' @rdname install.java
97+
install.OpenJdk <- install.java

man/install.conda.Rd

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/install.java.Rd

Lines changed: 26 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/install.nodejs.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)