Marek Marczykowski-Górecki 919f2ed17e

Merge branch 'master' into spelling-grammar-fixes ...

Resolved conflicts in:
      basics_user/doc-guidelines.md
      basics_user/reporting-bugs.md
      common-tasks/backup-restore.md
      common-tasks/software-update-dom0.md
      common-tasks/software-update-vm.md
      common-tasks/usb.md
      configuration/disk-trim.md
      configuration/external-audio.md
      configuration/network-printer.md
      configuration/resize-disk-image.md
      configuration/resize-root-disk-image.md
      customization/fedora-minimal-template-customization.md
      managing-os/hvm.md
      managing-os/templates/archlinux.md
      privacy/whonix-install.md
      security/yubi-key.md
      troubleshooting/install-nvidia-driver.md
      troubleshooting/macbook-troubleshooting.md

2018-02-10 16:46:43 +01:00

..

assigning-devices.md

reinstate USB link removed accidentally

2017-05-25 16:55:35 +10:00

config-files.md

more minor typo/grammar fixes

2017-05-12 15:58:22 +10:00

disk-trim.md

collapse sections, explain LUKS

2018-02-06 12:21:39 +00:00

external-audio.md

Merge branch 'master' into spelling-grammar-fixes

2018-02-10 16:46:43 +01:00

fetchmail.md

yum -> dnf

2018-02-04 15:20:42 +00:00

http-filtering-proxy.md

Fix conflicts introduced from new changes in master branch

2017-11-01 14:00:00 +11:00

managing-vm-kernel.md

More typo/grammar/re-wording from @jpouellet's review

2017-05-25 16:43:11 +10:00

multiboot.md

more minor typo/grammar fixes

2017-05-12 15:58:22 +10:00

mutt.md

http -> https

2017-05-03 15:15:29 +00:00

network-bridge-support.md

More typo/grammar/re-wording from @jpouellet's review

2017-05-25 16:43:11 +10:00

network-printer.md

network-printer 4.0 updates

2018-02-07 11:02:52 +00:00

postfix.md

Merge branch 'master' into spelling-grammar-fixes

2018-02-10 16:46:43 +01:00

resize-disk-image.md

remove broken /doc/dom0-tools link for now

2018-02-07 12:47:14 +00:00

resize-root-disk-image.md

Merge branch 'master' into spelling-grammar-fixes

2018-02-10 16:46:43 +01:00

rpc-policy.md

Create RPC Policy documentation page

2017-10-08 15:16:12 -05:00

rxvt.md

yum -> dnf

2018-02-07 11:38:45 +00:00

salt.md

Fix conflicts introduced from new changes in master branch

2017-11-01 14:00:00 +11:00

secondary-storage.md

Replace absolute with relative paths for Qubes URLs

2018-02-03 14:51:06 -06:00

vpn.md

Fix formatting

2018-01-30 20:41:56 -06:00

w3m.md

fix spelling

2018-02-03 13:48:00 +00:00

zfs.md

Remove en/ from URLs (QubesOS/qubes-issues#1333)

2015-10-28 22:14:40 +00:00