Merge branch '2.0'

Conflicts: docs/changes.md docs/readme.md Signed-off-by: crynobone <crynobone@gmail.com>
orchestral · Dec 7, 2013 · 9573cad · 9573cad
2 parents 7e8f80b + a8a308d
commit 9573cad
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 28 deletions.
diff --git a/docs/changes.md b/docs/changes.md
@@ -1,32 +1,33 @@
-Widget Change Log
-==============
+---
+title: Widget Change Log
+---
 
-## Version 2.1
+## Version 2.1 {#v2-1}
 
-### v2.1.0@dev
+### v2.1.0@dev {#v2-1-0}
 
 * Add `Orchestra\Widget\Drivers::is()` to allow direct manipulation of `Illuminate\Support\Fluent` through `Orchestra\Support\Nesty::is()` API.
 * Predefined package path to avoid additional overhead to guest package path.
 
-## Version 2.0
+## Version 2.0 {#v2-0}
 
-### v2.0.4
+### v2.0.4 {#v2-0-4}
 
 * Implement [PSR-2](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md) coding standard.
 
-### v2.0.3
+### v2.0.3 {#v2-0-3}
 
 * Add `Orchestra\Widget\Drivers::is()` to allow direct manipulation of `Illuminate\Support\Fluent` through `Orchestra\Support\Nesty::is()` API.
 
-### v2.0.2
+### v2.0.2 {#v2-0-2}
 
 * Code improvements.
 
-### v2.0.1
+### v2.0.1 {#v2-0-1}
 
 * Update `Orchestra\Widget\WidgetManager` based on changes to [Orchestra\Support](/docs/2.0/components/support/changes#v2.0.2)
 
-### v2.0.0
+### v2.0.0 {#v2-0-0}
 
 * Migrate `Orchestra\Widget` from Orchestra Platform 1.2.
 * Change the way `Orchestra\Widget` handle positional insert; `before` to `<`, `after` to `>` and `child-of` to `^`.

diff --git a/docs/readme.md b/docs/readme.md
@@ -1,5 +1,6 @@
-Widget Component
-==============
+---
+title: Widget Component
+---
 
 * [Installation](#installation)
 * [Configuration](#configuration)
@@ -10,27 +11,23 @@ Widget allow you to manage widgetize actions in Orchestra Platform. By default O
 * **Pane** to manage dashboard items.
 * **Placeholder** to manage sidebar widgets.
 
-## Installation
+## Installation {#installation}
 
 To install through composer, simply put the following in your `composer.json` file:
 
-```json
-{
-	"require": {
-		"orchestra/widget": "2.1.*@dev"
+	{
+		"require": {
+			"orchestra/widget": "2.1.*@dev"
+		}
 	}
-}
-```
 
-## Configuration
+## Configuration {#configuration}
 
 Next add the service provider in `app/config/app.php`.
 
-```php
-'providers' => array(
-
-	// ...
-
-	'Orchestra\Widget\WidgetServiceProvider',
-),
-```
+	'providers' => array(
+
+		// ...
+
+		'Orchestra\Widget\WidgetServiceProvider',
+	),