summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Lu <david.lu@hotmail.com>2016-06-30 08:41:58 -0400
committerJoram Wilander <jwawilander@gmail.com>2016-06-30 08:41:58 -0400
commit65e18ad1f553d91c28b444afaced08f462f9d374 (patch)
treea89df721a0a9289f27879a98275a0588e64bbfff
parent744f740112e962793286fe0fd695d4682a5298d0 (diff)
downloadchat-65e18ad1f553d91c28b444afaced08f462f9d374.tar.gz
chat-65e18ad1f553d91c28b444afaced08f462f9d374.tar.bz2
chat-65e18ad1f553d91c28b444afaced08f462f9d374.zip
fixed typo (#3450)
-rw-r--r--webapp/components/admin_console/recycle_db.jsx2
-rw-r--r--webapp/i18n/en.json2
2 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/admin_console/recycle_db.jsx b/webapp/components/admin_console/recycle_db.jsx
index e421711e7..cdabf3b2d 100644
--- a/webapp/components/admin_console/recycle_db.jsx
+++ b/webapp/components/admin_console/recycle_db.jsx
@@ -67,7 +67,7 @@ export default class RecycleDbButton extends React.Component {
let helpText = (
<FormattedHTMLMessage
id='admin.recycle.recycleDescription'
- defaultMessage='Deployments using multiple databases can switch from one master database to another without restarting the Mattermost server by updating "config.json" to the new desired confugration and using the <a href="../general/configuration"><b>Configuration > Reload Configuration from Disk</b></a> feature to load the new settings while the server is running. The administrator should then use <b>Recycle Database Connections</b> feature to recycle the database connections based on the new settings.'
+ defaultMessage='Deployments using multiple databases can switch from one master database to another without restarting the Mattermost server by updating "config.json" to the new desired configuration and using the <a href="../general/configuration"><b>Configuration > Reload Configuration from Disk</b></a> feature to load the new settings while the server is running. The administrator should then use <b>Recycle Database Connections</b> feature to recycle the database connections based on the new settings.'
/>
);
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 38c657714..1fb274223 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -396,7 +396,7 @@
"admin.rate.title": "Rate Limit Settings",
"admin.recycle.button": "Recycle Database Connections",
"admin.recycle.loading": " Recycling...",
- "admin.recycle.recycleDescription": "Deployments using multiple databases can switch from one master database to another without restarting the Mattermost server by updating \"config.json\" to the new desired confugration and using the <a href=\"../general/configuration\"><b>Configuration > Reload Configuration from Disk</b></a> feature to load the new settings while the server is running. The administrator should then use <b>Recycle Database Connections</b> feature to recycle the database connections based on the new settings.",
+ "admin.recycle.recycleDescription": "Deployments using multiple databases can switch from one master database to another without restarting the Mattermost server by updating \"config.json\" to the new desired configuration and using the <a href=\"../general/configuration\"><b>Configuration > Reload Configuration from Disk</b></a> feature to load the new settings while the server is running. The administrator should then use <b>Recycle Database Connections</b> feature to recycle the database connections based on the new settings.",
"admin.recycle.reloadFail": "Recycling unsuccessful: {error}",
"admin.regenerate": "Regenerate",
"admin.reload.button": "Reload Configuration From Disk",