marmarek · maiska · Jul 10, 2021 · Jul 10, 2021 · Jul 10, 2021 · Jul 10, 2021
diff --git a/.gitignore b/.gitignore
@@ -17,3 +17,5 @@ coverage
 tmp/*
 .jekyll-metadata
 /vendor
+.tx/
+.tx/config
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -0,0 +1,6 @@
+include:
+  - project: 'QubesOS/qubes-continuous-integration'
+    file: '/gitlab-website.yml'
+
+build:website:
+  extends: .website
diff --git a/.gitmodules b/.gitmodules
@@ -1,12 +1,15 @@
 [submodule "attachment"]
 	path = attachment
-	url = https://github.com/QubesOS/qubes-attachment
+	url = https://github.com/maiska/qubes-attachment
 [submodule "_posts"]
 	path = _posts
-	url = https://github.com/QubesOS/qubes-posts
-[submodule "_doc"]
-	path = _doc
-	url = https://github.com/QubesOS/qubes-doc
+	url = https://github.com/maiska/qubes-posts
 [submodule "_hcl"]
 	path = _hcl
-	url = https://github.com/QubesOS/qubes-hcl
+	url = https://github.com/maiska/qubes-hcl
+[submodule "_qubes-translated"]
+	path = _qubes-translated
+	url = https://github.com/maiska/qubes-translated.git
+[submodule "_doc"]
+	path = _doc
+	url = https://github.com/maiska/qubes-doc
diff --git a/.tx/config b/.tx/config
@@ -0,0 +1,3 @@
+[main]
+host = https://www.transifex.com
+
diff --git a/404.md b/404.md
@@ -1,7 +1,9 @@
 ---
-layout: default
-title: 404 Not Found
+lang: en
+layout: site
 permalink: /404.html
+ref: 1
+title: 404 Not Found
 ---
 
 Sorry!
@@ -11,4 +13,4 @@ We can't find a page or resource at this address. Please check the spelling of
 the URL in your address bar.
 
 If this looks like a mistake on our part, please
-[report the problem](/doc/reporting-bugs/) so we can fix it. Thanks!
+[report the problem](/doc/issue-tracking/) so we can fix it. Thanks!
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -3,8 +3,10 @@ Contributing to `qubesos.github.io`
 
 Thank you for your interest in contributing to `qubesos.github.io`, the Qubes OS
 Project's official website repository! Please take a moment to read our
-[Documentation Guidelines] before contributing. These guidelines are
-important to maintaining high standards of quality, and following them will
-increase the likelihood that your contribution will be accepted.
+[website style guide](https://www.qubes-os.org/doc/website-style-guide/) before
+contributing. These guidelines are important to maintaining high standards of
+quality, and following them will increase the likelihood that your contribution
+will be accepted.
 
-[Documentation Guidelines]: https://www.qubes-os.org/doc/doc-guidelines/
+To contribute to the documentation, please see [how to edit the
+documentation](https://www.qubes-os.org/doc/how-to-edit-the-documentation).
diff --git a/README.md b/README.md
@@ -1,22 +1,20 @@
 [![Build Status](https://travis-ci.org/QubesOS/qubesos.github.io.svg?branch=master)](https://travis-ci.org/QubesOS/qubesos.github.io)
 
-Qubes OS Official Website
-=========================
+# Qubes OS Official Website
 
 Canonical URL: https://www.qubes-os.org
 
-This is the main repository for the [Qubes OS Project][qubes] website. Qubes is
-a security-oriented, open-source operating system for personal computers. It
-uses virtualization to implement [security by compartmentalization][intro] and
-supports both Linux and Windows virtual environments.
+This is the main repository for the [Qubes OS
+Project](https://github.com/QubesOS) website. Qubes is a security-oriented,
+open-source operating system for personal computers. It uses virtualization to
+implement [security by compartmentalization](https://www.qubes-os.org/intro/)
+and supports both Linux and Windows virtual environments.
 
-
-Your support counts!
---------------------
+## Your support counts!
 
 Qubes OS is free and open-source software. If you rely on Qubes for secure
-computing in your work or personal life, or see the value in our efforts, please
-consider making a [donation](https://www.qubes-os.org/donate/) today.
+computing in your work or personal life, or see the value in our efforts,
+please consider making a [donation](https://www.qubes-os.org/donate/) today.
 
 <a href="https://opencollective.com/qubes-os/backer/0/website" target="_blank"><img src="https://opencollective.com/qubes-os/backer/0/avatar.svg"></a>
 <a href="https://opencollective.com/qubes-os/backer/1/website" target="_blank"><img src="https://opencollective.com/qubes-os/backer/1/avatar.svg"></a>
@@ -45,22 +43,23 @@ 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)
  - `qubes-hcl` (Hardware Compatibility List (HCL) reports generated by a YAML
    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: <http://guides.rubygems.org/>
  - For troubleshooting with Jekyll, see: <https://jekyllrb.com/docs/home/>
- - For troubleshooting with GitHub pages and Jekyll, see: <https://help.github.com/articles/using-jekyll-as-a-static-site-generator-with-github-pages/>
+ - For troubleshooting with GitHub pages and Jekyll, see:
+   <https://help.github.com/articles/using-jekyll-as-a-static-site-generator-with-github-pages/>
  - To run on a Git post-receive hook, use:
 
         GIT_REPO=/usr/home/git/repositories/www.qubes-os.org.git
@@ -105,53 +105,32 @@ Instructions
 
         exit
 
-Documentation Guidelines
-------------------------
-
-Our [Documentation Guidelines] include:
- - How to Report Issues
- - How to Contribute
- - Contribution Suggestions
- - Style Guidelines
- - Markdown Conventions
- - Git Conventions
+## Documentation
 
-Please carefully read these guidelines before submitting a pull request.
+To contribute to the documentation, please see [how to edit the
+documentation](https://www.qubes-os.org/doc/how-to-edit-the-documentation).
 
-### Dependencies & Third Party Docs ###
+### Dependencies & Third Party Docs
 
- - [Jekyll Documentation] - template rendering engine
- - [Bootstrap 3] - styling and CSS structure
- - [FontAwesome] - the icon font throughout the site
- - [jQuery 1.7] - javascript helper library
- - [jQuery ToC MD Generator] - renders header menu on documentation section
+ - [Jekyll Documentation](http://jekyllrb.com/docs/) - template rendering
+   engine
+ - [Bootstrap 3](http://getbootstrap.com) - styling and CSS structure
+ - [FontAwesome](http://fontawesome.io) - the icon font throughout the site
+ - [jQuery 1.7](http://api.jquery.com) - javascript helper library
+ - [jQuery ToC MD Generator](https://github.com/dafi/tocmd-generator) - renders
+   header menu on documentation section
 
-Deprecated Documentation
-------------------------
+## Deprecated Documentation
 
- - [qubes-os.org-3.2-EOL.zip] contains the state of the Qubes website when
-   [Qubes OS 3.2 reached EOL]. All you need to browse it is a web browser.
+ - [qubes-os.org-3.2-EOL.zip](https://github.com/QubesOS/qubesos.github.io/releases/download/3.2-EOL/qubes-os.org-3.2-EOL.zip)
+   contains the state of the Qubes website when [Qubes OS 3.2 reached
+   EOL](https://www.qubes-os.org/news/2019/03/28/qubes-3-2-has-reached-eol/).
+   All you need to browse it is a web browser.
  - Here is the state of this repo and all submodules when [Qubes OS 3.2 reached
-   EOL]:
+   EOL](https://www.qubes-os.org/news/2019/03/28/qubes-3-2-has-reached-eol/):
    - https://github.com/QubesOS/qubesos.github.io/tree/3.2-EOL
    - https://github.com/QubesOS/qubes-doc/tree/3.2-EOL
    - https://github.com/QubesOS/qubes-hcl/tree/3.2-EOL
    - https://github.com/QubesOS/qubes-posts/tree/3.2-EOL
    - https://github.com/QubesOS/qubes-attachment/tree/3.2-EOL
 
-
-[qubes]: https://github.com/QubesOS
-[intro]: https://www.qubes-os.org/intro/
-[Documentation Guidelines]: https://www.qubes-os.org/doc/doc-guidelines/
-[Jekyll]: https://jekyllrb.com/
-[Jekyll Documentation]: http://jekyllrb.com/docs/
-[FontAwesome]: http://fontawesome.io
-[Bootstrap 3]: http://getbootstrap.com
-[jQuery 1.7]: http://api.jquery.com
-[jQuery ToC MD Generator]: https://github.com/dafi/tocmd-generator
-[gh-fork]: https://guides.github.com/activities/forking/
-[gh-pull]: https://help.github.com/articles/using-pull-requests/
-[patch]: https://www.qubes-os.org/doc/source-code/#sending-a-patch
-[qubes-os.org-3.2-EOL.zip]: https://github.com/QubesOS/qubesos.github.io/releases/download/3.2-EOL/qubes-os.org-3.2-EOL.zip
-[Qubes OS 3.2 reached EOL]: https://www.qubes-os.org/news/2019/03/28/qubes-3-2-has-reached-eol/
-
diff --git a/_config.yml b/_config.yml
@@ -1,6 +1,6 @@
 # Site settings
 title: Qubes OS
-description: > # this means to ignore newlines until "baseurl:"
+description: > # this means to ignore newlines
   Qubes is a security-oriented, free and open-source operating system for
   personal computers that allows you to securely compartmentalize your digital
   life.
@@ -10,7 +10,6 @@ github_username:  QubesOS
 project_url: "https://www.qubes-os.org"
 project_repo_path: "https://github.com/QubesOS"
 project_repo_site: "/qubesos.github.io"
-project_repo_wiki: "/qubes-wiki"
 project_repo_artwork: "/qubes-artwork"
 
 # Build settings
@@ -29,9 +28,13 @@ plugins:
 collections:
   doc:
     output: true
-    permalink: /doc/:path/
   hcl:
     output: false
+  qubes-translated:
+    output: true
+
+exclude:
+  - attachment/COPYRIGHT*
 
 allowed_categories:
   - press
@@ -41,5 +44,5 @@ allowed_categories:
   - security
   - talks
 
-default_author: "The Qubes OS Team"
+default_author: "The Qubes team"
 default_category: "announcements"
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,3 +17,5 @@ coverage @@
     tmp/*
     .jekyll-metadata
     /vendor
+    .tx/
+    .tx/config