Merge branch '2.4' into 2

.github/workflows/main.yml

@@ -0,0 +1,14 @@
+name: Build Docs
+on:
+  push:
+    branches:
+      - '2.1'
+    paths:
+      - 'docs/en/userguide/**'
+jobs:
+  build:
+    name: build-docs
+    runs-on: ubuntu-latest
+    steps:
+      - name: Run build hook
+        run: curl -X POST -d {} https://api.netlify.com/build_hooks/${{ secrets.NETLIFY_BUILD_HOOK }}

composer.json

@@ -1,39 +1,39 @@
 {
-	"name": "silverstripe/translatable",
-	"type": "silverstripe-module",
-	"description": "Allows translation of DataObject and SiteTree records into multiple languages ",
-	"keywords": [
-		"silverstripe",
-		"cms",
-		"i18n",
-		"localization",
-		"globalization"
-	],
-	"license": "BSD-3-Clause",
-	"homepage": "https://github.com/silverstripe/silverstripe-translatable/",
-	"authors": [
-		{
-			"name": "Ingo Schommer",
-			"homepage": "http://chillu.com",
-			"email": "ingo@silverstripe.com"
-		}
-	],
-	"require": {
-		"php": ">=5.3.2",
-		"silverstripe/framework": "~3.2",
-		"silverstripe/cms": "~3.2"
-	},
-	"require-dev": {
-    "phpunit/phpunit": "^5.7",
-    "squizlabs/php_codesniffer": "^3.0"
-	},
-	"extra": {
-		"screenshots": [
-			"http://www.silverstripe.org/assets/Uploads/translatable4-small.png"
-		]
-	},
-	"support": {
-		"issues": "https://github.com/silverstripe/silverstripe-translatable/issues?state=open"
-	},
-	"minimum-stability": "dev"
+    "name": "silverstripe/translatable",
+    "type": "silverstripe-module",
+    "description": "Allows translation of DataObject and SiteTree records into multiple languages ",
+    "keywords": [
+        "silverstripe",
+        "cms",
+        "i18n",
+        "localization",
+        "globalization"
+    ],
+    "license": "BSD-3-Clause",
+    "homepage": "https://github.com/silverstripe/silverstripe-translatable/",
+    "authors": [
+        {
+            "name": "Ingo Schommer",
+            "homepage": "http://chillu.com",
+            "email": "ingo@silverstripe.com"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.2",
+        "silverstripe/framework": "~3.2",
+        "silverstripe/cms": "~3.2"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^5.7",
+        "squizlabs/php_codesniffer": "^3.0"
+    },
+    "extra": {
+        "screenshots": [
+            "http://www.silverstripe.org/assets/Uploads/translatable4-small.png"
+        ]
+    },
+    "support": {
+        "issues": "https://github.com/silverstripe/silverstripe-translatable/issues?state=open"
+    },
+    "minimum-stability": "dev"
 }

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