Consolidate security pages and add relevant entries to ToC

en/doc.md

@@ -74,7 +74,7 @@ Managing Operating Systems within Qubes
 
 Security Guides
 ---------------
- *  [General Security Information](/en/doc/qubes-security/)
+ *  [Qubes OS Project Security Information](/en/doc/security/)
  *  [Security Guidelines](/en/doc/security-guidelines/)
  *  [Understanding Qubes Firewall](/en/doc/qubes-firewall/)
  *  [Understanding and Preventing Data Leaks](/en/doc/data-leaks/)
@@ -142,7 +142,8 @@ For Developers
  *  [System Documentation](/en/doc/system-doc/)
  *  [Developers' FAQ](/en/doc/devel-faq/)
  *  [How to Contribute to the Qubes OS Project](/en/doc/contributing/)
- *  [Bug Reporting Guide](/en/doc/reporting-bugs/)
+ *  [Reporting Security Issues](/en/doc/security/)
+ *  [Reporting Bugs](/en/doc/reporting-bugs/)
  *  [Source Code](/en/doc/source-code/)
  *  [Qubes OS Version Scheme](/en/doc/version-scheme/)
  *  [Coding Guidelines](/en/doc/coding-style/)

en/security/QubesSecurity.md

@@ -1,20 +0,0 @@
----
-layout: doc
-title: QubesSecurity
-permalink: /en/doc/qubes-security/
-redirect_from:
-- /doc/QubesSecurity/
-- /wiki/QubesSecurity/
----
-
-Qubes Security
-==============
-
--   [Reporting Security Issues in Qubes OS](/en/doc/security-page/)
--   [Qubes Security Pack](/en/doc/security-pack/)
--   [Qubes Security Bulletins](/en/doc/security-bulletins/)
--   [Qubes Security Goals](/en/doc/security-goals/)
--   [On digital signatures and how to verify Qubes keys and downloads](/en/doc/verifying-signatures/)
-
--   [Qubes Keys](http://keys.qubes-os.org/keys/)
-

en/security/Security.md

@@ -1,24 +1,37 @@
 ---
 layout: doc
-title: SecurityPage
-permalink: /en/doc/security-page/
+title: Security
+permalink: /en/doc/security/
 redirect_from: 
+- /en/doc/qubes-security/
+- /doc/QubesSecurity/
+- /wiki/QubesSecurity/
+- /en/doc/security-page/
 - /doc/SecurityPage/
 - /wiki/SecurityPage/
 - /trac/wiki/SecurityPage/
 ---
 
-Reporting Security Issues in Qubes OS
+Qubes OS Project Security Information
 =====================================
 
+-   [Qubes Security Pack](/en/doc/security-pack/)
+-   [Qubes Security Bulletins](/en/doc/security-bulletins/)
+-   [Qubes Security Goals](/en/doc/security-goals/)
+-   [How to Verify Signatures](/en/doc/verifying-signatures/)
+-   [Qubes PGP Keys](http://keys.qubes-os.org/keys/)
+
+Reporting Security Issues in Qubes OS
+-------------------------------------
+
 If you believe you have found a security issue affecting Qubes OS, either directly or indirectly (e.g. the issue affects Xen in a configuration that is used in Qubes OS), then we would be more than happy to hear from you!
 
 We promise to treat any reported issue seriously and, if the investigation confirms it affects Qubes, to patch it within a reasonable time, and also to release a public Security Bulletin that describes the issue, discusses potential impact of the vulnerability, references applicable patches or workarounds, and also credits the discoverer.
 
 The list of all Qubes Security Advisories published so far can be found [here](/en/doc/security-bulletins/).
 
-Qubes Security Team
--------------------
+The Qubes Security Team
+-----------------------
 
 The Qubes Security Team can be contacted via email using the following address:
 
@@ -26,13 +39,11 @@ The Qubes Security Team can be contacted via email using the following address:
 security at qubes-os dot org
 ~~~
 
-Qubes Security Team GPG Key
----------------------------
+### Qubes Security Team GPG Key ###
 
-Please use the [this GPG key](http://keys.qubes-os.org/keys/qubes-os-security-team-key.asc) for encrypting any emails send to this address. Like all the GPG keys used by the Qubes project, this key is signed with the Qubes Master key. Please see [this page](/en/doc/verifying-signatures/) for more information on how to verify the keys.
+Please use the [this GPG key](http://keys.qubes-os.org/keys/qubes-os-security-team-key.asc) for encrypting any emails sent to this address. Like all the GPG keys used by the Qubes project, this key is signed with the Qubes Master key. Please see [this page](/en/doc/verifying-signatures/) for more information on how to verify the keys.
 
-Members of the Security Team
-----------------------------
+### Members of the Security Team ###
 
 -   Joanna Rutkowska \<joanna at invisiblethingslab dot com\>
 -   Marek Marczykowski \<marmarek at invisiblethingslab dot com\>