Site: Back to original main navigation (#6544)

Merge pull request 6544

docs/404.html

@@ -27,9 +27,6 @@ sitemap: false
           <li>
             <a href="/news/">News</a>
           </li>
-          <li>
-            <a href="/community/">Community</a>
-          </li>
           <li>
             <a href="/help/">Help</a>
           </li>

docs/_includes/primary-nav-items.html

@@ -8,9 +8,6 @@
   <li class="{% if page.author %}current{% endif %}">
     <a href="/news/">News</a>
   </li>
-  <li class="{% if page.url contains '/community/' %}current{% endif %}">
-    <a href="/community/">Community</a>
-  </li>
   <li class="{% if page.url contains '/help/' %}current{% endif %}">
     <a href="/help/">Help</a>
   </li>

docs/community/index.md

@@ -1,14 +1,14 @@
 ---
 layout: page
-title: Community
+title: JekyllConf
-permalink: /community/
+redirect_from: /community/index.html
+permalink: /jekyllconf/
 ---
 
-## Jekyllconf
-
 [JekyllConf](http://jekyllconf.com) is a free, online conference for all things Jekyll hosted by [CloudCannon](http://cloudcannon.com). Each year members of the Jekyll community speak about interesting use cases, tricks they've learned, or meta Jekyll topics.
 
-### Featured
+## Featured
+
 {% assign random = site.time | date: "%s%N" | modulo: site.data.jekyllconf-talks.size %}
 {% assign featured = site.data.jekyllconf-talks[random] %}
 
@@ -19,7 +19,7 @@ permalink: /community/
 
 {% assign talks = site.data.jekyllconf-talks | group_by: 'year' %}
 {% for year in talks reversed %}
-### {{ year.name }}
+## {{ year.name }}
     {% for talk in year.items %}
  * [{{ talk.topic }}](https://youtu.be/{{ talk.youtube_id }}) - [{{ talk.speaker }}](https://twitter.com/{{ talk.twitter_handle }})
     {% endfor %}

docs/help/index.md

@@ -5,27 +5,6 @@ title: Getting Help
 
 Need help with Jekyll? Try these resources.
 
-### [Upgrading](/docs/upgrading/)
-
-Did you recently upgrade from Jekyll 1 to 2 or from Jekyll 2 to 3?
-Known breaking changes are listed in the upgrading docs.
-
-### [Documentation](/docs/home/)
-
-Our guide to Jekyll covering installation, writing, customization, deployment, and more.
-
-### [Tutorials](/tutorials/home)
-
-Similar to documentation, but more detailed scenario-based walk-throughs covering a variety of topics.
-
-### [View source](https://github.com/jekyll/jekyll/wiki/sites)
-
-Learn from the source of others' Jekyll-powered sites.
-
-### [Google](https://www.google.com/?q=jekyll)
-
-Add **jekyll** to almost any query, and you'll find just what you need.
-
 ### [Jekyll Talk](https://talk.jekyllrb.com/)
 
 Jekyll Talk is our official Discourse forum. Here, users and contributors
@@ -42,6 +21,31 @@ question!
 Get live support at **#jekyll** on **irc.freenode.net**, the official
 Jekyll IRC channel.
 
+### [Documentation](/docs/home/)
+
+Our guide to Jekyll covering installation, writing, customization, deployment, and more.
+
+### [Tutorials](/tutorials/home)
+
+Similar to documentation, but more detailed scenario-based walk-throughs covering a variety of topics.
+
+### [Upgrading](/docs/upgrading/)
+
+Did you recently upgrade from Jekyll 1 to 2 or from Jekyll 2 to 3?
+Known breaking changes are listed in the upgrading docs.
+
+### [Jekyllconf](/jekyllconf/)
+
+Watch videos from members of the Jekyll community speak about interesting use cases, tricks they've learned or meta Jekyll topics.
+
+### [View source](https://github.com/jekyll/jekyll/wiki/sites)
+
+Learn from the source of others' Jekyll-powered sites.
+
+### [Google](https://www.google.com/?q=jekyll)
+
+Add **jekyll** to almost any query, and you'll find just what you need.
+
 ### [jekyll/jekyll](https://github.com/jekyll/jekyll/issues)
 
 Search through the issues on the main Jekyll development. Think you've