diff options
author | Andrey Andreev <narf@bofh.bg> | 2012-02-29 22:44:17 +0100 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2012-02-29 22:44:17 +0100 |
commit | 99f31cd1a487d209fd9632b40baf12406bd897c1 (patch) | |
tree | 4d775677036840092dd29d4028a5d1b9d5a81751 /user_guide_src/source/conf.py | |
parent | 0b5a4867af78838f3c7e2726e469f904e15976f1 (diff) | |
parent | db0c06247949a4def38bcb0c0cf1239312140a81 (diff) |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-zip
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. |