[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5-6121-g6383f23

The branch, master has been updated via 6383f23035e07f80ada7eea4082856756c2c2bd7 (commit) from 887e2be664f04827fe164d724d233598a251bcb9 (commit) - Log ----------------------------------------------------------------- commit 6383f23035e07f80ada7eea4082856756c2c2bd7 Author: Isaac Bennetch &lt;ibennetch(a)users.sourceforge.net&gt; Date: Tue Aug 3 12:39:02 2010 -0400 patch #3038293 [doc] Language and grammar fixes ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ Documentation.html | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 06a26a0..e27a334 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,6 +100,8 @@ $Id$ configuration storage. - [interface] Move drop/empty links from being tabs to Operations tab. - [interface] Fixed rendering of error/notice/info titles background. +- patch #3038293 [doc] Language and grammar fixes, + thanks to Isaac Bennetch - ibennetch 3.3.6.0 (not yet released) - bug #3033063 [core] Navi gets wrong db name diff --git a/Documentation.html b/Documentation.html index 62dd51f..43db8fa 100644 --- a/Documentation.html +++ b/Documentation.html @@ -2425,11 +2425,11 @@ setfacl -d -m "g:www-data:rwx" tmp transformations.</p> <p> Because the user cannot enter own mimetypes, it is kept sure that transformations - always work. It makes no sense to apply a transformation to a mimetype, the + always work. It makes no sense to apply a transformation to a mimetype the transform-function doesn't know to handle.</p> <p> One can, however, use empty mime-types and global transformations which should work - for many mimetypes. You can also use transforms on a different mimetype they where built + for many mimetypes. You can also use transforms on a different mimetype than what they where built for, but pay attention to option usage as well as what the transformation does to your column.</p> @@ -4337,8 +4337,8 @@ chmod o+rwx tmp In all places where phpMyAdmin accepts format strings, you can use <code>@VARIABLE@</code> expansion and <a href="http://php.net/strftime">strftime</a> format strings. The - expanded variables depend on a context (eg. if you don't have chosen - table, you can not get table name), but following variables can be used: + expanded variables depend on a context (for example, if you haven't chosen a + table, you can not get the table name), but the following variables can be used: </p> <dl> <dt><code>@HTTP_HOST@</code></dt> hooks/post-receive -- phpMyAdmin