From d5fcc4806ce2fb40f46a594d0c6f473bbbeced32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 9 Nov 2012 10:06:06 +0100 Subject: [PATCH] Bring back note/warning markup --- config.rst | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/config.rst b/config.rst index 4819b87e5e..09df00b6de 100644 --- a/config.rst +++ b/config.rst @@ -3,22 +3,25 @@ Configuration ============= -**Warning for :abbr:`Mac (Apple Macintosh)` users:** PHP does not seem -to like :abbr:`Mac (Apple Macintosh)` end of lines character -("``\r``"). So ensure you choose the option that allows to use the -\*nix end of line character ("``\n``") in your text editor before -saving a script you have modified. +.. warning:: -**Configuration note:** Almost all configurable data is placed in -``config.inc.php``. If this file does not exist, please refer to the -section to create one. This file only needs to contain the parameters -you want to change from their corresponding default value in -``libraries/config.default.php``. + :abbr:`Mac (Apple Macintosh)` users should note that PHP does not seem to + like :abbr:`Mac (Apple Macintosh)` end of lines character ("``\r``"). So + ensure you choose the option that allows to use the \*nix end of line + character ("``\n``") in your text editor before saving a script you have + modified. -The parameters which relate to design (like colors) are placed in -``themes/themename/layout.inc.php``. You might also want to create -*config.footer.inc.php* and *config.header.inc.php* files to add your -site specific code to be included on start and end of each page. +.. note:: + + Almost all configurable data is placed in ``config.inc.php``. If this file + does not exist, please refer to the section to create one. This file only + needs to contain the parameters you want to change from their corresponding + default value in ``libraries/config.default.php``. + + The parameters which relate to design (like colors) are placed in + ``themes/themename/layout.inc.php``. You might also want to create + *config.footer.inc.php* and *config.header.inc.php* files to add your + site specific code to be included on start and end of each page. .. config:option:: $cfg['PmaAbsoluteUri']