Fix merge conflict

docs/_config.yml

@@ -73,14 +73,12 @@ deploy:
 
 sidebar:
   top:
-    - title: Github
+    - title: GitHub
       url: https://github.com/coralproject/
     - title: Docker
       url: https://hub.docker.com/r/coralproject/
     - title: Roadmap
       url: https://www.pivotaltracker.com/n/projects/1863625
-    - title: Google Group
-      url: https://groups.google.com/forum/#!forum/coral-talk-users
   side:
     - title: Installation
       children:
@@ -154,10 +152,8 @@ sidebar:
           url: /migration/4/
         - title: Migrating to v4.1.0
           url: /migration/4.1/
-    - title: FAQ
-      children:
-        - title: FAQ
-          url: /faq/
+    - title: Contact
+      url: /contact/
 
 marked:
   gfm: true

docs/source/01-03-installation-from-source.md

@@ -6,7 +6,7 @@ permalink: /installation-from-source/
 To install Talk from Source, ensure that you have Node version 8+.
 Installing via source is the recommended method when developing as it give you
 the best tooling. We release versions using semantic versioning, and do so to
-our [Github Releases](https://github.com/coralproject/talk/releases) page.
+our [GitHub Releases](https://github.com/coralproject/talk/releases) page.
 There you can download archives of older versions or the latest release. The
 examples following will download the latest code on our master branch.
 

docs/source/contact.md

@@ -0,0 +1,17 @@
+---
+title: Contact
+permalink: /contact/
+---
+
+## How can I get help integrating Talk into my newsroom?
+
+We're here to help with newsrooms of all sizes. Email our Integration Engineer
+([jeff@mozillafoundation.org](mailto:jeff@mozillafoundation.org)) to set up a meeting.
+
+## How do I request a feature or submit a bug?
+
+The best way is to [submit a GitHub issue](https://github.com/coralproject/talk/issues). Make sure you give plenty of details, our Core Team can usually respond within a few hours on weekdays.
+
+## How can our dev team contribute to Talk?
+
+We are lucky to work with newsroom dev teams and individual contributors who span the world, and come from newsrooms of all sizes. You can read our [Contribution Guide](https://github.com/coralproject/talk/blob/master/CONTRIBUTING.md) to get started, but feel free to reach out to us via GitHub, or get in touch directly with Jeff via jeff@mozillafoundation.org.

docs/source/integrating/translations-i18n.md

@@ -23,6 +23,6 @@ That would set the language to French.
 
 To add a new Talk translation, simply translate the `en.yml` file (https://github.com/coralproject/talk/blob/master/locales/en.yml) into a new yml file with the language code of your choice. You can find supported language codes here: http://www.localeplanet.com/icu/iso639.html
 
-If you are a developer contributing a new language, you'll need to add the required i18n support in the i18n files (or you can leave that to us if you like). If you're a non-developer, you can submit the translation via Github if you feel comfortable doing that, or feel free to email it to us via our Support: support@coralproject.net
+If you are a developer contributing a new language, you'll need to add the required i18n support in the i18n files (or you can leave that to us if you like). If you're a non-developer, you can submit the translation via GitHub if you feel comfortable doing that, or feel free to email it to us via our Support: support@coralproject.net
 
-If you want to suggest a new language or put a placeholder for a translation you’re working on, feel free to create a Github issue: https://github.com/coralproject/talk/issues/new
+If you want to suggest a new language or put a placeholder for a translation you’re working on, feel free to create a GitHub issue: https://github.com/coralproject/talk/issues/new

docs/themes/coral/layout/partial/sidebar.swig

@@ -7,16 +7,22 @@
   </a>
   <ul class="sidebar__list">
   {% for item in config.sidebar.side %}
-    <li class="sidebar__section{% for item in item.children %}{% if is_current(item.url) %} active toggled{% endif %}{% endfor %}">
-      <a href="#" class="sidebar__header">{{ item.title }}</a>
-      <ul class="sidebar__links">
-        {% for item in item.children %}
-          <li class="{% if is_current(item.url) %}active{% endif %}">
-            <a href="{% if !is_current(item.url) %}{{ url_for(item.url) }}{% else %}#{% endif %}">{{ item.title }}</a>
-          </li>
-        {% endfor %}
-      </ul>
-    </li>
+      {% if item.url %}
+        <li class="sidebar__section{% if is_current(item.url) %} active toggled{% endif %}">
+            <a href="{{ url_for(item.url) }}" class="sidebar__header sidebar__header__link">{{ item.title }}</a>
+        </li>
+      {% else %}
+        <li class="sidebar__section{% for item in item.children %}{% if is_current(item.url) %} active toggled{% endif %}{% endfor %}">
+            <a href="#" class="sidebar__header">{{ item.title }}</a>
+            <ul class="sidebar__links">
+              {% for item in item.children %}
+                <li class="{% if is_current(item.url) %}active{% endif %}">
+                  <a href="{% if !is_current(item.url) %}{{ url_for(item.url) }}{% else %}#{% endif %}">{{ item.title }}</a>
+                </li>
+              {% endfor %}
+            </ul>
+        </li>
+      {% endif %}
     {% endfor %}
   </ul>
 

docs/themes/coral/source/js/main.js

@@ -28,7 +28,7 @@ $(document).ready(function() {
   });
 
   // Setup the menu controls.
-  $('a.sidebar__header').on('click', function(e) {
+  $('a.sidebar__header:not(.sidebar__header__link)').on('click', function(e) {
     e.preventDefault();
     $('.sidebar__section.toggled').removeClass('toggled');
     $(this)