From: etimberg <evert.timberg@gmail.com>
Date: Tue, 1 Dec 2015 01:47:49 +0000 (-0500)
Subject: Update docs
X-Git-Tag: 2.0.0-beta1~1^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=refs%2Fpull%2F1720%2Fhead;p=thirdparty%2FChart.js.git

Update docs
---

diff --git a/docs/01-Scales.md b/docs/01-Scales.md
index a1ecc7c24..be4872dd0 100644
--- a/docs/01-Scales.md
+++ b/docs/01-Scales.md
@@ -150,8 +150,19 @@ The time scale extends the core scale class with the following tick template:
 		unit: false,
 		// string - By default, no rounding is applied.  To round, set to a supported time unit eg. 'week', 'month', 'year', etc.
 		round: false,
-		// string - By default, is set to the detected (or manually overridden) time unit's `display` property (see supported time measurements).  To override, use a pattern string from http://momentjs.com/docs/#/displaying/format/
-		displayFormat: false
+		// Moment js for each of the units. Replaces `displayFormat`
+		// To override, use a pattern string from http://momentjs.com/docs/#/displaying/format/
+		displayFormats: {
+				'millisecond': 'SSS [ms]',
+				'second': 'h:mm:ss a', // 11:20:01 AM
+				'minute': 'h:mm:ss a', // 11:20:01 AM
+				'hour': 'MMM D, hA', // Sept 4, 5PM
+				'day': 'll', // Sep 4 2015
+				'week': 'll', // Week 46, or maybe "[W]WW - YYYY" ?
+				'month': 'MMM YYYY', // Sept 2015
+				'quarter': '[Q]Q - YYYY', // Q3
+				'year': 'YYYY', // 2015
+			}, 
 	},
 }
 ```