diff --git a/org.fortiss.af3.rcp.application/intro/newFeatures.html b/org.fortiss.af3.rcp.application/intro/newFeatures.html
index 33bac76a5ff4913693d3e9bf23d3c0f4cd5f2dd9..d575a0831b295081e22fa4aa4327c08988d729c4 100644
--- a/org.fortiss.af3.rcp.application/intro/newFeatures.html
+++ b/org.fortiss.af3.rcp.application/intro/newFeatures.html
@@ -2,7 +2,7 @@
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
- <title>New features and changes in AutoFOCUS 2.25</title>
+ <title>New features and changes in AutoFOCUS 2.26</title>
<style>
.mBlock { margin-left: 62px; }
h2 { color: black; }
@@ -14,7 +14,7 @@
</head>
<body>
<div class="mBlock">
- <h2>New Features and Changes in AutoFOCUS 2.25</h2>
+ <h2>New Features and Changes in AutoFOCUS 2.26</h2>
<h3>Variability</h3>
<ul>
@@ -50,23 +50,23 @@
<br>
- <h3>Detailed list of changes in 2.25:</h3>
+ <h3>Detailed list of changes in 2.26:</h3>
<ul>
- <li>Product-line Analysis: Remove verbose messages to log (#4374)</li>
- <li>Requirements overview editor: Fix editable fields (#4369)</li>
- <li>Variability: Grey out non-editable cells in the variant configuration dialog (#4289)</li>
- <li>Optional Requirements (#3272)</li>
- <li>Incomplete allocation tables cause NPEs (#4366)</li>
- <li>TreeTableEditors: Automatic line wrapping breaks after editing text (#4365)</li>
- <li>FMUs cannot be exported when the project has not been saved immediately before (#4264)</li>
- <li>getEClassForClass gives unexpected result in presence of inheritance (#4262)</li>
- <li>Requirements Analysis: use consistent label for collection of "All requirements" (#4153)</li>
- <li>[Hierarcharchical Platform] Account for clusters when deriving the type size (#4100)</li>
- <li>Include Java Binaries in the Nightly Build (#4357)</li>
- <li>Create weight annotation (#4354)</li>
- <li>Diagram editor: Add reconnect functionality to component architecture (#4279)</li>
- <li>Combine reuse context menu entries to one menu group (with sub-entries) (#4248)</li>
+ <li>SysML: Avoid NPE when exporting logical architecture only (#4418)</li>
+ <li>SysML Export: Ask before overwriting output files (#4417)</li>
+ <li>SysML Exporter: Renaming of methods and classes to reflect their purpose (#4392)</li>
+ <li>MQS: Locate git repository w/o assumptions on directory layout (#4390)</li>
+ <li>SysML-Export: Display warning, if no views have been selected (or select all views automatically) (#4373)</li>
+ <li>EGit Metrik Extractor for an AF3 git repository (#4371)</li>
+ <li>Extend the central viewtype collection of the CCCC with all needed elements from the AF3 metamodel (#4364)</li>
+ <li>Improve code quality of AF3 consistency adapter (#4363)</li>
+ <li>SysML Exporter: encoding of atomic data types (#4355)</li>
+ <li>Variability: Add Product-Line-Analysis to state automata (#4311)</li>
+ <li>Variability: Add checker for incorrect presence conditions (#4401)</li>
+ <li>Integrate Consistency Checker and AF3 Consistency Adapter into AF3 (#4362)</li>
+ <li>Feature Model: Assign a unique name for newly created features (#4313)</li>
+ <li>Component Architecture: Create connections without existing ports (#4304)</li>
</ul>
</div>
</body>
diff --git a/org.fortiss.af3.rcp.application/intro/newFeatures_af3_fortissPage.html b/org.fortiss.af3.rcp.application/intro/newFeatures_af3_fortissPage.html
index 136e079c9d5aa6808efa46893efdfda5fe431102..75b2f9f49ccfda59b41f5dfeb7c25fd2c3aa86d9 100644
--- a/org.fortiss.af3.rcp.application/intro/newFeatures_af3_fortissPage.html
+++ b/org.fortiss.af3.rcp.application/intro/newFeatures_af3_fortissPage.html
@@ -3,7 +3,7 @@
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
- <title>New features and changes in AutoFOCUS 2.25</title>
+ <title>New features and changes in AutoFOCUS 2.26</title>
<style>
.mBlock { margin-left: 62px; }
h2 { color: black; }
@@ -15,39 +15,39 @@
</head>
<body>
<div class="mBlock">
- <h2>New Features and Changes in AutoFOCUS 2.25</h2>
+ <h2>New Features and Changes in AutoFOCUS 2.26</h2>
- <h3>Variability</h3>
- <ul>
-
- <li>Requirements can be modeled with variability</li>
- <li>Improved management of mandatory features in variant configuration dialog</li>
-
+ <h3>Model Consistency</h3>
+ <ul>
+ <li> Integration of a novel consistency checking functionality (CCCC) </li>
+ <li> Automated checks for consistency of cost requirements with the technical architecture. </li>
+ <li> Enables check for consistency with arbitrary external models via consistency adapters. </li>
</ul>
-
- <h3>Platform Architecture</h3>
- <ul>
-
- <li>Added weight annotation to platform elements</li>
-
- </ul>
-
- <h3>Requirements Analysis</h3>
- <ul>
-
- <li>Improved requirements overview editor</li>
-
+
+ <h3>Model Metrics and Quality</h3>
+ <ul>
+ <li> New button to extract metrics via EGit </li>
+ <li> Improved metrics extraction from git repositories </li>
+ </ul>
+
+ <h3>Variability</h3>
+ <ul>
+ <li> Added product-line analysis to state automata with variability </li>
+ <li> Presence Conditions are automatically checked for correctness. </li>
+ <li> Improved editor bhavior and automated checks ensure unique names of features </li>
</ul>
-
+
+ <h3>SysML-Export</h3>
+ <ul>
+ <li> Useability improvements via more robust UI and new warnings in case of unintended usage </li>
+ <li> Improved encoding of atomic data types </li>
+ </ul>
+
+ <h3>Component Architecture</h3>
+ <ul>
+ <li> Enable to connect connections more easy, by automatically creatig missing ports on sub-components </li>
+ </ul>
- <h3>General</h3>
- <ul>
-
- <li>The AF3 releases and nightly builds do not require a separate Java installation anymore (JRE is bundled)</li>
- <li>Several quality of live improvements to the graphical user interface</li>
- <li>Several improvements of stability all over the tool</li>
-
- </ul>
<br>
@@ -84,24 +84,24 @@
<br>
<h3>
- Detailed list of changes in 2.25:
+ Detailed list of changes in 2.26:
</h3>
<ul>
- <li>Product-line Analysis: Remove verbose messages to log (#4374)</li>
- <li>Requirements overview editor: Fix editable fields (#4369)</li>
- <li>Variability: Grey out non-editable cells in the variant configuration dialog (#4289)</li>
- <li>Optional Requirements (#3272)</li>
- <li>Incomplete allocation tables cause NPEs (#4366)</li>
- <li>TreeTableEditors: Automatic line wrapping breaks after editing text (#4365)</li>
- <li>FMUs cannot be exported when the project has not been saved immediately before (#4264)</li>
- <li>getEClassForClass gives unexpected result in presence of inheritance (#4262)</li>
- <li>Requirements Analysis: use consistent label for collection of "All requirements" (#4153)</li>
- <li>[Hierarcharchical Platform] Account for clusters when deriving the type size (#4100)</li>
- <li>Include Java Binaries in the Nightly Build (#4357)</li>
- <li>Create weight annotation (#4354)</li>
- <li>Diagram editor: Add reconnect functionality to component architecture (#4279)</li>
- <li>Combine reuse context menu entries to one menu group (with sub-entries) (#4248)</li>
+ <li>SysML: Avoid NPE when exporting logical architecture only (#4418)</li>
+ <li>SysML Export: Ask before overwriting output files (#4417)</li>
+ <li>SysML Exporter: Renaming of methods and classes to reflect their purpose (#4392)</li>
+ <li>MQS: Locate git repository w/o assumptions on directory layout (#4390)</li>
+ <li>SysML-Export: Display warning, if no views have been selected (or select all views automatically) (#4373)</li>
+ <li>EGit Metrik Extractor for an AF3 git repository (#4371)</li>
+ <li>Extend the central viewtype collection of the CCCC with all needed elements from the AF3 metamodel (#4364)</li>
+ <li>Improve code quality of AF3 consistency adapter (#4363)</li>
+ <li>SysML Exporter: encoding of atomic data types (#4355)</li>
+ <li>Variability: Add Product-Line-Analysis to state automata (#4311)</li>
+ <li>Variability: Add checker for incorrect presence conditions (#4401)</li>
+ <li>Integrate Consistency Checker and AF3 Consistency Adapter into AF3 (#4362)</li>
+ <li>Feature Model: Assign a unique name for newly created features (#4313)</li>
+ <li>Component Architecture: Create connections without existing ports (#4304)</li>
</ul>
</div>