From 922edbd650ac52cae5c1f4bd9ef5c67b1acae615 Mon Sep 17 00:00:00 2001 From: "gerv%gerv.net" Date: Wed, 28 Nov 2007 10:16:54 +0000 Subject: [PATCH] Bug 403052 - switch mozTXTToHTMLConv to standard tri-licence. Thanks to benb for permission to do so. Patch by gerv; r=beltzner. git-svn-id: svn://10.0.0.236/trunk@240029 18797224-902f-48f8-a5cc-f745e15eee43 --- .../converters/mozTXTToHTMLConv.cpp | 45 +++++++------------ .../streamconv/converters/mozTXTToHTMLConv.h | 45 +++++++------------ .../streamconv/public/mozITXTToHTMLConv.idl | 45 +++++++------------ 3 files changed, 48 insertions(+), 87 deletions(-) diff --git a/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp b/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp index f34eac58f5b..4195ec082c9 100644 --- a/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp +++ b/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp @@ -1,37 +1,24 @@ /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* ***** BEGIN LICENSE BLOCK ***** - * - * The "License" shall be the Mozilla Public License Version 1.1, except - * Sections 6.2 and 11, but with the addition of the below defined Section 14. - * You may obtain a copy of the Mozilla Public License Version 1.1 at - * . The contents of this file are subject to the - * License; you may not use this file except in compliance with the License. - * - * Section 14: MISCELLANEOUS. - * This License represents the complete agreement concerning subject matter - * hereof. If any provision of this License is held to be unenforceable, such - * provision shall be reformed only to the extent necessary to make it - * enforceable. This License shall be governed by German law provisions. Any - * litigation relating to this License shall be subject to German jurisdiction. - * - * Once Covered Code has been published under a particular version of the - * License, You may always continue to use it under the terms of that version. - + The Initial Developer and no one else has the right to modify the terms - * applicable to Covered Code created under this License. - * (End of Section 14) - * - * Software distributed under the License is distributed on an "AS IS" - * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - * License for the specific language governing rights and limitations - * under the License. - * + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * * The Original Code is the Mozilla Text to HTML converter code. - * + * * The Initial Developer of the Original Code is * Ben Bucksch . - * Portions created by Ben Bucksch are Copyright - * (C) 1999, 2000 Ben Bucksch. All Rights Reserved. - * + * Portions created by the Initial Developer are Copyright (C) 1999, 2000 + * the Initial Developer. All Rights Reserved. + * * Contributor(s): * * Alternatively, the contents of this file may be used under the terms of diff --git a/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.h b/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.h index f69ec81b3b7..cfc48970a28 100644 --- a/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.h +++ b/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.h @@ -1,37 +1,24 @@ /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* ***** BEGIN LICENSE BLOCK ***** - * - * The "License" shall be the Mozilla Public License Version 1.1, except - * Sections 6.2 and 11, but with the addition of the below defined Section 14. - * You may obtain a copy of the Mozilla Public License Version 1.1 at - * . The contents of this file are subject to the - * License; you may not use this file except in compliance with the License. - * - * Section 14: MISCELLANEOUS. - * This License represents the complete agreement concerning subject matter - * hereof. If any provision of this License is held to be unenforceable, such - * provision shall be reformed only to the extent necessary to make it - * enforceable. This License shall be governed by German law provisions. Any - * litigation relating to this License shall be subject to German jurisdiction. - * - * Once Covered Code has been published under a particular version of the - * License, You may always continue to use it under the terms of that version. - + The Initial Developer and no one else has the right to modify the terms - * applicable to Covered Code created under this License. - * (End of Section 14) - * - * Software distributed under the License is distributed on an "AS IS" - * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - * License for the specific language governing rights and limitations - * under the License. - * + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * * The Original Code is the Mozilla Text to HTML converter code. - * + * * The Initial Developer of the Original Code is * Ben Bucksch . - * Portions created by Ben Bucksch are Copyright - * (C) 1999, 2000 Ben Bucksch. All Rights Reserved. - * + * Portions created by the Initial Developer are Copyright (C) 1999, 2000 + * the Initial Developer. All Rights Reserved. + * * Contributor(s): * * Alternatively, the contents of this file may be used under the terms of diff --git a/mozilla/netwerk/streamconv/public/mozITXTToHTMLConv.idl b/mozilla/netwerk/streamconv/public/mozITXTToHTMLConv.idl index 996e1e85817..8c51fd92f59 100644 --- a/mozilla/netwerk/streamconv/public/mozITXTToHTMLConv.idl +++ b/mozilla/netwerk/streamconv/public/mozITXTToHTMLConv.idl @@ -1,37 +1,24 @@ /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* ***** BEGIN LICENSE BLOCK ***** - * - * The "License" shall be the Mozilla Public License Version 1.1, except - * Sections 6.2 and 11, but with the addition of the below defined Section 14. - * You may obtain a copy of the Mozilla Public License Version 1.1 at - * . The contents of this file are subject to the - * License; you may not use this file except in compliance with the License. - * - * Section 14: MISCELLANEOUS. - * This License represents the complete agreement concerning subject matter - * hereof. If any provision of this License is held to be unenforceable, such - * provision shall be reformed only to the extent necessary to make it - * enforceable. This License shall be governed by German law provisions. Any - * litigation relating to this License shall be subject to German jurisdiction. - * - * Once Covered Code has been published under a particular version of the - * License, You may always continue to use it under the terms of that version. - + The Initial Developer and no one else has the right to modify the terms - * applicable to Covered Code created under this License. - * (End of Section 14) - * - * Software distributed under the License is distributed on an "AS IS" - * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - * License for the specific language governing rights and limitations - * under the License. - * + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * * The Original Code is the Mozilla Text to HTML converter code. - * + * * The Initial Developer of the Original Code is * Ben Bucksch . - * Portions created by Ben Bucksch are Copyright - * (C) 1999, 2000 Ben Bucksch. All Rights Reserved. - * + * Portions created by the Initial Developer are Copyright (C) 1999, 2000 + * the Initial Developer. All Rights Reserved. + * * Contributor(s): * * Alternatively, the contents of this file may be used under the terms of