The branch, master has been updated
       via  fdcad5b0642765275958e6459609d02faa70a2f6 (commit)
      from  d29674f9b18e1e26fa3fcb5f8aa83461aaa10f5e (commit)


- Log -----------------------------------------------------------------
commit fdcad5b0642765275958e6459609d02faa70a2f6
Author: Marc Delisle <[email protected]>
Date:   Fri Jul 29 10:21:51 2011 -0400

    Remove unneeded line feeds in message

-----------------------------------------------------------------------

Summary of changes:
 server_status.php |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/server_status.php b/server_status.php
index 3ff8f09..cbcf73c 100644
--- a/server_status.php
+++ b/server_status.php
@@ -1361,9 +1361,7 @@ function printMonitor() {
     </div>
 
     <div id="monitorInstructionsDialog" title="<?php echo __('Monitor 
Instructions'); ?>" style="display:none;">
-        <?php echo __('The phpMyAdmin Monitor can assist you in optimizing the 
server configuration and track down time intensive
-        queries. For the latter you will need to set log_output to \'TABLE\' 
and have either the slow_query_log or general_log enabled. Note however, that 
the
-        general_log produces a lot of data and increases server load by up to 
15%'); ?>
+        <?php echo __('The phpMyAdmin Monitor can assist you in optimizing the 
server configuration and track down time intensive queries. For the latter you 
will need to set log_output to \'TABLE\' and have either the slow_query_log or 
general_log enabled. Note however, that the general_log produces a lot of data 
and increases server load by up to 15%'); ?>
         <p></p>
         <img class="ajaxIcon" src="<?php echo $GLOBALS['pmaThemeImage']; 
?>ajax_clock_small.gif" alt="Loading">
         <div class="ajaxContent">


hooks/post-receive
-- 
phpMyAdmin

------------------------------------------------------------------------------
Got Input?   Slashdot Needs You.
Take our quick survey online.  Come on, we don't ask for help often.
Plus, you'll get a chance to win $100 to spend on ThinkGeek.
http://p.sf.net/sfu/slashdot-survey
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to