Merge pull request #8793 from piwik/6773_glossary

Auto generated glossary of all Metrics & Report definitions in Piwik 

14 files changed, 541 insertions, 8 deletions

diff --git a/lang/en.json b/lang/en.json
index bb04c42636..ff5dd3738b 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -43,7 +43,6 @@
         "ColumnAvgTimeOnSiteDocumentation": "The average duration of a visit.",
         "ColumnBounceRate": "Bounce Rate",
         "ColumnBounceRateDocumentation": "The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.",
-        "ColumnBounceRateForPageDocumentation": "Percentage of visits that started and ended on this page.",
         "ColumnBounces": "Bounces",
         "ColumnBouncesDocumentation": "Number of visits that started and ended on this page. This means that the visitor left the website after viewing only this page.",
         "ColumnConversionRate": "Conversion Rate",
diff --git a/plugins/API/API.php b/plugins/API/API.php
index fb1e5ae669..809c94fa13 100644
--- a/plugins/API/API.php
+++ b/plugins/API/API.php
@@ -556,6 +556,30 @@ class API extends \Piwik\Plugin\API
     }
 
     /**
+     * A glossary of all reports and their definition
+     *
+     * @param $idSite
+     * @return array
+     */
+    public function getGlossaryReports($idSite)
+    {
+        $glossary = StaticContainer::get('Piwik\Plugins\API\Glossary');
+        return $glossary->reportsGlossary($idSite);
+    }
+
+    /**
+     * A glossary of all metrics and their definition
+     *
+     * @param $idSite
+     * @return array
+     */
+    public function getGlossaryMetrics($idSite)
+    {
+        $glossary = StaticContainer::get('Piwik\Plugins\API\Glossary');
+        return $glossary->metricsGlossary($idSite);
+    }
+
+    /**
      * @param $segmentName
      * @return bool
      */
diff --git a/plugins/API/Controller.php b/plugins/API/Controller.php
index 17dbe3fd12..3f5f96d9de 100644
--- a/plugins/API/Controller.php
+++ b/plugins/API/Controller.php
@@ -13,6 +13,7 @@ use Piwik\API\Proxy;
 use Piwik\API\Request;
 use Piwik\Common;
 use Piwik\Config;
+use Piwik\Container\StaticContainer;
 use Piwik\Piwik;
 use Piwik\Plugin\Report;
 use Piwik\Url;
@@ -137,4 +138,14 @@ class Controller extends \Piwik\Plugin\Controller
 		</table>
 		";
     }
+
+    public function glossary()
+    {
+        Piwik::checkUserHasSomeViewAccess();
+
+        return $this->renderTemplate('glossary', array(
+            'reports' => Request::processRequest('API', array('method' => 'API.getGlossaryReports')),
+            'metrics' => Request::processRequest('API', array('method' => 'API.getGlossaryMetrics')),
+        ));
+    }
 }
