Skip to content

Commit

Permalink
Merge pull request #165 from lawinslow/master
Browse files Browse the repository at this point in the history
Fixed some readme issues
  • Loading branch information
Luke Winslow committed Apr 6, 2015
2 parents aa27fc4 + 9b22d6b commit a7f75ff
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
4 changes: 4 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
^.*\.Rproj$
^\.Rproj\.user$
.travis.yml
appveyor.yml
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ glmtools.Rproj
man/.DS_Store
R/.DS_Store
.DS_Store
.Rbuildignore
13 changes: 6 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,13 @@ FAQ

How do I install `glmtools`? It isn't on CRAN!
===
`glmtools` can be installed from the [github.gleon.io](http://github.gleon.io "GLEON's github page") repository. To install `glmtools` and all dependencies, follow the appropriate instructions below:
`glmtools` can be installed from the [USGS GRAN](http://owi.usgs.gov/R/gran.html) repository. To install `glmtools` and all dependencies, follow the appropriate instructions below:

use the following command in R:
1. Setup R to add GRAN using the instructions on the [USGS R page](http://owi.usgs.gov/R/gran.html).

install.packages("glmtools",
repos = c("http://gleon.github.com/", "http://usgs-r.github.com/", "http://cran.us.r-project.org"),
dependencies = TRUE,
type = "both")
2. After GRAN is setup (usually requires a restart of R), then use the following command in R:

`install.packages("glmtools")`

What libraries does `glmtools` need?
===
Expand All @@ -71,7 +70,7 @@ In order to contribute to this code, we recommend the following workflow:

$cd glmtools

$git remote add upstream https://github.com/GLEON/glmtools.git
$git remote add upstream https://github.com/USGS-R/glmtools.git

5) before pushing your changes to your repository, pull in the current version of the GLEON master:

Expand Down

0 comments on commit a7f75ff

Please sign in to comment.