diff --git a/_includes/doc-translated-warning.html b/_includes/doc-translated-warning.html
deleted file mode 100644
index ceabb641..00000000
--- a/_includes/doc-translated-warning.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- This page is an unverified translation.
- The Qubes OS Project cannot evaluate the accuracy of translations into languages that our team cannot read.
-
diff --git a/_includes/doc-widget.html b/_includes/doc-widget.html
index d918823e..0299d0fc 100644
--- a/_includes/doc-widget.html
+++ b/_includes/doc-widget.html
@@ -1,47 +1,28 @@
-
- Documentation
-
-
- Improve the Docs
-
-
- View Page Source
-
-
- Edit This Page
-
-
- Report a Security Issue
-
-
- Report a Bug
-
-
- Help & Support
-
-
- Make a Donation
-
+
+{% include variables.html %}
+{% assign docs = includes | where_exp: "item", "item.section == 'doc-widget'" | first %}
+
+{% if page.lang == nil or page.lang == "en" %}
+ {% assign master_edit = site.project_repo_path | append: "/qubes-doc/edit/master" | append: page.relative_path | remove_first: '_doc' %}
+ {% assign master_blob = site.project_repo_path | append: "/qubes-doc/blob/master" | append: page.relative_path | remove_first: '_doc' %}
+{% else %}
+ {% assign master_edit = site.project_repo_path | append: "/qubes-translated/edit/master" | append: page.relative_path | remove_first: '_qubes-translated' %}
+ {% assign master_blob = site.project_repo_path | append: "/qubes-translated/blob/master" | append: page.relative_path| remove_first: '_qubes-translated' %}
+{% endif %}
+
+{% for item in docs.links %}
+ {% if item.icon == "fa-book" %}
+ {% assign a_class = "btn btn-primary btn-block" %}
+ {% else %}
+ {% assign a_class = "page-source-link btn btn-default btn-block" %}
+ {% endif %}
+ {% if item.icon == "fa-github" %}
+ {% assign a_href = master_blob %}
+
+ {% else %}
+ {% assign a_href = item.url %}
+ {% endif %}
+
+ {{ item.text }}
+
+{% endfor %}
diff --git a/_includes/downloads.html b/_includes/downloads.html
new file mode 100644
index 00000000..dbbdb2b0
--- /dev/null
+++ b/_includes/downloads.html
@@ -0,0 +1,178 @@
+
+{% include variables.html %}
+
+{% assign surv = downloads-page | where_exp: "item", "item.htmlsection == 'survey'" | first %}
+
+
+
+{% assign ls = downloads-page | where_exp: "item", "item.htmlsection == 'loop-releases'" | first %}
+{% assign test = ls.releases | where_exp: "item", "item.r_version == 'testing'" | first %}
+{% assign stable = ls.releases | where_exp: "item", "item.r_version == 'stable'" | first %}
+{% assign old = ls.releases | where_exp: "item", "item.r_version == 'old'" | first %}
+{% assign depr = ls.releases | where_exp: "item", "item.r_version == 'deprecated'" | first %}
+{% for releasex in site.data.downloads.releases %}
+
+
+ {% assign release_name = releasex[0] %}
+ {% assign release = releasex[1] %}
+ {% assign testing = release.testing | default: false %}
+ {% assign latest = release.latest | default: false %}
+ {% assign aging = release.aging | default: false %}
+ {% assign deprecated = release.deprecated | default: false %}
+
{{ release_name }}
+
+ {% if testing %}
+
+
+ {% if testing != true %}
+ {{ testing }}
+ {% else %}
+ {% for s in test.snippets %}
+ {% if s.url != nil %}
+
{{ s.snippet }}
+ {% else %}
+ {{ s.snippet }}
+ {% endif %}
+ {% endfor %}
+ {% endif %}
+
+ {% endif %}
+ {% if latest %}
+
+
+ {% if latest != true %}
+ {{ latest }}
+ {% else %}
+ {{ stable.snippets[0].snippet }}
+ {% endif %}
+
+ {% endif %}
+
+ {% if aging %}
+
+
+ {% if aging != true %}
+ {{ aging }}
+ {% else %}
+ {% for s in old.snippets %}
+ {% if s.url != nil %}
+
{{ s.snippet }}
+ {% else %}
+ {{ s.snippet }}
+ {% endif %}
+ {% endfor %}
+ {% endif %}
+
+ {% endif %}
+
+ {% if deprecated %}
+
+
+ {% if deprecated != true %}
+ {{ deprecated }}
+ {% else %}
+ {% for s in depr.snippets %}
+ {% if s.url != nil %}
+
{{ s.snippet }}
+ {% else %}
+ {{ s.snippet }}
+ {% endif %}
+ {% endfor %}
+ {% endif %}
+
+ {% endif %}
+
+
+ {% for source in release.sources %}
+ {% if source.display %}
+
+ {% endif %}
+ {% endfor %}
+
+
+
+{% endfor %}
+
+{% assign dm = downloads-page | where_exp: "item", "item.htmlsection == 'download-mirrors'" | first %}
+
diff --git a/_includes/experts.html b/_includes/experts.html
new file mode 100644
index 00000000..24f8cdba
--- /dev/null
+++ b/_includes/experts.html
@@ -0,0 +1,28 @@
+
+{% include variables.html %}
+{% assign experts = experts | where_exp: "item", "item.experts == nil" | first %}
+
+
+
+
+
{{ experts.title }}
+
+
+
+ {% for item in experts.expert %}
+
+
+
+
+
+
+ {% endfor %}
+
+
@@ -45,11 +43,10 @@ consider making a [donation](https://www.qubes-os.org/donate/) today.
--------------------------------------------------------------------------------
-Contents
---------
+## Contents
-This repository consists of a [Jekyll] site and several Git submodules for
-content:
+This repository consists of a [Jekyll](https://jekyllrb.com/) site and several
+Git submodules for content:
- `qubes-doc` (official documentation)
- `qubes-attachment` (binary files such as images)
@@ -57,10 +54,12 @@ content:
version of `qubes-hcl-report`)
- `qubes-posts` (news and blog posts)
-Instructions
-------------
+## Instructions
+
+### Podman Compose
-### Podman Compose ###
+These instructions have been tested on a Fedora 33 qube. Podman is not
+available in Debian 10. You must use a Fedora-based machine or Debian 11.
1. Install `podman` and `podman-compose`.
@@ -81,12 +80,13 @@ Instructions
http://127.0.0.1:4000/
-### Notes ###
+### Notes
- To update the submodules, use `git submodule foreach git pull --tags`.
- For troubleshooting with RubyGems, see: