Skip to content
Permalink
Browse files

Merge branch 'QA_4_9' into QA_5_0

Signed-off-by: William Desportes <williamdes@wdes.fr>
  • Loading branch information...
williamdes committed Sep 8, 2019
2 parents 8343320 + 7110206 commit d070127c2d08144a2279e1d021a94b7a1acb899f
Showing with 5 additions and 5 deletions.
  1. +2 −2 doc/config.rst
  2. +1 −1 doc/setup.rst
  3. +1 −1 doc/two_factor.rst
  4. +1 −1 libraries/config.default.php
@@ -1878,7 +1878,7 @@ Cookie authentication options
:default: ``''``

The public key for the reCaptcha service that can be obtained from
https://www.google.com/recaptcha/intro/.
https://www.google.com/recaptcha/intro/v3.html.

reCaptcha will be then used in :ref:`cookie`.

@@ -1888,7 +1888,7 @@ Cookie authentication options
:default: ``''``

The private key for the reCaptcha service that can be obtain from
https://www.google.com/recaptcha/intro/.
https://www.google.com/recaptcha/intro/v3.html.

reCaptcha will be then used in :ref:`cookie`.

@@ -93,7 +93,7 @@ Installing from Git

In order to install from Git, you'll need a few supporting applications:

* `Git <https://git-scm.com/downloads>`_ to download the source, or you can download the most recent source directly from `Github <https://github.com/phpmyadmin/phpmyadmin/archive/master.zip>`_
* `Git <https://git-scm.com/downloads>`_ to download the source, or you can download the most recent source directly from `Github <https://codeload.github.com/phpmyadmin/phpmyadmin/zip/master>`_
* `Composer <https://getcomposer.org/download/>`__
* `Node.js <https://nodejs.org/en/download/>`_ (version 8 or higher)
* `Yarn <https://yarnpkg.com/lang/en/docs/install>`_
@@ -38,7 +38,7 @@ standards, the most widely used include:

* `FreeOTP for iOS, Android and Pebble <https://freeotp.github.io/>`_
* `Authy for iOS, Android, Chrome, OS X <https://authy.com/>`_
* `Google Authenticator for iOS <https://itunes.apple.com/us/app/google-authenticator/id388497605>`_
* `Google Authenticator for iOS <https://apps.apple.com/us/app/google-authenticator/id388497605>`_
* `Google Authenticator for Android <https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2>`_
* `LastPass Authenticator for iOS, Android, OS X, Windows <https://lastpass.com/auth/>`_

@@ -2595,7 +2595,7 @@
/**
* Specify some parameters for iconv used in character set conversion. See iconv
* documentation for details:
* https://www.gnu.org/software/libiconv/documentation/libiconv/iconv_open.3.html
* https://www.gnu.org/savannah-checkouts/gnu/libiconv/documentation/libiconv-1.15/iconv_open.3.html
*
* @global string $cfg['IconvExtraParams']
*/

0 comments on commit d070127

Please sign in to comment.
You can’t perform that action at this time.