diff --git a/developer/building/development-workflow.md b/developer/building/development-workflow.md index 2b91c597..e9ca27bc 100644 --- a/developer/building/development-workflow.md +++ b/developer/building/development-workflow.md @@ -19,7 +19,7 @@ assumes you're using qubes-builder to build Qubes. # Repositories and committing Code -Qubes is split into a bunch of git repos. This are all contained in the +Qubes is split into a bunch of git repos. These are all contained in the `qubes-src` directory under qubes-builder. Subdirectories there are separate components, stored in separate git repositories. @@ -153,7 +153,7 @@ RPMS will appear in qubes-src/linux-kernel/pkgs/fc20/x86\_64: if all repository are tagged with signed tag. 2. `make show-vtags` - show version of each component (based on git tags) - mostly useful just before building ISO. **Note:** this will not show version -for components containing changes since last version tag +for components containing changes since last version tag. 3. `make push` - push change from **all** repositories to git server. You must set proper remotes (see above) for all repositories first. 4. `make prepare-merge` - fetch changes from remote repositories (can be diff --git a/developer/general/gsod.md b/developer/general/gsod.md index 942397e7..a297d5b4 100644 --- a/developer/general/gsod.md +++ b/developer/general/gsod.md @@ -94,7 +94,7 @@ Here are some successful projects which have been implemented in the past by Goo **Project**: Consolidate troubleshooting guides **Brief explanation**: Troubleshooting guides are scattered across many pages and sometimes incomplete, leading to repeatedly posting the same instruction over and over when helping users to diagnose problems. -This could be helped by writing consolidated guide with with a clear list of symptom-action layout. +This could be helped by writing a consolidated guide with a clear list of symptom-action layout. **Expected results**: diff --git a/user/common-tasks/backup-restore.md b/user/common-tasks/backup-restore.md index 211b1b6e..d80a4c89 100644 --- a/user/common-tasks/backup-restore.md +++ b/user/common-tasks/backup-restore.md @@ -114,7 +114,7 @@ This brings up the **Qubes Restore VMs** window. 4. If your backup is encrypted, you must check the **Encrypted backup** box. If a passphrase was supplied during the creation of your backup (regardless of whether it is encrypted), then you must supply it here. - **Note:** The passphrase which was supplied when the backup was created was used for **both** encryption/decryption and integrity verification. + **Note:** The passphrase which was supplied when the backup was created is used for **both** encryption/decryption and integrity verification. If the backup was not encrypted, the supplied passphrase is used only for integrity verification. All backups made from a Qubes R4.0 system will be encrypted.