Merge pull request #3319 from dgmike/issue-3313
Verifying From header before send mail
diff --git a/application/config/config.php b/application/config/config.php
index 675cb4f..fc4547b 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -218,11 +218,11 @@
| use segment based URLs.
|
*/
-$config['allow_get_array'] = TRUE;
+$config['allow_get_array'] = TRUE;
$config['enable_query_strings'] = FALSE;
-$config['controller_trigger'] = 'c';
-$config['function_trigger'] = 'm';
-$config['directory_trigger'] = 'd'; // experimental not currently in use
+$config['controller_trigger'] = 'c';
+$config['function_trigger'] = 'm';
+$config['directory_trigger'] = 'd';
/*
|--------------------------------------------------------------------------
diff --git a/user_guide_src/source/contributing/index.rst b/user_guide_src/source/contributing/index.rst
index 7359e09..c784a59 100644
--- a/user_guide_src/source/contributing/index.rst
+++ b/user_guide_src/source/contributing/index.rst
@@ -20,6 +20,42 @@
Request, which is done by "Forking" the main repository and committing to your
own copy. This will require you to use the version control system called Git.
+*******
+Support
+*******
+
+Note that GitHub is not for general support questions!
+
+If you are having trouble using a feature of CodeIgniter, ask for help on the forum.
+
+If you are wondering if you are using
+something correctly or if you have found a bug, ask on the forum first.
+
+***************************
+Tips for a Good Issue Report
+***************************
+
+Use a descriptive subject line (eg parser library chokes on commas) rather than a vague one (eg. your code broke).
+
+Address a single issue in a report.
+
+Identify the CodeIgniter version (eg 3.0-develop) and the component if you know it (eg. parser library)
+
+Explain what you expected to happen, and what did happen.
+Include error messages and stacktrace, if any.
+
+Include short code segments if they help to explain.
+Use a pastebin or dropbox facility to include longer segments of code or screenshots - do not include them in the issue report itself.
+This means setting a reasonable expiry for those, until the issue is resolved or closed.
+
+If you know how to fix the issue, you can do so in your own fork & branch, and submit a pull request.
+The issue report information above should be part of that.
+
+If your issue report can describe the steps to reproduce the problem, that is great.
+If you can include a unit test that reproduces the problem, that is even better, as it gives whoever is fixing
+it a clearer target!
+
+
**********
Guidelines
**********
diff --git a/user_guide_src/source/documentation/index.rst b/user_guide_src/source/documentation/index.rst
index b080c0e..38124f7 100644
--- a/user_guide_src/source/documentation/index.rst
+++ b/user_guide_src/source/documentation/index.rst
@@ -42,7 +42,7 @@
.. code-block:: bash
- easy_install sphinx
+ easy_install "sphinx==1.2.3"
easy_install sphinxcontrib-phpdomain
Then follow the directions in the README file in the :samp:`cilexer` folder