Merge remote-tracking branch 'origin/master'
This commit is contained in:
Weblate
commit
476d4f8fcc
@ -56,6 +56,8 @@ matrix:
|
||||
env: CI_MODE=selenium
|
||||
- php: "7.0"
|
||||
env: CI_MODE=release
|
||||
- php: "7.0"
|
||||
env: CI_MODE=docs
|
||||
cache:
|
||||
directories:
|
||||
- $HOME/.composer/cache/
|
||||
|
||||
@ -52,21 +52,21 @@ class ConfigOption(ObjectDescription):
|
||||
# Generic index entries
|
||||
indexentry = self.indextemplate % (name,)
|
||||
self.indexnode['entries'].append((indextype, indexentry,
|
||||
targetname, targetname))
|
||||
targetname, targetname, None))
|
||||
self.indexnode['entries'].append((indextype, name,
|
||||
targetname, targetname))
|
||||
targetname, targetname, None))
|
||||
|
||||
# Server section
|
||||
if targetparts[0] == 'Servers' and len(targetparts) > 1:
|
||||
indexname = ', '.join(targetparts[1:])
|
||||
self.indexnode['entries'].append((indextype, 'server configuration; %s' % indexname,
|
||||
targetname, targetname))
|
||||
targetname, targetname, None))
|
||||
self.indexnode['entries'].append((indextype, indexname,
|
||||
targetname, targetname))
|
||||
targetname, targetname, None))
|
||||
else:
|
||||
indexname = ', '.join(targetparts)
|
||||
self.indexnode['entries'].append((indextype, indexname,
|
||||
targetname, targetname))
|
||||
targetname, targetname, None))
|
||||
|
||||
self.env.domaindata['config']['objects'][self.objtype, name] = \
|
||||
self.env.docname, targetname
|
||||
@ -84,8 +84,8 @@ class ConfigSectionXRefRole(XRefRole):
|
||||
tgtid = 'index-%s' % env.new_serialno('index')
|
||||
indexnode = addnodes.index()
|
||||
indexnode['entries'] = [
|
||||
('single', varname, tgtid, varname),
|
||||
('single', 'configuration section; %s' % varname, tgtid, varname)
|
||||
('single', varname, tgtid, varname, None),
|
||||
('single', 'configuration section; %s' % varname, tgtid, varname, None)
|
||||
]
|
||||
targetnode = nodes.target('', '', ids=[tgtid])
|
||||
document.note_explicit_target(targetnode)
|
||||
@ -118,7 +118,7 @@ class ConfigSection(ObjectDescription):
|
||||
indextype = 'single'
|
||||
indexentry = self.indextemplate % (name,)
|
||||
self.indexnode['entries'].append((indextype, indexentry,
|
||||
targetname, targetname))
|
||||
targetname, targetname, None))
|
||||
self.env.domaindata['config']['objects'][self.objtype, name] = \
|
||||
self.env.docname, targetname
|
||||
|
||||
@ -135,8 +135,8 @@ class ConfigOptionXRefRole(XRefRole):
|
||||
tgtid = 'index-%s' % env.new_serialno('index')
|
||||
indexnode = addnodes.index()
|
||||
indexnode['entries'] = [
|
||||
('single', varname, tgtid, varname),
|
||||
('single', 'configuration option; %s' % varname, tgtid, varname)
|
||||
('single', varname, tgtid, varname, None),
|
||||
('single', 'configuration option; %s' % varname, tgtid, varname, None)
|
||||
]
|
||||
targetnode = nodes.target('', '', ids=[tgtid])
|
||||
document.note_explicit_target(targetnode)
|
||||
@ -185,4 +185,3 @@ class ConfigFileDomain(Domain):
|
||||
|
||||
def setup(app):
|
||||
app.add_domain(ConfigFileDomain)
|
||||
|
||||
|
||||
@ -34,13 +34,13 @@ Pie chart
|
||||
|
||||
Query results for a simple pie chart can be generated with:
|
||||
|
||||
.. code-block:: sql
|
||||
.. code-block:: mysql
|
||||
|
||||
SELECT 'Food' AS 'expense',
|
||||
1250 AS 'amount' UNION
|
||||
SELECT 'Accommodation', 500 UNION
|
||||
SELECT 'Travel', 720 UNION
|
||||
SELECT 'Misc', 220
|
||||
SELECT 'Food' AS 'expense',
|
||||
1250 AS 'amount' UNION
|
||||
SELECT 'Accommodation', 500 UNION
|
||||
SELECT 'Travel', 720 UNION
|
||||
SELECT 'Misc', 220
|
||||
|
||||
And the result of this query is:
|
||||
|
||||
@ -67,16 +67,16 @@ Both bar charts and column chats support stacking. Upon selecting one of these t
|
||||
|
||||
Query results for a simple bar or column chart can be generated with:
|
||||
|
||||
.. code-block:: sql
|
||||
.. code-block:: mysql
|
||||
|
||||
SELECT
|
||||
'ACADEMY DINOSAUR' AS 'title',
|
||||
0.99 AS 'rental_rate',
|
||||
20.99 AS 'replacement_cost' UNION
|
||||
SELECT 'ACE GOLDFINGER', 4.99, 12.99 UNION
|
||||
SELECT 'ADAPTATION HOLES', 2.99, 18.99 UNION
|
||||
SELECT 'AFFAIR PREJUDICE', 2.99, 26.99 UNION
|
||||
SELECT 'AFRICAN EGG', 2.99, 22.99
|
||||
SELECT
|
||||
'ACADEMY DINOSAUR' AS 'title',
|
||||
0.99 AS 'rental_rate',
|
||||
20.99 AS 'replacement_cost' UNION
|
||||
SELECT 'ACE GOLDFINGER', 4.99, 12.99 UNION
|
||||
SELECT 'ADAPTATION HOLES', 2.99, 18.99 UNION
|
||||
SELECT 'AFFAIR PREJUDICE', 2.99, 26.99 UNION
|
||||
SELECT 'AFRICAN EGG', 2.99, 22.99
|
||||
|
||||
And the result of this query is:
|
||||
|
||||
@ -114,15 +114,15 @@ These charts can be used to illustrate trends in underlying data. Spline charts
|
||||
|
||||
Query results for a simple line, spline or timeline chart can be generated with:
|
||||
|
||||
.. code-block:: sql
|
||||
.. code-block:: mysql
|
||||
|
||||
SELECT
|
||||
DATE('2006-01-08') AS 'date',
|
||||
2056 AS 'revenue',
|
||||
1378 AS 'cost' UNION
|
||||
SELECT DATE('2006-01-09'), 1898, 2301 UNION
|
||||
SELECT DATE('2006-01-15'), 1560, 600 UNION
|
||||
SELECT DATE('2006-01-17'), 3457, 1565
|
||||
SELECT
|
||||
DATE('2006-01-08') AS 'date',
|
||||
2056 AS 'revenue',
|
||||
1378 AS 'cost' UNION
|
||||
SELECT DATE('2006-01-09'), 1898, 2301 UNION
|
||||
SELECT DATE('2006-01-15'), 1560, 600 UNION
|
||||
SELECT DATE('2006-01-17'), 3457, 1565
|
||||
|
||||
And the result of this query is:
|
||||
|
||||
|
||||
@ -833,7 +833,7 @@ Server connection settings
|
||||
``pma__column_info``)
|
||||
* to update your PRE-2.5.0 Column\_comments table use this: and
|
||||
remember that the Variable in :file:`config.inc.php` has been renamed from
|
||||
:config:option:`$cfg['Servers'][$i]['column\_comments']` to
|
||||
:samp:`$cfg['Servers'][$i]['column\_comments']` to
|
||||
:config:option:`$cfg['Servers'][$i]['column\_info']`
|
||||
|
||||
.. code-block:: mysql
|
||||
@ -2291,7 +2291,13 @@ Export and import settings
|
||||
* ``custom-no-form`` same as ``custom`` but does not display the option
|
||||
of using quick export
|
||||
|
||||
.. config:option:: $cfg['Export']['charset']
|
||||
|
||||
:type: string
|
||||
:default: ``''``
|
||||
|
||||
Defines charset for generated export. By default no charset conversion is
|
||||
done assuming UTF-8.
|
||||
|
||||
.. config:option:: $cfg['Import']
|
||||
|
||||
@ -2302,6 +2308,13 @@ Export and import settings
|
||||
items are similar to texts seen on import page, so you can easily
|
||||
identify what they mean.
|
||||
|
||||
.. config:option:: $cfg['Import']['charset']
|
||||
|
||||
:type: string
|
||||
:default: ``''``
|
||||
|
||||
Defines charset for import. By default no charset conversion is done
|
||||
assuming UTF-8.
|
||||
|
||||
Tabs display settings
|
||||
---------------------
|
||||
@ -3211,7 +3224,9 @@ Google Cloud SQL with SSL
|
||||
To connect to Google Could SQL, you currently need to disable certificate
|
||||
verification. This is caused by the certficate being issued for CN matching
|
||||
your instance name, but you connect to an IP address and PHP tries to match
|
||||
these two. With verfication you end up with error message like::
|
||||
these two. With verfication you end up with error message like:
|
||||
|
||||
.. code-block:: text
|
||||
|
||||
Peer certificate CN=`api-project-851612429544:pmatest' did not match expected CN=`8.8.8.8'
|
||||
|
||||
|
||||
28
doc/faq.rst
28
doc/faq.rst
@ -254,8 +254,8 @@ current setup):
|
||||
|
||||
[PHP]
|
||||
|
||||
; Directory in which the loadable extensions (modules) reside.
|
||||
extension_dir = "C:/Apache2/modules/php/ext"
|
||||
; Directory in which the loadable extensions (modules) reside.
|
||||
extension_dir = "C:/Apache2/modules/php/ext"
|
||||
|
||||
The :file:`php.ini` can be loaded from several locations (especially on
|
||||
Windows), so please check you're updating the correct one. If using Apache, you
|
||||
@ -263,14 +263,14 @@ can tell it to use specific path for this file using ``PHPIniDir`` directive:
|
||||
|
||||
.. code-block:: apache
|
||||
|
||||
LoadFile "C:/php/php5ts.dll"
|
||||
LoadModule php5_module "C:/php/php5apache2_2.dll"
|
||||
LoadFile "C:/php/php5ts.dll"
|
||||
LoadModule php5_module "C:/php/php5apache2_2.dll"
|
||||
<IfModule php5_module>
|
||||
PHPIniDir "C:/PHP"
|
||||
<Location>
|
||||
AddType text/html .php
|
||||
AddHandler application/x-httpd-php .php
|
||||
</Location>
|
||||
PHPIniDir "C:/PHP"
|
||||
<Location>
|
||||
AddType text/html .php
|
||||
AddHandler application/x-httpd-php .php
|
||||
</Location>
|
||||
</IfModule>
|
||||
|
||||
In some rare cases this problem can be also caused by other extensions loaded
|
||||
@ -373,7 +373,7 @@ This can happen due to a MySQL bug when having database / table names
|
||||
with upper case characters although ``lower_case_table_names`` is
|
||||
set to 1. To fix this, turn off this directive, convert all database
|
||||
and table names to lower case and turn it on again. Alternatively,
|
||||
there's a bug-fix available starting with MySQL 3.23.56 /
|
||||
there's a bug-fix available starting with MySQL 3.23.56 /
|
||||
4.0.11-gamma.
|
||||
|
||||
.. _faq1_29:
|
||||
@ -1351,7 +1351,9 @@ browser cache to see if the problem goes away.
|
||||
5.20 I get errors about violating Content Security Policy.
|
||||
----------------------------------------------------------
|
||||
|
||||
If you see errors like::
|
||||
If you see errors like:
|
||||
|
||||
.. code-block:: text
|
||||
|
||||
Refused to apply inline style because it violates the following Content Security Policy directive
|
||||
|
||||
@ -1376,7 +1378,9 @@ Programs known to cause these kind of errors:
|
||||
5.21 I get errors about potentially unsafe operation when browsing table or executing SQL query.
|
||||
------------------------------------------------------------------------------------------------
|
||||
|
||||
If you see errors like::
|
||||
If you see errors like:
|
||||
|
||||
.. code-block:: text
|
||||
|
||||
A potentially unsafe operation has been detected in your request to this site.
|
||||
|
||||
|
||||
@ -209,7 +209,7 @@ By default, :ref:`cookie` is used, but if :envvar:`PMA_USER` and
|
||||
|
||||
The credentials you need to login are stored in the MySQL server, in case
|
||||
of Docker image there are various ways to set it (for example
|
||||
:envvar:`MYSQL_ROOT_PASSWORD` when starting MySQL container). Please check
|
||||
:samp:`MYSQL_ROOT_PASSWORD` when starting MySQL container). Please check
|
||||
documentation for `MariaDB container <https://hub.docker.com/r/_/mariadb/>`_
|
||||
or `MySQL container <https://hub.docker.com/r/_/mysql/>`_.
|
||||
|
||||
@ -318,8 +318,8 @@ simple configuration may look like this:
|
||||
$i=0;
|
||||
$i++;
|
||||
$cfg['Servers'][$i]['auth_type'] = 'cookie';
|
||||
// if you insist on "root" having no password:
|
||||
// $cfg['Servers'][$i]['AllowNoPasswordRoot'] = true; `
|
||||
// if you insist on "root" having no password:
|
||||
// $cfg['Servers'][$i]['AllowNoPasswordRoot'] = true; `
|
||||
?>
|
||||
|
||||
Or, if you prefer to not be prompted every time you log in:
|
||||
|
||||
30
test/ci-docs
Executable file
30
test/ci-docs
Executable file
@ -0,0 +1,30 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
travis_retry() {
|
||||
local result=0
|
||||
local count=1
|
||||
while [ $count -le 3 ]; do
|
||||
[ $result -ne 0 ] && {
|
||||
echo -e "\n${ANSI_RED}The command \"$@\" failed. Retrying, $count of 3.${ANSI_RESET}\n" >&2
|
||||
}
|
||||
"$@"
|
||||
result=$?
|
||||
[ $result -eq 0 ] && break
|
||||
count=$(($count + 1))
|
||||
sleep 1
|
||||
done
|
||||
|
||||
[ $count -gt 3 ] && {
|
||||
echo -e "\n${ANSI_RED}The command \"$@\" failed 3 times.${ANSI_RESET}\n" >&2
|
||||
}
|
||||
|
||||
return $result
|
||||
}
|
||||
|
||||
# Build documentation with warnings treated as errors
|
||||
make -C doc html SPHINXOPTS='-n -W -a'
|
||||
|
||||
# Check external links
|
||||
travis_retry make -C doc linkcheck
|
||||
6
test/ci-install-docs
Executable file
6
test/ci-install-docs
Executable file
@ -0,0 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
# We use 1.5 to be able to deal with gzip only sites in linkcheck (such as tcpdf.org)
|
||||
|
||||
pip install --user 'Sphinx>=1.5a2' 'requests[security]'
|
||||
|
||||
Loading…
Reference in New Issue
Block a user
