Skip to content

Commit

Permalink
Fix double escaping
Browse files Browse the repository at this point in the history
  • Loading branch information
nijel committed Nov 9, 2012
1 parent e6d4761 commit d32b60a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
5 changes: 2 additions & 3 deletions config.rst
Original file line number Diff line number Diff line change
Expand Up @@ -244,8 +244,7 @@ or signon authentication should be used for this server.
allow you to log in in arbitrary server if :config:option:`$cfg['AllowArbitraryServer']` enabled.
* ':abbr:`HTTP (HyperText Transfer Protocol)`' authentication (was
called 'advanced' in previous versions and can be written also as
'http') (``$auth\_type = ':abbr:`HTTP (HyperText Transfer
Protocol)`'``) as introduced in 1.3.0 allows you to log in as any
'http') (``$auth_type = 'http';'``) as introduced in 1.3.0 allows you to log in as any
valid MySQL user via HTTP-Auth.
* 'signon' authentication mode (``$auth_type = 'signon'``) as
introduced in 2.10.0 allows you to log in from prepared PHP session
Expand Down Expand Up @@ -334,7 +333,7 @@ phpMyAdmin 2.5.5 the order inside the array is used for sorting the
databases in the navigation panel, so that you can individually
arrange your databases. If you want to have certain databases at the
top, but don't care about the others, you do not need to specify all
other databases. Use: ``$cfg['Servers'][$i]['only\_db'] = array('db3',
other databases. Use: ``$cfg['Servers'][$i]['only_db'] = array('db3',
'db4', '\*');`` instead to tell phpMyAdmin that it should display db3
and db4 on top, and the rest in alphabetic order.

Expand Down
2 changes: 1 addition & 1 deletion transformations.rst
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ handle.
There is a file called '*transformations.lib.php*' that provides some
basic functions which can be included by any other transform function.

The file name convention is ``[Mimetype]\_[Subtype]\_[Transformation
The file name convention is ``[Mimetype]_[Subtype]_[Transformation
Name].class.php``, while the abtract class that it extends has the
name ``[Transformation Name]TransformationsPlugin``. All of the
methods that have to be implemented by a transformations plug-in are:
Expand Down

0 comments on commit d32b60a

Please sign in to comment.