Merge pull request #2 from CodeIgniter-TW/develop

Update from base

Author: tpai

README.md

@@ -41,16 +41,16 @@
 
 # General information about the project.
 project = u'CodeIgniter'
-copyright = u'2014, British Columbia Institute of Technology'
+copyright = u'2014 - 2015, British Columbia Institute of Technology'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '3.0'
+version = '3.0.1'
 # The full version, including alpha/beta/rc tags.
-release = '3.0-dev'
+release = '3.0.0-dev'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -69,11 +69,11 @@
 # The reST default role (used for this markup: `text`) to use for all documents.
 #default_role = None
 
-# If true, '()' will be appended to :func: etc. cross-reference text.
+# If true, '()' will be appended to :php:func: etc. cross-reference text.
 #add_function_parentheses = True
 
 # If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
+# unit titles (such as .. php:function::).
 #add_module_names = True
 
 # If true, sectionauthor and moduleauthor directives will be shown in the
@@ -229,7 +229,7 @@
 epub_title = u'CodeIgniter'
 epub_author = u'British Columbia Institute of Technology'
 epub_publisher = u'British Columbia Institute of Technology'
-epub_copyright = u'2014, British Columbia Institute of Technology'
+epub_copyright = u'2014 - 2015, British Columbia Institute of Technology'
 
 # The language of the text. It defaults to the language option
 # or en if the language is not set.
@@ -260,4 +260,4 @@
 #epub_tocdepth = 3
 
 # Allow duplicate toc entries.
-#epub_tocdup = True
+#epub_tocdup = True