From f1999ee5a9f3e382dd3d2bd74d6b83ccaefdf3e7 Mon Sep 17 00:00:00 2001 From: Serghei Iakovlev Date: Mon, 18 Jul 2016 21:49:11 +0300 Subject: [PATCH 1/4] Fixed Ukrainian config (#838) --- uk/conf.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/uk/conf.py b/uk/conf.py index 71674e09ce3b..d18713ec609e 100644 --- a/uk/conf.py +++ b/uk/conf.py @@ -55,8 +55,8 @@ # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. -#language = None -language = 'en' +# See http://www.sphinx-doc.org/en/stable/config.html#confval-language +language = 'uk_UA' # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: @@ -117,12 +117,12 @@ # The name of an image file (within the static path) to use as favicon of the # docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 # pixels large. -html_favicon = 'en/_static/favicon.ico' +html_favicon = 'uk/_static/favicon.ico' # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['../en/_static'] +html_static_path = ['../uk/_static'] # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. From 3ecae9701301ca114270de6a8e538999047118ea Mon Sep 17 00:00:00 2001 From: Raghav Garg Date: Tue, 19 Jul 2016 09:25:53 +0530 Subject: [PATCH 2/4] corrected the fetch_mode change affecting function (#834) As written in the "setFetchMode" only "fetch()" gets affected. so the remaining two "fetchArray()" and "fetchAll()" should no tbe affected. --- en/api/Phalcon_Db_Result_Pdo.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/en/api/Phalcon_Db_Result_Pdo.rst b/en/api/Phalcon_Db_Result_Pdo.rst index 7d57e1f075f7..7e6def38a9fc 100644 --- a/en/api/Phalcon_Db_Result_Pdo.rst +++ b/en/api/Phalcon_Db_Result_Pdo.rst @@ -56,7 +56,7 @@ Fetches an array/object of strings that corresponds to the fetched row, or FALSE public **fetchArray** () -Returns an array of strings that corresponds to the fetched row, or FALSE if there are no more rows. This method is affected by the active fetch flag set using Phalcon\\Db\\Result\\Pdo::setFetchMode +Returns an array of strings that corresponds to the fetched row, or FALSE if there are no more rows. This method is not affected by the active fetch flag set using Phalcon\\Db\\Result\\Pdo::setFetchMode .. code-block:: php @@ -73,7 +73,7 @@ Returns an array of strings that corresponds to the fetched row, or FALSE if the public **fetchAll** ([*unknown* $fetchStyle], [*unknown* $fetchArgument], [*unknown* $ctorArgs]) -Returns an array of arrays containing all the records in the result This method is affected by the active fetch flag set using Phalcon\\Db\\Result\\Pdo::setFetchMode +Returns an array of arrays containing all the records in the result This method is not affected by the active fetch flag set using Phalcon\\Db\\Result\\Pdo::setFetchMode .. code-block:: php From 6b460a45d98c2fdd11279c11b1cc612a58e55b8f Mon Sep 17 00:00:00 2001 From: Serghei Iakovlev Date: Tue, 19 Jul 2016 06:56:33 +0300 Subject: [PATCH 3/4] Fixed release version (#839) --- en/conf.py | 2 +- es/conf.py | 2 +- fr/conf.py | 2 +- ja/conf.py | 2 +- pl/conf.py | 2 +- pt/conf.py | 2 +- ru/conf.py | 2 +- uk/conf.py | 2 +- zh/conf.py | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/en/conf.py b/en/conf.py index 71674e09ce3b..19474e61d115 100755 --- a/en/conf.py +++ b/en/conf.py @@ -51,7 +51,7 @@ version = '2.0.x' # The full version, including alpha/beta/rc tags. -release = '2.0.10' +release = '2.0.13' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/es/conf.py b/es/conf.py index af2f66bb498d..5e03cf0d92d3 100644 --- a/es/conf.py +++ b/es/conf.py @@ -51,7 +51,7 @@ version = '2.0.x' # The full version, including alpha/beta/rc tags. -release = '2.0.10' +release = '2.0.13' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/fr/conf.py b/fr/conf.py index b1f06ba35dc0..f1d0977310d5 100755 --- a/fr/conf.py +++ b/fr/conf.py @@ -51,7 +51,7 @@ version = '2.0.x' # The full version, including alpha/beta/rc tags. -release = '2.0.10' +release = '2.0.13' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/ja/conf.py b/ja/conf.py index 7d16fd0d598b..850ba77c7082 100755 --- a/ja/conf.py +++ b/ja/conf.py @@ -51,7 +51,7 @@ version = '2.0.x' # The full version, including alpha/beta/rc tags. -release = '2.0.10' +release = '2.0.13' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/pl/conf.py b/pl/conf.py index 84166a20a38b..a7d49c42b855 100644 --- a/pl/conf.py +++ b/pl/conf.py @@ -51,7 +51,7 @@ version = '2.0.x' # The full version, including alpha/beta/rc tags. -release = '2.0.10' +release = '2.0.13' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/pt/conf.py b/pt/conf.py index 16bcc3fdeeeb..a27405030227 100755 --- a/pt/conf.py +++ b/pt/conf.py @@ -51,7 +51,7 @@ version = '2.0.x' # The full version, including alpha/beta/rc tags. -release = '2.0.10' +release = '2.0.13' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/ru/conf.py b/ru/conf.py index 39ef6a902b3f..fd3506446f3c 100755 --- a/ru/conf.py +++ b/ru/conf.py @@ -51,7 +51,7 @@ version = '2.0.x' # The full version, including alpha/beta/rc tags. -release = '2.0.10' +release = '2.0.13' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/uk/conf.py b/uk/conf.py index d18713ec609e..c9bfc5a92524 100644 --- a/uk/conf.py +++ b/uk/conf.py @@ -51,7 +51,7 @@ version = '2.0.x' # The full version, including alpha/beta/rc tags. -release = '2.0.10' +release = '2.0.13' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/zh/conf.py b/zh/conf.py index 5c6173b01b29..c06704f88ce9 100644 --- a/zh/conf.py +++ b/zh/conf.py @@ -51,7 +51,7 @@ version = '2.0.x' # The full version, including alpha/beta/rc tags. -release = '2.0.10' +release = '2.0.13' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. From f86ab827f16ab589a4ec0c55b2bd7696cfc878e5 Mon Sep 17 00:00:00 2001 From: Andy Gutierrez Date: Fri, 29 Jul 2016 11:59:32 -0500 Subject: [PATCH 4/4] Fixed version --- en/conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/en/conf.py b/en/conf.py index 19474e61d115..8255258963f1 100755 --- a/en/conf.py +++ b/en/conf.py @@ -48,10 +48,10 @@ # built documents. # # The short X.Y version. -version = '2.0.x' +version = '3.0.x' # The full version, including alpha/beta/rc tags. -release = '2.0.13' +release = '3.0.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.