From 606606f088b5d56863ab73c6625838197f584fab Mon Sep 17 00:00:00 2001
From: Arni Magnusson <arnima@hafro.is>
Date: Fri, 3 Aug 2018 11:33:42 +0200
Subject: [PATCH] Bump date, roxygenize

---
 DESCRIPTION      |  4 ++--
 NEWS             |  4 +++-
 man/read.taf.Rd  |  6 +++++-
 man/write.taf.Rd | 10 +++++-----
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 32634b6..a05d4cc 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: icesTAF
 Version: 1.6-2
-Date: 2018-07-03
+Date: 2018-08-03
 Title: Functions to Support the ICES Transparent Assessment Framework
 Authors@R: c(person("Arni", "Magnusson", role=c("aut","cre"), email="arni.magnusson@ices.dk"),
              person("Colin", "Millar", role="aut"))
@@ -13,4 +13,4 @@ Description: Functions to support the ICES Transparent Assessment Framework
   in marine science.
 License: GPL (>= 2)
 URL: http://taf.ices.dk
-RoxygenNote: 6.0.1
+RoxygenNote: 6.1.0
diff --git a/NEWS b/NEWS
index f2f0d66..aace3c4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,12 @@
 --------------------------------------------------------------------------------
-icesTAF 1.6-2 (2018-07-03)
+icesTAF 1.6-2 (2018-08-03)
 --------------------------------------------------------------------------------
 o Added argument 'underscore' to write.taf().
 
 o Added argument 'stringsAsFactors' to read.taf().
 
+o Improved multitable support for read.taf() and write.taf().
+
 
 
 
diff --git a/man/read.taf.Rd b/man/read.taf.Rd
index 3e9af66..af03224 100644
--- a/man/read.taf.Rd
+++ b/man/read.taf.Rd
@@ -21,11 +21,15 @@ column name \samp{"3"} to \samp{"X3"}.}
 }
 \value{
 A data frame in TAF format, or a list of data frames if \code{file} is a
-vector of filenames.
+directory or a vector of filenames.
 }
 \description{
 Read a TAF table from a file into a data frame.
 }
+\details{
+Alternatively, \code{file} can be a directory or a vector of filenames, to
+read many tables in one call.
+}
 \examples{
 \dontrun{
 write.taf(catage.taf, "catage.csv")
diff --git a/man/write.taf.Rd b/man/write.taf.Rd
index f4acb74..d16be67 100644
--- a/man/write.taf.Rd
+++ b/man/write.taf.Rd
@@ -4,8 +4,8 @@
 \alias{write.taf}
 \title{Write TAF Table to File}
 \usage{
-write.taf(x, file = NULL, dir = NULL, quote = FALSE, row.names = FALSE,
-  fileEncoding = "UTF-8", underscore = TRUE, ...)
+write.taf(x, file = NULL, dir = NULL, quote = FALSE,
+  row.names = FALSE, fileEncoding = "UTF-8", underscore = TRUE, ...)
 }
 \arguments{
 \item{x}{a data frame in TAF format.}
@@ -29,9 +29,9 @@ write.taf(x, file = NULL, dir = NULL, quote = FALSE, row.names = FALSE,
 Write a TAF table to a file.
 }
 \details{
-Alternatively, \code{x} can be a string vector of names to write many tables
-in one call, using \code{file = NULL} to automatically name the resulting
-files.
+Alternatively, \code{x} can be a list of data frames or a string vector of
+object names, to write many tables in one call. The resulting files are named
+automatically, similar to \code{file = NULL}.
 
 The default value \code{file = NULL} uses the name of \code{x} as a filename,
 so a data frame called \code{survey.uk} will be written to a file called