Skip to main content
summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJonah Graham2018-11-20 08:02:15 -0500
committerJonah Graham2018-11-22 15:31:51 -0500
commitf70a8b35c18a21a8cfb9132ad9de84caebac0d78 (patch)
tree189e3f8176db984588ecb358e112fc562075f423 /doc
parentf0ce92d3b5719794f5f786e513b4b4ff8e0abe0f (diff)
downloadorg.eclipse.cdt-f70a8b35c18a21a8cfb9132ad9de84caebac0d78.tar.gz
org.eclipse.cdt-f70a8b35c18a21a8cfb9132ad9de84caebac0d78.tar.xz
org.eclipse.cdt-f70a8b35c18a21a8cfb9132ad9de84caebac0d78.zip
Bug 540371: Update to EPLv2 using releng/scripts/change_to_eplv2.sh
Diffstat (limited to 'doc')
-rw-r--r--doc/org.eclipse.cdt.doc.isv/about.html40
-rw-r--r--doc/org.eclipse.cdt.doc.isv/build.properties9
-rw-r--r--doc/org.eclipse.cdt.doc.isv/guide/dom/index/prebuiltIndexes.html8
-rw-r--r--doc/org.eclipse.cdt.doc.isv/guide/dsf/intro/dsf_programming_intro.html6
-rw-r--r--doc/org.eclipse.cdt.doc.isv/guide/projectTemplateEngine/_stock/sysdoc.css8
-rw-r--r--doc/org.eclipse.cdt.doc.isv/plugin.properties9
-rw-r--r--doc/org.eclipse.cdt.doc.user/about.html49
-rw-r--r--doc/org.eclipse.cdt.doc.user/build.properties9
-rw-r--r--doc/org.eclipse.cdt.doc.user/concepts/cdt_c_over_cdt.htm2
-rw-r--r--doc/org.eclipse.cdt.doc.user/plugin.properties9
10 files changed, 91 insertions, 58 deletions
diff --git a/doc/org.eclipse.cdt.doc.isv/about.html b/doc/org.eclipse.cdt.doc.isv/about.html
index a47c46b1c1..164f781a8f 100644
--- a/doc/org.eclipse.cdt.doc.isv/about.html
+++ b/doc/org.eclipse.cdt.doc.isv/about.html
@@ -2,27 +2,35 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
<title>About</title>
</head>
<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 22, 2007</p>
-<h3>License</h3>
+ <h2>About This Content</h2>
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
+ <p>November 30, 2017</p>
+ <h3>License</h3>
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+ <p>
+ The Eclipse Foundation makes available all content in this plug-in
+ (&quot;Content&quot;). Unless otherwise indicated below, the Content
+ is provided to you under the terms and conditions of the Eclipse
+ Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+ available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+ For purposes of the EPL, &quot;Program&quot; will mean the Content.
+ </p>
+
+ <p>
+ If you did not receive this Content directly from the Eclipse
+ Foundation, the Content is being redistributed by another party
+ (&quot;Redistributor&quot;) and different terms and conditions may
+ apply to your use of any object code in the Content. Check the
+ Redistributor's license that was provided with the Content. If no such
+ license exists, contact the Redistributor. Unless otherwise indicated
+ below, the terms and conditions of the EPL still apply to any source
+ code in the Content and such source code may be obtained at <a
+ href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+ </p>
</body>
</html> \ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.isv/build.properties b/doc/org.eclipse.cdt.doc.isv/build.properties
index 57d97a2b70..e42262c448 100644
--- a/doc/org.eclipse.cdt.doc.isv/build.properties
+++ b/doc/org.eclipse.cdt.doc.isv/build.properties
@@ -1,9 +1,12 @@
###############################################################################
# Copyright (c) 2005, 2011 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# IBM Corporation - initial API and implementation
diff --git a/doc/org.eclipse.cdt.doc.isv/guide/dom/index/prebuiltIndexes.html b/doc/org.eclipse.cdt.doc.isv/guide/dom/index/prebuiltIndexes.html
index 4fc587350a..392dece97c 100644
--- a/doc/org.eclipse.cdt.doc.isv/guide/dom/index/prebuiltIndexes.html
+++ b/doc/org.eclipse.cdt.doc.isv/guide/dom/index/prebuiltIndexes.html
@@ -1867,19 +1867,21 @@ style='mso-spacerun:yes'> </span>* Copyright (c) 2006 Symbian Software Ltd. and
others.<o:p></o:p></span></p>
<p class=MsoNormal style='text-align:justify'><span style='font-size:10.0pt'><span
-style='mso-spacerun:yes'> </span>* All rights reserved. This program and the
+style='mso-spacerun:yes'> </span>* This program and the
accompanying materials<o:p></o:p></span></p>
<p class=MsoNormal style='text-align:justify'><span style='font-size:10.0pt'><span
style='mso-spacerun:yes'> </span>* are made available under the terms of the
-Eclipse Public License v1.0<o:p></o:p></span></p>
+Eclipse Public License 2.0<o:p></o:p></span></p>
<p class=MsoNormal style='text-align:justify'><span style='font-size:10.0pt'><span
style='mso-spacerun:yes'> </span>* <span class=GramE>which</span> accompanies
this distribution, and is available at<o:p></o:p></span></p>
<p class=MsoNormal style='text-align:justify'><span style='font-size:10.0pt'><span
-style='mso-spacerun:yes'> </span>* http://www.eclipse.org/legal/epl-v10.html<o:p></o:p></span></p>
+style='mso-spacerun:yes'> </span>* https://www.eclipse.org/legal/epl-2.0/
+>*
+>* SPDX-License-Identifier: EPL-2.0<o:p></o:p></span></p>
<p class=MsoNormal style='text-align:justify'><span style='font-size:10.0pt'><span
style='mso-spacerun:yes'> </span>*<o:p></o:p></span></p>
diff --git a/doc/org.eclipse.cdt.doc.isv/guide/dsf/intro/dsf_programming_intro.html b/doc/org.eclipse.cdt.doc.isv/guide/dsf/intro/dsf_programming_intro.html
index 7410992d8b..d88e2c6098 100644
--- a/doc/org.eclipse.cdt.doc.isv/guide/dsf/intro/dsf_programming_intro.html
+++ b/doc/org.eclipse.cdt.doc.isv/guide/dsf/intro/dsf_programming_intro.html
@@ -91,9 +91,11 @@ Platform SDK</a></li>
<h4>Copyright</h4>
Copyright (c) 2008, 2016 Wind River Systems and others. All rights
reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which
+available under the terms of the Eclipse Public License 2.0 which
accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html<br>
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0<br>
<br>
Contributors:<br>
<ul>
diff --git a/doc/org.eclipse.cdt.doc.isv/guide/projectTemplateEngine/_stock/sysdoc.css b/doc/org.eclipse.cdt.doc.isv/guide/projectTemplateEngine/_stock/sysdoc.css
index 017ff3282a..79368b9c96 100644
--- a/doc/org.eclipse.cdt.doc.isv/guide/projectTemplateEngine/_stock/sysdoc.css
+++ b/doc/org.eclipse.cdt.doc.isv/guide/projectTemplateEngine/_stock/sysdoc.css
@@ -1,9 +1,11 @@
/* -*- c -*-
Copyright (c) 2007, 2008 Symbian Software Ltd. and others.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License 2.0
which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
*/
diff --git a/doc/org.eclipse.cdt.doc.isv/plugin.properties b/doc/org.eclipse.cdt.doc.isv/plugin.properties
index d527ca0a88..183da59aab 100644
--- a/doc/org.eclipse.cdt.doc.isv/plugin.properties
+++ b/doc/org.eclipse.cdt.doc.isv/plugin.properties
@@ -1,9 +1,12 @@
###############################################################################
# Copyright (c) 2000, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# IBM Corporation - initial API and implementation
diff --git a/doc/org.eclipse.cdt.doc.user/about.html b/doc/org.eclipse.cdt.doc.user/about.html
index 7ceab074a2..164f781a8f 100644
--- a/doc/org.eclipse.cdt.doc.user/about.html
+++ b/doc/org.eclipse.cdt.doc.user/about.html
@@ -1,29 +1,36 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
<title>About</title>
</head>
-
<body lang="EN-US">
-<div role="main">
-<h1>About This Content</h1>
-
-<p>June 22, 2007</p>
-<h2>License</h2>
+ <h2>About This Content</h2>
+
+ <p>November 30, 2017</p>
+ <h3>License</h3>
+
+ <p>
+ The Eclipse Foundation makes available all content in this plug-in
+ (&quot;Content&quot;). Unless otherwise indicated below, the Content
+ is provided to you under the terms and conditions of the Eclipse
+ Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+ available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+ For purposes of the EPL, &quot;Program&quot; will mean the Content.
+ </p>
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
+ <p>
+ If you did not receive this Content directly from the Eclipse
+ Foundation, the Content is being redistributed by another party
+ (&quot;Redistributor&quot;) and different terms and conditions may
+ apply to your use of any object code in the Content. Check the
+ Redistributor's license that was provided with the Content. If no such
+ license exists, contact the Redistributor. Unless otherwise indicated
+ below, the terms and conditions of the EPL still apply to any source
+ code in the Content and such source code may be obtained at <a
+ href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+ </p>
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-</div>
</body>
</html> \ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/build.properties b/doc/org.eclipse.cdt.doc.user/build.properties
index 4f622f31dd..95bce3b501 100644
--- a/doc/org.eclipse.cdt.doc.user/build.properties
+++ b/doc/org.eclipse.cdt.doc.user/build.properties
@@ -1,9 +1,12 @@
###############################################################################
# Copyright (c) 2000, 2011 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# IBM Corporation - initial API and implementation
diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_over_cdt.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_over_cdt.htm
index d941daca15..9bc75e8772 100644
--- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_over_cdt.htm
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_over_cdt.htm
@@ -65,7 +65,7 @@ This is the main source for information around CDT.</li>
<h3>License</h3>
-<p>The CDT is an open source project and is licensed under the <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License</a>.
+<p>The CDT is an open source project and is licensed under the <a href="https://www.eclipse.org/legal/epl-2.0/">Eclipse Public License</a>.
<p>
<img src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21">
diff --git a/doc/org.eclipse.cdt.doc.user/plugin.properties b/doc/org.eclipse.cdt.doc.user/plugin.properties
index 7d951d35a1..f9b190e8af 100644
--- a/doc/org.eclipse.cdt.doc.user/plugin.properties
+++ b/doc/org.eclipse.cdt.doc.user/plugin.properties
@@ -1,9 +1,12 @@
###############################################################################
# Copyright (c) 2000, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# IBM Corporation - initial API and implementation

Back to the top