From e4f8489bc3e313ca4507a93257ef4416119fec2d Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Mon, 8 Dec 2014 13:13:08 -0700 Subject: [PATCH] Reorganized Copyright file, removed some improper references. --- docs/COPYRIGHT.dox | 37 +++++++++++++++++++++++++++++++++++++ docs/Doxyfile.in | 2 +- docs/all-error-codes.md | 2 -- libdispatch/dgroup.c | 2 +- libdispatch/dvarget.c | 2 +- 5 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 docs/COPYRIGHT.dox diff --git a/docs/COPYRIGHT.dox b/docs/COPYRIGHT.dox new file mode 100644 index 000000000..1062dd529 --- /dev/null +++ b/docs/COPYRIGHT.dox @@ -0,0 +1,37 @@ +/*! \page copyright COPYRIGHT + +Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, +University Corporation for Atmospheric Research/Unidata. + +Portions of this software were developed by the Unidata Program at the +University Corporation for Atmospheric Research. + +Access and use of this software shall impose the following obligations +and understandings on the user. The user is granted the right, without +any fee or cost, to use, copy, modify, alter, enhance and distribute +this software, and any derivative works thereof, and its supporting +documentation for any purpose whatsoever, provided that this entire +notice appears in all copies of the software, derivative works and +supporting documentation. Further, UCAR requests that the user credit +UCAR/Unidata in any publications that result from the use of this +software or in any product that includes this software, although this +is not an obligation. The names UCAR and/or Unidata, however, may not +be used in any advertising or publicity to endorse or promote any +products or commercial entity unless specific written permission is +obtained from UCAR/Unidata. The user also understands that +UCAR/Unidata is not obligated to provide the user with any support, +consulting, training or assistance of any kind with regard to the use, +operation and performance of this software nor to provide the user +with any updates, revisions, new versions or "bug fixes." + +THIS SOFTWARE IS PROVIDED BY UCAR/UNIDATA "AS IS" AND ANY EXPRESS 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 UCAR/UNIDATA BE LIABLE FOR ANY SPECIAL, +INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING +FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +WITH THE ACCESS, USE OR PERFORMANCE OF THIS SOFTWARE. + +*/ \ No newline at end of file diff --git a/docs/Doxyfile.in b/docs/Doxyfile.in index 703550168..7736add58 100644 --- a/docs/Doxyfile.in +++ b/docs/Doxyfile.in @@ -745,7 +745,7 @@ WARN_LOGFILE = INPUT = \ @abs_top_srcdir@/RELEASE_NOTES.md \ - @abs_top_srcdir@/COPYRIGHT \ + @abs_top_srcdir@/docs/COPYRIGHT.dox \ @abs_top_srcdir@/docs/mainpage.dox \ @abs_top_srcdir@/docs/FAQ.md \ @abs_top_srcdir@/docs/architecture.dox \ diff --git a/docs/all-error-codes.md b/docs/all-error-codes.md index 075eb8f4d..ff2c35d97 100644 --- a/docs/all-error-codes.md +++ b/docs/all-error-codes.md @@ -1,8 +1,6 @@ NetCDF Error Code Listing {#nc-error-codes} ================== -\ingroup error - \tableofcontents # NetCDF-3 Error Codes {#nc3-error-codes} diff --git a/libdispatch/dgroup.c b/libdispatch/dgroup.c index dca2c01f6..c93b85462 100644 --- a/libdispatch/dgroup.c +++ b/libdispatch/dgroup.c @@ -2,7 +2,7 @@ Functions for netCDF-4 features. Copyright 2010 University Corporation for Atmospheric -Research/Unidata. See \ref COPYRIGHT file for more info. */ +Research/Unidata. See \ref copyright file for more info. */ #include "ncdispatch.h" diff --git a/libdispatch/dvarget.c b/libdispatch/dvarget.c index bce780398..cd0e83284 100644 --- a/libdispatch/dvarget.c +++ b/libdispatch/dvarget.c @@ -2,7 +2,7 @@ Functions for getting data from variables. Copyright 2011 University Corporation for Atmospheric -Research/Unidata. See \ref COPYRIGHT file for more info. +Research/Unidata. See \ref copyright file for more info. */