Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
weblate committed Jun 2, 2017
2 parents c905572 + a9626ec commit a12a41e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions doc/setup.rst
Expand Up @@ -289,7 +289,7 @@ You can use following volumes to customize image behavior:

:file:`/www/themes/`

Directory where phpMyAdmin looks for themes. By default only ones shipped
Directory where phpMyAdmin looks for themes. By default only those shipped
with phpMyAdmin are included, but you can include additional phpMyAdmin
themes (see :ref:`themes`) by using Docker volumes.

Expand Down Expand Up @@ -326,7 +326,7 @@ Running with additional configuration:
docker run --name phpmyadmin -d --link mysql_db_server:db -p 8080:80 -v /some/local/directory/config.user.inc.php:/etc/phpmyadmin/config.user.inc.php phpmyadmin/phpmyadmin
Running with additional theme:
Running with additional themes:

.. code-block:: sh
Expand Down

0 comments on commit a12a41e

Please sign in to comment.