Renamed all-about-analytics-data to data-model and updated all links to point to correct article

mnapoli · mnapoli · commit c415f91839a5 · 2015-01-27T11:36:02.000+13:00
diff --git a/app/helpers/Content/Category/DevelopCategory.php b/app/helpers/Content/Category/DevelopCategory.php
@@ -48,7 +48,7 @@ public function getItems()
                 new Guide('piwiks-reporting-api'),
             ]),
             new Guide('piwik-on-the-command-line'),
-            new Guide('all-about-analytics-data'),
+            new Guide('data-model'),
             new EmptySubCategory('Database', [
                 new Guide('persistence-and-the-mysql-backend'),
                 new Guide('extending-database'),
diff --git a/app/helpers/Redirects.php b/app/helpers/Redirects.php
@@ -13,17 +13,18 @@ class Redirects
     public static function getRedirects()
     {
         return [
-            '/guides'                     => '/',
-            '/guides/'                     => '/',
-            '/contributing'               => '/guides/contributing-to-piwik-core',
-            '/plugins'                    => '/develop',
-            '/api-reference/metadata'     => '/api-reference/reporting-api-metadata',
-            '/api-reference/segmentation' => '/api-reference/reporting-api-segmentation',
-            '/guides/automated-tests'     => '/guides/tests',
-            '/guides/mvc-in-piwik'        => '/guides/controllers',
-            '/guides/mvc-models'          => '/guides/apis',
-            '/guides/mvc-views'           => '/guides/views',
-            '/guides/mvc-controllers'     => '/guides/controllers',
+            '/guides'                          => '/',
+            '/guides/'                         => '/',
+            '/contributing'                    => '/guides/contributing-to-piwik-core',
+            '/plugins'                         => '/develop',
+            '/api-reference/metadata'          => '/api-reference/reporting-api-metadata',
+            '/api-reference/segmentation'      => '/api-reference/reporting-api-segmentation',
+            '/guides/automated-tests'          => '/guides/tests',
+            '/guides/mvc-in-piwik'             => '/guides/controllers',
+            '/guides/mvc-models'               => '/guides/apis',
+            '/guides/mvc-views'                => '/guides/views',
+            '/guides/mvc-controllers'          => '/guides/controllers',
+            '/guides/all-about-analytics-data' => '/guides/data-model',
         ];
     }
 }
diff --git a/docs/archive-data.md b/docs/archive-data.md
@@ -104,7 +104,7 @@ Goal specific metrics are stored in the database in the `goals` column of serial
 
 ### Processed metrics
 
-In the interests of [archiving](/guides/all-about-analytics-data#the-archiving-process) and database size efficiency, some metrics are not stored in database. They are instead calculated when needed using other metrics. These metrics are called **processed metrics**.
+In the interests of [archiving](/guides/archiving) and database size efficiency, some metrics are not stored in database. They are instead calculated when needed using other metrics. These metrics are called **processed metrics**.
 
 Below is the list of processed metrics that are calculated using *core metrics*. New reports that analyze visits, action types or conversions should be have these metrics added when possible.
 
diff --git a/docs/archiving.md b/docs/archiving.md
@@ -3,7 +3,7 @@ category: Develop
 previous: log-data
 next: archive-data
 ---
-# The Archiving Process
+# The archiving process
 
 **Log data** cannot be used directly for end-user reports because it would require to process an enormous amount of data every time the report is needed.
 
diff --git a/docs/data-model.md b/docs/data-model.md
@@ -12,10 +12,10 @@ subGuides:
 
 Read this guide if
 
-* you'd like to know **how to aggregate, store and serve new analytics data with your plugin**
-* you'd like to know **what the Archiving Process is and how it is used to automatically aggregate and cache analytics data**
-* you'd like to know **how analytics data is stored and manipulated in PHP**
-* you'd like to know **what segments are and how you can define your own**
+- you'd like to know **how to aggregate, store and serve new analytics data with your plugin**
+- you'd like to know **what the Archiving Process is and how it is used to automatically aggregate and cache analytics data**
+- you'd like to know **how analytics data is stored and manipulated in PHP**
+- you'd like to know **what segments are and how you can define your own**
 
 ## About analytics
 
diff --git a/docs/getting-started-part-1.md b/docs/getting-started-part-1.md
@@ -166,7 +166,7 @@ Ok! You've set up your development environment and created your plugin! Now all
 
 If you'd like to learn the basics of Piwik plugin development all at once, continue on to the [next part in this series of guides](/guides/getting-started-part-2). If you want to learn how to do just one thing, try reading one of our other guides:
 
-- If you're interested in **creating new analytics reports**, you may want to read our [All About Analytics Data](/guides/all-about-analytics-data) and [Visualizing Report Data](/guides/visualizing-report-data) guides.
+- If you're interested in **creating new analytics reports**, you may want to read about [Reports](/guides/reports) and [Visualizing Report Data](/guides/visualizing-report-data) guides.
 - If you're interested in **changing the look and feel of Piwik**, read our [Theming](/guides/theming) guide.
 - If you're interested in **taking part in core development**, read our [Contributing to Piwik Core](/guides/contributing-to-piwik-core) guide.
 - If you're interested in **integrating Piwik with another technology**, you might want to read our [All About Tracking](/guides/all-about-tracking) guide to learn how to use our Tracking API. You might also want to read our [Piwik's HTTP API](/api-reference/tracking-api) guide to learn about Piwik's Reporting API.
diff --git a/docs/getting-started-part-2.md b/docs/getting-started-part-2.md
@@ -189,7 +189,7 @@ If you visit [http://localhost/index.php?module=API&method=MyPlugin.getLastVisit
 
 This new API method directly accesses visit data. That is because the report is a real-time report. Most reports aren't in real-time because the amount of time it would take to process visit data would make the interface unusable.
 
-Archived reports are calculated and **cached** during the [Archiving Process](http://piwik.org/docs/setup-auto-archiving/). To learn more, read our [All About Analytics Data](/guides/all-about-analytics-data) guide.
+Archived reports are calculated and **cached** during the [Archiving Process](/guides/archiving). To learn more, read about Piwik's [Data Model](/guides/data-model) guide.
 </div>
 
 #### Displaying the report
diff --git a/docs/how-piwik-works.md b/docs/how-piwik-works.md
@@ -169,7 +169,7 @@ Because Archive data must be fast to query, it is splitted in separate tables pe
 - `archive_blob_2014_11`: reports for November 2014
 - …
 
-The content of those archive tables is explained in more details in the ["Piwik database schema" guide](/guides/persistence-and-the-mysql-backend#archive-tables). The archiving process is explained in details in the ["All About Analytics Data" guide](/guides/all-about-analytics-data#the-archiving-process).
+The content of those archive tables is explained in more details in the ["Piwik database schema" guide](/guides/persistence-and-the-mysql-backend#archive-tables). The archiving process is explained in details in the ["Archiving" guide](/guides/archiving).
 
 ### From Archive data to reports
 
@@ -179,7 +179,7 @@ Reports are [`DataTable`](/api-reference/Piwik/DataTable) objects and are served
 
 Sometimes, one persisted record can be the source of several API reports.
 
-You can read more details on how reports are created and served in the ["All About Analytics Data" guide](/guides/all-about-analytics-data#serving-reports).
+You can read more details on how reports are created and served in the ["Reports" guide](/guides/reports).
 
 ## Piwik's extensibility points
 
diff --git a/docs/log-data.md b/docs/log-data.md
@@ -1,6 +1,6 @@
 ---
 category: Develop
-previous: all-about-analytics-data
+previous: data-model
 next: archiving
 ---
 # Log data
diff --git a/docs/persistence-and-the-mysql-backend.md b/docs/persistence-and-the-mysql-backend.md
@@ -367,8 +367,8 @@ Some options should be loaded on every non-tracking request. These options have
 ## Learn more
 
 * To learn **how the tracker inserts log data** see our [All About Tracking](/guides/all-about-tracking) guide.
-* To learn **how log data is aggregated** see our [All About Analytics](/guides/all-about-analytics-data) guide and take a look at the [LogAggregator](/api-reference/Piwik/DataAccess/LogAggregator) class.
-* To learn **how archive data is cached** see our [All About Analytics](/guides/all-about-analytics-data) guide.
+* To learn **how log data is aggregated** see our [Archiving](/guides/archiving) guide and take a look at the [LogAggregator](/api-reference/Piwik/DataAccess/LogAggregator) class.
+* To learn **how archive data is cached** see our [Archive Data](/guides/archive-data) guide.
 * To learn **about Piwik's logging utility** see this section in our [Getting started extending Piwik](/guides/getting-started-part-1) guide.
 * To learn **about database backed sessions** read [this FAQ entry](http://piwik.org/faq/how-to-install/faq_133/).
 * To learn **how plugins can persist data** read the [Extending the Database](/guides/extending-database) guide.
diff --git a/docs/piwiks-extensibility-points.md b/docs/piwiks-extensibility-points.md
@@ -163,9 +163,9 @@ Plugins can define an **API** class (that extends [Piwik\Plugin\API](/api-refere
 
 ### Archiver
 
-Plugins can define an **Archiver** class (that extends [Piwik\Plugin\Archiver](/api-reference/Piwik/Plugin/Archiver)) to hook into Piwik's [Archiving Process](/guides/all-about-analytics-data#the-archiving-process). These classes are used to calculate and cache analytics data. They are, thus, very important.
+Plugins can define an **Archiver** class (that extends [Piwik\Plugin\Archiver](/api-reference/Piwik/Plugin/Archiver)) to hook into Piwik's [Archiving Process](/guides/archiving). These classes are used to calculate and cache analytics data. They are, thus, very important.
 
-*Learn more about these classes in our [All About Analytics](/guides/all-about-analytics-data) guide.*
+*Learn more about these classes in our [Data Model](/guides/data-model) guide.*
 
 ### Settings
 
@@ -194,6 +194,6 @@ The [ViewDataTable](/api-reference/Piwik/Plugin/ViewDataTable) class can be exte
 * To learn **about every event that Piwik posts** [read the event docs](/api-reference/events).
 * To learn **more about the Twig filters and functions Piwik defines** read the documentation for the [View](/api-reference/Piwik/View) class.
 * To learn **about API and Controller classes** read our [Controllers](/guides/controllers) or [APIs](/guides/apis) guides.
-* To learn **about Archiver classes** read our [All About Analytics](/guides/all-about-analytics-data) guide.
+* To learn **about Archiver classes** read our [Archiving](/guides/archiving) guide.
 * To learn **about plugin settings** read our [Plugin Settings](/guides/plugin-settings) guide.
 * To learn **about creating new report visualizations** read our [Visualizing Report Data](/guides/visualizing-report-data) guide.
diff --git a/docs/piwiks-reporting-api.md b/docs/piwiks-reporting-api.md
@@ -17,7 +17,7 @@ category: Develop
 This guide assumes that you:
 
 * can code in PHP,
-* understand how reports are stored in memory (if not, read this section of our [All About Analytics Data](/guides/all-about-analytics-data) guide),
+* understand how reports are stored in memory (if not read the [Reports](/guides/reports) guide),
 * and have a general understanding of extending Piwik (if not, read our [Getting Started](/guides/getting-started-part-1) guide).
 
 ## The Reporting API
@@ -178,4 +178,4 @@ This example uses the following API requests:
 ## Learn more
 
 - To learn **how API classes are used internally** read our [Piwik APIs](/guides/apis) guide.
-- To learn **about how to calculate a report** read our guide [All About Analytics Data](/guides/all-about-analytics-data).
+- To learn **about how to calculate a report** read our [Reports](/guides/reports) guide.
diff --git a/docs/tests-php.md b/docs/tests-php.md
@@ -13,7 +13,7 @@ The PHP test suite is written and run using [PHPUnit](https://phpunit.de). Tests
 
 - **Unit tests** test individual classes isolated from the rest of the code to make sure they work correctly as a unit
 - **Integration tests** test several parts working together, e.g. a test using a database
-- **System tests** test Piwik's [Reporting API](/guides/piwiks-reporting-api) and [archiving logic](/guides/all-about-analytics-data#the-archiving-process) by tracking visits and checking that the output of certain API queries matches the expected output
+- **System tests** test Piwik's [Reporting API](/guides/piwiks-reporting-api) and [archiving logic](/guides/archiving) by tracking visits and checking that the output of certain API queries matches the expected output
 
 ## Running PHP tests
 
diff --git a/docs/tests.md b/docs/tests.md
@@ -31,6 +31,6 @@ Piwik Core contains a suite of tests used to make sure that Piwik works properly
 
 - **Integration tests** test several parts working together, e.g. a test using a database.
 
-- **System tests** test Piwik's [Reporting API](/guides/piwiks-reporting-api) and [archiving logic](/guides/all-about-analytics-data#the-archiving-process) by tracking visits and checking that the output of certain API queries matches the expected output.
+- **System tests** test Piwik's [Reporting API](/guides/piwiks-reporting-api) and [archiving logic](/guides/archiving) by tracking visits and checking that the output of certain API queries matches the expected output.
 
 - **UI tests** test Piwik's twig templates, JavaScript and CSS by tracking visits, generating screenshots of URLs with [phantomjs](http://phantomjs.org/) and comparing expected screenshots with generated ones.
diff --git a/docs/visualizing-report-data.md b/docs/visualizing-report-data.md
@@ -389,7 +389,7 @@ To make sure your visualization can be themed, make sure any color value you use
 
 ## Learn more
 
-* To learn **how reports are stored and created**, read our [All About Analytics](/guides/all-about-analytics-data) guide.
+* To learn **how reports are stored and created**, read our [Data Model](/guides/data-model) guide.
 * To see a **full example of creating a new visualization**, see the source for the [Treemap Visualization](https://github.com/piwik/plugin-TreemapVisualization) plugin.
 * To learn more about **Piwik Controllers and outputting HTML**, read about [Controllers in Piwik](/guides/controllers).
 * To learn more about **interacting with Piwik's client side JavaScript**, read our [Working with Piwik's UI](/guides/working-with-piwiks-ui) guide.
diff --git a/piwik b/piwik
@@ -1 +1 @@
-Subproject commit 86145d588836b259c0b17400a89d2cabee0f4f67
+Subproject commit 2a54b6d21500f907dc3681a02c6292b0f4879061
