[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12154-gd320115

[Marc Delisle]

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


- Log -----------------------------------------------------------------
commit d32011572cf1c953b0ce687f4507dbb518332021
Author: Marc Delisle <marc at infomarc.info>
Date:   Fri Jul 29 10:27:26 2011 -0400

    Remove unneeded line feeds in message

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

Summary of changes:
 server_status.php |   13 ++-----------
 1 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/server_status.php b/server_status.php
index cbcf73c..7e4babd 100644
--- a/server_status.php
+++ b/server_status.php
@@ -1368,20 +1368,11 @@ function printMonitor() {
         </div>
         <div class="monitorUse" style="display:none;">
         <p></p>
-        <?php echo __('<b>Using the monitor:</b><br/>
-        Ok, you are good to go! Once you click \'Start monitor\' your browser will refresh all displayed charts
-        in a regular interval. You may add charts and change the refresh rate under \'Settings\', or remove any chart
-        using the cog icon on each respective chart.
-        <p>When you get to see a sudden spike in activity, select the relevant time span on any chart by holding down the
-        left mouse button and panning over the chart. This will load statistics from the logs helping you find what caused the
-        activity spike.</p>');
+        <?php echo __('<b>Using the monitor:</b><br/> Ok, you are good to go! Once you click \'Start monitor\' your browser will refresh all displayed charts in a regular interval. You may add charts and change the refresh rate under \'Settings\', or remove any chart using the cog icon on each respective chart.<p>When you get to see a sudden spike in activity, select the relevant time span on any chart by holding down the left mouse button and panning over the chart. This will load statistics from the logs helping you find what caused the activity spike.</p>');
         ?>
         <p>
         <img class="icon ic_s_attention" src="themes/dot.gif" alt="">
-        <?php echo __('<b>Please note:</b>
-        Enabling the general_log may increase the server load by 5-15%. Also be aware that generating statistics from the logs is a
-        load intensive task, so it is advisable to select only a small time span and to disable the general_log and empty its table once monitoring is not required any more.
-        '); ?>
+        <?php echo __('<b>Please note:</b> Enabling the general_log may increase the server load by 5-15%. Also be aware that generating statistics from the logs is a load intensive task, so it is advisable to select only a small time span and to disable the general_log and empty its table once monitoring is not required any more.'); ?>
         </p>
         </div>
     </div>


hooks/post-receive
-- 
phpMyAdmin