summaryrefslogtreecommitdiffstats
path: root/web/react/components/admin_console/rate_settings.jsx
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-09-26 13:48:03 -0700
committerCorey Hulen <corey@hulen.com>2015-09-26 13:48:03 -0700
commit16a0b63aca894f7c2b4c443612b55386c9a2227a (patch)
tree09a439eddfaf5d2abc26072ed122440288594bb0 /web/react/components/admin_console/rate_settings.jsx
parent5d9d8a6c0085157ee41bca194719e396dffe5d58 (diff)
parent8af7386898737770b2b845c76c2810c7ea6697ae (diff)
downloadchat-16a0b63aca894f7c2b4c443612b55386c9a2227a.tar.gz
chat-16a0b63aca894f7c2b4c443612b55386c9a2227a.tar.bz2
chat-16a0b63aca894f7c2b4c443612b55386c9a2227a.zip
Merge pull request #819 from mattermost/it33-patch-1
Adjustments to help text of System Console
Diffstat (limited to 'web/react/components/admin_console/rate_settings.jsx')
-rw-r--r--web/react/components/admin_console/rate_settings.jsx12
1 files changed, 6 insertions, 6 deletions
diff --git a/web/react/components/admin_console/rate_settings.jsx b/web/react/components/admin_console/rate_settings.jsx
index c05bf4a82..0081daca3 100644
--- a/web/react/components/admin_console/rate_settings.jsx
+++ b/web/react/components/admin_console/rate_settings.jsx
@@ -140,7 +140,7 @@ export default class RateSettings extends React.Component {
/>
{'false'}
</label>
- <p className='help-text'>{'When enabled throttles rate at which APIs respond.'}</p>
+ <p className='help-text'>{'When true, APIs are throttled at rates specified below.'}</p>
</div>
</div>
@@ -184,7 +184,7 @@ export default class RateSettings extends React.Component {
onChange={this.handleChange}
disabled={!this.state.EnableRateLimiter}
/>
- <p className='help-text'>{'Maximum number of users sessions connected to the system as determined by VaryByRemoteAddr and VaryByHeader variables.'}</p>
+ <p className='help-text'>{'Maximum number of users sessions connected to the system as determined by "Vary By Remote Address" and "Vary By Header" settings below.'}</p>
</div>
</div>
@@ -193,7 +193,7 @@ export default class RateSettings extends React.Component {
className='control-label col-sm-4'
htmlFor='VaryByRemoteAddr'
>
- {'Limit By Remote Address: '}
+ {'Vary By Remote Address: '}
</label>
<div className='col-sm-8'>
<label className='radio-inline'>
@@ -219,7 +219,7 @@ export default class RateSettings extends React.Component {
/>
{'false'}
</label>
- <p className='help-text'>{'Rate limit API access by IP address.'}</p>
+ <p className='help-text'>{'When true, rate limit API access by IP address.'}</p>
</div>
</div>
@@ -228,7 +228,7 @@ export default class RateSettings extends React.Component {
className='control-label col-sm-4'
htmlFor='VaryByHeader'
>
- {'Limit By Http Header:'}
+ {'Vary By HTTP Header:'}
</label>
<div className='col-sm-8'>
<input
@@ -241,7 +241,7 @@ export default class RateSettings extends React.Component {
onChange={this.handleChange}
disabled={!this.state.EnableRateLimiter || this.state.VaryByRemoteAddr}
/>
- <p className='help-text'>{'When filled in, vary rate limiting by http header field specified (e.g. when configuring ngnix set to "X-Real-IP", when configuring AmazonELB set to "X-Forwarded-For").'}</p>
+ <p className='help-text'>{'When filled in, vary rate limiting by HTTP header field specified (e.g. when configuring Ngnix set to "X-Real-IP", when configuring AmazonELB set to "X-Forwarded-For").'}</p>
</div>
</div>