From fe2a998bfe82513f5ab5a8dc9d373d57c9c68ec5 Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Wed, 11 Jan 2012 23:41:51 +0100 Subject: Bug 680131: Replace the MPL 1.1 license by the MPL 2.0 one in all files, and add it to files which miss one r=kiko r=mkanat r=mrbball a=LpSolit --- docs/en/images/bzLifecycle.xml | 7 +++++++ docs/en/xml/Bugzilla-Guide.xml | 8 +++++++- docs/en/xml/about.xml | 8 +++++++- docs/en/xml/administration.xml | 8 +++++++- docs/en/xml/conventions.xml | 8 +++++++- docs/en/xml/customization.xml | 8 +++++++- docs/en/xml/gfdl.xml | 8 +++++++- docs/en/xml/glossary.xml | 7 +++++++ docs/en/xml/index.xml | 8 +++++++- docs/en/xml/installation.xml | 7 +++++++ docs/en/xml/modules.xml | 7 +++++++ docs/en/xml/patches.xml | 8 +++++++- docs/en/xml/security.xml | 8 +++++++- docs/en/xml/troubleshooting.xml | 9 +++++++-- docs/en/xml/using.xml | 8 +++++++- docs/lib/Pod/Simple/HTML/Bugzilla.pm | 23 +++++------------------ docs/lib/Pod/Simple/HTMLBatch/Bugzilla.pm | 23 +++++------------------ docs/makedocs.pl | 28 +++++----------------------- docs/style.css | 21 +++++---------------- docs/xsl/bugzilla-docs.xsl | 7 +++++++ docs/xsl/chunks.xsl | 7 +++++++ docs/xsl/nochunks.xsl | 7 +++++++ docs/xsl/pdf.xsl | 7 +++++++ 23 files changed, 153 insertions(+), 87 deletions(-) (limited to 'docs') diff --git a/docs/en/images/bzLifecycle.xml b/docs/en/images/bzLifecycle.xml index 92ea28155..fe4611dde 100644 --- a/docs/en/images/bzLifecycle.xml +++ b/docs/en/images/bzLifecycle.xml @@ -1,4 +1,11 @@ + diff --git a/docs/en/xml/Bugzilla-Guide.xml b/docs/en/xml/Bugzilla-Guide.xml index b20962358..1017f559f 100644 --- a/docs/en/xml/Bugzilla-Guide.xml +++ b/docs/en/xml/Bugzilla-Guide.xml @@ -1,3 +1,10 @@ + @@ -126,4 +133,3 @@ sgml-shorttag:t sgml-tag-region-if-active:t End: --> - diff --git a/docs/en/xml/about.xml b/docs/en/xml/about.xml index ffc52e9f9..758b0b609 100644 --- a/docs/en/xml/about.xml +++ b/docs/en/xml/about.xml @@ -1,4 +1,11 @@ + @@ -216,4 +223,3 @@ sgml-parent-document:("Bugzilla-Guide.xml" "book" "chapter") sgml-shorttag:t sgml-tag-region-if-active:t End: --> - diff --git a/docs/en/xml/administration.xml b/docs/en/xml/administration.xml index c4dbc28c0..a25ed555c 100644 --- a/docs/en/xml/administration.xml +++ b/docs/en/xml/administration.xml @@ -1,4 +1,11 @@ + @@ -3101,4 +3108,3 @@ sgml-shorttag:t sgml-tag-region-if-active:t End: --> - diff --git a/docs/en/xml/conventions.xml b/docs/en/xml/conventions.xml index 6a8f8b47e..707146551 100644 --- a/docs/en/xml/conventions.xml +++ b/docs/en/xml/conventions.xml @@ -1,4 +1,11 @@ + @@ -82,4 +89,3 @@ sgml-shorttag:t sgml-tag-region-if-active:t End: --> - diff --git a/docs/en/xml/customization.xml b/docs/en/xml/customization.xml index 1cfa0c548..1bc3f10d8 100644 --- a/docs/en/xml/customization.xml +++ b/docs/en/xml/customization.xml @@ -1,4 +1,11 @@ + @@ -603,4 +610,3 @@ sgml-shorttag:t sgml-tag-region-if-active:t End: --> - diff --git a/docs/en/xml/gfdl.xml b/docs/en/xml/gfdl.xml index 0de66acd3..29587ee3d 100644 --- a/docs/en/xml/gfdl.xml +++ b/docs/en/xml/gfdl.xml @@ -1,4 +1,11 @@ + @@ -448,4 +455,3 @@ sgml-shorttag:t sgml-tag-region-if-active:t End: --> - diff --git a/docs/en/xml/glossary.xml b/docs/en/xml/glossary.xml index 8d0c0e58d..5458fa32d 100644 --- a/docs/en/xml/glossary.xml +++ b/docs/en/xml/glossary.xml @@ -1,4 +1,11 @@ + diff --git a/docs/en/xml/index.xml b/docs/en/xml/index.xml index 7fc1a4c14..e71a504a8 100644 --- a/docs/en/xml/index.xml +++ b/docs/en/xml/index.xml @@ -1,3 +1,10 @@ + - diff --git a/docs/en/xml/installation.xml b/docs/en/xml/installation.xml index ba97d9591..d5217706f 100644 --- a/docs/en/xml/installation.xml +++ b/docs/en/xml/installation.xml @@ -1,4 +1,11 @@ + diff --git a/docs/en/xml/modules.xml b/docs/en/xml/modules.xml index a578f9f16..5017e241b 100644 --- a/docs/en/xml/modules.xml +++ b/docs/en/xml/modules.xml @@ -1,4 +1,11 @@ + diff --git a/docs/en/xml/patches.xml b/docs/en/xml/patches.xml index e5a6a8c47..ed7d304c7 100644 --- a/docs/en/xml/patches.xml +++ b/docs/en/xml/patches.xml @@ -1,4 +1,11 @@ + @@ -134,4 +141,3 @@ sgml-shorttag:t sgml-tag-region-if-active:t End: --> - diff --git a/docs/en/xml/security.xml b/docs/en/xml/security.xml index 270b8a72c..582604029 100644 --- a/docs/en/xml/security.xml +++ b/docs/en/xml/security.xml @@ -1,4 +1,11 @@ + @@ -272,4 +279,3 @@ sgml-parent-document:("Bugzilla-Guide.xml" "book" "chapter") sgml-shorttag:t sgml-tag-region-if-active:t End: --> - diff --git a/docs/en/xml/troubleshooting.xml b/docs/en/xml/troubleshooting.xml index f42436d2e..7dcf75238 100644 --- a/docs/en/xml/troubleshooting.xml +++ b/docs/en/xml/troubleshooting.xml @@ -1,4 +1,11 @@ + @@ -278,5 +285,3 @@ sgml-parent-document:("Bugzilla-Guide.xml" "book" "chapter") sgml-shorttag:t sgml-tag-region-if-active:t End: --> - - diff --git a/docs/en/xml/using.xml b/docs/en/xml/using.xml index e832dea7a..cf59e8d4d 100644 --- a/docs/en/xml/using.xml +++ b/docs/en/xml/using.xml @@ -1,4 +1,11 @@ + @@ -1962,4 +1969,3 @@ sgml-shorttag:t sgml-tag-region-if-active:t End: --> - diff --git a/docs/lib/Pod/Simple/HTML/Bugzilla.pm b/docs/lib/Pod/Simple/HTML/Bugzilla.pm index f82ab9266..cc607be7c 100644 --- a/docs/lib/Pod/Simple/HTML/Bugzilla.pm +++ b/docs/lib/Pod/Simple/HTML/Bugzilla.pm @@ -1,22 +1,9 @@ -# -*- Mode: perl; indent-tabs-mode: nil -*- +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# 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 Bugzilla Bug Tracking System. -# -# The Initial Developer of the Original Code is Everything Solved. -# Portions created by Everything Solved are Copyright (C) 2006 -# Everything Solved. All Rights Reserved. -# -# Contributor(s): Max Kanat-Alexander +# This Source Code Form is "Incompatible With Secondary Licenses", as +# defined by the Mozilla Public License, v. 2.0. package Pod::Simple::HTML::Bugzilla; diff --git a/docs/lib/Pod/Simple/HTMLBatch/Bugzilla.pm b/docs/lib/Pod/Simple/HTMLBatch/Bugzilla.pm index eb37773b9..366ceb7a0 100644 --- a/docs/lib/Pod/Simple/HTMLBatch/Bugzilla.pm +++ b/docs/lib/Pod/Simple/HTMLBatch/Bugzilla.pm @@ -1,22 +1,9 @@ -# -*- Mode: perl; indent-tabs-mode: nil -*- +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# 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 Bugzilla Bug Tracking System. -# -# The Initial Developer of the Original Code is Everything Solved. -# Portions created by Everything Solved are Copyright (C) 2006 -# Everything Solved. All Rights Reserved. -# -# Contributor(s): Max Kanat-Alexander +# This Source Code Form is "Incompatible With Secondary Licenses", as +# defined by the Mozilla Public License, v. 2.0. package Pod::Simple::HTMLBatch::Bugzilla; diff --git a/docs/makedocs.pl b/docs/makedocs.pl index 136a7da8b..4bf1fb4a0 100755 --- a/docs/makedocs.pl +++ b/docs/makedocs.pl @@ -1,27 +1,10 @@ #!/usr/bin/perl -w -# -*- Mode: perl; indent-tabs-mode: nil -*- +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# 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 Bugzilla Bug Tracking System. -# -# The Initial Developer of the Original Code is Netscape Communications -# Corporation. Portions created by Netscape are -# Copyright (C) 1998 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): Matthew Tuck -# Jacob Steenhagen -# Colin Ogilvie -# Max Kanat-Alexander +# This Source Code Form is "Incompatible With Secondary Licenses", as +# defined by the Mozilla Public License, v. 2.0. # This script compiles all the documentation. @@ -194,4 +177,3 @@ foreach my $lang (@langs) { MakeDocs('PDF', 'dblatex -p ../xsl/pdf.xsl -o pdf/Bugzilla-Guide.pdf xml/Bugzilla-Guide.xml'); } - diff --git a/docs/style.css b/docs/style.css index 9acd36dc7..8604b5b67 100644 --- a/docs/style.css +++ b/docs/style.css @@ -1,20 +1,9 @@ -/* 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/ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * 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 Bugzilla Bug Tracking System. - * - * The Initial Developer of the Original Code is Everything Solved. - * Portions created by Everything Solved are Copyright (C) 2006 - * Everything Solved. All Rights Reserved. - * - * Contributor(s): Max Kanat-Alexander + * This Source Code Form is "Incompatible With Secondary Licenses", as + * defined by the Mozilla Public License, v. 2.0. */ body { diff --git a/docs/xsl/bugzilla-docs.xsl b/docs/xsl/bugzilla-docs.xsl index 48678294b..f791087e6 100644 --- a/docs/xsl/bugzilla-docs.xsl +++ b/docs/xsl/bugzilla-docs.xsl @@ -1,4 +1,11 @@ + diff --git a/docs/xsl/chunks.xsl b/docs/xsl/chunks.xsl index 17b964908..1389dd5e0 100644 --- a/docs/xsl/chunks.xsl +++ b/docs/xsl/chunks.xsl @@ -1,4 +1,11 @@ + diff --git a/docs/xsl/nochunks.xsl b/docs/xsl/nochunks.xsl index bb0d69625..2b10a0d85 100644 --- a/docs/xsl/nochunks.xsl +++ b/docs/xsl/nochunks.xsl @@ -1,4 +1,11 @@ + + -- cgit v1.2.3-24-g4f1b