diff options
| author | Joel Kallman <jkallman@eclarian.com> | 2012-03-12 23:10:44 +0100 |
|---|---|---|
| committer | Joel Kallman <jkallman@eclarian.com> | 2012-03-12 23:10:44 +0100 |
| commit | 7c4870c3741e165bc7bc06624c816e66db474ee2 (patch) | |
| tree | a96962212cb012be32ab09545dcd5c4dbdac05e2 /user_guide_src/source/conf.py | |
| parent | 10aa8e660c6f439958b79fce5d85ce7e8eecf028 (diff) | |
| parent | 6b535f51fcb94e0a645fda0d0356f4748076877e (diff) | |
Merge branch 'develop' into feature/db_toString_support
Diffstat (limited to 'user_guide_src/source/conf.py')
| -rw-r--r-- | user_guide_src/source/conf.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py index bb10d06e4..593ceaf1c 100644 --- a/user_guide_src/source/conf.py +++ b/user_guide_src/source/conf.py @@ -41,7 +41,7 @@ master_doc = 'index' # General information about the project. project = u'CodeIgniter' -copyright = u'2011, EllisLab, Inc.' +copyright = u'2012, EllisLab, Inc.' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -223,7 +223,7 @@ man_pages = [ epub_title = u'CodeIgniter' epub_author = u'EllisLab, Inc.' epub_publisher = u'EllisLab, Inc.' -epub_copyright = u'2011, EllisLab, Inc.' +epub_copyright = u'2012, EllisLab, Inc.' # The language of the text. It defaults to the language option # or en if the language is not set. |