summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-07-14 17:50:15 -0300
committerRenato Botelho <renato@netgate.com>2016-07-14 18:34:49 -0300
commitfc91ddca11665dbd26d9b678947c6dd34d5a3e1f (patch)
treec14601ba9bf8ef7a972917018bd5e46230448e31
parent3f757bb27c73025aa95281600ffc3694f320ced9 (diff)
downloadpfsense-fc91ddca11665dbd26d9b678947c6dd34d5a3e1f.zip
pfsense-fc91ddca11665dbd26d9b678947c6dd34d5a3e1f.tar.gz
Retire copyright-master.txt
-rw-r--r--src/etc/pfSense.obsoletedfiles1
-rw-r--r--src/usr/local/www/copyright-master.txt53
2 files changed, 1 insertions, 53 deletions
diff --git a/src/etc/pfSense.obsoletedfiles b/src/etc/pfSense.obsoletedfiles
index aad7b1d..af394aa 100644
--- a/src/etc/pfSense.obsoletedfiles
+++ b/src/etc/pfSense.obsoletedfiles
@@ -754,6 +754,7 @@
/usr/local/www/carp_status.php
/usr/local/www/classes/maintable.inc
/usr/local/www/code-syntax-highlighter
+/usr/local/www/copyright-master.txt
/usr/local/www/csrf/csrf-secret.php
/usr/local/www/css/table.css
/usr/local/www/datetimepicker.js
diff --git a/src/usr/local/www/copyright-master.txt b/src/usr/local/www/copyright-master.txt
deleted file mode 100644
index bf35096..0000000
--- a/src/usr/local/www/copyright-master.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved.
- *
- * Some or all of this file is based on the m0n0wall project which is
- * Copyright (c) 2004 Manuel Kasper (BSD 2 clause)
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgment:
- * "This product includes software developed by the pfSense Project
- * for use in the pfSense software distribution. (http://www.pfsense.org/).
- *
- * 4. The names "pfSense" and "pfSense Project" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For written permission, please contact
- * coreteam@pfsense.org.
- *
- * 5. Products derived from this software may not be called "pfSense"
- * nor may "pfSense" appear in their names without prior written
- * permission of the Electric Sheep Fencing, LLC.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- *
- * "This product includes software developed by the pfSense Project
- * for use in the pfSense software distribution (http://www.pfsense.org/).
- *
- * THIS SOFTWARE IS PROVIDED BY THE pfSense PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE pfSense PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ====================================================================
- *
- */ \ No newline at end of file
OpenPOWER on IntegriCloud