Merge remote-tracking branch 'origin/master'

2013-06-24 12:58:08 +02:00 · 2013-06-24 12:58:08 +02:00 · ea7e0ab62f
commit ea7e0ab62f
parent 8962e5a0bf a5bf25a9ca
1 changed files with 1 additions and 1 deletions
--- a/doc/config.rst
+++ b/doc/config.rst
@ -1980,7 +1980,7 @@ Web server settings
    in :file:`config.footer.inc.php` or :file:`config.header.inc.php`, which
    would be normally not allowed by Content Security Policy.

-    To allow some sites, just list them wihin the string:
+    To allow some sites, just list them within the string:

    .. code-block:: php