Reorganize project security pages

- Redirect to templates in qubes-secpack
- Standardize titles and URLs

project-security/bulletins-template.md

@@ -1,82 +0,0 @@
----
-lang: en
-layout: doc
-permalink: /security/bulletins/template/
-redirect_from:
-- /doc/security-bulletins/template/
-ref: 209
-title: Security Bulletin Template
----
-
-~~~
-Dear Qubes Community,
-
-We have just published Qubes Security Bulletin (QSB) #<number>:
-<title>.
-The text of this QSB is reproduced below. This QSB and its accompanying
-signatures will always be available in the Qubes Security Pack (qubes-secpack).
-
-View QSB #<number> in the qubes-secpack:
-
-<https://github.com/QubesOS/qubes-secpack/blob/master/QSBs/qsb-`<number>`-`<year>`.txt>
-
-Learn about the qubes-secpack, including how to obtain, verify, and read it:
-
-<https://www.qubes-os.org/security/pack/>
-
-View all past QSBs:
-
-<https://www.qubes-os.org/security/bulletins/>
-
-View <XSA> in the XSA Tracker:
-
-<https://www.qubes-os.org/security/xsa/`<XSA>`>
-
-```
-             ---===[ Qubes Security Bulletin #<number>]===---
-
-                                  <date>
-
-                                  <title>
-
-Summary
-=======
-
-[...]
-
-Description
-===========
-
-[...]
-
-Impact
-======
-
-[...]
-
-Discussion
-==========
-
-[...]
-
-Patching
-========
-
-[...]
-
-Credits
-=======
-
-[...]
-
-References
-==========
-
-[...]
-
---
-The Qubes Security Team
-https://www.qubes-os.org/security/
-```
-
-~~~

project-security/canary-checklist.md

@@ -1,9 +1,11 @@
 ---
 lang: en
 layout: doc
-permalink: /security/canaries/checklist/
+permalink: /security/canary/checklist/
+redirect_from:
+- /security/canaries/checklist/
 ref: 216
-title: Canary Checklist
+title: Qubes Canary Checklist
 ---
 
 ## Preparation

project-security/canary-template.md

@@ -1,61 +1,12 @@
 ---
 lang: en
 layout: doc
-permalink: /security/canaries/template/
+permalink: /security/canary/template/
 redirect_from:
+- /security/canaries/template/
 - /doc/canaries/template/
+redirect_to:
+- https://github.com/QubesOS/qubes-secpack/blob/master/canaries/canary-template.txt
 ref: 212
-title: Canary Template
+title: Qubes Canary Template
 ---
-
-
-~~~
-Dear Qubes community,
-
-We have just published Qubes Canary #<number>. The text of this canary is
-reproduced below. This canary and its accompanying signatures will always be
-available in the Qubes Security Pack (qubes-secpack).
-
-View Canary #<number> in the qubes-secpack:
-
-<https://github.com/QubesOS/qubes-secpack/blob/master/canaries/canary-`<number>`-`<year>`.txt>
-
-Learn about the qubes-secpack, including how to obtain, verify, and read it:
-
-<https://www.qubes-os.org/security/pack/>
-
-View all past canaries:
-
-<https://www.qubes-os.org/security/canaries/>
-
-```
-                    ---===[ Qubes Canary #<number> ]===---
-
-
-Statements
------------
-
-[...]
-
-Special announcements
-----------------------
-
-[...]
-
-Disclaimers and notes
-----------------------
-
-[...]
-
-Proof of freshness
--------------------
-
-[...]
-
-Footnotes
-----------
-
-[...]
-```
-
-~~~

project-security/canary.md

@@ -1,8 +1,9 @@
 ---
 lang: en
 layout: doc
-permalink: /security/canaries/
+permalink: /security/canary/
 redirect_from:
+- /security/canaries/
 - /doc/canaries/
 ref: 208
 title: Qubes Canaries

project-security/qsb-checklist.md

@@ -1,11 +1,12 @@
 ---
 lang: en
 layout: doc
-permalink: /security/bulletins/checklist/
+permalink: /security/qsb/checklist/
 redirect_from:
+- /security/bulletins/checklist/
 - /doc/security-bulletins/checklist/
 ref: 215
-title: Security Bulletin Checklist
+title: Qubes Security Bulletin (QSB) Checklist
 ---
 
 ## Preparation

project-security/qsb-template.md

@@ -0,0 +1,12 @@
+---
+lang: en
+layout: doc
+permalink: /security/qsb/template/
+redirect_from:
+- /security/bulletins/template/
+- /doc/security-bulletins/template/
+redirect_to:
+- https://github.com/QubesOS/qubes-secpack/blob/master/QSBs/qsb-template.txt
+ref: 209
+title: Qubes Security Bulletin (QSB) Template
+---

project-security/qsb.md

@@ -1,8 +1,9 @@
 ---
 lang: en
 layout: doc
-permalink: /security/bulletins/
+permalink: /security/qsb/
 redirect_from:
+- /security/bulletins/
 - /doc/security-bulletins/
 - /en/doc/security-bulletins/
 - /doc/SecurityBulletins/