diff --git a/documentation/yocto-project-qs/yocto-project-qs.xml b/documentation/yocto-project-qs/yocto-project-qs.xml
index 72d7dcce12..333ccc4727 100644
--- a/documentation/yocto-project-qs/yocto-project-qs.xml
+++ b/documentation/yocto-project-qs/yocto-project-qs.xml
@@ -404,13 +404,30 @@
              Use the following commands to build your image.
              The OpenEmbedded build process creates an entire Linux
              distribution, including the toolchain, from source.
-             <note>
-                 By default, the build process searches for source code using
-                 a pre-determined order through a set of locations.
-                 If you encounter problems with the build process finding and
-                 downloading source code, see the
-                 "<ulink url='&YOCTO_DOCS_REF_URL;#how-does-the-yocto-project-obtain-source-code-and-will-it-work-behind-my-firewall-or-proxy-server'>How does the OpenEmbedded build system obtain source code and will it work behind my firewall or proxy server?</ulink>"
-                 entry in the Yocto Project Reference Manual FAQ.
+             <note><title>Note about Network Proxies</title>
+                 <para>
+                     By default, the build process searches for source code
+                     using a pre-determined order through a set of locations.
+                     If you are working behind a firewall and your build system
+                     is not set up for proxies, you could encounter problems
+                     with the build process when fetching source code (e.g.
+                     fetcher failures or Git failures).
+                 </para>
+
+                 <para>
+                     If you do not know your proxy settings, consult your
+                     local network infrastructure resources and get that
+                     information.
+                     A good starting point could also be to check your web
+                     browser settings.
+                     Finally, you can find more information on using the Yocto
+                     Project behind a firewall in the Yocto Project Reference
+                     Manual
+                     <ulink url='&YOCTO_DOCS_REF_URL;#how-does-the-yocto-project-obtain-source-code-and-will-it-work-behind-my-firewall-or-proxy-server'>FAQ</ulink>
+                     and on the
+                     "<ulink url='https://wiki.yoctoproject.org/wiki/Working_Behind_a_Network_Proxy'>Working Behind a Network Proxy</ulink>"
+                     wiki page.
+                 </para>
              </note>
          </para>