diff options
author | Andrey Andreev <narf@bofh.bg> | 2012-01-27 20:15:17 +0100 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2012-01-27 20:15:17 +0100 |
commit | c323493380eba2f1418380f35db0c0bf52b82838 (patch) | |
tree | f6dc601d0e9af7c15b41d746cc76de0c7da3501a /user_guide_src/source/general | |
parent | f1993c825f568e0ab5d08a8810f96363f0713dad (diff) | |
parent | 0c4fb6a578d23e5a0fa5c8ce41a75d2b2b1310e7 (diff) |
Merge remote-tracking branch 'upstream/develop' into develop-db-driver
Diffstat (limited to 'user_guide_src/source/general')
-rw-r--r-- | user_guide_src/source/general/styleguide.rst | 16 | ||||
-rw-r--r-- | user_guide_src/source/general/urls.rst | 9 |
2 files changed, 22 insertions, 3 deletions
diff --git a/user_guide_src/source/general/styleguide.rst b/user_guide_src/source/general/styleguide.rst index b3dc08871..d8bdd0531 100644 --- a/user_guide_src/source/general/styleguide.rst +++ b/user_guide_src/source/general/styleguide.rst @@ -441,6 +441,13 @@ same level as the control statement that "owns" them. // ... } } + + try { + // ... + } + catch() { + // ... + } **CORRECT**:: @@ -470,6 +477,15 @@ same level as the control statement that "owns" them. // ... } } + + try + { + // ... + } + catch() + { + // ... + } Bracket and Parenthetic Spacing =============================== diff --git a/user_guide_src/source/general/urls.rst b/user_guide_src/source/general/urls.rst index 857078b1c..6b390b559 100644 --- a/user_guide_src/source/general/urls.rst +++ b/user_guide_src/source/general/urls.rst @@ -39,9 +39,10 @@ By default, the **index.php** file will be included in your URLs:: example.com/index.php/news/article/my_article -You can easily remove this file by using a .htaccess file with some -simple rules. Here is an example of such a file, using the "negative" -method in which everything is redirected except the specified items: +If your Apache server has mod_rewrite enabled, you can easily remove this +file by using a .htaccess file with some simple rules. Here is an example +of such a file, using the "negative" method in which everything is redirected +except the specified items: :: @@ -53,6 +54,8 @@ method in which everything is redirected except the specified items: In the above example, any HTTP request other than those for existing directories and existing files is treated as a request for your index.php file. +.. note:: Note: These specific rules might not work for all server configurations. + Adding a URL Suffix =================== |