Miscellaneous copy/editorial changes

Makefile

@@ -21,7 +21,7 @@ build: clean install lint js css minify
 	echo "Site built out to ./public dir"
 
 help:
-	@echo 'Makefile for a ipfs.io, a hugo built static site.                                                         '
+	@echo 'Makefile for ipfs.io, a hugo built static site.                                                         '
 	@echo '                                                                                                          '
 	@echo 'Usage:                                                                                                    '
 	@echo '   make                                Build the optimised site to ./$(OUTPUTDIR)                         '

content/support/index.md

@@ -0,0 +1,51 @@
+---
+pagetype: major
+pagename: support
+section: support
+title: Support & help
+url: support
+save_as: support/index.html
+constellation: constellation-02.svg
+---
+
+# IPFS support
+
+<p class="lead"> The IPFS ecosystem is extensive and diverse — if you're looking for help or support, here's a list to help you get started.</p>
+
+* **IPFS documentation**: We have a [dedicated docs site](https://docs-beta.ipfs.io) that's the best first place to look.
+* **Technical support**: For specific questions, including technical support, please use the [official IPFS discussion forums](https://discuss.ipfs.io).
+* **General questions and discussions**: Use the [official IPFS discussion forums](https://discuss.ipfs.io) or [chat on IRC](https://docs-beta.ipfs.io/community/irc/).
+* **IPFS-related community announcements**: If you'd like to announce something to the IPFS community at large, use the [official IPFS discussion forums](https://discuss.ipfs.io); we monitor the forums for things to include in the weekly IPFS newsletter! You can also inform people via [IRC](https://docs-beta.ipfs.io/community/irc/) and the [other venues](#other-venues) listed below.
+* **Bugs and feature proposals**: IPFS-codebase-related bugs and feature proposals can be reported directly in their repositories (most are in the [IPFS](https://github.com/ipfs) and [IPFS Shipyard](https://github.com/ipfs-shipyard) GitHub orgs), for example [go-ipfs](https://github.com/ipfs/go-ipfs) or [js-ipfs](https://github.com/ipfs/js-ipfs). If you're not sure where the best place to report a bug or request a feature is, ask in the [forums](https://discuss.ipfs.io) and someone will point you in the right direction.
+* **Support for libp2p**: Questions specific to libp2p should use the [libp2p forums](https://discuss.libp2p.io) for faster results.
+* **Reporting**: To report a [security issue](https://github.com/ipfs/community/blob/master/CONTRIBUTING.md#security-issues), please email <a href="mailto:[email protected]">[email protected]</a>.
+* **Reporting abuse**: To report [abuse](https://github.com/ipfs/community/blob/master/code-of-conduct.md), please email <a href="mailto:[email protected]">[email protected]</a>.
+* **Something else not listed here?** Ask in the [official IPFS discussion forums](https://discuss.ipfs.io).
+
+
+### IPFS discussion forums
+
+We aim to direct the majority of discussions and support questions toward the [official IPFS discussion forums](https://discuss.ipfs.io). IPFS developers keep an eye on posts in the forums and are happy to jump in to help. This makes it easier to search and learn from previous discussions, and it helps us keep code repositories focused — thereby increasing the ratio of actionable, clearly defined, and scoped issues that anyone can contribute to.
+
+### GitHub repositories
+
+We keep all our codebases and supporting/additional repositories in GitHub. For this, we maintain several GitHub organizations:
+
+* [IPFS](https://github.com/ipfs) contains the core codebases and related libraries. We aim to keep this organization tidy, with all projects in it being actively maintained by the IPFS core teams.
+* [IPFS Shipyard](https://github.com/ipfs/ipfs-shipyard) contains many side projects, tooling, and endeavors that are not part of the core codebase and therefore may have different levels of maturity and activity. We encourage the community to step up and drive Shipyard projects forward!
+* [IPFS Archive](https://github.com/ipfs/ipfs-archive) contains archived repositories that are obsolete and no longer under active development (usually because they have been replaced by something else).
+
+We aim to keep the issue trackers in most repositories for specific, scoped discussions and implementation approaches. Reducing the noise in the repositories via high-quality, on-point issues helps our teams perform more efficiently and serve the developer community faster.
+
+### Matrix and IRC
+
+Our official chat rooms in [Matrix](https://riot.im/app/#/room/#ipfs:matrix.org) and [IRC](http://webchat.freenode.net/?channels=#ipfs) are bridged, so you can join
+whichever you prefer. They can be used to ask questions and discuss with the community — however, while IPFS core developers are usually in these rooms, it can be hard to keep up with the running conversation and questions can be missed or disappear due to a lack of indexing. Therefore, we prefer the [forums](https://discuss.ipfs.io) for support questions, though you can still try the chats!
+
+### Other venues
+
+Core IPFS developers do not monitor the following venues, but many of our community members do and are happy to help and discuss:
+
+* [Discord](https://discord.gg/24fmuwR) (bridged to Matrix and IRC).
+* [Stack Overflow](https://stackoverflow.com/questions/tagged/ipfs)
+* [Reddit](https://www.reddit.com/r/ipfs/)

layouts/partials/footer.html

@@ -16,7 +16,7 @@
             <li><a href="//github.com/ipfs/ipfs">GitHub</a></li>
             <li><a href="//docs.ipfs.io/">Docs</a></li>
             <li><a href="//docs.ipfs.io/community/">Community</a></li>
-            <li><a href="//discuss.ipfs.io">Forum</a></li>
+            <li><a href="/support">Support</a></li>
             <li><a href="https://awesome.ipfs.io/">Awesome IPFS</a></li>
             <li><a href="https://cluster.ipfs.io/">IPFS Cluster</a></li>
             <li><a href="/team">Team</a></li>

layouts/partials/header.html

@@ -16,7 +16,7 @@ <h1 class="pull-left">
         <li><a href="//blog.ipfs.io/"
             {{ if or (eq .page.Type "blog") (eq .page.Data.Singular "author") }}class="current-item" {{ end }}>Blog</a>
         </li>
-        <li><a href="/help">Help</a></li>
+        <li><a href="/support">Support</a></li>
       </ul>
     </nav>
     {{ if eq .hero "homepage" }}