Merge branch 'awokd-patch-1'

building/building-whonix-template.md

@@ -15,7 +15,7 @@ Many other Qubes templates can also be built by following this procedure.
 Simply choose the appropriate builder(s) and template(s) you wish to build in the `./setup` procedure below.
 Always include the `mgmt-salt` builder.
 
-First, set up the [Build Environment](/doc/qubes-r3-building/#build-environment) (follow the build environment section only).
+First, set up the [Build Environment](/doc/qubes-iso-building/#build-environment) (follow the build environment section only).
 
 Next, configure the builder:
 
@@ -24,15 +24,23 @@ cd ~/qubes-builder
 ./setup
 # Select Yes to add Qubes Master Signing Key
 # Select Yes to add Qubes OS Signing Key
-# Select 3.2 or 4.0 for version
+# Select 4.0 for version
 # Stable
+# Select Current (if you want to use pre-built packages instead of compiling for hours)
 # Yes (we want to build only templates)
-# Select builder-fedora, builder-debian, template-whonix, mgmt-salt (setup won't let you continue if you don't include builder-fedora, but we don't actually use it)
+# Select fc29 and stretch (for the currently shipping templates)
-# Choose Yes to add adrelanos's third party key
+# Select builder-rpm, builder-debian, template-whonix, mgmt-salt
-# Yes (to download sources)
+# Yes (to download)
-# Select whonix-gateway, whonix-workstation (for the currently shipping templates)
 ~~~
 
+Once it completes downloading, re-run `setup` to add the Whonix templates:
+
+~~~
+./setup
+# Choose the same options as above, except at templates select:
+# whonix-gateway-14, whonix-workstation-14
+# If prompted, choose Yes to add adrelanos's third party key
+~~~
 Continue the build process with:
 
 ~~~
@@ -71,7 +79,7 @@ make qubes-vm
 make template
 ~~~
  
-Once the build is complete, the install packages for your newly built templates will be located in `/qubes-builder/qubes-src/linux-template-builder/rpm/noarch`.
+Once the build is complete, the install packages for your newly built templates will be located in `~/qubes-builder/qubes-src/linux-template-builder/rpm/noarch`.
 Copy them from there to dom0 and install:
 
 ~~~

building/qubes-builder.md

@@ -8,7 +8,7 @@ redirect_from:
 - /wiki/QubesBuilder/
 ---
 
-**Note: The build system has been improved since this how-to was last updated. The [ISO building instructions](/doc/qubes-r3-building/) contain more up-to-date information on how to use the build system.**
+**Note: See [ISO building instructions](/doc/qubes-iso-building/) for a streamlined overview on how to use the build system.**
 
 Building Qubes from scratch
 ===========================

building/qubes-iso-building.md

@@ -1,9 +1,11 @@
 ---
 layout: doc
 title: Qubes ISO Building
-permalink: /doc/qubes-r3-building/
+permalink: /doc/qubes-iso-building/
 redirect_from:
+- /doc/qubes-r3-building/
 - /en/doc/qubes-r3-building/
+- /en/doc/qubes-iso-building/
 - /doc/QubesR3Building/
 - /wiki/QubesR3Building/
 ---
@@ -14,27 +16,26 @@ Building Qubes OS ISO
 Build Environment
 -----------------
 
-Fedora 26 has been successfully used to build Qubes R3.2 and R4.0 with the below steps.
+Fedora 29 has been successfully used to build Qubes R4.0 with the below steps.
 Other rpm-based operating systems may also work.
-Travis-CI also uses Ubuntu 14.04 to perform test builds, except it can not test the `./setup` script.
+Travis-CI uses Ubuntu 14.04 to perform test builds, except it can not test the `./setup` script.
 
-In `dom0`, install the Fedora 26 template if you don't already have it.
+In `dom0`, install the Fedora 29 template if you don't already have it.
 
 ~~~
-sudo qubes-dom0-update qubes-template-fedora-26
+sudo qubes-dom0-update qubes-template-fedora-29
 ~~~
 
-Create a standalone appVM from the Fedora 26 template.
+Create a standalone AppVM from the Fedora 29 template.
-You may choose your own name, but this document will refer to it as `dev26`.
 Set private storage to at least 60 GB if you will be building only the default templates; 100 GB or more if you plan on additional.
 It's not required, but if you allocate additional CPU cores, the build process can utilize them at some steps such as the kernel build.
 Likewise, more memory (up to 16 GB) can help.
-Last, you may want to disable memory balancing on `dev26` but keep in mind the impact on your other qubes.
+Last, you may want to disable memory balancing, but keep in mind the impact on your other qubes.
 
-Once you've built `dev26`, open a Terminal window to it and install the necessary dependencies (see [QubesBuilder](/doc/qubes-builder/) for more info):
+Once you've built the development AppVM, open a Terminal window to it and install the necessary dependencies (see [QubesBuilder](/doc/qubes-builder/) for more info):
 
 ~~~
-$ sudo dnf install gnupg git createrepo rpm-build make wget rpmdevtools python2-sh dialog rpm-sign dpkg-dev debootstrap PyYAML devscripts perl-Digest-MD5 perl-Digest-SHA
+$ sudo dnf install perl-Digest-SHA rpmdevtools rpm-build dialog rpm-sign python2-sh dpkg-dev debootstrap devscripts
 ~~~
 
 Get the necessary keys to verify the sources (run these and other commands below as a regular user, not root):
@@ -71,20 +72,29 @@ The builder will do that for us for each component, every time we build, even fo
 Build using setup script
 -----------------
 
-Let's configure the builder first (see [procedure](/doc/qubes-r3-building/#build-using-manual-steps) at bottom if you would prefer to manually configure):
+Let's configure the builder first (see [procedure](/doc/qubes-iso-building/#build-using-manual-steps) at bottom if you would prefer to manually configure):
 
 ~~~
 cd ~/qubes-builder
 ./setup
 # Select Yes to add Qubes Master Signing Key
 # Select Yes to add Qubes OS Signing Key
-# Select 3.2 or 4.0 for version
+# Select 4.0 for version
 # Stable
+# Select Current (if you want to use pre-built packages instead of compiling for hours)
 # No (we want a full build)
-# Select builder-fedora, builder-debian, template-whonix, mgmt-salt
+# Select fc29 and stretch (for the currently shipping templates)
-# Choose Yes to add adrelanos's third party key
+# Select builder-rpm, builder-debian, template-whonix, mgmt-salt
 # Yes (to download)
-# Select fc26, stretch, whonix-gateway, whonix-workstation (for the currently shipping templates)
+~~~
+
+Once it completes downloading, re-run `setup` to add the Whonix templates:
+
+~~~
+./setup
+# Choose the same options as above, except at templates select:
+# fc29, stretch, whonix-gateway-14, whonix-workstation-14
+# If prompted, choose Yes to add adrelanos's third party key
 ~~~
 
 Continue the build process with:

doc.md

@@ -269,7 +269,7 @@ redirect_from:
 
  * [Building Qubes](/doc/qubes-builder/) (["API" Details](/doc/qubes-builder-details/))
  * [Development Workflow](/doc/development-workflow/)
- * [Building Qubes OS ISO](/doc/qubes-r3-building/)
+ * [Building Qubes OS ISO](/doc/qubes-iso-building/)
  * [Building Qubes Templates](https://github.com/QubesOS/qubes-template-configs)
  * [Building a TemplateVM based on a new OS (ArchLinux example)](/doc/building-non-fedora-template/)
  * [Building the Archlinux Template](/doc/building-archlinux-template/)