Merge branch 'develop' into patch-30

Author: lonnieezell

app/Config/Autoload.php

@@ -36,7 +36,7 @@ public function __construct()
 		 * to their location on the file system. These are used by the
 		 * Autoloader to locate files the first time they have been instantiated.
 		 *
-		 * The '/application' and '/system' directories are already mapped for
+		 * The '/app' and '/system' directories are already mapped for
 		 * you. You may change the name of the 'App' namespace if you wish,
 		 * but this should be done prior to creating any namespaced classes,
 		 * else you will need to modify all of those classes for this to work.

app/Config/Paths.php

@@ -2,7 +2,7 @@
 
 /**
  * Holds the paths that are used by the system to
- * locate the main directories, application, system, etc.
+ * locate the main directories, app, system, etc.
  * Modifying these allows you to re-structure your application,
  * share a system folder between multiple applications, and more.
  *
@@ -45,7 +45,7 @@ class Paths
 	 * This variable must contain the name of your "writable" directory.
 	 * The writable directory allows you to group all directories that
 	 * need write permission to a single place that can be tucked away
-	 * for maximum security, keeping it out of the application and/or
+	 * for maximum security, keeping it out of the app and/or
 	 * system directories.
 	 */
 	public $writableDirectory = __DIR__ . '/../../writable';
@@ -58,7 +58,7 @@ class Paths
 	 * This variable must contain the name of your "tests" directory.
 	 * The writable directory allows you to group all directories that
 	 * need write permission to a single place that can be tucked away
-	 * for maximum security, keeping it out of the application and/or
+	 * for maximum security, keeping it out of the app and/or
 	 * system directories.
 	 */
 	public $testsDirectory = __DIR__ . '/../../tests';
@@ -70,7 +70,7 @@ class Paths
 	 *
 	 * This variable must contain the name of the directory that
 	 * contains the view files used by your application. By
-	 * default this is in `application/Views`. This value
+	 * default this is in `app/Views`. This value
 	 * is used when no value is provided to `Services::renderer()`.
 	 */
 	public $viewDirectory = __DIR__ . '/../../app/Views';

app/Views/welcome_message.php

@@ -111,15 +111,15 @@
 
 				<pre>
 				<code>
-					application/Views/welcome_message.php
+					app/Views/welcome_message.php
 				</code>
 				</pre>
 
 				<p>The corresponding controller for this page is found at:</p>
 
 				<pre>
 				<code>
-					application/Controllers/Home.php
+					app/Controllers/Home.php
 				</code>
 				</pre>
 

license.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2018 British Columbia Institute of Technology
+Copyright (c) 2014-2019 British Columbia Institute of Technology
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

system/API/ResponseTrait.php

@@ -7,7 +7,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014-2018 British Columbia Institute of Technology
+ * Copyright (c) 2014-2019 British Columbia Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -29,7 +29,7 @@
  *
  * @package    CodeIgniter
  * @author     CodeIgniter Dev Team
- * @copyright  2014-2018 British Columbia Institute of Technology (https://bcit.ca/)
+ * @copyright  2014-2019 British Columbia Institute of Technology (https://bcit.ca/)
  * @license    https://opensource.org/licenses/MIT	MIT License
  * @link       https://codeigniter.com
  * @since      Version 3.0.0

system/Autoloader/Autoloader.php

@@ -7,7 +7,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014-2018 British Columbia Institute of Technology
+ * Copyright (c) 2014-2019 British Columbia Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -29,7 +29,7 @@
  *
  * @package    CodeIgniter
  * @author     CodeIgniter Dev Team
- * @copyright  2014-2018 British Columbia Institute of Technology (https://bcit.ca/)
+ * @copyright  2014-2019 British Columbia Institute of Technology (https://bcit.ca/)
  * @license    https://opensource.org/licenses/MIT	MIT License
  * @link       https://codeigniter.com
  * @since      Version 3.0.0

system/Autoloader/FileLocator.php

@@ -7,7 +7,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014-2018 British Columbia Institute of Technology
+ * Copyright (c) 2014-2019 British Columbia Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -29,7 +29,7 @@
  *
  * @package    CodeIgniter
  * @author     CodeIgniter Dev Team
- * @copyright  2014-2018 British Columbia Institute of Technology (https://bcit.ca/)
+ * @copyright  2014-2019 British Columbia Institute of Technology (https://bcit.ca/)
  * @license    https://opensource.org/licenses/MIT	MIT License
  * @link       https://codeigniter.com
  * @since      Version 3.0.0

system/CLI/BaseCommand.php

@@ -7,7 +7,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014-2018 British Columbia Institute of Technology
+ * Copyright (c) 2014-2019 British Columbia Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -29,7 +29,7 @@
  *
  * @package    CodeIgniter
  * @author     CodeIgniter Dev Team
- * @copyright  2014-2018 British Columbia Institute of Technology (https://bcit.ca/)
+ * @copyright  2014-2019 British Columbia Institute of Technology (https://bcit.ca/)
  * @license    https://opensource.org/licenses/MIT	MIT License
  * @link       https://codeigniter.com
  * @since      Version 3.0.0

system/CLI/CLI.php

@@ -7,7 +7,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014-2018 British Columbia Institute of Technology
+ * Copyright (c) 2014-2019 British Columbia Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -29,7 +29,7 @@
  *
  * @package    CodeIgniter
  * @author     CodeIgniter Dev Team
- * @copyright  2014-2018 British Columbia Institute of Technology (https://bcit.ca/)
+ * @copyright  2014-2019 British Columbia Institute of Technology (https://bcit.ca/)
  * @license    https://opensource.org/licenses/MIT	MIT License
  * @link       https://codeigniter.com
  * @since      Version 3.0.0

system/CLI/CommandRunner.php

@@ -8,7 +8,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014-2018 British Columbia Institute of Technology
+ * Copyright (c) 2014-2019 British Columbia Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,7 +30,7 @@
  *
  * @package    CodeIgniter
  * @author     CodeIgniter Dev Team
- * @copyright  2014-2018 British Columbia Institute of Technology (https://bcit.ca/)
+ * @copyright  2014-2019 British Columbia Institute of Technology (https://bcit.ca/)
  * @license    https://opensource.org/licenses/MIT	MIT License
  * @link       https://codeigniter.com
  * @since      Version 3.0.0