Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2013-10-16 12:35:22 +02:00
commit 383c253adc

View File

@ -1229,7 +1229,7 @@ Generic settings
.. note::
In some setups (like separate SSL proxy or loadballancer) you might
In some setups (like separate SSL proxy or load balancer) you might
have to set :config:option:`$cfg['PmaAbsoluteUri']` for correct
redirection.