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

Avoid using non breakable space in code samples

Browse Source 
- It's not possible to copy and paste it then
- It's not possible to use syntax highlighting on these

Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
Michal Čihař 2016-10-18 10:03:52 +02:00
parent 21beba716a
commit fffbcd1969
4 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
doc/charts.rst
View File

@ -34,13 +34,13 @@ Pie chart
Query results for a simple pie chart can be generated with:
.. code-block:: mysql
.. code-block:: sql
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:
@ -69,14 +69,14 @@ Query results for a simple bar or column chart can be generated with:
.. code-block:: sql
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:
@ -116,13 +116,13 @@ Query results for a simple line, spline or timeline chart can be generated with:
.. code-block:: sql
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:

4
doc/config.rst
View File

@ -3224,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
View File

@ -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 erros about potentnionally 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.

4
doc/setup.rst
View File

@ -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: