From 579030fee48e51c8e2249414c3d8a9d117170e9c Mon Sep 17 00:00:00 2001
From: awokd <34515595+awokd@users.noreply.github.com>
Date: Sat, 6 Apr 2019 23:18:48 +0000
Subject: [PATCH 1/4] describe pre-built component selection

---
 building/qubes-builder.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/building/qubes-builder.md b/building/qubes-builder.md
index 367105f5..0c8a9658 100644
--- a/building/qubes-builder.md
+++ b/building/qubes-builder.md
@@ -145,7 +145,13 @@ Before creating the `chroot`, add this to your `builder.conf`:
     USE_QUBES_REPO_VERSION = $(RELEASE)
 
 It will add the 'current' Qubes repository to your `chroot` environment.
-This way, you can build only the packages you are interested in.
+Next, specify which components (`gcc`, for example) you do *not* want to compile:
+
+    COMPONENTS := $(filter-out gcc,$(COMPONENTS))
+
+Alternatively, edit the actual COMPONENTS list which is defined in the included version-dependent config from example-configs (see series of include directives near the beginning of `builder.conf`).
+This way, you can build only the packages in which you are interested.
+
 If you also want to use the 'current-testing' repository, add this to your configuration:
 
     USE_QUBES_REPO_TESTING = 1

From a2ef7a8a6c7aa5b07ddf220f996226abd547fd73 Mon Sep 17 00:00:00 2001
From: awokd <34515595+awokd@users.noreply.github.com>
Date: Sat, 6 Apr 2019 23:27:59 +0000
Subject: [PATCH 2/4] add step and link describing pre-built packages

---
 building/qubes-iso-building.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/building/qubes-iso-building.md b/building/qubes-iso-building.md
index f5fa773b..d602656e 100644
--- a/building/qubes-iso-building.md
+++ b/building/qubes-iso-building.md
@@ -81,7 +81,7 @@ cd ~/qubes-builder
 # Select Yes to add Qubes OS Signing Key
 # Select 4.0 for version
 # Stable
-# Select Current (if you want to use pre-built packages instead of compiling for hours)
+# Select Current (if you want the option to use pre-built packages)
 # No (we want a full build)
 # Select fc29 and stretch (for the currently shipping templates)
 # Select builder-rpm, builder-debian, template-whonix, mgmt-salt
@@ -104,9 +104,12 @@ make install-deps
 make get-sources
 ~~~
 
-When building the Whonix templates, you will often need to add/update the `WHONIX_TBB_VERSION` variable at this stage to specify the currently shipping Tor Browser version.
+When building the Whonix templates, you will often need to add/update the `WHONIX_TBB_VERSION` variable in `builder.conf` at this stage to specify the currently shipping Tor Browser version.
 See the related note under [Extra Whonix Build Options](/doc/building-whonix-template/).
 
+You may also want to add `COMPONENTS := $(filter-out gcc,$(COMPONENTS))` to bypass a multiple hour compile step.
+See [QubesBuilder](/doc/qubes-builder/#use-pre-built-qubes-packages) for more detail.
+
 Finally, if you are making a test build, use:
 
 ~~~

From d329766e49ab912bd0d0a312c8279bc66e16de5f Mon Sep 17 00:00:00 2001
From: awokd <34515595+awokd@users.noreply.github.com>
Date: Sat, 6 Apr 2019 23:29:21 +0000
Subject: [PATCH 3/4] change pre-built package wording to option

---
 building/building-whonix-template.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/building/building-whonix-template.md b/building/building-whonix-template.md
index 74cfeff2..423487b1 100644
--- a/building/building-whonix-template.md
+++ b/building/building-whonix-template.md
@@ -26,7 +26,7 @@ cd ~/qubes-builder
 # Select Yes to add Qubes OS Signing Key
 # Select 4.0 for version
 # Stable
-# Select Current (if you want to use pre-built packages instead of compiling for hours)
+# Select Current (if you want the option to use pre-built packages)
 # Yes (we want to build only templates)
 # Select fc29 and stretch (for the currently shipping templates)
 # Select builder-rpm, builder-debian, template-whonix, mgmt-salt

From bed97cac64b1b64eb516f459775ddab7cf873a5e Mon Sep 17 00:00:00 2001
From: awokd <34515595+awokd@users.noreply.github.com>
Date: Sat, 6 Apr 2019 23:32:28 +0000
Subject: [PATCH 4/4] make clear components will be downloaded

---
 building/qubes-builder.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/building/qubes-builder.md b/building/qubes-builder.md
index 0c8a9658..3eda0b1f 100644
--- a/building/qubes-builder.md
+++ b/building/qubes-builder.md
@@ -145,7 +145,7 @@ Before creating the `chroot`, add this to your `builder.conf`:
     USE_QUBES_REPO_VERSION = $(RELEASE)
 
 It will add the 'current' Qubes repository to your `chroot` environment.
-Next, specify which components (`gcc`, for example) you do *not* want to compile:
+Next, specify which components (`gcc`, for example) you want to download instead of compiling:
 
     COMPONENTS := $(filter-out gcc,$(COMPONENTS))