diff --git a/webapp/components/admin_console/configuration_settings.jsx b/webapp/components/admin_console/configuration_settings.jsx
index 5934cf1410..0a2e32f77e 100644
--- a/webapp/components/admin_console/configuration_settings.jsx
+++ b/webapp/components/admin_console/configuration_settings.jsx
@@ -44,7 +44,6 @@ export default class ConfigurationSettings extends AdminSettings {
renderSettings() {
return (
-
+
);
}
diff --git a/webapp/components/admin_console/recycle_db.jsx b/webapp/components/admin_console/recycle_db.jsx
index c863fccd28..e421711e75 100644
--- a/webapp/components/admin_console/recycle_db.jsx
+++ b/webapp/components/admin_console/recycle_db.jsx
@@ -6,7 +6,7 @@ import React from 'react';
import Client from 'utils/web_client.jsx';
import * as Utils from 'utils/utils.jsx';
-import {FormattedMessage} from 'react-intl';
+import {FormattedMessage, FormattedHTMLMessage} from 'react-intl';
export default class RecycleDbButton extends React.Component {
constructor(props) {
@@ -64,6 +64,13 @@ export default class RecycleDbButton extends React.Component {
);
}
+ let helpText = (
+
+ );
+
let contents = null;
if (this.state.loading) {
contents = (
@@ -93,6 +100,9 @@ export default class RecycleDbButton extends React.Component {
{testMessage}
+
+ {helpText}
+
);
diff --git a/webapp/components/admin_console/reload_config.jsx b/webapp/components/admin_console/reload_config.jsx
index 19395fa536..633993296f 100644
--- a/webapp/components/admin_console/reload_config.jsx
+++ b/webapp/components/admin_console/reload_config.jsx
@@ -6,7 +6,7 @@ import React from 'react';
import Client from 'utils/web_client.jsx';
import * as Utils from 'utils/utils.jsx';
-import {FormattedMessage} from 'react-intl';
+import {FormattedMessage, FormattedHTMLMessage} from 'react-intl';
export default class ReloadConfigButton extends React.Component {
constructor(props) {
@@ -64,6 +64,13 @@ export default class ReloadConfigButton extends React.Component {
);
}
+ let helpText = (
+
+ );
+
let contents = null;
if (this.state.loading) {
contents = (
@@ -93,8 +100,11 @@ export default class ReloadConfigButton extends React.Component {
{testMessage}
+
+ {helpText}
+
);
}
-}
\ No newline at end of file
+}
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index fd35e3fac8..1595c2c821 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -387,10 +387,12 @@
"admin.recycle.button": "Recycle Database Connections",
"admin.recycle.loading": " Recycling...",
"admin.recycle.reloadFail": "Recycling unsuccessful: {error}",
+ "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 Configuration > Reload Configuration from Disk feature to load the new settings while the server is running. The administrator should then use Recycle Database Connections feature to recycle the database connections based on the new settings.",
"admin.regenerate": "Regenerate",
"admin.reload.button": "Reload Configuration From Disk",
"admin.reload.loading": " Loading...",
"admin.reload.reloadFail": "Reloading unsuccessful: {error}",
+ "admin.reload.reloadDescription": "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 Reload Configuration from Disk feature to load the new settings while the server is running. The administrator should then use the Database > Recycle Database Connections feature to recycle the database connections based on the new settings.",
"admin.reset_password.close": "Close",
"admin.reset_password.newPassword": "New Password",
"admin.reset_password.select": "Select",