diff --git a/README.md b/README.md
index 538759e6..58b1fa30 100644
--- a/README.md
+++ b/README.md
@@ -61,3 +61,98 @@ More information is available in the [Debugging](https://www.11ty.dev/docs/debug
## Deployment
[TBC]
+
+## Authoring pages
+
+### Page data
+
+At the beginning of all pages, there's a block of data wrapped with ---. This is called frontmatter and it will follow a specific schema relative to the page you are on.
+
+The frontmatter data is written in [YAML format](https://yaml.org/) using `key: value` pairs.
+
+### Markdown and HTML
+
+Pages can contain a mix of Markdown and HTML. This means we can intersperse basic content formatting with more bespoke HTML elements in the same file.
+
+```
+# Page title
+
+A paragraph of text, Markdown style.
+
+- Markdown list items
+- Lists are great
+
+
+
Stick to HTML
+
+```
+
+The **caveat** here is to ensure that there is always a clear break between Markdown and HTML elements. Mixing and matching the two in a single content block will not work.
+
+```
+
+
+ ## Trying for a Markdown heading (and failing)
+
+
+
+
+
+## All good here
+
+
+```
+
+To learn more about what's possible in Markdown, see [Markdown Guide](https://www.markdownguide.org).
+
+### Adding links
+
+Linking to pages throughout the site works in the same way as linking to pages in standard HTML sites.
+
+We'll most likely be using Markdown's link syntax to link to pages. The links we choose can be relative or absolute.
+
+Let's use a _blog-posts_ page (`/blog/yyyy/blog-post`) as an example. If we want to link to another blog post page it can be done in two ways:
+
+```md
+[Relative link to blog post](../blog-post/)
+
+[Root relative link to blog post](/blog/yyyy/blog-post/)
+```
+
+If we need to link to another section/page within the site we can use either method shown above. The `../` prefix can be used to traverse further up the site tree:
+
+```md
+[Relative link to my parent](../)
+[Relative link to my grandparent](../../)
+[Relative link to a sibling of mine](../sibling-page/)
+```
+
+Note: these don't need filename `.md`/`.html` extensions.
+
+Only use absolute URLs for links out of the site:
+
+```md
+[Absolute link to Ceph.io](https://ceph.io/)
+```
+
+### Dynamic values
+
+We can interpolate these dynamic values throughout the Markdown. For example, we can save ourselves repeating the page's `title` property for our page title heading by using the `{{ }}` syntax:
+
+```md
+---
+title: Don't repeat yourself
+---
+
+# Don't repeat yourself
+```
+
+becomes:
+
+```md
+---
+title: Don't repeat yourself
+---
+
+# {{ title }}
+```
diff --git a/src/_includes/layouts/event.njk b/src/_includes/layouts/event.njk
index c9c2a5e4..300ebb70 100644
--- a/src/_includes/layouts/event.njk
+++ b/src/_includes/layouts/event.njk
@@ -11,10 +11,20 @@ layout: base
Deploying CloudStack and Ceph with flexible XLAN and BGp networking – Wido den Hollander
-
9:00 am
+
10:15am
+
Ceph with CloudStack – Andrija Panic
+
+
+
11:00am
+
Coffee break
-
9:15 am
+
11:15am
+
Achieving the ultimate performance with KVM
+
+
+
12:00pm
+
Lunch
-
9:30 am
-
Ceph Introduction and Community Update — Mike Perez (Red Hat)
+
1:00pm
+
Storage based snapshots
-
9:45 am
+
1:45pm
+
Cloud management portal
-
10:00 am
-
Self-healing Ceph at scale — Flilp Dorosz (OVH)
+
2:30pm
+
New stuff in CloudStack
+
+
+
3:15pm
+
Coffee
-
10:15 am
+
3:30pm
+
Our journey with CloudStack
+
+
+
4:15pm
+
Running OpenShift clusters
+
+
+
5:00pm
+
Closing words
+
+
+
5:15pm
+
Pub
diff --git a/src/en-GB/community/events/README.md b/src/en-GB/community/events/README.md
new file mode 100644
index 00000000..eafa0edb
--- /dev/null
+++ b/src/en-GB/community/events/README.md
@@ -0,0 +1,76 @@
+
+
+# Events
+
+## Frontmatter
+
+```yaml
+---
+title: Event title
+date: yyyy-mm-dd
+end: yyyy-mm-dd
+location: Event location
+venue: Event venue
+map: "https://www.google.com/maps"
+register: "https://www.eventbrite.com/"
+image: "/assets/image.jpg"
+links:
+ videos: "https://www.youtube.com/"
+ slides: "https://ceph.io/event.pdf"
+sponsors:
+ - label: Platinum sponsors
+ list:
+ - name: SoftIron
+ logo: "/assets/image.png"
+ website: "https://softiron.com"
+ - name: RedHat
+ logo: "/assets/image.png"
+ website: "https://redhat.com"
+ - label: Gold sponsors
+ list:
+ - name: SUSE
+ logo: "/assets/image.png"
+ website: "https://suse.com"
+tags:
+ - taxonomy
+ - taxonomy
+---
+
+```
+
+- `title` (String) — Determines the link text as it appears in the event navigation card. Also used as the `` for the page.\*
+- `date` (Date) — Determines the start date of the event.
+- `end` (Date) — Determines the end date of the event.
+- `location` (String) — Determines the location of the event, city and country.
+- `venue` (String) — Determines the venue of the event, building name and street.
+- `map` (String) — Determines the map of the event with a google maps link.\*
+- `register` (String) — Determines the website to register for the event. This is hidden once the end date of the event has pasted.
+- `image` (String) — Determines the asset path for the image shown in the event navigation card and the hero image beneath the title on the event page.
+- `links` (List) - These only appear when the end date of the event has pasted.
+ - `videos` (String) — Determines the website showing videos of the event with a youtube/vimeo link.
+ - `slides` (String) — Determines the website or PDF showing slides of the event.
+- `sponsors` (Array)
+ - `label` (String) — Determines the type of sponsors for the event.
+ `list`
+ - `name` (String) — Determines the name of the sponsor.
+ `logo` (String) — Determines the asset path for the sponsor logo.
+ `website` (String) — Determines the URL of the sponsor website which is applied to the sponsor logo.
+- `tags` (Array) - This is an array of values that determine the taxonomy of the event.
+ - (String) - Choose from a pre-defined selection of values that apply only to events. You can apply as many values as required.
+
+\* Careful with any strings that include a colon `:`, as YAML uses this as the key-value pair delimiter. A `URL` will always include a colon and possibly the other values will include them too. For example let's say the `title` needs to include colons, wrap the `title` string in double-quote marks `"` to ensure it renders as intended or if a URL contains.
+
+```yaml
+title: "Storage or: How I Learned to Stop Worrying and Love Ceph"
+map: "https://www.google.com/maps"
+```
+
+## Events structure
+
+The content of the events can be found in the `src/{locale}/community/events/yyyy/event` directories. Any folder/page created within these directories will generate a web page in the site.
+
+### Folders and file naming
+
+| Input File | Output URL |
+| -------------------------------------------------- | ------------------------------------- |
+| /src/{locale}/community/events/yyyy/event/index.md | /{locale}/community/events/yyyy/event |
diff --git a/src/en-GB/news/blog/README.md b/src/en-GB/news/blog/README.md
index 1180d3db..9226f83e 100644
--- a/src/en-GB/news/blog/README.md
+++ b/src/en-GB/news/blog/README.md
@@ -2,11 +2,7 @@
# Blog posts
-## Page data
-
-At the beginning of all blog posts, there's a block of data wrapped with ---. This is called frontmatter, and defines data specific to that page in the site.
-
-The frontmatter data is written in [YAML format](https://yaml.org/) using `key: value` pairs. Frontmatter for the blog post pages follows a specific schema:
+## Frontmatter
```yaml
---
@@ -24,113 +20,23 @@ tags:
- `title` (String) — Determines the link text as it appears in the blog post navigation card. Also used as the `` for the page.\*
- `date` (Date) — Determines the published date of the blog post.
- `author` (String) — Determines the name of the blog post author.
-- `image` (String) — Determines the image shown in the blog post navigation card and the hero image beneath the title on the blog post page.
-- `tags` (Array) - This is an array of values that determine the taxonomy of the blog post page.
- - (String) - Choose from a pre-defined selection of values that apply only to blog posts. You can apply as many values as required.\*
+- `image` (String) — Determines the asset path for the image shown in the blog post navigation card and the hero image beneath the title on the blog post page.\*
+- `tags` (Array) - This is an array of values that determine the taxonomy of the blog post.
+ - (String) - Choose from a pre-defined selection of values that apply only to blog posts. You can apply as many values as required.
-\* Careful with any strings that include a colon `:`, as YAML uses this as the key-value pair delimiter. If the title needs to include colons, wrap the `title` string in double-quote marks `"` to ensure it renders as intended. E.g.
+\* Careful with any strings that include a colon `:`, as YAML uses this as the key-value pair delimiter. A `URL` will always include a colon and possibly the other values will include them too. For example let's say the `title` needs to include colons, wrap the `title` string in double-quote marks `"` to ensure it renders as intended or if a URL contains.
```yaml
title: "Storage or: How I Learned to Stop Worrying and Love Ceph"
-```
-
-## Authoring pages
-
-While the blog post pages are all composed in Markdown `.md` files, there are a few bonus features.
-
-### Markdown and HTML
-
-Pages can contain a mix of Markdown and HTML. This means we can intersperse basic content formatting with more bespoke HTML elements in the same file.
-
-```
-# Page title
-
-A paragraph of text, Markdown style.
-
-- Markdown list items
-- Lists are great
-
-
-
Stick to HTML
-
-```
-
-The **caveat** here is to ensure that there is always a clear break between Markdown and HTML elements. Mixing and matching the two in a single content block will not work.
-
-```
-
-
- ## Trying for a Markdown heading (and failing)
-
-
-
-
-
-## All good here
-
-
-```
-
-To learn more about what's possible in Markdown, see [Markdown Guide](https://www.markdownguide.org).
-
-### Adding links
-
-Linking to pages throughout the site works in the same way as linking to pages in standard HTML sites.
-
-We'll most likely be using Markdown's link syntax to link to pages. The links we choose can be relative or absolute.
-
-If we were on a _blog-posts_ page (`/blog/yyyy/blog-post`), we could link to another blog post page in two ways:
-
-```md
-[Relative link to blog post](../blog-post/)
-
-[Root relative link to blog post](/blog/yyyy/blog-post/)
-```
-
-If we need to link to another section/page within the site we can use either method shown above. The `../` prefix can be used to traverse further up the site tree:
-
-```md
-[Relative link to my parent](../)
-[Relative link to my grandparent](../../)
-[Relative link to a sibling of mine](../sibling-page/)
-```
-
-Note: these don't need filename `.md`/`.html` extensions.
-
-Only use absolute URLs for links out of the site:
-
-```md
-[Absolute link to Ceph.io](https://ceph.io/)
-```
-
-## Dynamic values
-
-We can interpolate these dynamic values throughout the Markdown. For example, we can save ourselves repeating the page's `title` property for our page title heading by using the `{{ }}` syntax:
-
-```md
----
-title: Don't repeat yourself
----
-
-# Don't repeat yourself
-```
-
-becomes:
-
-```md
----
-title: Don't repeat yourself
----
-
-# {{ title }}
+image: "https://via.placeholder.com/50"
```
## Blog post structure
-The contents of the blog posts can all be found in the `src/locale/news/blog/yyyy/` directories. Any folder/page created within these directories will generate a web page in the site.
+The content of the blog posts can be found in the `src/{locale}/news/blog/yyyy/blog-post` directories. Any folder/page created within these directories will generate a web page in the site.
### Folders and file naming
-| Input File | Output URL |
-| ----------------------------------- | -------------------------------- |
-| /src/locale/news/blog/yyyy/index.md | /locale/news/blog/yyyy/blog-post |
+| Input File | Output URL |
+| ----------------------------------------------- | ---------------------------------- |
+| /src/{locale}/news/blog/yyyy/blog-post/index.md | /{locale}/news/blog/yyyy/blog-post |
diff --git a/src/en-GB/news/press-releases/README.md b/src/en-GB/news/press-releases/README.md
index fa0ffa67..cccfe8ee 100644
--- a/src/en-GB/news/press-releases/README.md
+++ b/src/en-GB/news/press-releases/README.md
@@ -2,11 +2,7 @@
# Press releases
-## Page data
-
-At the beginning of all press releases, there's a block of data wrapped with ---. This is called frontmatter, and defines data specific to that page in the site.
-
-The frontmatter data is written in [YAML format](https://yaml.org/) using `key: value` pairs. Frontmatter for the press release pages follows a specific schema:
+## Frontmatter
```yaml
---
@@ -24,113 +20,23 @@ tags:
- `title` (String) — Determines the link text as it appears in the press release navigation card. Also used as the `` for the page.\*
- `date` (Date) — Determines the published date of the press release.
- `author` (String) — Determines the name of the press release author.
-- `image` (String) — Determines the image shown in the press release navigation card and the hero image beneath the title on the press release page.
-- `tags` (Array) - This is an array of values that determine the taxonomy of the press release page.
- - (String) - Choose from a pre-defined selection of values that apply only to press releases. You can apply as many values as required.\*
+- `image` (String) — Determines the asset path for the image shown in the press release navigation card and the hero image beneath the title on the press release page.\*
+- `tags` (Array) - This is an array of values that determine the taxonomy of the press release.
+ - (String) - Choose from a pre-defined selection of values that apply only to press releases. You can apply as many values as required.
-\* Careful with any strings that include a colon `:`, as YAML uses this as the key-value pair delimiter. If the title needs to include colons, wrap the `title` string in double-quote marks `"` to ensure it renders as intended. E.g.
+\* Careful with any strings that include a colon `:`, as YAML uses this as the key-value pair delimiter. A `URL` will always include a colon and possibly the other values will include them too. For example let's say the `title` needs to include colons, wrap the `title` string in double-quote marks `"` to ensure it renders as intended or if a URL contains.
```yaml
title: "Storage or: How I Learned to Stop Worrying and Love Ceph"
-```
-
-## Authoring pages
-
-While the press release pages are all composed in Markdown `.md` files, there are a few bonus features.
-
-### Markdown and HTML
-
-Pages can contain a mix of Markdown and HTML. This means we can intersperse basic content formatting with more bespoke HTML elements in the same file.
-
-```
-# Page title
-
-A paragraph of text, Markdown style.
-
-- Markdown list items
-- Lists are great
-
-
-
Stick to HTML
-
-```
-
-The **caveat** here is to ensure that there is always a clear break between Markdown and HTML elements. Mixing and matching the two in a single content block will not work.
-
-```
-
-
- ## Trying for a Markdown heading (and failing)
-
-
-
-
-
-## All good here
-
-
-```
-
-To learn more about what's possible in Markdown, see [Markdown Guide](https://www.markdownguide.org).
-
-### Adding links
-
-Linking to pages throughout the site works in the same way as linking to pages in standard HTML sites.
-
-We'll most likely be using Markdown's link syntax to link to pages. The links we choose can be relative or absolute.
-
-If we were on a _press-releases_ page (`/press-releases/yyyy/press-release`), we could link to another press release page in two ways:
-
-```md
-[Relative link to press release](../press-release/)
-
-[Root relative link to press release](/press-releases/yyyy/press-release/)
-```
-
-If we need to link to another section/page within the site we can use either method shown above. The `../` prefix can be used to traverse further up the site tree:
-
-```md
-[Relative link to my parent](../)
-[Relative link to my grandparent](../../)
-[Relative link to a sibling of mine](../sibling-page/)
-```
-
-Note: these don't need filename `.md`/`.html` extensions.
-
-Only use absolute URLs for links out of the site:
-
-```md
-[Absolute link to Ceph.io](https://ceph.io/)
-```
-
-## Dynamic values
-
-We can interpolate these dynamic values throughout the Markdown. For example, we can save ourselves repeating the page's `title` property for our page title heading by using the `{{ }}` syntax:
-
-```md
----
-title: Don't repeat yourself
----
-
-# Don't repeat yourself
-```
-
-becomes:
-
-```md
----
-title: Don't repeat yourself
----
-
-# {{ title }}
+image: "https://via.placeholder.com/50"
```
## Press release structure
-The contents of the press releases can all be found in the `src/locale/news/press-releases/yyyy/` directories. Any folder/page created within these directories will generate a web page in the site.
+The content of the press releases can be found in the `src/{locale}/news/press-releases/yyyy/press-release` directories. Any folder/page created within these directories will generate a web page in the site.
### Folders and file naming
-| Input File | Output URL |
-| --------------------------------------------- | ---------------------------------------------- |
-| /src/locale/news/press-releases/yyyy/index.md | /locale/news/press-releases/yyyy/press-release |
+| Input File | Output URL |
+| ------------------------------------------------------------- | ------------------------------------------------ |
+| /src/{locale}/news/press-releases/yyyy/press-release/index.md | /{locale}/news/press-releases/yyyy/press-release |
diff --git a/src/en-GB/solutions/case-studies/README.md b/src/en-GB/solutions/case-studies/README.md
index 6da2f441..af0c9662 100644
--- a/src/en-GB/solutions/case-studies/README.md
+++ b/src/en-GB/solutions/case-studies/README.md
@@ -2,11 +2,7 @@
# Case studies
-## Page data
-
-At the beginning of all case studies, there's a block of data wrapped with ---. This is called frontmatter, and defines data specific to that page in the site.
-
-The frontmatter data is written in [YAML format](https://yaml.org/) using `key: value` pairs. Frontmatter for the case study pages follows a specific schema:
+## Frontmatter
```yaml
---
@@ -24,117 +20,27 @@ tags:
```
- `title` (String) — Determines the link text as it appears in the case study navigation card. Also used as the `` for the page.\*
-- `image` (String) — Determines the image shown in the case study navigation card and the hero image beneath the title on the case study page.
+- `image` (String) — Determines the asset path for the image shown in the case study navigation card and the hero image beneath the title on the case study page.\*
- `sponsor` (Array) - This is an array of values that all contribute to the sponsor information on the case study page.
- - `name` (String) - Determines the sponsor name as it appears in the case study page.\*
- - `logo` (String) - Determines the sponsor logo shown in the case study page.
- - `website` (String) - Determines the URL for the sponsor’s website. This is applied to the sponsor logo and button shown in the case study page.
+ - `name` (String) - Determines the name of the sponsor.
+ - `logo` (String) - Determines the asset path for the sponsor logo.
+ - `website` (String) - Determines the URL of the sponsor website which is applied to the sponsor logo and button shown on the case study page.
- `tags` (Array) - This is an array of values that determine the taxonomy of the case study page.
- - (String) - Choose from a pre-defined selection of values that apply only to case studies. You can apply as many values as required.\*
+ - (String) - Choose from a pre-defined selection of values that apply only to case studies. You can apply as many values as required.
-\* Careful with any strings that include a colon `:`, as YAML uses this as the key-value pair delimiter. If the title needs to include colons, wrap the `title` string in double-quote marks `"` to ensure it renders as intended. E.g.
+\* Careful with any strings that include a colon `:`, as YAML uses this as the key-value pair delimiter. A `URL` will always include a colon and possibly the other values will include them too. For example let's say the `title` needs to include colons, wrap the `title` string in double-quote marks `"` to ensure it renders as intended or if a URL contains.
```yaml
title: "Storage or: How I Learned to Stop Worrying and Love Ceph"
-```
-
-## Authoring pages
-
-While the case study pages are all composed in Markdown `.md` files, there are a few bonus features.
-
-### Markdown and HTML
-
-Pages can contain a mix of Markdown and HTML. This means we can intersperse basic content formatting with more bespoke HTML elements in the same file.
-
-```
-# Page title
-
-A paragraph of text, Markdown style.
-
-- Markdown list items
-- Lists are great
-
-
-
Stick to HTML
-
-```
-
-The **caveat** here is to ensure that there is always a clear break between Markdown and HTML elements. Mixing and matching the two in a single content block will not work.
-
-```
-
-
- ## Trying for a Markdown heading (and failing)
-
-
-
-
-
-## All good here
-
-
-```
-
-To learn more about what's possible in Markdown, see [Markdown Guide](https://www.markdownguide.org).
-
-### Adding links
-
-Linking to pages throughout the site works in the same way as linking to pages in standard HTML sites.
-
-We'll most likely be using Markdown's link syntax to link to pages. The links we choose can be relative or absolute.
-
-If we were on a _case-studies_ page (`/case-studies/case-study`), we could link to another case study page in two ways:
-
-```md
-[Relative link to case study](../case-study/)
-
-[Root relative link to case study](/case-studies/case-study/)
-```
-
-If we need to link to another section/page within the site we can use either method shown above. The `../` prefix can be used to traverse further up the site tree:
-
-```md
-[Relative link to my parent](../)
-[Relative link to my grandparent](../../)
-[Relative link to a sibling of mine](../sibling-page/)
-```
-
-Note: these don't need filename `.md`/`.html` extensions.
-
-Only use absolute URLs for links out of the site:
-
-```md
-[Absolute link to Ceph.io](https://ceph.io/)
-```
-
-## Dynamic values
-
-We can interpolate these dynamic values throughout the Markdown. For example, we can save ourselves repeating the page's `title` property for our page title heading by using the `{{ }}` syntax:
-
-```md
----
-title: Don't repeat yourself
----
-
-# Don't repeat yourself
-```
-
-becomes:
-
-```md
----
-title: Don't repeat yourself
----
-
-# {{ title }}
+image: "https://via.placeholder.com/50"
```
## Case study structure
-The contents of the case studies can all be found in the `src/locale/solutions/case-studies/` directory. Any folder/page created within this directory will generate a web page in the site.
+The content of the case studies can be found in the `src/{locale}/solutions/case-studies/case-study` directories. Any folder/page created within these directories will generate a web page in the site.
### Folders and file naming
-| Input File | Output URL |
-| ------------------------------------------------------ | ------------------------------------------ |
-| /src/locale/solutions/case-studies/case-study/index.md | /locale/solutions/case-studies/case-study/ |
+| Input File | Output URL |
+| -------------------------------------------------------- | ------------------------------------------- |
+| /src/{locale}/solutions/case-studies/case-study/index.md | /{locale}/solutions/case-studies/case-study |