From 4ac399216f0c745134830149cb17dd5423243dd1 Mon Sep 17 00:00:00 2001 From: James L Parry Date: Sun, 26 Oct 2014 22:50:42 -0700 Subject: Specify sphinx version (fixes #3275) The latest version of sphinx installed by easy_install is incompatible with our user guide. This change specifies sphinx version 1.2.3, the required one. Signed-off-by:James L Parry --- user_guide_src/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/README.rst b/user_guide_src/README.rst index 1c27fc22a..188b42e88 100644 --- a/user_guide_src/README.rst +++ b/user_guide_src/README.rst @@ -23,7 +23,7 @@ Installation ============ 1. Install `easy_install `_ -2. ``easy_install sphinx`` +2. ``easy_install "sphinx==1.2.3"`` 3. ``easy_install sphinxcontrib-phpdomain`` 4. Install the CI Lexer which allows PHP, HTML, CSS, and JavaScript syntax highlighting in code examples (see *cilexer/README*) 5. ``cd user_guide_src`` -- cgit v1.2.3-24-g4f1b From ba99660bed34f960eac9e5d79550a225e0d955e4 Mon Sep 17 00:00:00 2001 From: James L Parry Date: Sun, 26 Oct 2014 22:51:52 -0700 Subject: Revert "Specify sphinx version (fixes #3275)" This reverts commit 4ac399216f0c745134830149cb17dd5423243dd1. --- user_guide_src/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/README.rst b/user_guide_src/README.rst index 188b42e88..1c27fc22a 100644 --- a/user_guide_src/README.rst +++ b/user_guide_src/README.rst @@ -23,7 +23,7 @@ Installation ============ 1. Install `easy_install `_ -2. ``easy_install "sphinx==1.2.3"`` +2. ``easy_install sphinx`` 3. ``easy_install sphinxcontrib-phpdomain`` 4. Install the CI Lexer which allows PHP, HTML, CSS, and JavaScript syntax highlighting in code examples (see *cilexer/README*) 5. ``cd user_guide_src`` -- cgit v1.2.3-24-g4f1b From 927b2d635aa469a4a89ba1e7828b918ee951b711 Mon Sep 17 00:00:00 2001 From: James L Parry Date: Sun, 26 Oct 2014 22:53:27 -0700 Subject: Specify sphinx version (fixes #3275) The latest version of sphinx installed by easy_install is incompatible with our user guide. This change specifies sphinx version 1.2.3, the required one. Signed-off-by:James L Parry --- user_guide_src/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/README.rst b/user_guide_src/README.rst index 1c27fc22a..188b42e88 100644 --- a/user_guide_src/README.rst +++ b/user_guide_src/README.rst @@ -23,7 +23,7 @@ Installation ============ 1. Install `easy_install `_ -2. ``easy_install sphinx`` +2. ``easy_install "sphinx==1.2.3"`` 3. ``easy_install sphinxcontrib-phpdomain`` 4. Install the CI Lexer which allows PHP, HTML, CSS, and JavaScript syntax highlighting in code examples (see *cilexer/README*) 5. ``cd user_guide_src`` -- cgit v1.2.3-24-g4f1b From 02e82b41598d28974991901280abf876b053b65f Mon Sep 17 00:00:00 2001 From: James L Parry Date: Mon, 27 Oct 2014 00:07:26 -0700 Subject: Fix copyright Update the sphinx configuration to reflect BCIT as the copyright holder. Signed-off-by:James L Parry --- user_guide_src/source/conf.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py index 3f9b2e476..118b2fb87 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'2014, EllisLab, Inc.' +copyright = u'2014, 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 @@ -181,7 +181,7 @@ html_copy_source = False # (source start file, target name, title, author, documentclass [howto/manual]). latex_documents = [ ('index', 'CodeIgniter.tex', u'CodeIgniter Documentation', - u'EllisLab, Inc.', 'manual'), + u'British Columbia Institute of Technology', 'manual'), ] # The name of an image file (relative to this directory) to place at the top of @@ -214,7 +214,7 @@ latex_documents = [ # (source start file, name, description, authors, manual section). man_pages = [ ('index', 'codeigniter', u'CodeIgniter Documentation', - [u'EllisLab, Inc.'], 1) + [u'British Columbia Institute of Technology'], 1) ] @@ -222,9 +222,9 @@ man_pages = [ # Bibliographic Dublin Core info. epub_title = u'CodeIgniter' -epub_author = u'EllisLab, Inc.' -epub_publisher = u'EllisLab, Inc.' -epub_copyright = u'2014, EllisLab, Inc.' +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' # The language of the text. It defaults to the language option # or en if the language is not set. -- cgit v1.2.3-24-g4f1b