From d0c51b18c52a3f6829a8d0080c113c2ccb2821b5 Mon Sep 17 00:00:00 2001
From: Will Beasley <wibeasley@hotmail.com>
Date: Sat, 4 Jul 2015 15:49:54 -0500
Subject: [PATCH] MIT license file update

---
 DESCRIPTION     |  6 +++---
 LICENSE         | 24 ++----------------------
 man/validate.Rd |  8 ++++----
 3 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index bdc4155..590e8c7 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: IalsaSynthesis
 Title: Synthesizing Information Across Collaborating Research
-Version: 0.0-3
-Date: 2015-04-30
+Version: 0.0-4
+Date: 2015-07-04
 Authors@R: c(person("Will", "Beasley", email="wibeasley@hotmail.com", role=c("aut", "cre")),
     person("Andrey", "Koval", email="andkov@uvic.ca", role = c("aut")),
     person(given="Integrative Analysis of Longitudinal Studies of Aging (IALSA)", role = c("cph")))
@@ -16,11 +16,11 @@ Depends:
     R(>= 3.0.0),
     stats
 Imports:
-    readr,
     testit
 Suggests:
     devtools,
     knitr,
+    readr,
     testthat (>= 0.9)
 License: MIT + file LICENSE
 LazyData: TRUE
diff --git a/LICENSE b/LICENSE
index 0dbd756..625b75c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,22 +1,2 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 IALSA Network
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
+YEAR: 2015
+COPYRIGHT HOLDER: Integrative Analysis of Longitudinal Studies of Aging; University of Oklahoma Health Sciences Center
diff --git a/man/validate.Rd b/man/validate.Rd
index 47f02b3..4129de8 100644
--- a/man/validate.Rd
+++ b/man/validate.Rd
@@ -11,10 +11,10 @@ validate_filename_output(filename, path, file_extension_expected = "out",
 \arguments{
   \item{filename}{The name of the file to be validated.}
   \item{path}{The location of the file to be validated.}
-  \item{file_extension_expected}{The extension of the
-  file. This defaults to "out", which corresponds to Mplus
-  output.} \item{underscore_count_expected}{The number of
-  underscores required in the name (not currently used).}
+  \item{file_extension_expected}{The extension of the file.
+  This defaults to "out", which corresponds to Mplus output.}
+  \item{underscore_count_expected}{The number of underscores
+  required in the name (not currently used).}
 }
 \value{
 An \code{invisible} \code{TRUE} value if the filename is