Merge pull request #4 from ldecicco-USGS/master

Travis badge + typos

.travis.yml

@@ -1,31 +1,34 @@
-# Sample .travis.yml for R projects from https://github.com/craigcitro/r-travis
+# Sample .travis.yml for R projects.
+#
+# See README.md for instructions, or for more configuration options,
+# see the wiki:
+#   https://github.com/craigcitro/r-travis/wiki
 
-language: c
-
-os:
-  - osx
-  - linux
+language: objective-c
+sudo: required
 
 env:
    global:
-     - CRAN: http://cran.rstudio.com
+     - R_LIBS="http://cran.rstudio.com"
      - R_BUILD_ARGS="--no-build-vignettes --no-manual"
      - R_CHECK_ARGS="--no-build-vignettes --no-manual --as-cran"
      - BOOTSTRAP_LATEX=""
-     - NOT_CRAN="true" 
-
-script: "./travis-tool.sh run_tests"
+     - NOT_CRAN="true"
 
-before_script:
+before_install:
   - curl -OL http://raw.github.com/craigcitro/r-travis/master/scripts/travis-tool.sh
   - chmod 755 ./travis-tool.sh
-  - "./travis-tool.sh bootstrap"
-  - "./travis-tool.sh install_deps - ./travis-tool.sh install_r EGRET lubridate binom"
+  - ./travis-tool.sh bootstrap
+
+install:
+  - ./travis-tool.sh install_deps
+
+script: ./travis-tool.sh run_tests
 
-after_script:
-  - "./travis-tool.sh dump_logs"
+after_failure:
+  - ./travis-tool.sh dump_logs
 
 notifications:
   email:
     on_success: change
-    on_failure: change
+    on_failure: change

DESCRIPTION

@@ -6,8 +6,7 @@ Authors@R: c( person("Robert", "Hirsch", role = c("aut"),
     email = "[email protected]"),
     person("Laura", "DeCicco", role = c("aut","cre"),
     email = "[email protected]"))
-Description: Confidence interval calculations for Weighted
-    Regressions on Time, Discharge, and Season (WRTDS).
+Description:  Collection of functions to evaluate uncertainty of results from water quality analysis using the Weighted Regressions on Time Discharge and Season (WRTDS) method. This package is an add-on to the EGRET package that performs the WRTDS analysis.
 License: CC0
 Depends:
     R (>= 3.0)

R/wBTCode.R

@@ -12,8 +12,9 @@
 #' LazyLoad: \tab yes\cr
 #' }
 #'
-#' Collection of functions to do WRTDS and flowHistory analysis, and produce graphs and tables of data and results from these analysesevaluate uncertainty of results from water quality analysis using the WRTDS (Weighted Regressions on Time Discharge and Season) method.  
-#' This package is an add-on to the EGRET package that performs the WRTDS analysis.
+#' Collection of functions to evaluate uncertainty of results from water quality analysis using 
+#' the Weighted Regressions on Time Discharge and Season (WRTDS) method. This package is an add-on 
+#' to the EGRET package that performs the WRTDS analysis.
 #'
 #' @name EGRETci-package
 #' @docType package

README.md

@@ -20,7 +20,8 @@ To install the `EGRETci` package you need to be using R 3.0 or greater. Then use
         "http://cran.us.r-project.org"))
 ```
 
-Linux: [![travis](https://api.travis-ci.org/ldecicco-USGS/EGRETci.svg?branch=master)](https://travis-ci.org/ldecicco-USGS/EGRETci)
+Linux: 
+[![Build Status](https://travis-ci.org/USGS-R/EGRETci.svg)](https://travis-ci.org/USGS-R/EGRETci)
 
 
  [

man/EGRETci-package.Rd

@@ -18,8 +18,9 @@ LazyLoad: \tab yes\cr
 }
 }
 \details{
-Collection of functions to do WRTDS and flowHistory analysis, and produce graphs and tables of data and results from these analysesevaluate uncertainty of results from water quality analysis using the WRTDS (Weighted Regressions on Time Discharge and Season) method.
-This package is an add-on to the EGRET package that performs the WRTDS analysis.
+Collection of functions to evaluate uncertainty of results from water quality analysis using
+the Weighted Regressions on Time Discharge and Season (WRTDS) method. This package is an add-on
+to the EGRET package that performs the WRTDS analysis.
 }
 \author{
 Robert M. Hirsch \email{rhirsch@usgs.gov}, Laura De Cicco \email{ldecicco@usgs.gov}