summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source/general
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2018-06-01 16:07:32 +0200
committerGitHub <noreply@github.com>2018-06-01 16:07:32 +0200
commitb1769f962d74adff766666e2b3e055191bf94b63 (patch)
tree3af32c2d6350f870479fd8515e40b8f3a06d5b98 /user_guide_src/source/general
parent67cf9daa7857917dce389befd9605609f7e65bcf (diff)
parent52a87e506d4fc70bd5922b07a532852d28f28ab6 (diff)
[ci skip] Merge pull request #5503 from mehdibo/http-to-https
http:// to https://
Diffstat (limited to 'user_guide_src/source/general')
-rw-r--r--user_guide_src/source/general/cli.rst2
-rw-r--r--user_guide_src/source/general/common_functions.rst2
-rw-r--r--user_guide_src/source/general/compatibility_functions.rst26
-rw-r--r--user_guide_src/source/general/controllers.rst2
-rw-r--r--user_guide_src/source/general/credits.rst2
-rw-r--r--user_guide_src/source/general/requirements.rst2
-rw-r--r--user_guide_src/source/general/routing.rst2
-rw-r--r--user_guide_src/source/general/security.rst2
-rw-r--r--user_guide_src/source/general/styleguide.rst6
9 files changed, 23 insertions, 23 deletions
diff --git a/user_guide_src/source/general/cli.rst b/user_guide_src/source/general/cli.rst
index 764a6b835..e4f57aefb 100644
--- a/user_guide_src/source/general/cli.rst
+++ b/user_guide_src/source/general/cli.rst
@@ -13,7 +13,7 @@ What is the CLI?
The command-line interface is a text-based method of interacting with
computers. For more information, check the `Wikipedia
-article <http://en.wikipedia.org/wiki/Command-line_interface>`_.
+article <https://en.wikipedia.org/wiki/Command-line_interface>`_.
Why run via the command-line?
=============================
diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst
index 77b0df14e..ef9058b2c 100644
--- a/user_guide_src/source/general/common_functions.rst
+++ b/user_guide_src/source/general/common_functions.rst
@@ -110,7 +110,7 @@ loading any libraries or helpers.
set_status_header(401);
// Sets the header as: Unauthorized
- `See here <http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html>`_ for
+ `See here <https://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html>`_ for
a full list of headers.
.. php:function:: remove_invisible_characters($str[, $url_encoded = TRUE])
diff --git a/user_guide_src/source/general/compatibility_functions.rst b/user_guide_src/source/general/compatibility_functions.rst
index 522e43f60..0ae36e710 100644
--- a/user_guide_src/source/general/compatibility_functions.rst
+++ b/user_guide_src/source/general/compatibility_functions.rst
@@ -26,7 +26,7 @@ Password Hashing
****************
This set of compatibility functions offers a "backport" of PHP's
-standard `Password Hashing extension <http://php.net/password>`_
+standard `Password Hashing extension <https://secure.php.net/password>`_
that is otherwise available only since PHP 5.5.
Dependencies
@@ -50,7 +50,7 @@ Function reference
:rtype: array
For more information, please refer to the `PHP manual for
- password_get_info() <http://php.net/password_get_info>`_.
+ password_get_info() <https://secure.php.net/password_get_info>`_.
.. php:function:: password_hash($password, $algo[, $options = array()])
@@ -61,7 +61,7 @@ Function reference
:rtype: string
For more information, please refer to the `PHP manual for
- password_hash() <http://php.net/password_hash>`_.
+ password_hash() <https://secure.php.net/password_hash>`_.
.. note:: Unless you provide your own (and valid) salt, this function
has a further dependency on an available CSPRNG source. Each
@@ -80,7 +80,7 @@ Function reference
:rtype: bool
For more information, please refer to the `PHP manual for
- password_needs_rehash() <http://php.net/password_needs_rehash>`_.
+ password_needs_rehash() <https://secure.php.net/password_needs_rehash>`_.
.. php:function:: password_verify($password, $hash)
@@ -90,7 +90,7 @@ Function reference
:rtype: bool
For more information, please refer to the `PHP manual for
- password_verify() <http://php.net/password_verify>`_.
+ password_verify() <https://secure.php.net/password_verify>`_.
*********************
Hash (Message Digest)
@@ -116,7 +116,7 @@ Function reference
:rtype: string
For more information, please refer to the `PHP manual for
- hash_equals() <http://php.net/hash_equals>`_.
+ hash_equals() <https://secure.php.net/hash_equals>`_.
.. php:function:: hash_pbkdf2($algo, $password, $salt, $iterations[, $length = 0[, $raw_output = FALSE]])
@@ -130,14 +130,14 @@ Function reference
:rtype: string
For more information, please refer to the `PHP manual for
- hash_pbkdf2() <http://php.net/hash_pbkdf2>`_.
+ hash_pbkdf2() <https://secure.php.net/hash_pbkdf2>`_.
****************
Multibyte String
****************
This set of compatibility functions offers limited support for PHP's
-`Multibyte String extension <http://php.net/mbstring>`_. Because of
+`Multibyte String extension <https://secure.php.net/mbstring>`_. Because of
the limited alternative solutions, only a few functions are available.
.. note:: When a character set parameter is ommited,
@@ -146,7 +146,7 @@ the limited alternative solutions, only a few functions are available.
Dependencies
============
-- `iconv <http://php.net/iconv>`_ extension
+- `iconv <https://secure.php.net/iconv>`_ extension
.. important:: This dependency is optional and these functions will
always be declared. If iconv is not available, they WILL
@@ -169,7 +169,7 @@ Function reference
:rtype: string
For more information, please refer to the `PHP manual for
- mb_strlen() <http://php.net/mb_strlen>`_.
+ mb_strlen() <https://secure.php.net/mb_strlen>`_.
.. php:function:: mb_strpos($haystack, $needle[, $offset = 0[, $encoding = NULL]])
@@ -181,7 +181,7 @@ Function reference
:rtype: mixed
For more information, please refer to the `PHP manual for
- mb_strpos() <http://php.net/mb_strpos>`_.
+ mb_strpos() <https://secure.php.net/mb_strpos>`_.
.. php:function:: mb_substr($str, $start[, $length = NULL[, $encoding = NULL]])
@@ -193,7 +193,7 @@ Function reference
:rtype: string
For more information, please refer to the `PHP manual for
- mb_substr() <http://php.net/mb_substr>`_.
+ mb_substr() <https://secure.php.net/mb_substr>`_.
******************
Standard Functions
@@ -219,4 +219,4 @@ Function reference
:rtype: array
For more information, please refer to the `PHP manual for
- array_column() <http://php.net/array_column>`_.
+ array_column() <https://secure.php.net/array_column>`_.
diff --git a/user_guide_src/source/general/controllers.rst b/user_guide_src/source/general/controllers.rst
index 14e583636..77d19c1cf 100644
--- a/user_guide_src/source/general/controllers.rst
+++ b/user_guide_src/source/general/controllers.rst
@@ -181,7 +181,7 @@ be passed as a parameter to the ``_remap()`` method::
Any extra segments after the method name are passed into ``_remap()`` as an
optional second parameter. This array can be used in combination with
-PHP's `call_user_func_array() <http://php.net/call_user_func_array>`_
+PHP's `call_user_func_array() <https://secure.php.net/call_user_func_array>`_
to emulate CodeIgniter's default behavior.
Example::
diff --git a/user_guide_src/source/general/credits.rst b/user_guide_src/source/general/credits.rst
index d0f14b3bd..66b51a7ad 100644
--- a/user_guide_src/source/general/credits.rst
+++ b/user_guide_src/source/general/credits.rst
@@ -12,7 +12,7 @@ It was, for years, developed and maintained by EllisLab, the ExpressionEngine
Development Team and a group of community members called the Reactor Team.
In 2014, CodeIgniter was acquired by the `British Columbia Institute of Technology
-<http://www.bcit.ca/>`_ and was then officially announced as a community-maintained
+<https://www.bcit.ca/>`_ and was then officially announced as a community-maintained
project.
Bleeding edge development is spearheaded by the handpicked contributors
diff --git a/user_guide_src/source/general/requirements.rst b/user_guide_src/source/general/requirements.rst
index 982a6014f..5b6a0109d 100644
--- a/user_guide_src/source/general/requirements.rst
+++ b/user_guide_src/source/general/requirements.rst
@@ -2,7 +2,7 @@
Server Requirements
###################
-`PHP <http://php.net/>`_ version 5.6 or newer is recommended.
+`PHP <https://secure.php.net/>`_ version 5.6 or newer is recommended.
It should work on 5.4.8 as well, but we strongly advise you NOT to run
such old versions of PHP, because of potential security and performance
diff --git a/user_guide_src/source/general/routing.rst b/user_guide_src/source/general/routing.rst
index 909289d8d..9c6a339cc 100644
--- a/user_guide_src/source/general/routing.rst
+++ b/user_guide_src/source/general/routing.rst
@@ -125,7 +125,7 @@ page after they log in, you may find this example useful::
passed to ``Auth::login()``.
For those of you who don't know regular expressions and want to learn
-more about them, `regular-expressions.info <http://www.regular-expressions.info/>`_
+more about them, `regular-expressions.info <https://www.regular-expressions.info/>`_
might be a good starting point.
.. note:: You can also mix and match wildcards with regular expressions.
diff --git a/user_guide_src/source/general/security.rst b/user_guide_src/source/general/security.rst
index 744a2c934..fb8cd31ff 100644
--- a/user_guide_src/source/general/security.rst
+++ b/user_guide_src/source/general/security.rst
@@ -130,7 +130,7 @@ with that. Please read below.
Also, DON'T invent your own algorithms.
Only use strong password hashing algorithms like BCrypt, which is used
- in PHP's own `Password Hashing <http://php.net/password>`_ functions.
+ in PHP's own `Password Hashing <https://secure.php.net/password>`_ functions.
Please use them, even if you're not running PHP 5.5+, CodeIgniter
provides them for you.
diff --git a/user_guide_src/source/general/styleguide.rst b/user_guide_src/source/general/styleguide.rst
index 5f25a5ae4..6c141efbc 100644
--- a/user_guide_src/source/general/styleguide.rst
+++ b/user_guide_src/source/general/styleguide.rst
@@ -160,7 +160,7 @@ programmers, but can prove invaluable when returning to your own code
months down the line. There is not a required format for comments, but
the following are recommended.
-`DocBlock <http://manual.phpdoc.org/HTMLSmartyConverter/HandS/phpDocumentor/tutorial_phpDocumentor.howto.pkg.html#basics.docblock>`_
+`DocBlock <https://manual.phpdoc.org/HTMLSmartyConverter/HandS/phpDocumentor/tutorial_phpDocumentor.howto.pkg.html#basics.docblock>`_
style comments preceding class, method, and property declarations so they can be
picked up by IDEs::
@@ -319,7 +319,7 @@ Use **===** and **!==** as necessary.
See also information regarding `typecasting
-<http://php.net/manual/en/language.types.type-juggling.php#language.types.typecasting>`_,
+<https://secure.php.net/manual/en/language.types.type-juggling.php#language.types.typecasting>`_,
which can be quite useful. Typecasting has a slightly different effect
which may be desirable. When casting a variable as a string, for
instance, NULL and boolean FALSE variables become empty strings, 0 (and
@@ -542,7 +542,7 @@ the ability to change this in the php.ini, you can often enable it with::
ini_set('display_errors', 1);
.. note:: Setting the `display_errors
- <http://php.net/manual/en/errorfunc.configuration.php#ini.display-errors>`_
+ <https://secure.php.net/manual/en/errorfunc.configuration.php#ini.display-errors>`_
setting with ``ini_set()`` at runtime is not identical to having
it enabled in the PHP environment. Namely, it will not have any
effect if the script has fatal errors.