Merge changes to the NetBSD copyright (advertising clause removal).
This commit is contained in:
parent
c6303b231f
commit
370bf6653c
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=167444
@ -1,4 +1,4 @@
|
|||||||
.\" $NetBSD: editline.3,v 1.50 2005/10/12 09:29:43 wiz Exp $
|
.\" $NetBSD: editline.3,v 1.51 2006/08/21 12:45:30 christos Exp $
|
||||||
.\"
|
.\"
|
||||||
.\" Copyright (c) 1997-2003 The NetBSD Foundation, Inc.
|
.\" Copyright (c) 1997-2003 The NetBSD Foundation, Inc.
|
||||||
.\" All rights reserved.
|
.\" All rights reserved.
|
||||||
@ -13,11 +13,7 @@
|
|||||||
.\" 2. Redistributions in binary form must reproduce the above copyright
|
.\" 2. Redistributions in binary form must reproduce the above copyright
|
||||||
.\" notice, this list of conditions and the following disclaimer in the
|
.\" notice, this list of conditions and the following disclaimer in the
|
||||||
.\" documentation and/or other materials provided with the distribution.
|
.\" documentation and/or other materials provided with the distribution.
|
||||||
.\" 3. All advertising materials mentioning features or use of this software
|
.\" 3. Neither the name of The NetBSD Foundation nor the names of its
|
||||||
.\" must display the following acknowledgement:
|
|
||||||
.\" This product includes software developed by the NetBSD
|
|
||||||
.\" Foundation, Inc. and its contributors.
|
|
||||||
.\" 4. Neither the name of The NetBSD Foundation nor the names of its
|
|
||||||
.\" contributors may be used to endorse or promote products derived
|
.\" contributors may be used to endorse or promote products derived
|
||||||
.\" from this software without specific prior written permission.
|
.\" from this software without specific prior written permission.
|
||||||
.\"
|
.\"
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
.\" $NetBSD: editrc.5,v 1.19 2003/11/01 23:35:33 christos Exp $
|
.\" $NetBSD: editrc.5,v 1.20 2006/08/21 12:45:30 christos Exp $
|
||||||
.\"
|
.\"
|
||||||
.\" Copyright (c) 1997-2000 The NetBSD Foundation, Inc.
|
.\" Copyright (c) 1997-2000 The NetBSD Foundation, Inc.
|
||||||
.\" All rights reserved.
|
.\" All rights reserved.
|
||||||
@ -13,11 +13,7 @@
|
|||||||
.\" 2. Redistributions in binary form must reproduce the above copyright
|
.\" 2. Redistributions in binary form must reproduce the above copyright
|
||||||
.\" notice, this list of conditions and the following disclaimer in the
|
.\" notice, this list of conditions and the following disclaimer in the
|
||||||
.\" documentation and/or other materials provided with the distribution.
|
.\" documentation and/or other materials provided with the distribution.
|
||||||
.\" 3. All advertising materials mentioning features or use of this software
|
.\" 3. Neither the name of The NetBSD Foundation nor the names of its
|
||||||
.\" must display the following acknowledgement:
|
|
||||||
.\" This product includes software developed by the NetBSD
|
|
||||||
.\" Foundation, Inc. and its contributors.
|
|
||||||
.\" 4. Neither the name of The NetBSD Foundation nor the names of its
|
|
||||||
.\" contributors may be used to endorse or promote products derived
|
.\" contributors may be used to endorse or promote products derived
|
||||||
.\" from this software without specific prior written permission.
|
.\" from this software without specific prior written permission.
|
||||||
.\"
|
.\"
|
||||||
|
@ -13,11 +13,7 @@
|
|||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
* 2. Redistributions in binary form must reproduce the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
* documentation and/or other materials provided with the distribution.
|
* documentation and/or other materials provided with the distribution.
|
||||||
* 3. All advertising materials mentioning features or use of this software
|
* 3. Neither the name of The NetBSD Foundation nor the names of its
|
||||||
* must display the following acknowledgement:
|
|
||||||
* This product includes software developed by the NetBSD
|
|
||||||
* Foundation, Inc. and its contributors.
|
|
||||||
* 4. Neither the name of The NetBSD Foundation nor the names of its
|
|
||||||
* contributors may be used to endorse or promote products derived
|
* contributors may be used to endorse or promote products derived
|
||||||
* from this software without specific prior written permission.
|
* from this software without specific prior written permission.
|
||||||
*
|
*
|
||||||
@ -33,7 +29,7 @@
|
|||||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||||
* POSSIBILITY OF SUCH DAMAGE.
|
* POSSIBILITY OF SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
* $NetBSD: read.h,v 1.4 2004/02/27 14:52:18 christos Exp $
|
* $NetBSD: read.h,v 1.5 2006/08/21 12:45:30 christos Exp $
|
||||||
* $FreeBSD$
|
* $FreeBSD$
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user