interlink the contact, local group and spread the word page fix the link to the COC from the contact group
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
|
||||
<html>
|
||||
<version>2</version>
|
||||
<version>3</version>
|
||||
|
||||
<head>
|
||||
<title>Contact</title>
|
||||
@@ -96,7 +96,7 @@
|
||||
href="http://www.ietf.org/rfc/rfc1855.txt">netiquette guidelines</a>
|
||||
in mind. In particular be aware that discussions inside the FSFE's
|
||||
technical infrastructure are covered by our <a
|
||||
href="/about/codeofconduct">Code of Conduct</a> that kindly asks all
|
||||
href="/about/codeofconduct.html">Code of Conduct</a> that kindly asks all
|
||||
participants to be excellent to each other.
|
||||
</p>
|
||||
|
||||
@@ -142,8 +142,14 @@
|
||||
</p>
|
||||
|
||||
<p>
|
||||
We encourage you to use the tags #FreeSoftware,
|
||||
#IloveFS, #FSFE, etc. in your messages.
|
||||
We encourage you to use the tags <code>#FreeSoftware</code>,
|
||||
<code>#IloveFS</code>, <code>#FSFE</code>, etc. in your messages.
|
||||
</p>
|
||||
|
||||
<h3 id="LocalGroups">Local Groups</h3>
|
||||
<p>
|
||||
We have a network of Free Software volunteers meeting in local groups throughout Europe.
|
||||
Find more information about how to reach and join them at the <a href="/about/groups.html">local groups overview</a> page.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
@@ -167,8 +173,8 @@
|
||||
|
||||
<p>We have an XMPP-Chat-Room where we can meet:</p>
|
||||
<ul>
|
||||
<li>Server: conference.jabber.fsfe.org</li>
|
||||
<li>Channel: community</li>
|
||||
<li>Server: <code>conference.jabber.fsfe.org</code></li>
|
||||
<li>Channel: <code>community</code></li>
|
||||
</ul>
|
||||
<p>
|
||||
Other channels can be found with the room search of your XMPP client. If
|
||||
@@ -180,8 +186,8 @@
|
||||
|
||||
<p>You can also join other Free Software supporters on IRC:</p>
|
||||
<ul>
|
||||
<li>Server: <em>irc.libera.chat</em></li>
|
||||
<li>Channel: <em>#fsfe</em></li>
|
||||
<li>Server: <code>irc.libera.chat</code></li>
|
||||
<li>Channel: <code>#fsfe</code></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<html>
|
||||
<version>1</version>
|
||||
<version>2</version>
|
||||
<head>
|
||||
<title>FSFE groups</title>
|
||||
</head>
|
||||
|
||||
<body class="overview">
|
||||
<body class="overview article">
|
||||
|
||||
<h1 id="community">Community</h1>
|
||||
|
||||
<div class="toc float-right">
|
||||
<div class="toc float-right visible-xs visible-sm">
|
||||
<p class="head"><a href="#community-groups">Community Groups</a></p>
|
||||
|
||||
<p>Local Groups</p>
|
||||
@@ -240,6 +240,33 @@ Whether you are a long-time Free Software enthusiast or a newcomer, our groups a
|
||||
</p>
|
||||
|
||||
</body>
|
||||
<sidebar promo="our-work">
|
||||
<div class="hidden-xs hidden-sm">
|
||||
<h3>Local Groups</h3>
|
||||
<ul style="white-space: nowrap;">
|
||||
<li><a href="#austria">🇦🇹 Austria</a></li>
|
||||
<li><a href="#denmark">🇩🇰 Denmark</a></li>
|
||||
<li><a href="#france">🇫🇷 France</a></li>
|
||||
<li><a href="#germany">🇩🇪 Germany</a></li>
|
||||
<li><a href="#greece">🇬🇷 Greece</a></li>
|
||||
<li><a href="#italy">🇮🇹 Italy</a></li>
|
||||
<li><a href="#netherlands">🇳🇱 Netherlands</a></li>
|
||||
<li><a href="#spain">🇪🇸 Spain</a></li>
|
||||
<li><a href="#switzerland">🇨🇭 Switzerland</a></li>
|
||||
<li><a href="#UK">🇬🇧 UK</a></li>
|
||||
</ul>
|
||||
<h3>Thematic Groups</h3>
|
||||
<ul style="white-space: nowrap;">
|
||||
<li><a href="#women">Women</a></li>
|
||||
<li><a href="#translators">Translators</a></li>
|
||||
</ul>
|
||||
<h3>Join the Community</h3>
|
||||
<ul>
|
||||
<li><a href="/about/contact.html#community">Contact our Community</a></li>
|
||||
<li><a href="/contribute/spreadtheword.html">Spread the Word</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</sidebar>
|
||||
|
||||
<description>FSFE country teams, local, and thematic groups</description>
|
||||
</html>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!-- @TRANSLATORS: PLEASE DON'T TRANSLATE THIS FILE YET. IT IS SUBJECT TO CHANGE DURING THE NEXT WEEKS -->
|
||||
<html>
|
||||
<version>3</version>
|
||||
<version>4</version>
|
||||
|
||||
<head>
|
||||
<title>Spread the word</title>
|
||||
@@ -36,6 +36,11 @@
|
||||
<li><a href="#archives">Our Archive</a></li>
|
||||
<li><a href="#upcoming">Upcoming promotion and campaigns</a></li>
|
||||
</ul>
|
||||
<p>Join the Community</p>
|
||||
<ul>
|
||||
<li><a href="/about/contact.html#community">Contact our community</a></li>
|
||||
<li><a href="/about/groups.html">Find a local group</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<h2 id="promo-material" class="noclear">FSFE Promotion Material</h2>
|
||||
@@ -66,7 +71,7 @@
|
||||
|
||||
<form class="highlight labeledform form-inline" id="orderpromo" method="post" action="/cgi-bin/promotion.php" accept-charset="utf-8">
|
||||
<add-language/>
|
||||
<h3>Order promotional material</h3>
|
||||
<h3 class="noclear">Order promotional material</h3>
|
||||
<p>Fields marked with * are mandatory.</p>
|
||||
<fieldset>
|
||||
<legend>Your address</legend>
|
||||
|
||||
Reference in New Issue
Block a user