Merge branch 'master' into rte-upgrade

bin/templates/plugin/client/components/MyPluginComponent.js

@@ -12,7 +12,7 @@ class MyPluginComponent extends React.Component {
 
           <small>
             To read more about plugins check{' '}
-            <a href="https://coralproject.github.io/talk/plugins-client.html">
+            <a href="https://docs.coralproject.net/talk/plugins-client">
               our docs and guides!
             </a>
           </small>

bin/templates/plugin/client/index.js

@@ -13,7 +13,7 @@
   };
   ```
 
-  To read more info on how to build client plugins. Please, go to: https://coralproject.github.io/talk/plugins-client.html
+  To read more info on how to build client plugins. Please, go to: https://docs.coralproject.net/talk/plugins-client
  */
 
 import MyPluginComponent from './components/MyPluginComponent';

docs/source/01-01-talk-quickstart.md

@@ -211,7 +211,7 @@ you'll find a demo that can be used to test the copy that is running now on your
 machine.
 
 In order for the demo to work, you must add
-`https://coralproject.github.io/` to your
+`https://docs.coralproject.net/` to your
 permitted domains list. You can do this by visiting
 [http://127.0.0.1:3000/admin/configure](http://127.0.0.1:3000/admin/configure)
 now and selecting *Tech Settings* from the sidebar.

errors.js

@@ -1,6 +1,6 @@
 /**
  * ExtendableError provides a base Error class to source off of that does not
- * break the inheritence chain.
+ * break the inheritance chain.
  */
 class ExtendableError {
   constructor(message = null) {
@@ -129,7 +129,7 @@ class ErrAssetCommentingClosed extends APIError {
 class ErrAuthentication extends APIError {
   constructor(message = null) {
     super(
-      'authentication error occured',
+      'authentication error occurred',
       {
         status: 401,
         translation_key: 'AUTHENTICATION',
@@ -160,7 +160,7 @@ class ErrAlreadyExists extends APIError {
 }
 
 // ErrContainsProfanity is returned in the event that the middleware detects
-// profanity/wordlisted words in the payload.
+// profanity/banned/suspect words in the payload.
 const ErrContainsProfanity = new APIError(
   'This username contains elements which are not permitted in our community. If you think this is in error, please contact us or try again.',
   {
@@ -189,7 +189,7 @@ const ErrNotAuthorized = new APIError('not authorized', {
 // ErrSettingsNotInit is returned when the settings are required but not
 // initialized.
 const ErrSettingsNotInit = new Error(
-  'Talk is currently not setup. Please proceed to our webinstaller at $ROOT_URL/admin/install or run ./bin/cli-setup. Visit https://coralproject.github.io/talk/ for more information on installation and configuration instructions'
+  'Talk is currently not setup. Please proceed to our web installer at $ROOT_URL/admin/install or run ./bin/cli-setup. Visit https://docs.coralproject.net/talk/ for more information on installation and configuration instructions'
 );
 
 // ErrSettingsInit is returned when the setup endpoint is hit and we are already
@@ -254,7 +254,7 @@ const ErrNotVerified = new APIError(
   }
 );
 
-const ErrMaxRateLimit = new APIError('Rate limit exeeded', {
+const ErrMaxRateLimit = new APIError('Rate limit exceeded', {
   translation_key: 'RATE_LIMIT_EXCEEDED',
   status: 429,
 });