From ecfba9d6abdda57383f61031ab3406efba2769b3 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Mon, 6 Jul 2009 11:22:58 -0700 Subject: [PATCH] doc: update license and contact information Update license information to 2-BSD; update contact information. Signed-off-by: H. Peter Anvin --- doc/nasmdoc.src | 65 ++++++++++++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 25 deletions(-) diff --git a/doc/nasmdoc.src b/doc/nasmdoc.src index 0c4f8ea5..bda3b6f8 100644 --- a/doc/nasmdoc.src +++ b/doc/nasmdoc.src @@ -320,12 +320,39 @@ know who you are), and we'll improve it out of all recognition. Again. -\S{legal} License Conditions +\S{legal} \i{License} Conditions -Please see the file \c{COPYING}, supplied as part of any NASM -distribution archive, for the \i{license} conditions under which you -may use NASM. NASM is now under the so-called GNU Lesser General -Public License, LGPL. +Please see the file \c{LICENSE}, supplied as part of any NASM +distribution archive, for the license conditions under which you may +use NASM. NASM is now under the so-called 2-clause BSD license, also +known as the simplified BSD license. + +Copyright 1996-2009 the NASM Authors - All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + +\b Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + +\b 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. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND +CONTRIBUTORS "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 THE COPYRIGHT OWNER OR +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. \H{contact} Contact Information @@ -335,32 +362,20 @@ team of developers, accessible through the \c{nasm-devel} mailing list (see below for the link). If you want to report a bug, please read \k{bugs} first. -NASM has a \i{WWW page} at -\W{http://nasm.sourceforge.net}\c{http://nasm.sourceforge.net}. If it's -not there, google for us! +NASM has a \i{website} at +\W{http://www.nasm.us/}\c{http://www.nasm.us/}. If it's not there, +google for us! - -The original authors are \i{e\-mail}able as -\W{mailto:jules@dsf.org.uk}\c{jules@dsf.org.uk} and -\W{mailto:anakin@pobox.com}\c{anakin@pobox.com}. -The latter is no longer involved in the development team. - -\i{New releases} of NASM are uploaded to the official sites -\W{http://nasm.sourceforge.net}\c{http://nasm.sourceforge.net} -and to -\W{ftp://ftp.kernel.org/pub/software/devel/nasm/}\i\c{ftp.kernel.org} -and -\W{ftp://ibiblio.org/pub/Linux/devel/lang/assemblers/}\i\c{ibiblio.org}. +\i{New releases} of NASM are available from the official web site. Announcements are posted to \W{news:comp.lang.asm.x86}\i\c{comp.lang.asm.x86}, -\W{news:alt.lang.asm}\i\c{alt.lang.asm} and -\W{news:comp.os.linux.announce}\i\c{comp.os.linux.announce} +and to the web site +\W{http://www.freshmeat.net/}\c{http://www.freshmeat.net/}. If you want information about NASM beta releases, and the current -development status, please subscribe to the \i\c{nasm-devel} email list -by registering at -\W{http://sourceforge.net/projects/nasm}\c{http://sourceforge.net/projects/nasm}. +development status, please subscribe to the \i\c{nasm-devel} email +list; see link from the website. \H{install} Installation