diff --git a/plugins/API/Glossary.php b/plugins/API/Glossary.php
new file mode 100644
index 0000000000..c6e15a25b1
--- /dev/null
+++ b/plugins/API/Glossary.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Plugins\API;
+
+class Glossary
+{
+    protected $metadata = array();
+
+    public function __construct(API $api)
+    {
+        $this->api = $api;
+    }
+
+    public function reportsGlossary($idSite)
+    {
+        $metadata = $this->api->getReportMetadata($idSite);
+
+        $reports = array();
+        foreach ($metadata as $report) {
+            if (isset($report['documentation'])) {
+                $reports[] = array(
+                    'name' => sprintf("%s (%s)", $report['name'], $report['category']),
+                    'documentation' => $report['documentation']
+                );
+            }
+        }
+
+        usort($reports, function ($a, $b) {
+            return strcmp($a['name'], $b['name']);
+        });
+
+        return $reports;
+    }
+
+    public function metricsGlossary($idSite)
+    {
+        $metadata = $this->api->getReportMetadata($idSite);
+
+        $metrics = array();
+        foreach ($metadata as $report) {
+            if (!isset($report['metricsDocumentation'])) {
+                continue;
+            }
+
+            foreach ($report['metricsDocumentation'] as $metricId => $metricDocumentation) {
+
+                $metricKey = $metricId;
+
+                if(empty($report['metrics'][$metricId])
+                    && empty($report['processedMetrics'][$metricId])) {
+                    continue;
+                }
+
+                $metricName = isset($report['metrics'][$metricId]) ? $report['metrics'][$metricId] : $report['processedMetrics'][$metricId];
+
+
+                // Already one metric with same name, but different documentation...
+                if (isset($metrics[$metricKey])
+                    && $metrics[$metricKey]['documentation'] !== $metricDocumentation) {
+
+                    // Don't show nb_hits in glossary since it duplicates others, eg. nb_downloads,
+                    if($metricKey == 'nb_hits') {
+                        continue;
+                    }
+
+                    $metricName = sprintf("%s (%s)", $metricName, $report['category']);
+                    $metricKey = $metricName;
+
+                    if (isset($metrics[$metricKey]) && $metrics[$metricKey]['documentation'] !== $metricDocumentation) {
+                        throw new \Exception(sprintf("Metric %s has two different documentations: \n(1) %s \n(2) %s",
+                                $metricKey,
+                                $metrics[$metricKey]['documentation'],
+                                $metricDocumentation)
+                        );
+                    }
+                } else {
+
+                    if (!isset($report['metrics'][$metricId])
+                        && !isset($report['processedMetrics'][$metricId])
+                    ) {
+                        // $metricId metric name not found in  $report['dimension'] report
+                        // it will be set in another one
+                        continue;
+                    }
+
+                }
+
+                $metrics[$metricKey] = array(
+                    'name' => $metricName,
+                    'id' => $metricId,
+                    'documentation' => $metricDocumentation
+                );
+            }
+        }
+
+        usort($metrics, function ($a, $b) {
+            return strcmp($a['name'], $b['name']);
+        });
+        return $metrics;
+    }
+}
\ No newline at end of file
diff --git a/plugins/API/Menu.php b/plugins/API/Menu.php
index a0f71ddf54..9d17b81545 100644
--- a/plugins/API/Menu.php
+++ b/plugins/API/Menu.php
@@ -26,10 +26,18 @@ class Menu extends \Piwik\Plugin\Menu
 
     public function configureUserMenu(MenuUser $menu)
     {
-        $apiUrlParams = $this->urlForAction('listAllAPI', array('segment' => false));
-        $tooltip      = Piwik::translate('API_TopLinkTooltip');
+        $menu->addPlatformItem('General_API',
+            $this->urlForAction('listAllAPI', array('segment' => false)),
+            6,
+            Piwik::translate('API_TopLinkTooltip')
+        );
 
-        $menu->addPlatformItem('General_API', $apiUrlParams, 6, $tooltip);
+        if(Piwik::isUserIsAnonymous()) {
+            $menu->addPlatformItem('API_Glossary',
+                $this->urlForAction('glossary', array('segment' => false)),
+                50
+            );
+        }
     }
 
     private function addTopMenuMobileApp(MenuTop $menu)
diff --git a/plugins/API/lang/en.json b/plugins/API/lang/en.json
index 47ff86f0c8..57ef19aa29 100644
--- a/plugins/API/lang/en.json
+++ b/plugins/API/lang/en.json
@@ -8,6 +8,8 @@
         "ReportingApiReference": "Reporting API Reference",
         "TopLinkTooltip": "Access your Web Analytics data programmatically through a simple API in json, xml, etc.",
         "UserAuthentication": "User authentication",
-        "UsingTokenAuth": "If you want to %s request data within a script, a crontab, etc. %s you need to add the parameter %s to the API calls URLs that require authentication."
+        "UsingTokenAuth": "If you want to %s request data within a script, a crontab, etc. %s you need to add the parameter %s to the API calls URLs that require authentication.",
+        "Glossary": "Glossary",
+        "LearnAboutCommonlyUsedTerms": "Learn about the commonly used terms to make the most of Piwik Analytics: %s and %s."
     }
 }
