Merge branch 'MadsRC-patch-1'

Merge branch 'patch-1' of https://github.com/MadsRC/qubes-doc into MadsRC-patch-1
Add Canary 17
2018-10-15 19:44:46 -05:00 · 2018-10-15 19:44:05 -05:00 · 2018-10-15 19:19:05 -05:00 · 2018-10-15 10:16:01 +02:00 · 2018-10-14 14:44:01 -05:00 · 2018-10-14 14:36:29 -05:00
5 changed files with 53 additions and 2 deletions
--- a/basics_dev/code-signing.md
+++ b/basics_dev/code-signing.md
@ -141,6 +141,15 @@ your Git commits.
   vtag = !git tag -v `git describe`
   ~~~

+GitHub Signature Verification (optional)
+----------------------------------------
+
+GitHub shows a green `Verified` label indicating that the GPG signature could be
+verified using any of the contributor’s GPG keys uploaded to GitHub. You can
+upload your public key on GitHub by adding your public GPG key on the [New GPG
+key][GitHub New GPG key] under the [SSH GPG keys page][GitHub SSH GPG keys
+page].
+
 Code Signature Checks
 ---------------------

@ -203,4 +212,6 @@ Enigmail is a security addon for the Mozilla Thunderbird email client that allow
 [developer mailing list]: /support/#qubes-devel
 [Enigmail]: https://www.enigmail.net/
 [signature-checker]: https://github.com/marmarek/signature-checker
+[GitHub New GPG key]: https://github.com/settings/gpg/new
+[GitHub SSH GPG keys page]: https://github.com/settings/keys

--- a/configuration/change-time-zone.md
+++ b/configuration/change-time-zone.md
@ -0,0 +1,36 @@
+---
+layout: doc
+title: Changing your Time Zone
+permalink: /doc/change-time-zone/
+---
+
+# Changing your Time Zone #
+
+## Qubes 4.0 ##
+
+### Command line ###
+
+If you use the i3 window manager or would prefer to change the system's time
+zone in terminal you can issue the `timedatectl` command with the option
+`set-timezone`.
+
+For example, to set the system's time zone to Berlin, Germany type in a dom0
+terminal:
+
+    $ sudo timedatectl set-timezone 'Europe/Berlin'
+
+You can list the available time zones with the option `list-timezones` and show
+the current settings of the system clock and time zone with option `status`.
+
+Example output status of `timedatectl` on a system with time zone set to
+Europe/Berlin:
+
+    [user@dom0 ~]$ timedatectl status
+          Local time: Sun 2018-10-14 06:20:00 CEST
+      Universal time: Sun 2018-10-14 04:20:00 UTC
+            RTC time: Sun 2018-10-14 04:20:00
+           Time zone: Europe/Berlin (CEST, +0200)
+     Network time on: no
+    NTP synchronized: no
+     RTC in local TZ: no
+
--- a/doc.md
+++ b/doc.md
@ -127,6 +127,7 @@ Configuration Guides
 * [Multibooting](/doc/multiboot/)
 * [Resize Disk Image](/doc/resize-disk-image/)
 * [RPC Policies](/doc/rpc-policy/)
+ * [Changing your Time Zone](/doc/change-time-zone)
 * [Installing ZFS in Qubes](/doc/zfs/)
 * [Mutt Guide](/doc/mutt/)
 * [Postfix Guide](/doc/postfix/)
--- a/managing-os/hvm.md
+++ b/managing-os/hvm.md
@ -22,7 +22,8 @@ Interested readers might want to check [this article](https://blog.invisiblethin
 Creating an HVM domain
 ----------------------

-R3.2:
+### R3.2 ###
+
 With a GUI: in Qubes Manager VM creation dialog box choose the "Standalone qube not based on a template" type.
 If "install system from device" is selected (which is by default), then `virt_mode` will be set to `hvm` automatically.
 Otherwise, open the newly created VM's Qube Settings GUI and in the "Advanced" tab select "HVM" in the virtualization mode drop-down list.
@ -32,7 +33,8 @@ Command line (the VM's name and label color are for illustration purposes):
 qvm-create my-new-vm --hvm --label green
 ~~~

-R4.0:
+### R4.0 ###
+
 With a GUI: in Qubes Manager VM creation dialog box choose the "Standalone qube not based on a template" type.
 If "install system from device" is selected (which is by default), then `virt_mode` will be set to `hvm` automatically.
 Otherwise, open the newly created VM's Qube Settings GUI and in the "Advanced" tab select `HVM` in the virtualization mode drop-down list.
--- a/security-info/canaries.md
+++ b/security-info/canaries.md
@ -41,4 +41,5 @@ Qubes Canaries are published through the [Qubes Security Pack](/security/pack/).

 -   [Qubes Canary \#15](https://github.com/QubesOS/qubes-secpack/blob/master/canaries/canary-015-2018.txt)
 -   [Qubes Canary \#16](https://github.com/QubesOS/qubes-secpack/blob/master/canaries/canary-016-2018.txt)
+-   [Qubes Canary \#17](https://github.com/QubesOS/qubes-secpack/blob/master/canaries/canary-017-2018.txt)
Author	SHA1	Message	Date
Andrew David Wong	8f77ebcf07	Merge branch 'MadsRC-patch-1'	2018-10-15 19:44:46 -05:00
Andrew David Wong	da21c5953b	Merge branch 'patch-1' of https://github.com/MadsRC/qubes-doc into MadsRC-patch-1	2018-10-15 19:44:05 -05:00
Andrew David Wong	3456ca3408	Add Canary 17	2018-10-15 19:19:05 -05:00
MadsRC	0d80b96bc6	Update hvm.md It's fairly easy to miss the fact that some of the text is for R3 and some of it is for R4. In the source it's pretty straightforward (Since it contains a linebreak) but when rendered, said linebreak is removed. Adding a few third-level headers clears this up, at least in opinion.	2018-10-15 10:16:01 +02:00
Andrew David Wong	766e4e2e3f	Merge branch 'anadahz-add/change-timezone'	2018-10-14 14:44:01 -05:00
Andrew David Wong	ebcc63ec2a	Improve time zone document (#714 ) - Move from Common Tasks to Configuration Guides, since most users will just use the GUI - Rename from `change-timezone-terminal.md` to `change-time-zone.md` (1) because we don't want multiple time zone documents for terminal and non-terminal usage and (2) to make the orthography of "time zone" consistent; update title and permalink accordingly - Make heading syntax consistent - Add heading - Fix code block syntax - Fix typo - Add page to ToC	2018-10-14 14:36:29 -05:00
Andrew David Wong	14e930e2e0	Merge branch 'add/change-timezone' of https://github.com/anadahz/qubes-doc into anadahz-add/change-timezone	2018-10-14 14:26:06 -05:00
Andrew David Wong	74365d965c	Merge branch 'anadahz-fix/4036' Closes QubesOS/qubes-issues#4036	2018-10-14 14:24:24 -05:00
anadahz	712a68cce0	Add GitHub Signature Verification instruction * Fixes #4036 (https://github.com/QubesOS/qubes-issues/issues/4036)	2018-10-14 17:32:29 +01:00
anadahz	d377c4ccf8	Add instructions to change time zone in terminal	2018-10-14 16:09:00 +01:00