diff --git a/dataRetrieval_1.2.1.tar.gz b/dataRetrieval_1.2.1.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..9082a40b829acb1939c96fcef272f8831aa10850
Binary files /dev/null and b/dataRetrieval_1.2.1.tar.gz differ
diff --git a/inst/doc/dataRetrieval-concordance.tex b/inst/doc/dataRetrieval-concordance.tex
index a22416b681976c43f0815c495024f879de0e7948..4e8d04e16a9fae63759762d464371401b9d1b42a 100644
--- a/inst/doc/dataRetrieval-concordance.tex
+++ b/inst/doc/dataRetrieval-concordance.tex
@@ -1,4 +1,4 @@
\Sconcordance{concordance:dataRetrieval.tex:dataRetrieval.Rnw:%
-1 80 1 1 2 1 0 1 1 3 0 1 2 1 1 1 2 4 0 1 2 5 1 1 3 5 0 1 2 2 1 1 4 6 0 %
-1 2 2 1 1 4 6 0 1 2 7 1 1 2 8 0 1 1 18 0 2 1 18 0 2 1 18 0 1 1 5 0 1 2 %
+1 75 1 1 3 5 0 1 2 2 1 1 4 6 0 1 2 2 1 1 4 6 0 1 2 8 1 1 2 1 0 1 1 3 0 %
+1 2 1 1 1 2 4 0 1 2 5 1 1 2 8 0 1 1 18 0 2 1 18 0 2 1 18 0 1 1 5 0 1 2 %
12 0 1 2 45 1}
diff --git a/inst/doc/dataRetrieval.Rnw b/inst/doc/dataRetrieval.Rnw
index e8eb0e07765315bf824fce183a6bb7f462371f82..de287c323baf2db8a02f95ed31b8cf707fc0f6d2 100644
--- a/inst/doc/dataRetrieval.Rnw
+++ b/inst/doc/dataRetrieval.Rnw
@@ -64,35 +64,15 @@ The dataRetrieval package was created to simplify the process of getting hydrolo
%------------------------------------------------------------
The dataRetrieval package was created to simplify hydrologic data retrieval. The options are web or user-produced files.....
-%------------------------------------------------------------
-\subsection{What is EGRET?}
-%------------------------------------------------------------
-Exploration and Graphics for RivEr Trends (EGRET): An R-package for the analysis of long-term changes in water quality and streamflow, including the water-quality method Weighted Regressions on Time, Discharge, and Season (WRTDS)...
-
\newpage
%------------------------------------------------------------
\section{Getting Started}
%------------------------------------------------------------
This section describes the options for downloading and installing the dataRetrieval package.
-%------------------------------------------------------------
-\subsection{Installing dataRetrieval from gitHub:}
-%------------------------------------------------------------
-One can easily install the latest version of dataRetrieval directly from gitHub using the devtools package. devtools is available on CRAN. Simpley type the following commands into R to install the latest version of dataRetrieval available on github.
-
-<<gitInstal,eval = FALSE>>=
-library(devtools)
-install_github("dataRetrieval", "USGS-CIDA")
-@
-To then open the library, simpley type:
-
-<<openLibrary>>=
-library(dataRetrieval)
-@
-
%------------------------------------------------------------
\subsection{Installing dataRetrieval from downloaded binary:}
%------------------------------------------------------------
-Alternatively, the dataRetrieval pacakage is available for download at \url{https://github.com/USGS-CIDA/WRTDS/downloads}. If the package's tar.gz file is saved in R's working directory, then the following commands will fully install the package:
+The dataRetrieval pacakage is available for download at \url{https://github.com/USGS-CIDA/WRTDS/downloads}. If the package's tar.gz file is saved in R's working directory, then the following command will fully install the package:
<<installFromWD,eval = FALSE>>=
install.packages("dataRetrieval_1.2.0.tar.gz",
@@ -115,7 +95,23 @@ install.packages(
repos=NULL, type="source")
@
-Some users have found it necessary to delete the package folders before installing newer versions of either dataRetrieval or EGRET. If you are experiencing an issue after updating a package, trying deleting the package folder, the default location for Windows is something like this: C:/Users/ldecicco/Documents/R/win-library/2.15/dataRetrieval the default for a Mac: /Users/ldecicco/Library/R/2.15/library/dataRetrieval Then, re-install the package using the directions above. Moving to CRAN should solve this problem.
+It is a good idea to re-start the R enviornment after installing the package, especially if installing an updated version. Some users have found it necessary to delete the previous version's package folder before installing newer version of dataRetrieval. If you are experiencing issues after updating a package, trying deleting the package folder - the default location for Windows is something like this: C:/Users/userA/Documents/R/win-library/2.15/dataRetrieval the default for a Mac: /Users/userA/Library/R/2.15/library/dataRetrieval Then, re-install the package using the directions above. Moving to CRAN should solve this problem.
+
+
+%------------------------------------------------------------
+\subsection{Installing dataRetrieval from gitHub:}
+%------------------------------------------------------------
+Alternatively, R-developers can install the latest version of dataRetrieval directly from gitHub using the devtools package. devtools is available on CRAN. Simpley type the following commands into R to install the latest version of dataRetrieval available on gitHub. Rtools (for Windows) and latex tools are required.
+
+<<gitInstal,eval = FALSE>>=
+library(devtools)
+install_github("dataRetrieval", "USGS-CIDA")
+@
+To then open the library, simpley type:
+
+<<openLibrary>>=
+library(dataRetrieval)
+@
%------------------------------------------------------------
\subsection{A Simple Web Retrieval Example}
diff --git a/inst/doc/dataRetrieval.log b/inst/doc/dataRetrieval.log
index 0247f4f4fba30881b03efa06fe97975f22ce4ca0..5fecb371fde0bc0980463894273a9c896786dbc2 100644
--- a/inst/doc/dataRetrieval.log
+++ b/inst/doc/dataRetrieval.log
@@ -1,4 +1,4 @@
-This is pdfTeX, Version 3.1415926-2.3-1.40.12 (MiKTeX 2.9) (preloaded format=pdflatex 2012.1.6) 28 DEC 2012 15:13
+This is pdfTeX, Version 3.1415926-2.3-1.40.12 (MiKTeX 2.9) (preloaded format=pdflatex 2012.1.6) 3 JAN 2013 15:51
entering extended mode
**dataRetrieval.tex
(D:\LADData\RCode\dataRetrievalGitorious\inst\doc\dataRetrieval.tex
@@ -453,7 +453,7 @@ Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[2]
-LaTeX Font Info: Try loading font information for T1+aett on input line 83.
+LaTeX Font Info: Try loading font information for T1+aett on input line 75.
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\ae\t1aett.fd"
File: t1aett.fd 1997/11/16 Font definitions for T1/aett.
)
@@ -477,27 +477,27 @@ Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[7]
-Package atveryend Info: Empty hook `BeforeClearDocument' on input line 265.
+Package atveryend Info: Empty hook `BeforeClearDocument' on input line 261.
Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[8]
-Package atveryend Info: Empty hook `AfterLastShipout' on input line 265.
+Package atveryend Info: Empty hook `AfterLastShipout' on input line 261.
(D:\LADData\RCode\dataRetrievalGitorious\inst\doc\dataRetrieval.aux)
-Package atveryend Info: Executing hook `AtVeryEndDocument' on input line 265.
-Package atveryend Info: Executing hook `AtEndAfterFileList' on input line 265.
+Package atveryend Info: Executing hook `AtVeryEndDocument' on input line 261.
+Package atveryend Info: Executing hook `AtEndAfterFileList' on input line 261.
Package rerunfilecheck Info: File `dataRetrieval.out' has not changed.
-(rerunfilecheck) Checksum: 5B41D0860A61614A8D9DE0A453F054CA;794.
+(rerunfilecheck) Checksum: AA1F9028E8B7805EFF68E9E6E5486C08;729.
)
Here is how much of TeX's memory you used:
- 7314 strings out of 494045
- 104611 string characters out of 3145961
+ 7312 strings out of 494045
+ 104581 string characters out of 3145961
185875 words of memory out of 3000000
- 10453 multiletter control sequences out of 15000+200000
+ 10452 multiletter control sequences out of 15000+200000
39706 words of font info for 81 fonts, out of 3000000 for 9000
715 hyphenation exceptions out of 8191
- 35i,4n,28p,540b,479s stack positions out of 5000i,500n,10000p,200000b,50000s
+ 35i,4n,28p,540b,481s stack positions out of 5000i,500n,10000p,200000b,50000s
<C:/Program Files (x86)/MiKTeX 2.9/fonts/type1/public/amsfonts/cm/cmbx10.pfb>
<C:/Program Files (x86)/MiKTeX 2.9/fonts/type1/public/amsfonts/cm/cmbx12.pfb><C
:/Program Files (x86)/MiKTeX 2.9/fonts/type1/public/amsfonts/cm/cmr10.pfb><C:/P
@@ -508,9 +508,9 @@ es (x86)/MiKTeX 2.9/fonts/type1/public/amsfonts/cm/cmr8.pfb><C:/Program Files (
x86)/MiKTeX 2.9/fonts/type1/public/amsfonts/cm/cmsltt10.pfb><C:/Program Files (
x86)/MiKTeX 2.9/fonts/type1/public/amsfonts/cm/cmti10.pfb><C:/Program Files (x8
6)/MiKTeX 2.9/fonts/type1/public/amsfonts/cm/cmtt10.pfb>
-Output written on dataRetrieval.pdf (8 pages, 163149 bytes).
+Output written on dataRetrieval.pdf (8 pages, 162191 bytes).
PDF statistics:
- 155 PDF objects out of 1000 (max. 8388607)
- 25 named destinations out of 1000 (max. 500000)
- 93 words of extra memory for PDF output out of 10000 (max. 10000000)
+ 149 PDF objects out of 1000 (max. 8388607)
+ 24 named destinations out of 1000 (max. 500000)
+ 85 words of extra memory for PDF output out of 10000 (max. 10000000)
diff --git a/inst/doc/dataRetrieval.pdf b/inst/doc/dataRetrieval.pdf
index 26f94d65157c123e9753d80dc282d9a323255f5e..e6c6a064f596b98b96aa71239b730352fab659a0 100644
Binary files a/inst/doc/dataRetrieval.pdf and b/inst/doc/dataRetrieval.pdf differ
diff --git a/inst/doc/dataRetrieval.synctex.gz b/inst/doc/dataRetrieval.synctex.gz
index 5eb48d840aebb1f18ba16e610b06b3c2fffce070..834973785849e0fb750372c9d606eeff278a238a 100644
Binary files a/inst/doc/dataRetrieval.synctex.gz and b/inst/doc/dataRetrieval.synctex.gz differ
diff --git a/inst/doc/dataRetrieval.tex b/inst/doc/dataRetrieval.tex
index 17e3f954efdde85f87bdb440acb3c5a306ead9a6..44f4a1a9ec956c7c39f23f72af90dbba2778c95e 100644
--- a/inst/doc/dataRetrieval.tex
+++ b/inst/doc/dataRetrieval.tex
@@ -64,39 +64,15 @@ The dataRetrieval package was created to simplify the process of getting hydrolo
%------------------------------------------------------------
The dataRetrieval package was created to simplify hydrologic data retrieval. The options are web or user-produced files.....
-%------------------------------------------------------------
-\subsection{What is EGRET?}
-%------------------------------------------------------------
-Exploration and Graphics for RivEr Trends (EGRET): An R-package for the analysis of long-term changes in water quality and streamflow, including the water-quality method Weighted Regressions on Time, Discharge, and Season (WRTDS)...
-
\newpage
%------------------------------------------------------------
\section{Getting Started}
%------------------------------------------------------------
This section describes the options for downloading and installing the dataRetrieval package.
-%------------------------------------------------------------
-\subsection{Installing dataRetrieval from gitHub:}
-%------------------------------------------------------------
-One can easily install the latest version of dataRetrieval directly from gitHub using the devtools package. devtools is available on CRAN. Simpley type the following commands into R to install the latest version of dataRetrieval available on github.
-
-\begin{Schunk}
-\begin{Sinput}
-> library(devtools)
-> install_github("dataRetrieval", "USGS-CIDA")
-\end{Sinput}
-\end{Schunk}
-To then open the library, simpley type:
-
-\begin{Schunk}
-\begin{Sinput}
-> library(dataRetrieval)
-\end{Sinput}
-\end{Schunk}
-
%------------------------------------------------------------
\subsection{Installing dataRetrieval from downloaded binary:}
%------------------------------------------------------------
-Alternatively, the dataRetrieval pacakage is available for download at \url{https://github.com/USGS-CIDA/WRTDS/downloads}. If the package's tar.gz file is saved in R's working directory, then the following commands will fully install the package:
+The dataRetrieval pacakage is available for download at \url{https://github.com/USGS-CIDA/WRTDS/downloads}. If the package's tar.gz file is saved in R's working directory, then the following commands will fully install the package:
\begin{Schunk}
\begin{Sinput}
@@ -127,6 +103,26 @@ A Mac example looks like this:
Some users have found it necessary to delete the package folders before installing newer versions of either dataRetrieval or EGRET. If you are experiencing an issue after updating a package, trying deleting the package folder, the default location for Windows is something like this: C:/Users/ldecicco/Documents/R/win-library/2.15/dataRetrieval the default for a Mac: /Users/ldecicco/Library/R/2.15/library/dataRetrieval Then, re-install the package using the directions above. Moving to CRAN should solve this problem.
+
+%------------------------------------------------------------
+\subsection{Installing dataRetrieval from gitHub:}
+%------------------------------------------------------------
+Alternatively, R-developers can install the latest version of dataRetrieval directly from gitHub using the devtools package. devtools is available on CRAN. Simpley type the following commands into R to install the latest version of dataRetrieval available on gitHub. Rtools (for Windows) and latex tools are required.
+
+\begin{Schunk}
+\begin{Sinput}
+> library(devtools)
+> install_github("dataRetrieval", "USGS-CIDA")
+\end{Sinput}
+\end{Schunk}
+To then open the library, simpley type:
+
+\begin{Schunk}
+\begin{Sinput}
+> library(dataRetrieval)
+\end{Sinput}
+\end{Schunk}
+
%------------------------------------------------------------
\subsection{A Simple Web Retrieval Example}
%------------------------------------------------------------
diff --git a/inst/doc/dataRetrieval.toc b/inst/doc/dataRetrieval.toc
index 4ee64a4c7371740216845750bfa7c628459adc20..6b90a0cac3634fb65e315cdc17df3a59f5e701cc 100644
--- a/inst/doc/dataRetrieval.toc
+++ b/inst/doc/dataRetrieval.toc
@@ -1,10 +1,9 @@
\select@language {american}
\contentsline {section}{\numberline {1}Introduction to dataRetrieval}{1}{section.1}
\contentsline {subsection}{\numberline {1.1}What is dataRetrieval?}{2}{subsection.1.1}
-\contentsline {subsection}{\numberline {1.2}What is EGRET?}{2}{subsection.1.2}
\contentsline {section}{\numberline {2}Getting Started}{3}{section.2}
-\contentsline {subsection}{\numberline {2.1}Installing dataRetrieval from gitHub:}{3}{subsection.2.1}
-\contentsline {subsection}{\numberline {2.2}Installing dataRetrieval from downloaded binary:}{3}{subsection.2.2}
+\contentsline {subsection}{\numberline {2.1}Installing dataRetrieval from downloaded binary:}{3}{subsection.2.1}
+\contentsline {subsection}{\numberline {2.2}Installing dataRetrieval from gitHub:}{3}{subsection.2.2}
\contentsline {subsection}{\numberline {2.3}A Simple Web Retrieval Example}{4}{subsection.2.3}
\contentsline {section}{\numberline {3}Function Details}{7}{section.3}
\contentsline {subsection}{\numberline {3.1}Daily Value Retrievals}{7}{subsection.3.1}