gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_4_8'

Browse Source
This commit is contained in:
Michal Čihař 2018-06-21 13:30:11 +02:00
commit 168bfee6b5
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/faq.rst
View File

@ -178,7 +178,7 @@ big or your hosting provider is unwilling to change the settings:
then able to import the files from the temporary directory. More
information is available in the :ref:`config` of this document.
* Using a utility (such as `BigDump
<http://www.ozerov.de/bigdump/>`_) to split the files before
<https://www.ozerov.de/bigdump/>`_) to split the files before
uploading. We cannot support this or any third party applications, but
are aware of users having success with it.
* If you have shell (command line) access, use MySQL to import the files

2
doc/import_export.rst
View File

@ -347,4 +347,4 @@ YAML
----
YAML is a data serialization format which is both human readable and
computationally powerful ( <http://www.yaml.org> ).
computationally powerful ( <http://yaml.org> ).

2
doc/other.rst
View File

@ -23,7 +23,7 @@ Third party tutorials and articles which you might find interesting:
English
+++++++
- `Having fun with phpMyAdmin's MIME-transformations & PDF-features <http://garv.in/tops/texte/mimetutorial>`_
- `Having fun with phpMyAdmin's MIME-transformations & PDF-features <https://garv.in/tops/texte/mimetutorial>`_
- `Learning SQL Using phpMyAdmin (old tutorial) <http://www.php-editors.com/articles/sql_phpmyadmin.php>`_
Русский (Russian)

4
doc/setup.rst
View File

@ -38,7 +38,7 @@ some ways from the official phpMyAdmin documentation. Specifically it does:
.. seealso::
More information can be found in `README.Debian <https://salsa.debian.org/phpmyadmin-team/phpmyadmin/raw/master/debian/README.Debian>`_
More information can be found in `README.Debian <https://salsa.debian.org/phpmyadmin-team/phpmyadmin/blob/master/debian/README.Debian>`_
(it is installed as :file:`/usr/share/doc/phmyadmin/README.Debian` with the package).
OpenSUSE
@ -596,7 +596,7 @@ Setup script on openSUSE
Some openSUSE releases do not include setup script in the package. In case you
want to generate configuration on these you can either download original
package from <https://www.phpmyadmin.net/> or use setup script on our demo
server: <https://demo.phpmyadmin.net/STABLE/setup/>.
server: <https://demo.phpmyadmin.net/master/setup/>.
.. _verify:

3
doc/two_factor.rst
View File

@ -50,9 +50,8 @@ tokens.
There are several manufacturers of these tokens, for example:
* `youbico FIDO U2F Security Key <https://www.yubico.com/products/yubikey-hardware/fido-u2f-security-key/>`_
* `youbico FIDO U2F Security Key <https://www.yubico.com/solutions/fido-u2f/>`_
* `HyperFIDO <https://www.hypersecu.com/products/hyperfido>`_
* `ePass FIDO USB <https://www.ftsafe.com/onlinestore/product?id=21>`_
* `TREZOR Bitcoin wallet <https://shop.trezor.io?a=572b241135e1>`_ can `act as an U2F token <http://doc.satoshilabs.com/trezor-user/u2f.html>`_
.. _simple2fa: