Merge "Infra4253-updated the iotwg charter"
diff --git a/artwork/content/en_index.php b/artwork/content/en_index.php
index d7fc500..aee52fa 100644
--- a/artwork/content/en_index.php
+++ b/artwork/content/en_index.php
@@ -153,12 +153,19 @@
<!-- end of .col-sm-18 -->
<h2 class="top-level-heading">Working Groups Logos</h2>
<div class="row margin-bottom-20 text-center">
+ <!-- Adoptium Logo -->
+ <div class="col-sm-12">
+ <div class="box match-height-item-by-row box-gray-border text-center vertical-align">
+ <img class="margin-auto img-responsive" src="images/wg_adoptium-logo.svg" alt="Adoptium logo" height="110"/>
+ </div>
+ <p class="text-right"><a href="zip_files/adoptium-logo.zip" class="btn btn-white-purple-border btn-full-width btn-border-radius-0" title="Download Adoptium Tools logo">Download</a></p>
+ </div>
<!-- AsciiDoc Logo -->
<div class="col-sm-12">
<div class="box match-height-item-by-row box-gray-border text-center vertical-align">
<img class="margin-auto img-responsive" src="images/wg_asciidoc-logo.svg" alt="AsciiDoc logo" height="110"/>
</div>
- <p class="text-right"><a href="zip_files/asciidoc_logo.zip" class="btn btn-white-purple-border btn-full-width btn-border-radius-0" title="Download ECD Tools logo">Download</a></p>
+ <p class="text-right"><a href="zip_files/asciidoc_logo.zip" class="btn btn-white-purple-border btn-full-width btn-border-radius-0" title="Download AsciiDoc logo">Download</a></p>
</div>
<!-- ECD Logo -->
<div class="col-sm-12">
diff --git a/artwork/images/wg_adoptium-logo.svg b/artwork/images/wg_adoptium-logo.svg
new file mode 100644
index 0000000..ee64368
--- /dev/null
+++ b/artwork/images/wg_adoptium-logo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="78.255 82.676 450.72 37.128" width="607.227" height="111.384"><defs><linearGradient x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="scale(-544.626 544.626) rotate(27.777 -3.505 -3.673)" spreadMethod="pad" id="b"><stop stop-color="#421644" offset="0"/><stop stop-color="#151530" offset="1"/></linearGradient><linearGradient x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="scale(651.833 -651.833) rotate(65.986 2.103 .056)" spreadMethod="pad" id="d"><stop stop-color="#a21058" offset="0"/><stop stop-color="#421644" offset="1"/></linearGradient><linearGradient x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="scale(649.524 -649.524) rotate(-66.448 -.235 -1.245)" spreadMethod="pad" id="f"><stop stop-color="#ee1a6d" offset="0"/><stop stop-color="#a21058" offset="1"/></linearGradient><clipPath clipPathUnits="userSpaceOnUse" id="a"><path d="M987.855 678.551l-.019-.012-107.453 233.09-81.121-175.981 235.708-106.097.01.019c-21.01 10.09-37.828 27.52-47.125 48.981z"/></clipPath><clipPath clipPathUnits="userSpaceOnUse" id="c"><path d="M1164.61 758.172l.09.039-194.618 422.019c-.547 1.32-1.184 2.59-1.789 3.88l-1.465 3.16-.047-.02c-.332.64-.703 1.25-1.054 1.89 7.382-13.69 11.582-29.34 11.582-45.98 0-14.34-3.196-27.91-8.782-40.16l.059-.02-88.203-191.351 107.441-233.09.031.012c14.905-34.391 49.125-58.473 88.995-58.473 53.57 0 96.99 43.434 96.99 97 0 14.711-3.37 28.602-9.23 41.094z"/></clipPath><clipPath clipPathUnits="userSpaceOnUse" id="e"><path d="M880.316 1240.16c-37.687 0-70.265-21.53-86.328-52.91l-.05.02-1.465-3.16c-.606-1.29-1.239-2.56-1.785-3.88L596.066 758.211l.09-.039c-5.859-12.492-9.23-26.383-9.23-41.094 0-53.566 43.418-97 96.992-97 39.875 0 74.094 24.082 88.996 58.473l.02-.012 195.652 424.441-.059.02c5.586 12.25 8.782 25.82 8.782 40.16 0 53.57-43.43 97-96.993 97z"/></clipPath></defs><path fill="#ee1a6d" d="M206.088 99.75h8.509l-4.254-8.954zm19.825 8.353c0 .882-.377 1.632-1.127 2.248a3.946 3.946 0 01-2.573.923 3.42 3.42 0 01-1.787-.482c-.539-.321-.965-.804-1.278-1.444l-1.913-4.057H203.45l-1.957 4.056c-.313.641-.744 1.125-1.297 1.445a3.395 3.204 0 01-1.808.482c-.965 0-1.837-.307-2.617-.923-.78-.616-1.17-1.366-1.17-2.249 0-.482.128-.978.384-1.486l11.231-21.763a3.823 3.823 0 011.637-1.666 4.766 4.498 0 012.402-.582 5.04 5.04 0 012.384.582 3.92 3.7 0 011.658 1.666l11.234 21.763c.253.508.381 1.004.381 1.487m34.246-4.92c1.46-1.351 2.19-3.419 2.19-6.203 0-2.784-.73-4.845-2.19-6.184-1.462-1.338-3.651-2.008-6.572-2.008h-3.83v16.423h3.83c2.92 0 5.11-.676 6.572-2.028zm-17.294 7.088c-.624-.59-.935-1.432-.935-2.53V86.258c0-1.097.31-1.94.935-2.529.624-.589 1.517-.885 2.682-.885h8.592c3.319 0 6.175.57 8.573 1.708 2.396 1.138 4.233 2.764 5.508 4.878 1.277 2.115 1.916 4.631 1.916 7.549 0 2.945-.633 5.48-1.893 7.608-1.264 2.13-3.093 3.755-5.489 4.879-2.398 1.124-5.268 1.687-8.615 1.687h-8.593c-1.164 0-2.057-.294-2.681-.883m63.09-6.686c1.278-1.512 1.915-3.714 1.915-6.605 0-2.892-.645-5.086-1.935-6.586-1.292-1.498-3.057-2.249-5.296-2.249-2.27 0-4.043.744-5.318 2.23-1.278 1.485-1.916 3.687-1.916 6.605 0 2.917.638 5.126 1.916 6.624 1.275 1.5 3.048 2.249 5.317 2.249 2.27 0 4.043-.755 5.317-2.268zm-13.294 6.143c-2.255-1.191-3.992-2.877-5.21-5.06-1.222-2.18-1.83-4.743-1.83-7.688 0-2.944.608-5.508 1.83-7.69 1.218-2.18 2.955-3.86 5.21-5.039 2.255-1.178 4.915-1.767 7.978-1.767 3.062 0 5.72.589 7.975 1.767 2.256 1.18 3.984 2.858 5.19 5.039 1.208 2.182 1.808 4.745 1.808 7.69 0 2.945-.608 5.507-1.828 7.688-1.22 2.183-2.958 3.869-5.21 5.06-2.256 1.192-4.901 1.787-7.935 1.787-3.063 0-5.723-.595-7.978-1.787m57.023-15.198c.697-.562 1.043-1.43 1.043-2.61 0-2.328-1.419-3.493-4.254-3.493h-5.617v6.947h5.617c1.448 0 2.517-.282 3.211-.844zM334.07 110.41c-.695-.655-1.04-1.546-1.04-2.67V86.258c0-1.097.31-1.94.934-2.529.625-.589 1.517-.885 2.68-.885h10.892c3.318 0 5.897.798 7.742 2.39 1.843 1.593 2.766 3.809 2.766 6.645 0 2.81-.93 5.02-2.786 6.625-1.859 1.607-4.432 2.41-7.722 2.41h-6.68v6.825c0 1.125-.354 2.016-1.063 2.671-.71.656-1.675.984-2.893.984-1.19 0-2.134-.328-2.83-.984m49.119-.04c-.724-.657-1.085-1.532-1.085-2.63V88.828h-5.998c-1.25 0-2.177-.247-2.787-.743-.61-.495-.914-1.25-.914-2.268 0-1.017.305-1.768.914-2.249.61-.482 1.538-.724 2.787-.724h19.91c1.249 0 2.176.242 2.786.724.61.481.914 1.232.914 2.249 0 1.017-.304 1.773-.914 2.268-.61.496-1.538.743-2.787.743h-5.997v18.912c0 1.098-.364 1.973-1.085 2.63-.724.655-1.68.984-2.873.984-1.19 0-2.148-.329-2.871-.984m34.075.04c-.694-.655-1.042-1.546-1.042-2.67V86.258c0-1.097.348-1.974 1.042-2.63.696-.656 1.64-.984 2.83-.984 1.219 0 2.183.328 2.893.984.708.655 1.064 1.533 1.064 2.63v21.481c0 1.125-.356 2.016-1.064 2.671-.71.656-1.674.984-2.892.984-1.192 0-2.135-.328-2.831-.984m28.59-2.028c-2.255-2.088-3.383-5.14-3.383-9.155v-12.97c0-1.096.346-1.974 1.043-2.629.694-.656 1.623-.984 2.785-.984 1.163 0 2.092.328 2.788.984.695.655 1.042 1.533 1.042 2.63v13.25c0 2.035.482 3.6 1.446 4.698.962 1.097 2.354 1.646 4.17 1.646 1.812 0 3.203-.549 4.168-1.646.963-1.097 1.447-2.663 1.447-4.698v-13.25c0-1.097.346-1.975 1.042-2.63.694-.656 1.623-.984 2.786-.984 1.162 0 2.099.328 2.808.984.71.655 1.063 1.533 1.063 2.63v12.97c0 3.988-1.14 7.032-3.424 9.134-2.283 2.102-5.58 3.152-9.89 3.152-4.34 0-7.637-1.044-9.892-3.132m70.863-24.733c.68.669 1.021 1.539 1.021 2.608v21.845c0 1.018-.313 1.82-.937 2.408-.623.589-1.446.884-2.467.884-.993 0-1.808-.295-2.448-.884-.636-.589-.956-1.39-.956-2.408V96.297l-4.85 8.432c-.483.858-.992 1.466-1.53 1.828-.54.36-1.178.542-1.916.542-.737 0-1.376-.181-1.913-.542-.539-.362-1.05-.97-1.533-1.828l-4.806-8.19v11.563c0 .991-.32 1.786-.957 2.39-.639.602-1.467.903-2.489.903-.993 0-1.809-.295-2.448-.884-.636-.589-.955-1.39-.955-2.408V86.258c0-1.07.347-1.94 1.042-2.608.694-.67 1.58-1.005 2.658-1.005a3.68 3.68 0 012.085.623c.624.415 1.147 1.01 1.573 1.787l7.829 13.893 7.785-13.893c.88-1.606 2.071-2.41 3.574-2.41 1.077 0 1.956.335 2.638 1.005"/><g transform="matrix(.12913 0 0 -.12187 5.436 212.799)" clip-path="url(#a)"><path fill="url(#b)" d="M987.855 678.551l-.019-.012-107.453 233.09-81.121-175.981 235.708-106.097.01.019c-21.01 10.09-37.828 27.52-47.125 48.981"/></g><g transform="matrix(.12913 0 0 -.12187 5.436 212.799)" clip-path="url(#c)"><path fill="url(#d)" d="M1164.61 758.172l.09.039-194.618 422.019c-.547 1.32-1.184 2.59-1.789 3.88l-1.465 3.16-.047-.02c-.332.64-.703 1.25-1.054 1.89 7.382-13.69 11.582-29.34 11.582-45.98 0-14.34-3.196-27.91-8.782-40.16l.059-.02-88.203-191.351 107.441-233.09.031.012c14.905-34.391 49.125-58.473 88.995-58.473 53.57 0 96.99 43.434 96.99 97 0 14.711-3.37 28.602-9.23 41.094"/></g><g transform="matrix(.12913 0 0 -.12187 5.436 212.799)" clip-path="url(#e)"><path fill="url(#f)" d="M880.316 1240.16c-37.687 0-70.265-21.53-86.328-52.91l-.05.02-1.465-3.16c-.606-1.29-1.239-2.56-1.785-3.88L596.066 758.211l.09-.039c-5.859-12.492-9.23-26.383-9.23-41.094 0-53.566 43.418-97 96.992-97 39.875 0 74.094 24.082 88.996 58.473l.02-.012 195.652 424.441-.059.02c5.586 12.25 8.782 25.82 8.782 40.16 0 53.57-43.43 97-96.993 97"/></g></svg>
\ No newline at end of file
diff --git a/artwork/images/wg_asciidoc-logo.svg b/artwork/images/wg_asciidoc-logo.svg
index 5eac324..dee18ca 100644
--- a/artwork/images/wg_asciidoc-logo.svg
+++ b/artwork/images/wg_asciidoc-logo.svg
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<!-- Generator: Adobe Illustrator 25.3.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- viewBox="0 0 397.8 86.5" style="enable-background:new 0 0 397.8 86.5;" xml:space="preserve">
+ viewBox="0 0 404.5 86.5" style="enable-background:new 0 0 404.5 86.5;" xml:space="preserve">
<style type="text/css">
.st0{fill:#203B70;}
.st1{fill:#F15F29;}
@@ -39,4 +39,16 @@
</g>
</g>
</g>
+<g>
+ <g>
+ <path class="st0" d="M393.7,23.8c-1.1,0-2.1-0.2-2.9-0.7c-0.8-0.5-1.5-1.2-2-2.1c-0.5-0.9-0.7-1.9-0.7-3.1s0.2-2.2,0.7-3.1
+ c0.5-0.9,1.1-1.6,2-2.1c0.8-0.5,1.8-0.7,2.9-0.7c1.1,0,2,0.2,2.9,0.7c0.8,0.5,1.5,1.2,2,2.1c0.5,0.9,0.7,1.9,0.7,3.1
+ s-0.2,2.2-0.7,3.1c-0.5,0.9-1.1,1.6-2,2.1C395.8,23.6,394.8,23.8,393.7,23.8z M393.7,23c1,0,1.9-0.2,2.6-0.7
+ c0.7-0.5,1.2-1.1,1.6-1.8c0.3-0.8,0.5-1.6,0.5-2.6s-0.2-1.8-0.5-2.6c-0.3-0.8-0.9-1.4-1.6-1.8c-0.7-0.5-1.6-0.7-2.6-0.7
+ c-1,0-1.9,0.2-2.6,0.7c-0.7,0.5-1.2,1.1-1.6,1.8s-0.5,1.6-0.5,2.6s0.2,1.8,0.5,2.6c0.3,0.8,0.9,1.4,1.6,1.8
+ C391.8,22.8,392.7,23,393.7,23z M391.6,20.7v-5.8h2.1c0.6,0,1.1,0.1,1.5,0.4c0.3,0.3,0.5,0.7,0.5,1.3c0,0.4-0.1,0.7-0.3,1
+ c-0.2,0.3-0.4,0.5-0.7,0.7l1.3,2.4h-1.2l-1.1-2.1h-1v2.1H391.6z M392.7,17.6h0.9c0.3,0,0.5-0.1,0.7-0.2s0.2-0.4,0.2-0.7
+ s-0.1-0.5-0.2-0.6c-0.2-0.2-0.4-0.2-0.7-0.2h-0.9V17.6z"/>
+ </g>
+</g>
</svg>
diff --git a/artwork/zip_files/adoptium-logo.zip b/artwork/zip_files/adoptium-logo.zip
new file mode 100644
index 0000000..57cd67a
--- /dev/null
+++ b/artwork/zip_files/adoptium-logo.zip
Binary files differ
diff --git a/artwork/zip_files/asciidoc_logo.zip b/artwork/zip_files/asciidoc_logo.zip
index 63d4135..671e5a1 100644
--- a/artwork/zip_files/asciidoc_logo.zip
+++ b/artwork/zip_files/asciidoc_logo.zip
Binary files differ
diff --git a/documents/ef-be-internal-rules.pdf b/documents/ef-be-internal-rules.pdf
new file mode 100644
index 0000000..6b9c6d4
--- /dev/null
+++ b/documents/ef-be-internal-rules.pdf
Binary files differ
diff --git a/documents/index.php b/documents/index.php
index 5b2bd88..601f403 100644
--- a/documents/index.php
+++ b/documents/index.php
@@ -88,6 +88,12 @@
$documents['Additional Policies']['communication_channel_guidelines'] = $doc;
$doc = new FoundationDocument();
+$doc->setTitle('Internal Rules');
+$doc->setDescription('The purpose of these Internal Rules is to further supplement the Bylaws of the Eclipse Foundation AISBL with a view to ensure that it is equipped with the necessary tools and processes to pursue and fulfil its Purposes.');
+$doc->setLink('ef-be-internal-rules.pdf');
+$documents['Additional Policies']['ef-aisbl-internal-rules'] = $doc;
+
+$doc = new FoundationDocument();
$doc->setTitle('Affiliates Membership Guidelines');
$doc->setDescription('These guidelines provide an outline of the benefits, responsibilities and rights of affiliate companies related to the participation of affiliated members.');
$doc->setLink('eclipse_affiliates_membership_guidelines.pdf');
diff --git a/foundation/boardbios/Stephen_Walli.php b/foundation/boardbios/Stephen_Walli.php
new file mode 100644
index 0000000..a714771
--- /dev/null
+++ b/foundation/boardbios/Stephen_Walli.php
@@ -0,0 +1,10 @@
+<div class="row">
+ <div class="col-sm-4 col-xs-24"><img class="img-responsive" src="boardbios/photos/Stephen_Walli.jpg" align="left" style="padding-right: 5px;" width="120"></div>
+ <div class="col-sm-20">
+ Stephen R. Walli, Principal Program Manager, Azure Office of the CTO<br><br>
+ Stephen is a principal program manager working in the Azure team at Microsoft. Prior to that he was a
+ Distinguished Technologist at Hewlett Packard Enterprise. Stephen has been a technical executive, a founder, a
+ writer, a systems developer, a software construction geek, and a standards diplomat. He has worked in the IT
+ industry since 1980 as both customer and vendor, working with open source for 25+ years. He blogs about open
+ source and software business at "Once More unto the Breach", opensource.com, and on Medium.</div>
+</div>
\ No newline at end of file
diff --git a/foundation/boardbios/Torkild_U_Resheim.php b/foundation/boardbios/Torkild_Resheim.php
similarity index 100%
rename from foundation/boardbios/Torkild_U_Resheim.php
rename to foundation/boardbios/Torkild_Resheim.php
diff --git a/foundation/boardbios/photos/Stephen_Walli.jpg b/foundation/boardbios/photos/Stephen_Walli.jpg
new file mode 100644
index 0000000..3974680
--- /dev/null
+++ b/foundation/boardbios/photos/Stephen_Walli.jpg
Binary files differ
diff --git a/foundation/content/en_directors.php b/foundation/content/en_directors.php
index dc80af4..55d5120 100644
--- a/foundation/content/en_directors.php
+++ b/foundation/content/en_directors.php
@@ -6,39 +6,7 @@
</ul>
<h2 id="eclipse_foundation_aisbl">Eclipse Foundation AISBL Board of Directors</h2>
-<?php $directors = $Directors->getDirectors(); ?>
-
-<?php foreach($directors as $director): ?>
- <h3>
- <?php print $director['fname'] . ' ' . $director['lname']; ?>
- <small><?php print $director['param']; ?></small>
- </h3>
-
- <div class="row">
- <div class="col-sm-20"><?php print $director['content']; ?></div>
- <div class="col-sm-4"><?php print $director['img']; ?></div>
- </div>
- <hr>
-<?php endforeach; ?>
+<?php print $DirectorsList->getBoardDirectorsBE();?>
<h2 id="eclipse_foundation_inc">Eclipse Foundation, Inc. Board of Directors</h2>
-<?php
- $directors = $Directors->getDirectors();
- foreach($directors as $director) {
- if (trim($director['fname']) == 'Basem' && trim($director['lname']) == 'Vaseghi') {
- continue;
- }
- ?>
-
- <h3>
- <?php print $director['fname'] . ' ' . $director['lname']; ?>
- <small><?php print $director['param']; ?></small>
- </h3>
-
- <div class="row">
- <div class="col-sm-20"><?php print $director['content']; ?></div>
- <div class="col-sm-4"><?php print $director['img']; ?></div>
- </div>
- <hr>
- <?php } ?>
-
+<?php print $DirectorsList->getBoardDirectorsUS();?>
diff --git a/foundation/directors.php b/foundation/directors.php
index 8ebd301..5b27680 100644
--- a/foundation/directors.php
+++ b/foundation/directors.php
@@ -15,7 +15,7 @@
require_once ($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");
require_once ($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php");
-require_once ($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/classes/directors/directors.class.php");
+require_once ($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/classes/directors/directorsList.class.php");
$App = new App();
$Nav = new Nav();
@@ -23,7 +23,7 @@
include ("../_projectCommon.php");
-$Directors = new Directors($App);
+$DirectorsList = DirectorsList::getInstance();
// Begin: page-specific settings. Change these.
$pageTitle = "Eclipse Foundation Board of Directors";
@@ -38,6 +38,7 @@
ob_start();
include ("content/en_" . $App->getScriptName());
$html = ob_get_clean();
+
$Theme->setNav($Nav);
$Theme->setHtml($html);
$Theme->generatePage();
diff --git a/foundation/eclipseawards/content/en_index.php b/foundation/eclipseawards/content/en_index.php
index d750a2f..1301348 100644
--- a/foundation/eclipseawards/content/en_index.php
+++ b/foundation/eclipseawards/content/en_index.php
@@ -17,7 +17,6 @@
<h1>Eclipse Foundation Community Awards</h1>
<p>The Eclipse Foundation Community Awards recognize the best of the Eclipse community. This year, we will be giving out four awards: <a href="#top-committer">Top Committer</a>, <a href="#top-newcomer">Top Newcomer Evangelist</a>, <a href="#top-contributor">Top Contributor</a>, and <a href="#lifetime-achievement">Lifetime Achievement</a>.</p>
-<p><a href="https://www.surveymonkey.com/r/eclipse-awards-2021" class="btn btn-primary">Vote Now</a></p>
<h2>Awards</h2>
diff --git a/workinggroups/assets/images/wg_asciidoc.svg b/workinggroups/assets/images/wg_asciidoc.svg
index a9c9fea..dee18ca 100644
--- a/workinggroups/assets/images/wg_asciidoc.svg
+++ b/workinggroups/assets/images/wg_asciidoc.svg
@@ -1,39 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<!-- Generator: Adobe Illustrator 25.3.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- viewBox="0 0 228.3 56.2" style="enable-background:new 0 0 228.3 56.2;" xml:space="preserve">
+ viewBox="0 0 404.5 86.5" style="enable-background:new 0 0 404.5 86.5;" xml:space="preserve">
<style type="text/css">
.st0{fill:#203B70;}
.st1{fill:#F15F29;}
.st2{fill:#FFFFFF;}
</style>
<g>
- <polygon class="st0" points="64.1,11.9 50.9,44.5 55.4,44.5 66.2,17.5 72.4,32.8 61.7,32.8 60.1,36.8 74,36.8 77.1,44.5 81.9,44.5
- 68.3,11.9 "/>
- <path class="st0" d="M98.3,30.6h-9.1c-1.5,0-2.2-0.6-2.2-2v-1.8c0-1.5,0.7-2.2,2.4-2.2h13.3v-3.7H88.7c-3.7,0-5.7,1.9-5.7,5.5V29
- c0,3.4,1.9,5.1,5.5,5.1h9.1c1.5,0,2.1,0.6,2.1,2v2.5c0,1-0.3,2.2-2.6,2.2H83.2v3.7h14.7c3.8,0,5.8-1.9,5.8-5.5v-3.3
- C103.8,32.3,101.9,30.6,98.3,30.6z"/>
- <path class="st0" d="M106.9,28.6v8.1c0,5.1,2.5,7.7,7.5,7.7H125v-4.1h-10c-2.7,0-4-1.3-4-4.1v-7.1c0-2.8,1.3-4.1,4-4.1h10v-4.2
- h-10.6C109.4,20.9,106.9,23.5,106.9,28.6z"/>
- <rect x="128.8" y="11.6" class="st0" width="4.2" height="6"/>
- <rect x="128.8" y="21.1" class="st0" width="4.2" height="23.3"/>
- <rect x="137.3" y="21.1" class="st0" width="4.2" height="23.3"/>
- <rect x="137.3" y="11.6" class="st0" width="4.2" height="6"/>
- <path class="st0" d="M161.8,11.9h-15.9v32.5h4.3V16.2h11.3c3.3,0,4.9,1.6,4.9,4.9v14.2c0,3.4-1.5,4.9-4.9,4.9h-9.6v4.2h9.9
- c5.8,0,8.8-3,8.8-9V20.9C170.6,15,167.6,11.9,161.8,11.9z"/>
- <path class="st0" d="M189.6,20.9H182c-5,0-7.5,2.6-7.5,7.7v8.1c0,5.1,2.5,7.7,7.5,7.7h7.6c5,0,7.5-2.6,7.5-7.7v-8.1
- C197.2,23.5,194.6,20.9,189.6,20.9z M193,29.2v7.1c0,2.8-1.3,4.1-4,4.1h-6.4c-2.7,0-4-1.3-4-4.1v-7.1c0-2.8,1.3-4.1,4-4.1h6.4
- C191.8,25.1,193,26.4,193,29.2z"/>
- <path class="st0" d="M209.2,25.1h10v-4.2h-10.6c-5,0-7.5,2.6-7.5,7.7v8.1c0,5.1,2.5,7.7,7.5,7.7h10.6v-4.1h-10c-2.7,0-4-1.3-4-4.1
- v-7.1C205.2,26.4,206.4,25.1,209.2,25.1z"/>
+ <g>
+ <polygon class="st0" points="108.3,14.2 84.4,72.8 92.5,72.8 112,24.2 123.2,51.7 103.9,51.7 101.1,58.9 126.1,58.9 131.7,72.8
+ 140.2,72.8 115.9,14.2 "/>
+ <path class="st0" d="M169.8,47.7h-16.3c-2.7,0-3.9-1.1-3.9-3.5V41c0-2.7,1.3-3.9,4.3-3.9h23.9v-6.7h-25.3
+ c-6.7,0-10.2,3.4-10.2,9.8v4.6c0,6,3.4,9.2,9.8,9.2h16.3c2.7,0,3.8,1.1,3.8,3.5v4.6c0,1.8-0.5,3.9-4.6,3.9h-25v6.7h26.5
+ c6.8,0,10.5-3.4,10.5-9.9v-5.9C179.6,50.9,176.2,47.7,169.8,47.7z"/>
+ <path class="st0" d="M185.3,44.3v14.6c0,9.2,4.6,13.9,13.6,13.9h19v-7.4h-17.9c-4.9,0-7.2-2.4-7.2-7.4V45.2c0-5,2.3-7.3,7.2-7.3
+ h17.9v-7.5h-19C189.8,30.4,185.3,35.1,185.3,44.3z"/>
+ <rect x="224.6" y="13.7" class="st0" width="7.5" height="10.8"/>
+ <rect x="224.6" y="30.8" class="st0" width="7.5" height="42"/>
+ <rect x="240" y="30.8" class="st0" width="7.5" height="42"/>
+ <rect x="240" y="13.7" class="st0" width="7.5" height="10.8"/>
+ <path class="st0" d="M284.1,14.2h-28.7v58.6h7.7V21.8h20.3c6,0,8.7,2.8,8.7,8.9v25.5c0,6.1-2.8,8.9-8.7,8.9h-17.2v7.6h17.8
+ c10.5,0,15.8-5.4,15.8-16.1V30.3C299.9,19.6,294.6,14.2,284.1,14.2z"/>
+ <path class="st0" d="M334.2,30.4h-13.8c-9,0-13.6,4.7-13.6,13.9v14.6c0,9.2,4.6,13.9,13.6,13.9h13.8c9,0,13.6-4.7,13.6-13.9V44.3
+ C347.7,35.1,343.2,30.4,334.2,30.4z M340.3,45.2V58c0,5.1-2.3,7.4-7.2,7.4h-11.6c-4.9,0-7.2-2.4-7.2-7.4V45.2c0-5,2.3-7.3,7.2-7.3
+ h11.6C338,37.9,340.3,40.2,340.3,45.2z"/>
+ <path class="st0" d="M369.3,37.9h17.9v-7.5h-19c-9,0-13.6,4.7-13.6,13.9v14.6c0,9.2,4.6,13.9,13.6,13.9h19v-7.4h-17.9
+ c-4.9,0-7.2-2.4-7.2-7.4V45.2C362.1,40.2,364.4,37.9,369.3,37.9z"/>
+ </g>
+ <path class="st1" d="M68.8,31.2c5.5,5.5,5.5,14.4,0,19.9L50.9,69c-5.5,5.5-14.4,5.5-19.9,0L13,51.1c-5.5-5.5-5.5-14.4,0-19.9
+ l17.9-17.9c5.5-5.5,14.4-5.5,19.9,0L68.8,31.2z"/>
+ <g>
+ <g>
+ <rect x="22.2" y="34.2" class="st2" width="37.3" height="4.5"/>
+ </g>
+ <g>
+ <rect x="22.2" y="43.6" class="st2" width="37.3" height="4.5"/>
+ </g>
+ </g>
</g>
-<path class="st1" d="M42.2,21.4c3,3,3,8,0,11.1l-10,10c-3,3-8,3-11.1,0l-10-10c-3-3-3-8,0-11.1l10-10c3-3,8-3,11.1,0L42.2,21.4z"/>
<g>
<g>
- <rect x="16.3" y="23" class="st2" width="20.7" height="2.5"/>
- </g>
- <g>
- <rect x="16.3" y="28.3" class="st2" width="20.7" height="2.5"/>
+ <path class="st0" d="M393.7,23.8c-1.1,0-2.1-0.2-2.9-0.7c-0.8-0.5-1.5-1.2-2-2.1c-0.5-0.9-0.7-1.9-0.7-3.1s0.2-2.2,0.7-3.1
+ c0.5-0.9,1.1-1.6,2-2.1c0.8-0.5,1.8-0.7,2.9-0.7c1.1,0,2,0.2,2.9,0.7c0.8,0.5,1.5,1.2,2,2.1c0.5,0.9,0.7,1.9,0.7,3.1
+ s-0.2,2.2-0.7,3.1c-0.5,0.9-1.1,1.6-2,2.1C395.8,23.6,394.8,23.8,393.7,23.8z M393.7,23c1,0,1.9-0.2,2.6-0.7
+ c0.7-0.5,1.2-1.1,1.6-1.8c0.3-0.8,0.5-1.6,0.5-2.6s-0.2-1.8-0.5-2.6c-0.3-0.8-0.9-1.4-1.6-1.8c-0.7-0.5-1.6-0.7-2.6-0.7
+ c-1,0-1.9,0.2-2.6,0.7c-0.7,0.5-1.2,1.1-1.6,1.8s-0.5,1.6-0.5,2.6s0.2,1.8,0.5,2.6c0.3,0.8,0.9,1.4,1.6,1.8
+ C391.8,22.8,392.7,23,393.7,23z M391.6,20.7v-5.8h2.1c0.6,0,1.1,0.1,1.5,0.4c0.3,0.3,0.5,0.7,0.5,1.3c0,0.4-0.1,0.7-0.3,1
+ c-0.2,0.3-0.4,0.5-0.7,0.7l1.3,2.4h-1.2l-1.1-2.1h-1v2.1H391.6z M392.7,17.6h0.9c0.3,0,0.5-0.1,0.7-0.2s0.2-0.4,0.2-0.7
+ s-0.1-0.5-0.2-0.6c-0.2-0.2-0.4-0.2-0.7-0.2h-0.9V17.6z"/>
</g>
</g>
</svg>
diff --git a/workinggroups/assets/inc/app.php b/workinggroups/assets/inc/app.php
index 867b95e..d231496 100644
--- a/workinggroups/assets/inc/app.php
+++ b/workinggroups/assets/inc/app.php
@@ -6,9 +6,9 @@
$inactive_state = 'inactive';
$working_group[] = array(
- 'title' => 'AsciiDoc',
+ 'title' => 'AsciiDoc®',
'logo' => 'wg_asciidoc.svg',
- 'body' => '<p>The AsciiDoc Working Group drives the standardization, adoption, and evolution of AsciiDoc. This group encourages and shapes the open, collaborative development of the AsciiDoc language and its processors. </p>',
+ 'body' => '<p>The AsciiDoc® Working Group drives the standardization, adoption, and evolution of AsciiDoc. This group encourages and shapes the open, collaborative development of the AsciiDoc language and its processors. </p>',
'website' => 'https://asciidoc-wg.eclipse.org/',
'charter' => '/org/workinggroups/asciidoc-charter.php',
'faq' => '',
