Merge branch 'marmarek-code-blocks'

developer/general/gsod.md

@@ -1,7 +1,9 @@
 ---
+lang: en
 layout: sidebar
-title: Google Season of Docs
 permalink: /gsod/
+ref: 242
+title: Google Season of Docs
 ---
 
 # 2021 Google Season of Docs
@@ -110,7 +112,7 @@ This could be helped by writing consolidated guide with with a clear list of sym
 
 **Project**: Improve Getting Started page
 
-**Brief explanation**: The [Getting Started page](https://www.qubes-os.org/getting-started/) is the place a new user would go to understand better how to use Qubes. It is currently has old screenshots not using the default desktop environment and could have much better flow. In addition, this improved page content may end up being served more directly to the user via the [offline documentation](#offline-documentation) or the [firstboot guide](#create-guide-on-firstboot-for-new-users). 
+**Brief explanation**: The [Getting Started page](https://www.qubes-os.org/getting-started/) is the place a new user would go to understand better how to use Qubes. It is currently has old screenshots not using the default desktop environment and could have much better flow. In addition, this improved page content may end up being served more directly to the user via the [offline documentation](https://github.com/QubesOS/qubes-issues/issues/1019) or the firstboot guide. 
 
 **Expected results**: 
 

developer/releases/4_0/release-notes.md

@@ -49,7 +49,9 @@ Security Notes
   2. Select `Terminal Emulator`.
   3. In the window that opens, enter this command:
 
+     ```
      sudo nano /etc/yum.repos.d/qubes-dom0.repo
+     ```
 
   4. This opens the nano text editor. Change all four instances of `http` to `https`.
   5. Press `CTRL+X`, then `Y`, then `ENTER` to save changes and exit.
@@ -61,8 +63,10 @@ Security Notes
   2. Select `Template: fedora-26`, then `fedora-26: Terminal`.
   3. In the window that opens, enter the command for your version:
 
+     ```
      [Qubes 3.2] sudo gedit /etc/yum.repos.d/qubes-r3.repo
      [Qubes 4.0] sudo gedit /etc/yum.repos.d/qubes-r4.repo
+     ```
 
   4. This opens the gedit text editor in a window. Change all four instances of `http` to `https`.
   5. Click the "Save" button in the top-right corner of the window.

external/configuration-guides/multiboot.md

@@ -1,8 +1,6 @@
 ---
 lang: en
 layout: doc
-redirect_from:
-- https://github.com/Qubes-Community/Contents/blob/master/docs/configuration/multiboot.md
 redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/configuration/multiboot.md
 ref: 112
 title: Multibooting

external/troubleshooting/macbook-troubleshooting.md

@@ -1,8 +1,6 @@
 ---
 lang: en
 layout: doc
-redirect_from:
-- https://github.com/Qubes-Community/Contents/blob/master/docs/troubleshooting/macbook-troubleshooting.md
 redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/troubleshooting/macbook-troubleshooting.md
 ref: 238
 title: Apple MacBook Troubleshooting

external/troubleshooting/nvidia-troubleshooting.md

@@ -2,8 +2,6 @@
 lang: en
 layout: doc
 redirect_from:
-- https://github.com/Qubes-Community/Contents/blob/master/docs/troubleshooting/nvidia-troubleshooting.md
-- /enhttps://github.com/Qubes-Community/Contents/blob/master/docs/troubleshooting/nvidia-troubleshooting.md
 - /doc/NvidiaTroubleshooting/
 - /wiki/NvidiaTroubleshooting/
 redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/troubleshooting/nvidia-troubleshooting.md

user/advanced-configuration/bind-dirs.md

@@ -32,13 +32,17 @@ Inside the TemplateBasedVM.
 
 1. Make sure folder `/rw/config/qubes-bind-dirs.d` exists.
 
+   ```
    sudo mkdir -p /rw/config/qubes-bind-dirs.d
+   ```
 
 2. Create a file `/rw/config/qubes-bind-dirs.d/50_user.conf` with root rights.
 
 3. Edit the file 50_user.conf to append a folder or file name to the `binds` variable.
 
+   ```
    binds+=( '/var/lib/tor' )
+   ```
 
 4. Save.
 

user/advanced-configuration/salt.md

@@ -73,9 +73,11 @@ state of the system with the administrator's configuration/desires.
 The smallest unit of configuration is a state.
 A state is written in YAML and looks like this:
 
+```
 stateid:
   cmd.run:  #this is the execution module. in this case it will execute a command on the shell
   - name: echo 'hello world' #this is a parameter of the state.
+```
 
 The stateid has to be unique throughout all states running for a minion and can
 be used to order the execution of the references state.
@@ -96,6 +98,7 @@ With these three states you can define most of the configuration of a VM.
 
 You can also [order the execution][salt-doc-states-order] of your states:
 
+```
 D:
   cmd.run:
   - name: echo 1
@@ -114,6 +117,7 @@ You can also [order the execution][salt-doc-states-order] of your states:
   cmd.run:
   - name: echo 1
   - order: 1
+```
 
 The order of execution will be `A, B, C, D`.
 The official documentation has more details on the
@@ -132,10 +136,12 @@ After you have several state files, you need something to assign them to a VM.
 This is done by `*.top` files ([official documentation][salt-doc-top]).
 Their structure looks like this:
 
+```
 environment:
   target_matching_clause:
   - statefile1
   - folder2.statefile2
+```
 
 In most cases, the environment will be called `base`.
 The `target_matching_clause` will be used to select your minions (VMs).
@@ -143,10 +149,12 @@ It can be either the name of a VM or a regular expression.
 If you are using a regular expressions, you need to give Salt a hint you are
 doing so:
 
+```
 environment:
   ^app-(work|(?!mail).*)$:
   - match: pcre
   - statefile
+```
 
 For each target you can write a list of state files.
 Each line is a path to a state file (without the `.sls` extension) relative to
@@ -220,6 +228,7 @@ You can also use the `qubes` pillar module to select VMs with a particular
 property (see below).
 If you do so, then you need to pass additional arguments to the `qubesctl` tool:
 
+```
 usage: qubesctl [-h] [--show-output] [--force-color] [--skip-dom0]
                 [--targets TARGETS | --templates | --app | --all]
                 ...
@@ -237,6 +246,7 @@ If you do so, then you need to pass additional arguments to the `qubesctl` tool:
   --templates        Target all templates
   --app              Target all AppVMs
   --all              Target all non-disposable VMs (TemplateVMs and AppVMs)
+```
 
 To apply a state to all templates, call `qubesctl --templates state.highstate`.
 
@@ -269,6 +279,7 @@ Beginning with Qubes 4.0 and after [QSB #45], we implemented two changes:
 
 Let's start with a quick example:
 
+```
 my new and shiny VM:
   qvm.present:
     - name: salt-test # can be omitted when same as ID
@@ -278,6 +289,7 @@ Let's start with a quick example:
     - vcpus: 4
     - flags:
       - proxy
+```
 
 It uses the Qubes-specific `qvm.present` state, which ensures that the domain is
 present (if not, it creates it).
@@ -297,9 +309,11 @@ As you will notice, the options are the same (or very similar) to those used in
 This should be put in `/srv/salt/my-new-vm.sls` or another `.sls` file.
 A separate `*.top` file should be also written:
 
+```
 base:
   dom0:
     - my-new-vm
+```
 
 **Note** The third line should contain the name of the previous state file,
 without the `.sls` extension.
@@ -322,15 +336,19 @@ Lets make sure that the `mc` package is installed in all templates.
 Similar to the previous example, you need to create a state file
 (`/srv/salt/mc-everywhere.sls`):
 
+```
 mc:
   pkg.installed: []
+```
 
 Then the appropriate top file (`/srv/salt/mc-everywhere.top`):
 
+```
 base:
  qubes:type:template:
     - match: pillar
     - mc-everywhere
+```
 
 Now you need to enable the top file:
 
@@ -354,16 +372,19 @@ As in the example above, it creates a domain and sets its properties.
 
 You can set properties of an existing domain:
 
+```
 my preferences:
   qvm.prefs:
     - name: salt-test2
     - netvm: sys-firewall
+```
 
 ***Note*** The `name:` option will not change the name of a domain, it will only
 be used to match a domain to apply the configurations to it.
 
 ### `qvm.service`
 
+```
 services in my domain:
   qvm.service:
     - name: salt-test3
@@ -375,6 +396,7 @@ be used to match a domain to apply the configurations to it.
       - service4
     - default:
       - service5
+```
 
 This enables, disables, or sets to default, services as in `qvm-service`.
 
@@ -382,9 +404,11 @@ This enables, disables, or sets to default, services as in `qvm-service`.
 
 Ensures the specified domain is running:
 
+```
 domain is running:
   qvm.running:
     - name: salt-test4
+```
 
 ## Virtual Machine Formulae
 
@@ -567,9 +591,11 @@ Having the `-p` flag is important when using a state with `cmd.run`.
 If you install multiple templates you may encounter this error.
 The solution is to shut down the updateVM between each install:
 
+```
 install template and shutdown updateVM:
   cmd.run:
   - name: sudo qubes-dom0-update -y fedora-24; qvm-shutdown {% raw %}{{ salt.cmd.run(qubes-prefs updateVM) }}{% endraw %}
+```
 
 ## Further Reading
 

user/common-tasks/backup-restore.md

@@ -30,10 +30,12 @@ When backing up dom0 using the Qubes backup tool (explained below), only the hom
 Therefore, if there are files outside of the home directory you wish to save, you should copy them into the home directory prior to creating a backup.
 Here is an example of how to back up Qubes config files and RPC policies:
 
+```
 $ mkdir -p ~/backup/etc/qubes/
 $ cp -a /etc/qubes/* ~/backup/etc/qubes/
 $ mkdir ~/backup/etc/qubes-rpc/
 $ cp -a /etc/qubes-rpc/* ~/systemfiles/etc/qubes-rpc/
+```
 
 To restore these files, move them from the restored directory in dom0's home back to their appropriate locations in `/etc/`.
 Please note that any packages installed via the package manager in dom0 will not be backed up.

user/security-in-qubes/vm-sudo.md

@@ -15,6 +15,7 @@ Passwordless Root Access in VMs
 
 Background (`/etc/sudoers.d/qubes` in VM):
 
+```
 user ALL=(ALL) NOPASSWD: ALL
 
 # WTF?! Have you lost your mind?!
@@ -60,6 +61,7 @@ Background (`/etc/sudoers.d/qubes` in VM):
 # be seen by the xinput program...)
 #
 # joanna.
+```
 
 Below is a complete list of configuration made according to the above statement, with (not necessary complete) list of mechanisms depending on each of them: