diff --git a/inst/doc/dataRetrieval.R b/inst/doc/dataRetrieval.R
index 670c0c6f0b94640261a0c7c24071a4e8319ff8bc..27648d1854c58f33ab30b5acef23a275499f62f4 100644
--- a/inst/doc/dataRetrieval.R
+++ b/inst/doc/dataRetrieval.R
@@ -210,11 +210,11 @@ startDate <- "1985-10-01"
endDate <- "2012-09-30"
dfLong <- readNWISqw(siteNumber, parameterCd,
- startDate, endDate, expanded=TRUE,reshape=FALSE)
+ startDate, endDate)
# Or the wide return:
# dfWide <- readNWISqw(siteNumber, parameterCd,
-# startDate, endDate, expanded=TRUE, reshape=TRUE)
+# startDate, endDate, reshape=TRUE)
## ----qwmeta, echo=TRUE, eval=FALSE------------------------
@@ -250,16 +250,6 @@ surfaceData <- readNWISmeas(siteNumber)
names(surfaceData)
-## ----label=geturl, echo=TRUE, eval=FALSE------------------
-# # Dissolved Nitrate parameter codes:
-# pCode <- c("00618","71851")
-# startDate <- "1964-06-11"
-# endDate <- "2012-12-18"
-# url_qw <- constructNWISURL(siteNumber,pCode,startDate,endDate,"qw")
-# url_dv <- constructNWISURL(siteNumber,"00060",startDate,endDate,
-# "dv",statCd="00003")
-# url_uv <- constructNWISURL(siteNumber,"00060",startDate,endDate,"uv")
-
## ----label=getQWData, echo=TRUE, eval=FALSE---------------
# specificCond <- readWQPqw('WIDNR_WQX-10032762',
# 'Specific conductance','2011-05-01','2011-09-30')
diff --git a/inst/doc/dataRetrieval.Rnw b/inst/doc/dataRetrieval.Rnw
index 9217883b755135a0ad613a6c786b03cd23c01b98..0cc9a4f7a8e47cd1222f47e02db7370f078736d1 100644
--- a/inst/doc/dataRetrieval.Rnw
+++ b/inst/doc/dataRetrieval.Rnw
@@ -599,7 +599,7 @@ Data are retrieved from \url{http://waterservices.usgs.gov/rest/IV-Test-Tool.htm
\subsection{Water Quality Data}
\label{sec:usgsWQP}
%------------------------------------------------------------
-To get USGS water quality data from water samples collected at the streamgage or other monitoring site (as distinct from unit values collected through some type of automatic monitor) we can use the function \texttt{readNWISqw}, with the input arguments: siteNumber, parameterCd, startDate, and endDate. Additionally, the argument \texttt{"}expanded\texttt{"} is a logical input that allows the user to choose between a simple return of datetimes/qualifier/values (expanded=FALSE), or a more complete and verbose output (expanded=TRUE). Expanded = TRUE includes such columns as remark codes, value qualifying text, and detection level for each parameter code. There also includes an argument \texttt{"}reshape\texttt{"}, that converts the expanded dataset to a \texttt{"}wide\texttt{"} format (each requested parameter code gets individual columns).
+To get USGS water quality data from water samples collected at the streamgage or other monitoring site (as distinct from unit values collected through some type of automatic monitor) we can use the function \texttt{readNWISqw}, with the input arguments: siteNumber, parameterCd, startDate, and endDate. Additionally, the argument \texttt{"}expanded\texttt{"} is a logical input that allows the user to choose between a simple return of datetimes/qualifier/values (expanded=FALSE), or a more complete and verbose output (expanded=TRUE). Expanded = TRUE includes such columns as remark codes, value qualifying text, and detection level for each parameter code. There also includes an argument \texttt{"}reshape\texttt{"}, that converts the expanded dataset to a \texttt{"}wide\texttt{"} format (each requested parameter code gets individual columns). The defaults are expanded=TRUE, and reshape=FALSE.
<<label=getQW, echo=TRUE, eval=TRUE>>=
@@ -609,11 +609,11 @@ startDate <- "1985-10-01"
endDate <- "2012-09-30"
dfLong <- readNWISqw(siteNumber, parameterCd,
- startDate, endDate, expanded=TRUE,reshape=FALSE)
+ startDate, endDate)
# Or the wide return:
# dfWide <- readNWISqw(siteNumber, parameterCd,
-# startDate, endDate, expanded=TRUE, reshape=TRUE)
+# startDate, endDate, reshape=TRUE)
@
@@ -692,27 +692,6 @@ names(surfaceData)
@
-
-%------------------------------------------------------------
-\subsection{URL Construction}
-\label{sec:usgsURL}
-%------------------------------------------------------------
-There may be times when you might be interested in seeing the URL (Web address) that was used to obtain the raw data. The \texttt{constructNWISURL} function returns the URL. In addition to input variables that have been described, there is a new argument \texttt{"}service\texttt{"}. The service argument can be \texttt{"}dv\texttt{"} (daily values), \texttt{"}uv\texttt{"} (unit values), \texttt{"}qw\texttt{"} (NWIS water quality values), or \texttt{"}wqp\texttt{"} (general Water Quality Portal values).
-
-
-<<label=geturl, echo=TRUE, eval=FALSE>>=
-# Dissolved Nitrate parameter codes:
-pCode <- c("00618","71851")
-startDate <- "1964-06-11"
-endDate <- "2012-12-18"
-url_qw <- constructNWISURL(siteNumber,pCode,startDate,endDate,"qw")
-url_dv <- constructNWISURL(siteNumber,"00060",startDate,endDate,
- "dv",statCd="00003")
-url_uv <- constructNWISURL(siteNumber,"00060",startDate,endDate,"uv")
-@
-
-
-
%------------------------------------------------------------
\section{Water Quality Portal Web Retrievals}
\label{sec:usgsSTORET}
diff --git a/inst/doc/dataRetrieval.pdf b/inst/doc/dataRetrieval.pdf
index 3178ded1b619290531ee36321551aacc854afb91..7a64272609718a7c11616097f9a2b1b33e2ecd77 100644
Binary files a/inst/doc/dataRetrieval.pdf and b/inst/doc/dataRetrieval.pdf differ
diff --git a/vignettes/dataRetrieval.Rnw b/vignettes/dataRetrieval.Rnw
index 9217883b755135a0ad613a6c786b03cd23c01b98..0cc9a4f7a8e47cd1222f47e02db7370f078736d1 100644
--- a/vignettes/dataRetrieval.Rnw
+++ b/vignettes/dataRetrieval.Rnw
@@ -599,7 +599,7 @@ Data are retrieved from \url{http://waterservices.usgs.gov/rest/IV-Test-Tool.htm
\subsection{Water Quality Data}
\label{sec:usgsWQP}
%------------------------------------------------------------
-To get USGS water quality data from water samples collected at the streamgage or other monitoring site (as distinct from unit values collected through some type of automatic monitor) we can use the function \texttt{readNWISqw}, with the input arguments: siteNumber, parameterCd, startDate, and endDate. Additionally, the argument \texttt{"}expanded\texttt{"} is a logical input that allows the user to choose between a simple return of datetimes/qualifier/values (expanded=FALSE), or a more complete and verbose output (expanded=TRUE). Expanded = TRUE includes such columns as remark codes, value qualifying text, and detection level for each parameter code. There also includes an argument \texttt{"}reshape\texttt{"}, that converts the expanded dataset to a \texttt{"}wide\texttt{"} format (each requested parameter code gets individual columns).
+To get USGS water quality data from water samples collected at the streamgage or other monitoring site (as distinct from unit values collected through some type of automatic monitor) we can use the function \texttt{readNWISqw}, with the input arguments: siteNumber, parameterCd, startDate, and endDate. Additionally, the argument \texttt{"}expanded\texttt{"} is a logical input that allows the user to choose between a simple return of datetimes/qualifier/values (expanded=FALSE), or a more complete and verbose output (expanded=TRUE). Expanded = TRUE includes such columns as remark codes, value qualifying text, and detection level for each parameter code. There also includes an argument \texttt{"}reshape\texttt{"}, that converts the expanded dataset to a \texttt{"}wide\texttt{"} format (each requested parameter code gets individual columns). The defaults are expanded=TRUE, and reshape=FALSE.
<<label=getQW, echo=TRUE, eval=TRUE>>=
@@ -609,11 +609,11 @@ startDate <- "1985-10-01"
endDate <- "2012-09-30"
dfLong <- readNWISqw(siteNumber, parameterCd,
- startDate, endDate, expanded=TRUE,reshape=FALSE)
+ startDate, endDate)
# Or the wide return:
# dfWide <- readNWISqw(siteNumber, parameterCd,
-# startDate, endDate, expanded=TRUE, reshape=TRUE)
+# startDate, endDate, reshape=TRUE)
@
@@ -692,27 +692,6 @@ names(surfaceData)
@
-
-%------------------------------------------------------------
-\subsection{URL Construction}
-\label{sec:usgsURL}
-%------------------------------------------------------------
-There may be times when you might be interested in seeing the URL (Web address) that was used to obtain the raw data. The \texttt{constructNWISURL} function returns the URL. In addition to input variables that have been described, there is a new argument \texttt{"}service\texttt{"}. The service argument can be \texttt{"}dv\texttt{"} (daily values), \texttt{"}uv\texttt{"} (unit values), \texttt{"}qw\texttt{"} (NWIS water quality values), or \texttt{"}wqp\texttt{"} (general Water Quality Portal values).
-
-
-<<label=geturl, echo=TRUE, eval=FALSE>>=
-# Dissolved Nitrate parameter codes:
-pCode <- c("00618","71851")
-startDate <- "1964-06-11"
-endDate <- "2012-12-18"
-url_qw <- constructNWISURL(siteNumber,pCode,startDate,endDate,"qw")
-url_dv <- constructNWISURL(siteNumber,"00060",startDate,endDate,
- "dv",statCd="00003")
-url_uv <- constructNWISURL(siteNumber,"00060",startDate,endDate,"uv")
-@
-
-
-
%------------------------------------------------------------
\section{Water Quality Portal Web Retrievals}
\label{sec:usgsSTORET}
diff --git a/vignettes/figure/getNWIStemperaturePlot-1.pdf b/vignettes/figure/getNWIStemperaturePlot-1.pdf
index 974cdf980cbc6b73faa6a8337c4ce9cf57cc14ad..690d55aeb71ae546305160ead49a81e76e8f87f4 100644
Binary files a/vignettes/figure/getNWIStemperaturePlot-1.pdf and b/vignettes/figure/getNWIStemperaturePlot-1.pdf differ