\ No newline at end of file
diff --git a/plugins/API/templates/glossary.twig b/plugins/API/templates/glossary.twig
new file mode 100644
index 0000000000..623c8ef126
--- /dev/null
+++ b/plugins/API/templates/glossary.twig
@@ -0,0 +1,43 @@
+{% extends isWidget ? 'empty.twig' : 'user.twig' %}
+
+{% set title %}{{ 'API_Glossary'|translate }}{% endset %}
+
+{% block content %}
+    <h2 piwik-enriched-headline>{{ title }}</h2>
+
+    {{ 'API_LearnAboutCommonlyUsedTerms'|translate(
+                '<a href="#metrics">'~ 'General_Metrics'|translate ~ '</a>',
+                '<a href="#reports">' ~ 'General_Reports'|translate ~ '</a>')|raw
+    }}
+
+    <!-- {{ metrics|length }} metrics, {{ reports|length }} reports -->
+
+    <a id="metrics"></a>
+    <h2>{{ 'General_Metrics'|translate }}</h2>
+    <table>
+    {% for metric in metrics %}
+        <tr>
+            <td>
+                <h3>{{ metric.name }}</h3>
+            </td>
+            <td>
+                {{ metric.documentation|raw }}
+
+                <br/><span style="color: #bbb;">{{ metric.id }} (API)</span>
+            </td>
+        </tr>
+    {% endfor %}
+    </table>
+
+    <a id="reports"></a>
+    <h2>{{ 'General_Reports'|translate }}</h2>
+
+
+    {% for report in reports %}
+        <h3>{{ report.name }}</h3>
+        <p>{{ report.documentation|raw }}</p>
+    {% endfor %}
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/plugins/Actions/Reports/GetEntryPageTitles.php b/plugins/Actions/Reports/GetEntryPageTitles.php
index e166c87cb8..7c029f4b02 100644
--- a/plugins/Actions/Reports/GetEntryPageTitles.php
+++ b/plugins/Actions/Reports/GetEntryPageTitles.php
@@ -54,7 +54,7 @@ class GetEntryPageTitles extends Base
     protected function getMetricsDocumentation()
     {
         $metrics = parent::getMetricsDocumentation();
-        $metrics['bounce_rate'] = Piwik::translate('General_ColumnBounceRateForPageDocumentation');
+        $metrics['bounce_rate'] = Piwik::translate('General_ColumnPageBounceRateDocumentation');
 
         // remove these metrics from API.getProcessedReport version of this report
         unset($metrics['avg_time_on_page']);
diff --git a/plugins/Actions/Reports/GetEntryPageUrls.php b/plugins/Actions/Reports/GetEntryPageUrls.php
index dfb3febee6..f3795db099 100644
--- a/plugins/Actions/Reports/GetEntryPageUrls.php
+++ b/plugins/Actions/Reports/GetEntryPageUrls.php
@@ -59,7 +59,7 @@ class GetEntryPageUrls extends Base
     protected function getMetricsDocumentation()
     {
         $metrics = parent::getMetricsDocumentation();
-        $metrics['bounce_rate'] = Piwik::translate('General_ColumnBounceRateForPageDocumentation');
+        $metrics['bounce_rate'] = Piwik::translate('General_ColumnPageBounceRateDocumentation');
 
         unset($metrics['bounce_rate']);
         unset($metrics['exit_rate']);
diff --git a/plugins/Feedback/templates/index.twig b/plugins/Feedback/templates/index.twig
index 503685c352..31e1ec83fc 100644
--- a/plugins/Feedback/templates/index.twig
+++ b/plugins/Feedback/templates/index.twig
@@ -32,6 +32,10 @@
             <p> &bull; {{ 'Feedback_ViewUserGuides'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/docs/'>","</a>")|raw }}.</p>
             <p> &bull; {{ 'Feedback_ViewAnswersToFAQ'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/faq/'>","</a>")|raw }}.</p>
             <p> &bull; {{ 'Feedback_VisitTheForums'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=http://forum.piwik.org/'>","</a>")|raw }}.</p>
+            <p> &bull; {{ 'API_LearnAboutCommonlyUsedTerms'|translate(
+                '<a href="'~ linkTo({'module':"API",'action':"glossary"}) ~ '#metrics">' ~ 'General_Metrics'|translate ~ '</a>',
+                '<a href="'~ linkTo({'module':"API",'action':"glossary"}) ~ '#reports">' ~ 'General_Reports'|translate ~ '</a>')|raw
+                }} ({{ 'API_Glossary'|translate }})</p>
         </div>
 
         <h2>{{ 'Feedback_ProfessionalHelp'|translate }}</h2>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryMetrics.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryMetrics.xml
new file mode 100644
index 0000000000..79e489aa71
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryMetrics.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<name>% Search Exits (Site Search)</name>
+		<id>exit_rate</id>
+		<documentation>The percentage of visits that left the website after searching for this Keyword on your Site Search engine.</documentation>
+	</row>
+	<row>
+		<name>Actions</name>
+		<id>nb_actions</id>
+		<documentation>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</documentation>
+	</row>
+	<row>
+		<name>Actions per Visit</name>
+		<id>nb_actions_per_visit</id>
+		<documentation>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</documentation>
+	</row>
+	<row>
+		<name>Avg. Time on Website</name>
+		<id>avg_time_on_site</id>
+		<documentation>The average duration of a visit.</documentation>
+	</row>
+	<row>
+		<name>Avg. generation time</name>
+		<id>avg_time_generation</id>
+		<documentation>The average time it took to generate the page. This metric includes the time it took the server to generate the web page, plus the time it took for the visitor to download the response from the server. A lower 'Avg. generation time' means a faster website for your visitors!</documentation>
+	</row>
+	<row>
+		<name>Avg. time on page</name>
+		<id>avg_time_on_page</id>
+		<documentation>The average amount of time visitors spent on this page (only the page, not the entire website).</documentation>
+	</row>
+	<row>
+		<name>Bounce Rate</name>
+		<id>bounce_rate</id>
+		<documentation>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</documentation>
+	</row>
+	<row>
+		<name>Bounce Rate (Actions)</name>
+		<id>bounce_rate</id>
+		<documentation>The percentage of visits that started on this page and left the website straight away.</documentation>
+	</row>
+	<row>
+		<name>Bounces</name>
+		<id>entry_bounce_count</id>
+		<documentation>Number of visits that started and ended on this page. This means that the visitor left the website after viewing only this page.</documentation>
+	</row>
+	<row>
+		<name>Clicked in search results</name>
+		<id>nb_hits_following_search</id>
+		<documentation>The number of times this Page was visited after a visitor did a search on your website, and clicked on this page in the search results.</documentation>
+	</row>
+	<row>
+		<name>Conversion Rate</name>
+		<id>conversion_rate</id>
+		<documentation>The percentage of visits that triggered a goal conversion.</documentation>
+	</row>
+	<row>
+		<name>Downloads</name>
+		<id>nb_downloads</id>
+		<documentation>The number of times this link was clicked.</documentation>
+	</row>
+	<row>
+		<name>Entrances</name>
+		<id>entry_nb_visits</id>
+		<documentation>Number of visits that started on this page.</documentation>
+	</row>
+	<row>
+		<name>Events with a value</name>
+		<id>nb_events_with_value</id>
+		<documentation>Number of events where an Event value was set</documentation>
+	</row>
+	<row>
+		<name>Exit rate</name>
+		<id>exit_rate</id>
+		<documentation>The percentage of visits that left the website after viewing this page.</documentation>
+	</row>
+	<row>
+		<name>Exits</name>
+		<id>exit_nb_visits</id>
+		<documentation>Number of visits that ended on this page.</documentation>
+	</row>
+	<row>
+		<name>Maximum value</name>
+		<id>max_event_value</id>
+		<documentation>The maximum value for this event</documentation>
+	</row>
+	<row>
+		<name>Minimum value</name>
+		<id>min_event_value</id>
+		<documentation>The minimum value for this event</documentation>
+	</row>
+	<row>
+		<name>Outlinks</name>
+		<id>nb_outlinks</id>
+		<documentation>The number of times this link was clicked.</documentation>
+	</row>
+	<row>
+		<name>Pageviews</name>
+		<id>nb_pageviews</id>
+		<documentation>The number of times this page was visited.</documentation>
+	</row>
+	<row>
+		<name>Search Results pages</name>
+		<id>nb_pages_per_search</id>
+		<documentation>Visitors will search on your website, and sometimes click &quot;next&quot; to view more results. This is the average number of search results pages viewed for this keyword.</documentation>
+	</row>
+	<row>
+		<name>Searches</name>
+		<id>nb_searches</id>
+		<documentation>The number of visits that searched for this keyword on your website's search engine.</documentation>
+	</row>
+	<row>
+		<name>Searches (Site Search)</name>
+		<id>nb_visits</id>
+		<documentation>The number of visits that searched for this keyword on your website's search engine.</documentation>
+	</row>
+	<row>
+		<name>The average of all values for this event</name>
+		<id>avg_event_value</id>
+		<documentation>The average of all values for this event</documentation>
+	</row>
+	<row>
+		<name>Total Pageviews</name>
+		<id>nb_hits</id>
+		<documentation>The number of times this page was visited.</documentation>
+	</row>
+	<row>
+		<name>Total events</name>
+		<id>nb_events</id>
+		<documentation>Total number of events</documentation>
+	</row>
+	<row>
+		<name>Total value</name>
+		<id>sum_event_value</id>
+		<documentation>The sum of event values</documentation>
+	</row>
+	<row>
+		<name>Unique Clicks (Actions)</name>
+		<id>nb_visits</id>
+		<documentation>The number of visits that involved a click on this link. If a link was clicked multiple times during one visit, it is only counted once.</documentation>
+	</row>
+	<row>
+		<name>Unique Downloads</name>
+		<id>nb_uniq_downloads</id>
+		<documentation>The number of visits that involved a click on this link. If a link was clicked multiple times during one visit, it is only counted once.</documentation>
+	</row>
+	<row>
+		<name>Unique Downloads (Actions)</name>
+		<id>nb_visits</id>
+		<documentation>The number of visits that involved a click on this link. If a link was clicked multiple times during one visit, it is only counted once.</documentation>
+	</row>
+	<row>
+		<name>Unique Outlinks</name>
+		<id>nb_uniq_outlinks</id>
+		<documentation>The number of visits that involved a click on this link. If a link was clicked multiple times during one visit, it is only counted once.</documentation>
+	</row>
+	<row>
+		<name>Unique Pageviews</name>
+		<id>nb_uniq_pageviews</id>
+		<documentation>The number of visits that included this page. If a page was viewed multiple times during one visit, it is only counted once.</documentation>
+	</row>
+	<row>
+		<name>Unique Pageviews (Actions)</name>
+		<id>nb_visits</id>
+		<documentation>The number of visits that included this page. If a page was viewed multiple times during one visit, it is only counted once.</documentation>
+	</row>
+	<row>
+		<name>Unique visitors</name>
+		<id>nb_uniq_visitors</id>
+		<documentation>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</documentation>
+	</row>
+	<row>
+		<name>Users</name>
+		<id>nb_users</id>
+		<documentation>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</documentation>
+	</row>
+	<row>
+		<name>Visits</name>
+		<id>nb_visits</id>
+		<documentation>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</documentation>
+	</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml
new file mode 100644
index 0000000000..1a2b71af9b
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<name>All Referrers (Referrers)</name>
+		<documentation>This report shows all your Referrers in one unified report, listing all Websites, Search keywords and Campaigns used by your visitors to find your website.</documentation>
+	</row>
+	<row>
+		<name>Browser Plugins (Visitor Settings)</name>
+		<documentation>This report shows which browser plugins your visitors had enabled. This information might be important for choosing the right way to deliver your content.</documentation>
+	</row>
+	<row>
+		<name>Browser engines (Visitor Devices)</name>
+		<documentation>This report shows your visitors' browsers broken down into browser engines. &lt;br /&gt; The most important information for web developers is what kind of rendering engine their visitors are using. The labels contain the names of the engines followed by the most common browser using that engine in brackets.</documentation>
+	</row>
+	<row>
+		<name>Campaigns (Referrers)</name>
+		<documentation>This report shows which campaigns led visitors to your website. &lt;br /&gt; For more information about tracking campaigns, read the &lt;a href=&quot;http://piwik.org/docs/tracking-campaigns/&quot; rel=&quot;noreferrer&quot;  target=&quot;_blank&quot;&gt;campaigns documentation on piwik.org&lt;/a&gt;</documentation>
+	</row>
+	<row>
+		<name>City (Visitors)</name>
+		<documentation>This report shows the cities your visitors were in when they accessed your website.&lt;br/&gt;In order to see data for this report, you must setup GeoIP in the Geolocation admin tab. The commercial &lt;a rel=&quot;noreferrer&quot;  target=&quot;_blank&quot; href=&quot;http://www.maxmind.com/?rId=piwik&quot;&gt;Maxmind&lt;/a&gt; GeoIP databases are more accurate than the free ones. To see how accurate they are, click &lt;a rel=&quot;noreferrer&quot;  target=&quot;_blank&quot; href=&quot;http://www.maxmind.com/en/city_accuracy?rId=piwik&quot;&gt;here&lt;/a&gt;.</documentation>
+	</row>
+	<row>
+		<name>Continent (Visitors)</name>
+		<documentation>This report shows which continent your visitors were in when they accessed your website.</documentation>
+	</row>
+	<row>
+		<name>Country (Visitors)</name>
+		<documentation>This report shows which country your visitors were in when they accessed your website.</documentation>
+	</row>
+	<row>
+		<name>Custom Variables (Visitors)</name>
+		<documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. &lt;br /&gt; For more information about Custom Variables in general, read the &lt;a href=&quot;http://piwik.org/docs/custom-variables/&quot; rel=&quot;noreferrer&quot;  target=&quot;_blank&quot;&gt;Custom Variables documentation on piwik.org&lt;/a&gt;</documentation>
+	</row>
+	<row>
+		<name>Downloads (Actions)</name>
+		<documentation>In this report, you can see which files your visitors have downloaded. &lt;br /&gt; What Piwik counts as a download is the click on a download link. Whether the download was completed or not isn't known to Piwik.</documentation>
+	</row>
+	<row>
+		<name>Entry page titles (Actions)</name>
+		<documentation>This report contains information about the titles of entry pages that were used during the specified period. Use the plus and minus icons on the left to navigate.</documentation>
+	</row>
+	<row>
+		<name>Entry pages (Actions)</name>
+		<documentation>This report contains information about the entry pages that were used during the specified period. An entry page is the first page that a user views during his visit. &lt;br /&gt; The entry URLs are displayed as a folder structure.&lt;br /&gt;Use the plus and minus icons on the left to navigate.</documentation>
+	</row>
+	<row>
+		<name>Exit page titles (Actions)</name>
+		<documentation>This report contains information about the titles of exit pages that occurred during the specified period. Use the plus and minus icons on the left to navigate.</documentation>
+	</row>
+	<row>
+		<name>Exit pages (Actions)</name>
+		<documentation>This report contains information about the exit pages that occurred during the specified period. An exit page is the last page that a user views during his visit. &lt;br /&gt; The exit URLs are displayed as a folder structure.&lt;br /&gt;Use the plus and minus icons on the left to navigate.</documentation>
+	</row>
+	<row>
+		<name>Keywords (Referrers)</name>
+		<documentation>This report shows which keywords users were searching for before they were referred to your website. &lt;br /&gt; By clicking on a row in the table, you can see the distribution of search engines that were queried for the keyword.</documentation>
+	</row>
+	<row>
+		<name>Length of Visits (Visitors)</name>
+		<documentation>In this report, you can see how many visits had a certain total duration. Initially, the report is shown as a tag cloud, more common durations are displayed in a larger font.&lt;br /&gt;Please note, that you can view the report in other ways than as a tag cloud. Use the controls at the bottom of the report to do so.</documentation>
+	</row>
+	<row>
+		<name>Outlinks (Actions)</name>
+		<documentation>This report shows a hierarchical list of outlink URLs that were clicked by your visitors. An outlink is a link that leads the visitor away from your website (to another domain).&lt;br /&gt;Use the plus and minus icons on the left to navigate.</documentation>
+	</row>
+	<row>
+		<name>Page Titles Following a Site Search (Site Search)</name>
+		<documentation>When visitors search on your website, they are looking for a particular page, content, product, or service. This report lists the pages that were clicked the most after an internal search. In other words, the list of pages the most searched for by visitors already on your website.&lt;br/&gt;Use the plus and minus icons on the left to navigate.</documentation>
+	</row>
+	<row>
+		<name>Page URLs (Actions)</name>
+		<documentation>This report contains information about the page URLs that have been visited. &lt;br /&gt; The table is organized hierarchically, the URLs are displayed as a folder structure.&lt;br /&gt;Use the plus and minus icons on the left to navigate.</documentation>
+	</row>
+	<row>
+		<name>Page titles (Actions)</name>
+		<documentation>This report contains information about the titles of the pages that have been visited. &lt;br /&gt; The page title is the HTML &lt;title&gt; Tag that most browsers show in their window title.</documentation>
+	</row>
+	<row>
+		<name>Pages Following a Site Search (Site Search)</name>
+		<documentation>When visitors search on your website, they are looking for a particular page, content, product, or service. This report lists the pages that were clicked the most after an internal search. In other words, the list of pages the most searched for by visitors already on your website.&lt;br/&gt;Use the plus and minus icons on the left to navigate.</documentation>
+	</row>
+	<row>
+		<name>Pages per Visit (Visitors)</name>
+		<documentation>In this report, you can see how many visits involved a certain number of pageviews. Initially, the report is shown as a tag cloud, more common numbers of pages are displayed in a larger font.&lt;br /&gt;Please note, that you can view the report in other ways than as a tag cloud. Use the controls at the bottom of the report to do so.</documentation>
+	</row>
+	<row>
+		<name>Provider (Visitors)</name>
+		<documentation>This report shows which Internet Service Providers your visitors used to access the website. You can click on a provider name for more details. &lt;br /&gt; If Piwik can't determine a visitor's provider, it is listed as IP.</documentation>
+	</row>
+	<row>
+		<name>Referrer Type (Referrers)</name>
+		<documentation>This table contains information about the distribution of the referrer types.&lt;br /&gt;&lt;b&gt;Direct Entry:&lt;/b&gt; A visitor has entered the URL in his browser and started browsing on your website - he entered the website directly.&lt;br /&gt;&lt;b&gt;Search Engines:&lt;/b&gt; A visitor was referred to your website by a search engine. &lt;br /&gt; See the &quot;Search Engines &amp; Keywords&quot; report for more details.&lt;br /&gt;&lt;b&gt;Websites:&lt;/b&gt; The visitor followed a link on another website that led to your site. &lt;br /&gt; See the &quot;Websites &amp; Social&quot; report for more details.&lt;br /&gt;&lt;b&gt;Campaigns:&lt;/b&gt; Visitors that came to your website as the result of a campaign. &lt;br /&gt; See the &quot;Campaigns&quot; report for more details.</documentation>
+	</row>
+	<row>
+		<name>Region (Visitors)</name>
+		<documentation>This report shows which region your visitors were in when they accessed your website.&lt;br/&gt;In order to see data for this report, you must setup GeoIP in the Geolocation admin tab. The commercial &lt;a rel=&quot;noreferrer&quot;  target=&quot;_blank&quot; href=&quot;http://www.maxmind.com/?rId=piwik&quot;&gt;Maxmind&lt;/a&gt; GeoIP databases are more accurate than the free ones. To see how accurate they are, click &lt;a rel=&quot;noreferrer&quot;  target=&quot;_blank&quot; href=&quot;http://www.maxmind.com/en/city_accuracy?rId=piwik&quot;&gt;here&lt;/a&gt;.</documentation>
+	</row>
+	<row>
+		<name>Search Categories (Site Search)</name>
+		<documentation>This report lists the Categories that visitors selected when they made a Search on your website.&lt;br/&gt;For example, Ecommerce websites typically have a &quot;Category&quot; selector so that visitors can restrict their searches to all products in a specific Category.</documentation>
+	</row>
+	<row>
+		<name>Search Engines (Referrers)</name>
+		<documentation>This report shows which search engines referred users to your website. &lt;br /&gt; By clicking on a row in the table, you can see what users were searching for using a specific search engine.</documentation>
+	</row>
+	<row>
+		<name>Search Keywords with No Results (Site Search)</name>
+		<documentation>Tracking searches that visitors make on your website is a very effective way to learn more about what your audience is looking for, it can help find ideas for new content, new Ecommerce products that potential customers might be searching for, and generally improve the visitors' experience on your website.&lt;br /&gt;&lt;br /&gt;This report lists the Search Keywords that did not return any Search result: maybe the search engine algorithm can be improved, or maybe your visitors are looking for content that is not (yet) on your website?</documentation>
+	</row>
+	<row>
+		<name>Site Search Keywords (Site Search)</name>
+		<documentation>This report lists the Search Keywords that visitors searched for on your internal Search Engine.&lt;br/&gt;&lt;br/&gt;Tracking searches that visitors make on your website is a very effective way to learn more about what your audience is looking for, it can help find ideas for new content, new Ecommerce products that potential customers might be searching for, and generally improve the visitors' experience on your website.&lt;br/&gt;&lt;br/&gt;&lt;a href=&quot;http://piwik.org/docs/site-search/&quot; rel=&quot;noreferrer&quot;  target=&quot;_blank&quot;&gt;Learn more about Tracking how your visitors use your Search engine.&lt;/a&gt;</documentation>
+	</row>
+	<row>
+		<name>Social Networks (Referrers)</name>
+		<documentation>In this table, you can see which websites referred visitors to your site. &lt;br /&gt; By clicking on a row in the table, you can see which URLs the links to your website were on.</documentation>
+	</row>
+	<row>
+		<name>Visitor Browser (Visitor Devices)</name>
+		<documentation>This report contains information about what kind of browser your visitors were using. Each browser version is listed separately.</documentation>
+	</row>
+	<row>
+		<name>Visitor Configuration (Visitor Settings)</name>
+		<documentation>This report shows the most common overall configurations that your visitors had. A configuration is the combination of an operating system, a browser type and a screen resolution.</documentation>
+	</row>
+	<row>
+		<name>Visits by Day of Week (Visits Summary)</name>
+		<documentation>This graph shows the number of visits your website received on each day of the week.</documentation>
+	</row>
+	<row>
+		<name>Visits by Local Time (Visits Summary)</name>
+		<documentation>This graph shows what time it was in the &lt;strong&gt; visitors' time zones &lt;/strong&gt; during their visits.</documentation>
+	</row>
+	<row>
+		<name>Visits by Server Time (Visits Summary)</name>
+		<documentation>This graph shows what time it was in the &lt;strong&gt; server's time zone &lt;/strong&gt; during the visits.</documentation>
+	</row>
+	<row>
+		<name>Visits by Visit Number (Visitors)</name>
+		<documentation>In this report, you can see the number of visits who were the Nth visit, ie. visitors who visited your website at least N times.&lt;br /&gt;Please note, that you can view the report in other ways than as a tag cloud. Use the controls at the bottom of the report to do so.</documentation>
+	</row>
+	<row>
+		<name>Visits by days since last visit (Visitors)</name>
+		<documentation>In this report, you can see how many visits were from visitors whose last visit was a certain number of days ago.</documentation>
+	</row>
+	<row>
+		<name>Websites (Referrers)</name>
+		<documentation>In this table, you can see which websites referred visitors to your site. &lt;br /&gt; By clicking on a row in the table, you can see which URLs the links to your website were on.</documentation>
+	</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
index 0f120ae565..cec23aa081 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
@@ -750,7 +750,7 @@
 		<metricsDocumentation>
 			<entry_nb_visits>Number of visits that started on this page.</entry_nb_visits>
 			<entry_bounce_count>Number of visits that started and ended on this page. This means that the visitor left the website after viewing only this page.</entry_bounce_count>
-			<bounce_rate>Percentage of visits that started and ended on this page.</bounce_rate>
+			<bounce_rate>The percentage of visits that started on this page and left the website straight away.</bounce_rate>
 			<avg_time_generation>The average time it took to generate the page. This metric includes the time it took the server to generate the web page, plus the time it took for the visitor to download the response from the server. A lower 'Avg. generation time' means a faster website for your visitors!</avg_time_generation>
 		</metricsDocumentation>
 		<processedMetrics>
diff --git a/tests/UI/expected-ui-screenshots b/tests/UI/expected-ui-screenshots
-Subproject 5413976e75fff2bb2b727816e015affdb7ec603
+Subproject 9cf16993f4017517a2a857d374c4bc45c0a152e