changed lots of old 4DIAC to 4diac
diff --git a/en_help.php b/en_help.php
index 7347d4e..da68405 100644
--- a/en_help.php
+++ b/en_help.php
@@ -5,8 +5,8 @@
include 'head.php';?>
<link rel="stylesheet" type="text/css" href="help.css">
-<title>4DIAC Documentation</title>
-<meta name="4DIAC documentation providing help and to get started with 4DIAC">
+<title>Eclipse 4diac Documentation</title>
+<meta name="Eclipse 4diac's documentation providing help and to get started with Eclipse 4diac">
<meta name="keywords" content="porting, tutorials, getting started, overview ">
<script type="text/javascript" src="jquery-1.6.2.js"></script>
diff --git a/en_ide.php b/en_ide.php
index 93ae8d4..44f200c 100644
--- a/en_ide.php
+++ b/en_ide.php
@@ -23,7 +23,7 @@
<section class="content">
<h1>4diac <i>IDE</i> – IEC 61499 Compliant Development Environment</h1>
- <p>The 4DIAC IDE is an extensible, IEC 61499 compliant engineering environment for distributed control applications.
+ <p>The 4diac IDE is an extensible, IEC 61499 compliant engineering environment for distributed control applications.
The modelled applications can be downloaded to distributed field devices according the means defined by the IEC 61499 standard.
The hardware capability definition allows to model the control hardware and its interconnections through networks.</p>
diff --git a/en_news.php b/en_news.php
index 422c949..51091cb 100644
--- a/en_news.php
+++ b/en_news.php
@@ -6,8 +6,8 @@
include 'head.php';?>
-<title>4DIAC-News</title>
-<meta name="description" content="Updates from the 4DIAC community for the 4DIAC community">
+<title>4diac News</title>
+<meta name="description" content="Updates from the 4diac community for the 4diac community">
<meta name="keywords" content="updates, news, applications, noteworthy">
<link rel="alternate" href="/feed/" title="4diac's News RSS feed" type="application/rss+xml" />
diff --git a/events/en_event_2010.php b/events/en_event_2010.php
index c0c8a59..e49573c 100644
--- a/events/en_event_2010.php
+++ b/events/en_event_2010.php
@@ -1,4 +1,4 @@
-<h1>1<sup>st</sup> 4DIAC Users' Workshop @ ETFA 2010</h1>
+<h1>1<sup>st</sup> 4diac Users' Workshop @ ETFA 2010</h1>
<p>The 1<sup>st</sup> Users' Workshop has been hold in conjunction with the 15th IEEE International Conference on Emerging Technologies and Factory Automation (ETFA) in Bilbao.</p>
<p><b>Workshop Date: 16<sup>th</sup> September 2010</b></p>
diff --git a/events/en_event_2011.php b/events/en_event_2011.php
index d07b17e..c0447e2 100644
--- a/events/en_event_2011.php
+++ b/events/en_event_2011.php
@@ -1,4 +1,4 @@
-<h1>2<sup>nd</sup> 4DIAC Users' Workshop @ ETFA 2011</h1>
+<h1>2<sup>nd</sup> 4diac Users' Workshop @ ETFA 2011</h1>
<p>The 2<sup>nd</sup> Users' Workshop has been hold in conjunction with the 16th IEEE International Conference on Emerging Technologies and Factory Automation (ETFA) in Toulouse.</p>
<p><b>Workshop Date: 9th September 2011</b></p>
@@ -80,7 +80,7 @@
<tr>
<td colspan="2">
- Plenary Discussion - Future Development of 4DIAC: Goals and Targets
+ Plenary Discussion - Future Development of 4diac: Goals and Targets
</td>
</tr>
</table>
diff --git a/events/en_event_2012.php b/events/en_event_2012.php
index 59caf0a..601860d 100644
--- a/events/en_event_2012.php
+++ b/events/en_event_2012.php
@@ -1,4 +1,4 @@
-<h1>3<sup>rd</sup> 4DIAC Users' Workshop @ ETFA 2012</h1>
+<h1>3<sup>rd</sup> 4diac Users' Workshop @ ETFA 2012</h1>
<p>The 3<sup>rd</sup> Users' Workshop has been hold in conjunction with the 17th IEEE International Conference on Emerging Technologies and Factory Automation (ETFA) in Kraków.</p>
<p><b>Workshop Date: 21th September 2012</b></p>
@@ -66,7 +66,7 @@
</tr>
<tr>
<td>
- Plenary Discussion - Future Development of 4DIAC: Goals and Targets
+ Plenary Discussion - Future Development of 4diac: Goals and Targets
</td>
</tr>
</table>
diff --git a/events/en_event_2013.php b/events/en_event_2013.php
index 55c649d..e5f9b38 100644
--- a/events/en_event_2013.php
+++ b/events/en_event_2013.php
@@ -1,4 +1,4 @@
-<h1>4<sup>th</sup> 4DIAC Users' Workshop @ ETFA 2013</h1>
+<h1>4<sup>th</sup> 4diac Users' Workshop @ ETFA 2013</h1>
<p>The 4<sup>th</sup> Users' Workshop has been hold in conjunction with the 18th IEEE International Conference on Emerging Technologies and Factory Automation (ETFA) in Cagliari, Italy.</p>
<p><b>Workshop Date: 10th September 2013</b></p>
diff --git a/events/en_event_2014.php b/events/en_event_2014.php
index 4b8ce4a..3131fb7 100644
--- a/events/en_event_2014.php
+++ b/events/en_event_2014.php
@@ -1,4 +1,4 @@
-<h1>5<sup>th</sup> 4DIAC Users' Workshop @ ETFA 2014</h1>
+<h1>5<sup>th</sup> 4diac Users' Workshop @ ETFA 2014</h1>
<p>The 5<sup>th</sup> Users' Workshop has been hold in conjunction with the 19th IEEE International Conference on Emerging Technologies and Factory Automation (ETFA) in Barcelona.</p>
<p><b>Workshop Date: 16th September 2014</b></p>
diff --git a/events/en_event_2015.php b/events/en_event_2015.php
index 0445c09..d0416ed 100644
--- a/events/en_event_2015.php
+++ b/events/en_event_2015.php
@@ -1,4 +1,4 @@
-<h1>6<sup>th</sup> 4DIAC Users' Workshop @ ETFA 2015</h1>
+<h1>6<sup>th</sup> 4diac Users' Workshop @ ETFA 2015</h1>
<p>The 6<sup>th</sup> Users' Workshop is held in conjunction with the 20th IEEE International Conference on Emerging Technologies and Factory Automation (ETFA) in Luxembourg.</p>
<p><b>Workshop Date: 8th September 2015</b></p>
diff --git a/events/en_event_2016.php b/events/en_event_2016.php
index 7a52634..838d3a8 100644
--- a/events/en_event_2016.php
+++ b/events/en_event_2016.php
@@ -1,4 +1,4 @@
-<h1>7<sup>th</sup> 4DIAC Users' Workshop @ ETFA 2016</h1>
+<h1>7<sup>th</sup> 4diac Users' Workshop @ ETFA 2016</h1>
<p>The 7<sup>th</sup> Users' Workshop is held in conjunction with the 21th IEEE International Conference on Emerging Technologies and Factory Automation (ETFA) in Berlin.</p>
<p><b>Workshop Date:</b> 6th September 2016</p>
@@ -67,7 +67,7 @@
</tr>
<tr>
<td>
- <a href="events/docs/2016/UW_10_Melik.pdf">4DIAC in Teaching - Lessons from Lab Exercises and Student Projects</a>
+ <a href="events/docs/2016/UW_10_Melik.pdf">4diac in Teaching - Lessons from Lab Exercises and Student Projects</a>
<br><i>Martin Melik Merkumians (Vienna University of Technology)</i>
</td>
</tr>
@@ -77,13 +77,13 @@
</th>
<td>
<h3>Hands on Session</h3>
- The afternoon is reserved for hands on and discussions where the 4DIAC team will be available for detailed discussions and explanation on using 4DIAC as well as on implementation details. The following topics can be covered but suggestions from the audience is welcome:
+ The afternoon is reserved for hands on and discussions where the 4diac team will be available for detailed discussions and explanation on using 4DIAC as well as on implementation details. The following topics can be covered but suggestions from the audience is welcome:
<ul>
- <li>Short Introduction to IEC 61499 and 4DIAC</li>
+ <li>Short Introduction to IEC 61499 and Eclipse 4diac</li>
<li>Guided small control application example </li>
<li>Implementing a control application for a simulated press application</li>
- <li>Extending 4DIAC-IDE </li>
- <li>Overview on FORTE </li>
+ <li>Extending 4diac IDE </li>
+ <li>Overview on 4diac FORTE </li>
<li>Real-time execution and communication architecture</li>
</ul>
</td>
@@ -92,7 +92,7 @@
<h2>Hardware Exhibition</h2>
-<p>An exhibition and interoperability panel of control devices executing IEC 61499 (based on 4DIAC)
+<p>An exhibition and interoperability panel of control devices executing IEC 61499 (based on 4diac)
will be held in the first time during the workshop of 2016.</p>
<h2>Workshop Organizers</h2>
diff --git a/events/en_event_template.txt b/events/en_event_template.txt
index 52a93d1..66e169a 100644
--- a/events/en_event_template.txt
+++ b/events/en_event_template.txt
@@ -1,40 +1,40 @@
-<h1>7<sup>th</sup> 4DIAC Users' Workshop</h1>
+<h1>7<sup>th</sup> 4diac Users' Workshop</h1>
<p>The 7<sup>th</sup> Users' Workshop is held in conjunction with the 21th IEEE International Conference on Emerging Technologies and Factory Automation (ETFA) in Berlin.</p>
<p><b>Workshop Date: 6th September 2016</b></p>
<p>Contributions to this workshop may address, but are not limited to:</p>
<ul>
- <li>Application of 4DIAC in automation projects across different industrial domains (manufacturing, robotics, logistics, energy, etc.</li>
- <li>Extension to the runtime environment (FORTE) and engineering tool (4DIAC-IDE)</li>
+ <li>Application of 4diac in automation projects across different industrial domains (manufacturing, robotics, logistics, energy, etc.</li>
+ <li>Extension to the runtime environment (4diac FORTE) and engineering tool (4diac IDE)</li>
<li>Integration to new communication technologies/protocols and/or porting to new hardware platforms</li>
<li>Interoperability with different automation systems</li>
- <li>proposals for extending 4DIAC</li>
+ <li>proposals for extending 4diac</li>
</ul>
<h2>Hands on Session</h2>
-<p>The workshop will be accompanied by a half day hands on session where the 4DIAC team will be available for detailed discussions and explanation on using 4DIAC as well as on implementation details. The following topics are covered:</p>
+<p>The workshop will be accompanied by a half day hands on session where the 4diac team will be available for detailed discussions and explanation on using 4DIAC as well as on implementation details. The following topics are covered:</p>
<ul>
- <li>Short Introduction to IEC 61499 and 4DIAC</li>
+ <li>Short Introduction to IEC 61499 and Eclipse 4diac</li>
<li>Guided small control application example</li>
<li>Implementing a control application for a simulated press application</li>
- <li>Extending 4DIAC-IDE</li>
- <li>Overview on FORTE</li>
+ <li>Extending 4diac IDE</li>
+ <li>Overview on 4diac FORTE</li>
<li>Real-time execution and communication architecture</li>
<li>etc.</li>
</ul>
<h2>Hardware Exhibition</h2>
-<p>An exhibition and interoperability panel of control devices executing IEC 61499 (based on 4DIAC) will be held in the first time during the workshop of 2016.</p>
+<p>An exhibition and interoperability panel of control devices executing IEC 61499 (based on Eclipse 4diac) will be held in the first time during the workshop of 2016.</p>
<h2>Workshop Presentation Formats and Submission of Proposals</h2>
<p>Authors may consider the following three presentation formats:</p>
<ul>
<li>Workshop presentation: Oral presentation on the above topics.</li>
- <li>Workshop poster on the above topics: Intended for 4DIAC users not able to attend the workshop.</li>
- <li>Exhibition of control devices running 4DIAC.</li>
+ <li>Workshop poster on the above topics: Intended for 4diac users not able to attend the workshop.</li>
+ <li>Exhibition of control devices running 4diac.</li>
</ul>
-<p>Presentations and posters will be published on the 4DIAC webpage after the event. For proposing a presentation, poster or hardware please contact <a href="mailto:alois.zoitl@gmx.at">Alois Zoitl, alois.zoitl@gmx.at<a/></p>
+<p>Presentations and posters will be published on the Eclipse 4diac webpage after the event. For proposing a presentation, poster or hardware please contact <a href="mailto:alois.zoitl@gmx.at">Alois Zoitl, alois.zoitl@gmx.at<a/></p>
<h2>Registration Information</h2>
<p>Registration details for the workshop can be found <a href="http://www.etfa2016.org">here</a>.</p>
@@ -79,7 +79,7 @@
Morning <br>Session
</th>
<td>
- <a href="uws/2016/.pdf">Welcome and Recent Activities of the 4DIAC Open Source Initiative</a>
+ <a href="uws/2016/.pdf">Welcome and Recent Activities of the Eclipse 4diac Open Source Initiative</a>
<br><i>A. Zoitl (fortiss GmbH)</i>
</td>
</tr>
@@ -91,7 +91,7 @@
</tr>
<tr>
<td>
- <a href="uws/2016/.pdf">Modeling Apps for CPS with 4DIAC</a>
+ <a href="uws/2016/.pdf">Modeling Apps for CPS with 4diac/a>
<br><i>Martin Jobst (fortiss GmbH)</i>
</td>
</tr>
@@ -109,19 +109,19 @@
</tr>
<tr>
<td>
- <a href="uws/2016/.pdf" >Human-Robot Collaborative Assembly: 4DIAC as base Technology in the SYMBIO-TIC project</a>
+ <a href="uws/2016/.pdf" >Human-Robot Collaborative Assembly: 4diac as base Technology in the SYMBIO-TIC project</a>
<br><i>Gerhard Ebenhofer (PROFACTOR GmbH)</i>
</td>
</tr>
<tr>
<td>
- <a href="uws/2016/.pdf">Integrating FORTE with ROS</a>
+ <a href="uws/2016/.pdf">Integrating 4diac FORTE with ROS</a>
<br><i>Waldemar Eisenmenger (fortiss GmbH)</i>
</td>
</tr>
<tr>
<td>
- <a href="uws/2016/.pdf">Integration of OPC UA with 4DIAC</a>
+ <a href="uws/2016/.pdf">Integration of OPC UA with 4diac</a>
<br><i>Petr Kadera (Czech Institute of Informatics, Robotics, and Cybernetics of Czech Technical University in Prague)</i>
</td>
</tr>
diff --git a/news/en_news_20190414.php b/news/en_news_20190414.php
index 92f11b7..9b34a4f 100644
--- a/news/en_news_20190414.php
+++ b/news/en_news_20190414.php
@@ -1,6 +1,6 @@
<?php printNewsEntryHeader(__FILE__, "4diac 1.10.2: Second Maintenance Release for 4diac 1.10", "img/release.png"); ?>
-<p>We are proud to announce the second maintenance release for 4DIAC 1.10 providing 11 bug fixes for 4diac IDE, and 6 for 4diac FORTE.</p>
+<p>We are proud to announce the second maintenance release for Eclipse 4diac 1.10 providing 11 bug fixes for 4diac IDE, and 6 for 4diac FORTE.</p>
<p>As always please download, test, and report problems and bugs.
For 1.9.x and 1.10.x users a simple <i><q>Help -> Check of Updates</q></i>
diff --git a/news/en_news_20190821.php b/news/en_news_20190821.php
index c567928..9b3cfb6 100644
--- a/news/en_news_20190821.php
+++ b/news/en_news_20190821.php
@@ -1,6 +1,6 @@
<?php printNewsEntryHeader(__FILE__, "4diac 1.10.3: Third Maintenance Release for 4diac 1.10", "img/release.png"); ?>
-<p>We are proud to announce the third maintenance release for 4DIAC 1.10 providing 14 bug fixes for 4diac IDE, and 3 for 4diac FORTE.</p>
+<p>We are proud to announce the third maintenance release for Eclipse 4diac 1.10 providing 14 bug fixes for 4diac IDE, and 3 for 4diac FORTE.</p>
<p>As always please download, test, and report problems and bugs.
For 1.9.x and 1.10.x users a simple <i><q>Help -> Check of Updates</q></i>
