History

Merge pull request #1774 from freeCodeCamp/docs/gitter-discord

Oliver Eyton-Williams committed 4 years ago

Commit a326e842 parents 1095bc8 ae8a9287 files · +11 −11Browse files

Unified · Split

7 files
  1. .github/CONTRIBUTING.md +1 −1
  2. .github/ISSUE_TEMPLATE/config.yml +2 −2
  3. README.md +3 −3
  4. assets/javascripts/templates/pages/about_tmpl.coffee +2 −2
  5. assets/javascripts/templates/pages/root_tmpl.coffee.erb +1 −1
  6. docs/adding-docs.md +1 −1
  7. docs/maintainers.md +1 −1
.github/CONTRIBUTING.md+1−1
@@ -83,4 +83,4 @@ Check out [EditorConfig.org](https://editorconfig.org/) to learn how to make you · 82 unmodified lines
83 83
84## Questions?84## Questions?
85 85
86If you have any questions, please feel free to ask them on the contributor chat room on [Gitter](https://gitter.im/FreeCodeCamp/DevDocs).86If you have any questions, please feel free to ask them on the contributor chat room on [Discord](https://discord.gg/PRyKn3Vbay).
.github/ISSUE_TEMPLATE/config.yml+2−2
@@ -1,8 +1,8 @@
1blank_issues_enabled: false1blank_issues_enabled: false
2contact_links:2contact_links:
3 - name: Question3 - name: Question
4 about: "Ask questions and have discussions on Gitter"4 about: "Ask questions and have discussions on Discord"
5 url: "https://gitter.im/FreeCodeCamp/DevDocs"5 url: "https://discord.gg/PRyKn3Vbay"
6 - name: New Documentation6 - name: New Documentation
7 about: "Request a new documentation on Trello"7 about: "Request a new documentation on Trello"
8 url: "https://trello.com/b/6BmTulfx/devdocs-documentation"8 url: "https://trello.com/b/6BmTulfx/devdocs-documentation"
README.md+3−3
@@ -6,11 +6,11 @@ DevDocs was created by [Thibaut Courouble](https://thibaut.me) and is operated b · 5 unmodified lines
6 6
7## We are currently searching for maintainers7## We are currently searching for maintainers
8 8
9Please reach out to the community on [Gitter](https://gitter.im/FreeCodeCamp/DevDocs) if you would like to join the team!9Please reach out to the community on [Discord](https://discord.gg/PRyKn3Vbay) if you would like to join the team!
10 10
11Keep track of development news:11Keep track of development news:
12 12
13* Join the contributor chat room on [Gitter](https://gitter.im/FreeCodeCamp/DevDocs)13* Join the devdocs chat room on [Discord](https://discord.gg/PRyKn3Vbay)
14* Watch the repository on [GitHub](https://github.com/freeCodeCamp/devdocs/subscription)14* Watch the repository on [GitHub](https://github.com/freeCodeCamp/devdocs/subscription)
15* Follow [@DevDocs](https://twitter.com/DevDocs) on Twitter15* Follow [@DevDocs](https://twitter.com/DevDocs) on Twitter
16 16
@@ -176,4 +176,4 @@ We also wish that any documentation file generated using this software be attrib · 159 unmodified lines
176 176
177## Questions?177## Questions?
178 178
179If you have any questions, please feel free to ask them on the contributor chat room on [Gitter](https://gitter.im/FreeCodeCamp/DevDocs).179If you have any questions, please feel free to ask them on the contributor chat room on [Discord](https://discord.gg/PRyKn3Vbay).
assets/javascripts/templates/pages/about_tmpl.coffee+2−2
@@ -17,7 +17,7 @@ app.templates.aboutPage = -> """ · 16 unmodified lines
17 <ul>17 <ul>
18 <li>Follow <a href="https://twitter.com/DevDocs">@DevDocs</a> on Twitter18 <li>Follow <a href="https://twitter.com/DevDocs">@DevDocs</a> on Twitter
19 <li>Watch the repository on <a href="https://github.com/freeCodeCamp/devdocs/subscription">GitHub</a> <iframe class="_github-btn" src="https://ghbtns.com/github-btn.html?user=freeCodeCamp&repo=devdocs&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100" height="20" tabindex="-1"></iframe>19 <li>Watch the repository on <a href="https://github.com/freeCodeCamp/devdocs/subscription">GitHub</a> <iframe class="_github-btn" src="https://ghbtns.com/github-btn.html?user=freeCodeCamp&repo=devdocs&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100" height="20" tabindex="-1"></iframe>
20 <li>Join the <a href="https://gitter.im/FreeCodeCamp/DevDocs">Gitter</a> chat room20 <li>Join the <a href="https://discord.gg/PRyKn3Vbay">Discord</a> chat room
21 </ul>21 </ul>
22 22
23 <h2 class="_block-heading" id="copyright">Copyright and License</h2>23 <h2 class="_block-heading" id="copyright">Copyright and License</h2>
@@ -43,7 +43,7 @@ app.templates.aboutPage = -> """ · 19 unmodified lines
43 <dt>Where can I suggest new docs and features?43 <dt>Where can I suggest new docs and features?
44 <dd>You can suggest and vote for new docs on the <a href="https://trello.com/b/6BmTulfx/devdocs-documentation">Trello board</a>.<br>44 <dd>You can suggest and vote for new docs on the <a href="https://trello.com/b/6BmTulfx/devdocs-documentation">Trello board</a>.<br>
45 If you have a specific feature request, add it to the <a href="https://github.com/freeCodeCamp/devdocs/issues">issue tracker</a>.<br>45 If you have a specific feature request, add it to the <a href="https://github.com/freeCodeCamp/devdocs/issues">issue tracker</a>.<br>
46 Otherwise, come talk to us in the <a href="https://gitter.im/FreeCodeCamp/DevDocs">Gitter</a> chat room.46 Otherwise, come talk to us in the <a href="https://discord.gg/PRyKn3Vbay">Discord</a> chat room.
47 <dt>Where can I report bugs?47 <dt>Where can I report bugs?
48 <dd>In the <a href="https://github.com/freeCodeCamp/devdocs/issues">issue tracker</a>. Thanks!48 <dd>In the <a href="https://github.com/freeCodeCamp/devdocs/issues">issue tracker</a>. Thanks!
49 </dl>49 </dl>
assets/javascripts/templates/pages/root_tmpl.coffee.erb+1−1
@@ -14,7 +14,7 @@ app.templates.intro = """ · 13 unmodified lines
14 <li>Run <code>thor docs:download --installed</code> to update all downloaded documentations.14 <li>Run <code>thor docs:download --installed</code> to update all downloaded documentations.
15 <li>To be notified about new versions, don't forget to <a href="https://github.com/freeCodeCamp/devdocs/subscription">watch the repository</a> on GitHub.15 <li>To be notified about new versions, don't forget to <a href="https://github.com/freeCodeCamp/devdocs/subscription">watch the repository</a> on GitHub.
16 <li>The <a href="https://github.com/freeCodeCamp/devdocs/issues">issue tracker</a> is the preferred channel for bug reports and16 <li>The <a href="https://github.com/freeCodeCamp/devdocs/issues">issue tracker</a> is the preferred channel for bug reports and
17 feature requests. For everything else, use <a href="https://gitter.im/FreeCodeCamp/DevDocs">Gitter</a>.17 feature requests. For everything else, use <a href="https://discord.gg/PRyKn3Vbay">Discord</a>.
18 <li>Contributions are welcome. See the <a href="https://github.com/freeCodeCamp/devdocs/blob/main/CONTRIBUTING.md">guidelines</a>.18 <li>Contributions are welcome. See the <a href="https://github.com/freeCodeCamp/devdocs/blob/main/CONTRIBUTING.md">guidelines</a>.
19 <li>DevDocs is licensed under the terms of the Mozilla Public License v2.0. For more information,19 <li>DevDocs is licensed under the terms of the Mozilla Public License v2.0. For more information,
20 see the <a href="https://github.com/freeCodeCamp/devdocs/blob/main/COPYRIGHT">COPYRIGHT</a> and20 see the <a href="https://github.com/freeCodeCamp/devdocs/blob/main/COPYRIGHT">COPYRIGHT</a> and
docs/adding-docs.md+1−1
@@ -1,4 +1,4 @@
1Adding a documentation may look like a daunting task but once you get the hang of it, it's actually quite simple. Don't hesitate to ask for help [in Gitter](https://gitter.im/FreeCodeCamp/DevDocs) if you ever get stuck.1Adding a documentation may look like a daunting task but once you get the hang of it, it's actually quite simple. Don't hesitate to ask for help [in Discord](https://discord.gg/PRyKn3Vbay) if you ever get stuck.
2 2
3**Note:** please read the [contributing guidelines](../.github/CONTRIBUTING.md) before submitting a new documentation.3**Note:** please read the [contributing guidelines](../.github/CONTRIBUTING.md) before submitting a new documentation.
4 4
docs/maintainers.md+1−1
@@ -130,6 +130,6 @@ The following people (used to) maintain DevDocs: · 129 unmodified lines
130 130
131To reach out, please ping [@freeCodeCamp/devdocs](https://github.com/orgs/freeCodeCamp/teams/devdocs).131To reach out, please ping [@freeCodeCamp/devdocs](https://github.com/orgs/freeCodeCamp/teams/devdocs).
132 132
133Interested in helping maintain DevDocs? Come talk to us on [Gitter](https://gitter.im/FreeCodeCamp/DevDocs) :)133Interested in helping maintain DevDocs? Come talk to us on [Discord](https://discord.gg/PRyKn3Vbay) :)
134 134
135In addition, we appreciate the major contributions made by [these great people](https://github.com/freeCodeCamp/devdocs/graphs/contributors).135In addition, we appreciate the major contributions made by [these great people](https://github.com/freeCodeCamp/devdocs/graphs/contributors).