Merge branch '2.1' into 2.2

composer.json

@@ -32,10 +32,7 @@
 	"extra": {
 		"screenshots": [
 			"http://www.silverstripe.org/assets/Uploads/translatable4-small.png"
-		],
-		"branch-alias": {
-			"2.x-dev": "2.2.x-dev"
-		}
+		]
 	},
 	"support": {
 		"issues": "https://github.com/silverstripe/silverstripe-translatable/issues?state=open"

docs/en/userguide/about-translatable.md

@@ -2,11 +2,11 @@
 
 The SilverStripe Translatable module allows you to create and edit multiple pages in various languages. This module also adds the ability for your users to select which language of a page they wish to view.
 
-<div class="note" markdown="1">
+[note]
 Notes:
 
 The SilverStripe Translatable module does not translate content automatically, content authors will need to enter the translated content manually for each translated page.
-</div>
+[/note]
 
 To begin translating content select a page in your site tree from the "Pages" admin. You can see in the below image:
 

docs/en/userguide/index.md

@@ -1,5 +1,7 @@
+---
 title: Working with translations
 summary: Adding translated content to your website.
+---
 
 # Working with translations