From 74be533423252a560ce87c6ae82f94fc835d87fb Mon Sep 17 00:00:00 2001
From: kn0wmad <kn0wmad@protonmail.com>
Date: Wed, 29 Dec 2021 12:48:18 -0700
Subject: [PATCH] DG Backups, About init, minor edits

---
 poetry.lock                                   |  12 +-
 site/03-todo.md                               |   2 +-
 site/source/about/contact.rst                 |  42 +++
 site/source/about/index.rst                   |  42 ++-
 site/source/about/jobs.rst                    |  14 +
 site/source/about/license.rst                 |  31 ++
 site/source/about/privacy.rst                 |  42 +--
 site/source/about/roadmap.rst                 | 354 +++++++++++++++++-
 .../device-guides/dg-android.rst              |   4 +-
 .../getting-started/device-guides/dg-ios.rst  |   4 +-
 .../device-guides/dg-linux.rst                |  13 +-
 .../getting-started/device-guides/dg-mac.rst  |  13 +-
 .../device-guides/dg-windows.rst              |  13 +-
 .../getting-started/device-guides/index.rst   |   6 +-
 site/source/support/user-manual/index.rst     |  14 +-
 .../source/support/user-manual/tuning/diy.rst |   8 +-
 .../tuning/service-guides/bitcoin.rst         |  19 +-
 .../tuning/service-guides/index.rst           |   2 +
 .../user-manual/walkthrough/updates.rst       |   2 +-
 19 files changed, 564 insertions(+), 73 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 4731824..1018e3c 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -24,17 +24,17 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
 [[package]]
 name = "attrs"
-version = "21.3.0"
+version = "21.4.0"
 description = "Classes Without Boilerplate"
 category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 
 [package.extras]
-dev = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit"]
+dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit", "cloudpickle"]
 docs = ["furo", "sphinx", "zope.interface", "sphinx-notfound-page"]
-tests = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface"]
-tests_no_zope = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins"]
+tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "cloudpickle"]
+tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "cloudpickle"]
 
 [[package]]
 name = "babel"
@@ -633,8 +633,8 @@ atomicwrites = [
     {file = "atomicwrites-1.4.0.tar.gz", hash = "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a"},
 ]
 attrs = [
-    {file = "attrs-21.3.0-py2.py3-none-any.whl", hash = "sha256:8f7335278dedd26b58c38e006338242cc0977f06d51579b2b8b87b9b33bff66c"},
-    {file = "attrs-21.3.0.tar.gz", hash = "sha256:50f3c9b216dc9021042f71b392859a773b904ce1a029077f58f6598272432045"},
+    {file = "attrs-21.4.0-py2.py3-none-any.whl", hash = "sha256:2d27e3784d7a565d36ab851fe94887c5eccd6a463168875832a1be79c82828b4"},
+    {file = "attrs-21.4.0.tar.gz", hash = "sha256:626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd"},
 ]
 babel = [
     {file = "Babel-2.9.1-py2.py3-none-any.whl", hash = "sha256:ab49e12b91d937cd11f0b67cb259a57ab4ad2b59ac7a3b41d6c06c0ac5b0def9"},
diff --git a/site/03-todo.md b/site/03-todo.md
index 3e09964..82fe4c0 100644
--- a/site/03-todo.md
+++ b/site/03-todo.md
@@ -3,7 +3,7 @@
     - Introduction
     - Purchasing
     - Initial Setup
-    - Device-specific Setup Guides <label links with connectivity, performance, or tuning>
+    - Device-specific Setup Guides <label links with connectivity, performance, reliability, or tuning> - **ASK LUCY ABOUT "BADGES?"**
         - Linux
         - Mac
         - Windows
diff --git a/site/source/about/contact.rst b/site/source/about/contact.rst
index e69de29..1f64d45 100644
--- a/site/source/about/contact.rst
+++ b/site/source/about/contact.rst
@@ -0,0 +1,42 @@
+.. _contact:
+
+==========
+Contact Us
+==========
+
+Community Channels
+------------------
+
+Matrix
+======
+
+Start9 Community - https://matrix.to/#/#community:matrix.start9labs.com
+Community Developers - https://matrix.to/#/#community-dev:matrix.start9labs.com
+
+Start9 Tor Community (Tor required) - https://matrix.to/#/!iRwnQntcjpWfLxdgav:matrix.privacy34kn4ez3y3nijweec6w4g54i3g54sdv7r5mr6soma3w4begyd.onion?via=matrix.start9labs.com&via=matrix.privacy34kn4ez3y3nijweec6w4g54i3g54sdv7r5mr6soma3w4begyd.onion&via=oayal5vhil3zhj7ylixvpi4nr2xvhypdnenji4sx5q4kvaotevjvsxad.onion
+
+Telegram
+========
+
+https://t.me/start9_labs
+
+Mastodon
+========
+
+https://mastodon.start9labs.com/
+
+Twitter
+=======
+
+https://twitter.com/start9labs
+
+Email
+-----
+
+General Inquiries - info@start9labs.com
+
+Support - support@start9labs.com
+
+Operations - ops@start9labs.com
+
+Affiliates - affiliate@start9labs.com
diff --git a/site/source/about/index.rst b/site/source/about/index.rst
index 853914d..84dd172 100644
--- a/site/source/about/index.rst
+++ b/site/source/about/index.rst
@@ -24,38 +24,56 @@
   <div class="grid-x grid-margin-x">
 
 .. topic-box::
-  :title: Teach
-  :link: teach
+  :title: Start9 Labs
+  :link: start9
   :icon: scylla-icon scylla-icon--knowledge-base
   :class: large-4
-  :anchor: Learn
+  :anchor: Principles
 
    An overview of the ideas and technologies surrounding Start9 Labs and Embassy.
 
 .. topic-box::
-  :title: Provide Support
-  :link: provide-support
+  :title: Roadmap
+  :link: roadmap
   :icon: scylla-icon scylla-icon--knowledge-base
   :class: large-4
-  :anchor: Learn
+  :anchor: View
 
    An overview of the ideas and technologies surrounding Start9 Labs and Embassy.
 
 .. topic-box::
-  :title: Decentralize
-  :link: decentralize
+  :title: Privacy
+  :link: privacy
   :icon: scylla-icon scylla-icon--knowledge-base
   :class: large-4
-  :anchor: Learn
+  :anchor: View
 
    An overview of the ideas and technologies surrounding Start9 Labs and Embassy.
 
 .. topic-box::
-  :title: Promote
-  :link: promote
+  :title: License
+  :link: license
   :icon: scylla-icon scylla-icon--knowledge-base
   :class: large-4
-  :anchor: Learn
+  :anchor: View
+
+   An overview of the ideas and technologies surrounding Start9 Labs and Embassy.
+
+.. topic-box::
+  :title: Jobs
+  :link: jobs
+  :icon: scylla-icon scylla-icon--knowledge-base
+  :class: large-4
+  :anchor: View
+
+   An overview of the ideas and technologies surrounding Start9 Labs and Embassy.
+
+.. topic-box::
+  :title: Contact Us
+  :link: contact
+  :icon: scylla-icon scylla-icon--knowledge-base
+  :class: large-4
+  :anchor: Reach out
 
    An overview of the ideas and technologies surrounding Start9 Labs and Embassy.
 
diff --git a/site/source/about/jobs.rst b/site/source/about/jobs.rst
index e69de29..e78aa85 100644
--- a/site/source/about/jobs.rst
+++ b/site/source/about/jobs.rst
@@ -0,0 +1,14 @@
+.. _jobs:
+
+==============
+Open Positions
+==============
+
+Get a jerb ya bum
+
+Engineering Manager
+-------------------
+
+
+Customer Support
+----------------
diff --git a/site/source/about/license.rst b/site/source/about/license.rst
index e69de29..4bfc6bb 100644
--- a/site/source/about/license.rst
+++ b/site/source/about/license.rst
@@ -0,0 +1,31 @@
+.. _license:
+
+=======================
+Start9 Software License
+=======================
+
+# START9 PERSONAL USE LICENSE v1.0
+
+This license governs the use of the accompanying Software. If you use the Software, you accept this license. If you do not accept the license, do not use the Software.
+
+1. **Definitions.**
+    1. “Licensor” means the copyright owner, Start9 Labs, Inc, or its successor(s) in interest, or a future assignee of the copyright.
+    2. “Source Code” means the preferred form of the Software for making modifications to it.
+    3. “Object Code” means any non-source form of the Software, including the machine-language output by a compiler or assembler.
+    4. “Distribute” means to convey or to publish and generally has the same meaning here as under U.S. Copyright law.
+    5. “Sell” means practicing any or all of the rights granted to you under the License to provide to third parties, for a fee or other consideration (including without limitation fees for hosting or consulting/support services related to the Software), a product or service whose value derives, entirely or substantially, from the functionality of the Software.
+
+2. **Grant of Rights.** Subject to the terms of this license, the Licensor grants you, the licensee, a non-exclusive, worldwide, royalty-free copyright license to:
+    1. Access, audit, copy, modify, compile, or distribute the Source Code or modifications to the Source Code.
+    2. Run, test, or otherwise use the Object Code.
+
+3. **Limitations.**
+    1. The grant of rights under the License will NOT include, and the License does NOT grant you the right to:
+        1. Sell the Software or any derivative works based thereon.
+        2. Distribute the Object Code.
+    2. If you Distribute the Source Code, or if permission is separately granted to Distribute the Object Code, you expressly undertake not to remove, or modify, in any manner, the copyright notices attached to the Source Code, and displayed in any output of the Object Code when run, and to reproduce these notices, in an identical manner, in any distributed copies of the Software together with a copy of this license. If you Distribute a modified copy of the Software, or a derivative work based thereon, the work must carry prominent notices stating that you modified it, and giving a relevant date.
+    3. The terms of this license will apply to anyone who comes into possession of a copy of the Software, and any modifications or derivative works based thereon, made by anyone.
+
+4. **Contributions.** You hereby grant to Licensor a perpetual, irrevocable, worldwide, non-exclusive, royalty-free license to use and exploit any modifications or derivative works based on the Source Code of which you are the author.
+
+5. **Disclaimer.** THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. LICENSOR HAS NO OBLIGATION TO SUPPORT RECIPIENTS OF THE SOFTWARE.
diff --git a/site/source/about/privacy.rst b/site/source/about/privacy.rst
index 180f95d..685f0ae 100644
--- a/site/source/about/privacy.rst
+++ b/site/source/about/privacy.rst
@@ -1,25 +1,25 @@
-    <h1 class="ion-text-center" style="font-size: calc(2vw + 24px);">Privacy Policy</h1>
+.. _privacy:
 
-    <section>
-      <h2 style="font-size: calc(1.5vw + 16px);">General Principles</h2>
-      <p>At Start9 Labs, Inc (“Start9”, “we”, “us”, “our”), we believe that privacy is a basic human right and have designed our
-      devices and software systems (“Products”) to uphold this principle.
-      
-      Start9 does not collect, does not want to collect, and has no reasonable means of collecting, your personal information
-      from the usage of our Products.</p>
+==============
+Privacy Policy
+==============
 
-      <h2 style="font-size: calc(1.5vw + 16px);">Voluntary Provisions</h2>
-      <p>When you visit start9.com or our other public websites, our visitors (“customers”, “you”, “your”) may voluntarily
-      provide us with certain personal information, such as your name or email address, for the purpose of receiving updates
-      about our Products, or to receive a response to an inquiry. We use this information internally and do not share it with
-      third parties. You will only receive communications from us, email or otherwise, if you have explicitly opted in to such
-      communications, and you may opt out at any time.</p>
 
-      <h2 style="font-size: calc(1.5vw + 16px);">Online Purchases</h2>
-      <p>When you purchase Products from our website, we necessarily collect certain personal information, such as name, email,
-      shipping address, and payment details, in order to facilitate the transaction and conduct shipment. We do not use the
-      information for any other purpose. Start9 relies on third party payment processors and shipping partners to conduct
-      transactions, and have no control over their collection or usage of your information.</p>
+General Principles
+------------------
 
-      <p>This Privacy Policy was last updated on July 28, 2020</p>
-    </section>
+At Start9 Labs, Inc (“Start9”, “we”, “us”, “our”), we believe that privacy is a basic human right and have designed our devices and software systems (“Products”) to uphold this principle.
+
+Start9 does not collect, does not want to collect, and has no reasonable means of collecting, your personal information from the usage of our Products.
+
+Voluntary Provisions
+--------------------
+
+When you visit start9.com or our other public websites, our visitors (“customers”, “you”, “your”) may voluntarily provide us with certain personal information, such as your name or email address, for the purpose of receiving updates about our Products, or to receive a response to an inquiry. We use this information internally and do not share it with third parties. You will only receive communications from us, email or otherwise, if you have explicitly opted in to such communications, and you may opt out at any time.
+
+Online Purchases
+----------------
+
+When you purchase Products from our website, we necessarily collect certain personal information, such as name, email, shipping address, and payment details, in order to facilitate the transaction and conduct shipment. We do not use the information for any other purpose. Start9 relies on third party payment processors and shipping partners to conduct transactions, and have no control over their collection or usage of your information.
+
+This Privacy Policy was last updated on July 28, 2020
diff --git a/site/source/about/roadmap.rst b/site/source/about/roadmap.rst
index 5383f93..1b65b2a 100644
--- a/site/source/about/roadmap.rst
+++ b/site/source/about/roadmap.rst
@@ -1,4 +1,356 @@
 Probably needs to actually be an html page that is linked to from "About"
 
 
-Also badly needs updating
\ No newline at end of file
+Also badly needs updating
+
+.. .. raw:: html
+
+..     <!doctype html>
+..     <html class="no-js" lang="en">
+..     <head>
+..     <meta charset="utf-8">
+..     <meta http-equiv="x-ua-compatible" content="ie=edge">
+..     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+..     <title>Start9 - Roadmap</title>
+..     <meta name="author" content="Start9">
+..     <meta name="description" content="The world of free and open source software is rich and expanding. With the Embassy device and platform, Start9 aims to unleash open source software and usher in a new era of sovereign computing.">
+..     <meta name="twitter:card" content="summary">
+..     <meta name="twitter:site" content="@start9labs">
+..     <meta name="og:title" content="Start9 - Sovereign Computing">
+..     <meta property="og:image" content="https://start9.com/images/icon.png" />
+..     <meta name="og:description" content="The world of free and open source software is rich and expanding. With the Embassy device and platform, Start9 aims to unleash open source software and usher in a new era of sovereign computing.">
+..     <link rel="icon" type="image/png" href="images/favicon.ico">
+..     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
+..     <link href="styles/main.css" rel="stylesheet">
+..     </head>
+..     <body class="body--transparent-header">
+..     <!-- <div class="banner" id="banner" role="banner">
+..         <span class="banner-text">Limited time sale on the <b>Embassy One</b>! Only $219. Custom engraving available. <a href="https://store.start9.com/collections/embassy">Purchase now!</a></span>
+..         <div class="banner-x" onclick="hideBanner()">&times;</div>
+..     </div> -->
+..     <header class="site-header-wrapper" id="top" role="navigation">
+..         <div class="site-header">
+..         <nav class="navbar navbar-expand-lg main-navigation navbar-dark">
+..             <a href="/" class="logo-box"><img src="images/Start9_logo.png" class="logo" alt="Start9 Logo"></a>
+..             <button class="navbar-toggler nav-toggle" type="button" data-toggle="collapse" data-target="#navbarNavDropdown"
+..             aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
+..             <span class="navbar-toggler-icon"></span>
+..             </button>
+..             <div class="collapse navbar-collapse" id="navbarNavDropdown">
+..             <ul class="navbar-nav">
+..                 <li class="nav-item">
+..                 <a class="nav-link" href="https://store.start9.com/collections/" target="_blank">Store</a>
+..                 </li>
+..                 <li class="nav-item">
+..                 <a class="nav-link documentation" href="#" target="_blank" rel="noopener noreferrer">Docs</a>
+..                 </li>
+..                 <li class="nav-item">
+..                 <a class="nav-link" href="https://www.youtube.com/channel/UCGEw4HJDvOn3Oy8ykR36P7Q" target="_blank" rel="noopener noreferrer">Videos</a>
+..                 </li>
+..                 <li class="nav-item">
+..                 <a class="nav-link" href="news">News</a>
+..                 </li>
+..                 <li class="nav-item">
+..                 <a class="nav-link" href="roadmap">Roadmap</a>
+..                 </li>
+..                 <li class="nav-item">
+..                 <a class="nav-link" href="join-us">Jobs</a>
+..                 </li>
+..             </ul>
+..             </div>
+..         </nav>
+..         </div>
+..     </header>
+
+..     <section class="margin-top-7 margin-bottom-7 content s-page-roadmap">
+..         <div class="container text-center">
+..         <h1 class="accent container">Roadmap</h1>
+..         <p class="container">The Past, Present, and Future of Start9</p>
+..         </div>
+
+..         <section id="cd-timeline" class="cd-container">
+..         <div class="cd-timeline-block">
+..             <div class="cd-timeline-img cd-picture">
+..             </div>
+
+..             <div class="cd-timeline-content">
+..             <h2>the beginning</h2>
+..             <h3>Start9 Labs founded</h3>
+..             <span class="cd-date">2019</span>
+..             </div> <!-- cd-timeline-content -->
+..         </div> <!-- cd-timeline-block -->
+
+..         <div class="cd-timeline-block">
+..             <div class="cd-timeline-img cd-movie">
+..             </div> <!-- cd-timeline-img -->
+
+..             <div class="cd-timeline-content">
+..             <h2>early days</h2>
+..             <h3>EmbassyOS v0.1.0</h3>
+..                 <ul class="content-skills">
+..                 <li>Services Marketplace</li>
+..                 <li>One-click installs of open source, self-hosted software</li>
+..                 </ul>
+..             <h3>Services</h3>
+..                 <ul class="content-skills">
+..                 <li>Bitcoin Core</li>
+..                 <li>Bitwarden</li>
+..                 <li>Cups messenger</li>
+..                 </ul>
+..             <span class="cd-date">2020 Q1 / Q2</span>
+..             </div> <!-- cd-timeline-content -->
+..         </div> <!-- cd-timeline-block -->
+
+..         <div class="cd-timeline-block">
+..             <div class="cd-timeline-img cd-picture">
+..             </div> <!-- cd-timeline-img -->
+
+..             <div class="cd-timeline-content">
+..             <h2>laying the foundation</h2>
+..             <h3>EOS v0.2.0</h3>
+..                 <ul class="content-skills">
+..                 <li>UI self-hosted on Embassy</li>
+..                 <li>Automated dependency management</li>
+..                 <li>User-generated private keys</li>
+..                 <li>User-generated passwords</li>
+..                 <li>Service data backups</li>
+..                 <li>Wifi credentials for additional networks</li>
+..                 <li>Many more 'under-the-hood' upgrades</li>
+..                 </ul>
+..             <h3>Services</h3>
+..                 <ul class="content-skills">
+..                 <li>File Browser</li>
+..                 </ul>
+..             <h3>Consulate Browser released</h3>
+..             <span class="cd-date">2020 Q3</span>
+..             </div> <!-- cd-timeline-content -->
+..         </div> <!-- cd-timeline-block -->
+
+..         <div class="cd-timeline-block">
+..             <div class="cd-timeline-img cd-location">
+..             </div> <!-- cd-timeline-img -->
+
+..             <div class="cd-timeline-content">
+..             <h2>forging lightning</h2>
+..             <h3>EOS v0.2.5</h3>
+..                 <ul class="content-skills">
+..                 <li>Radical new dependency management and configuration system</li>
+..                 </ul>
+..             <h3>Services</h3>
+..                 <ul class="content-skills">
+..                 <li>BTC Proxy</li>
+..                 <li>LND</li>
+..                 <li>C-Lightning</li>
+..                 <li>Ride the Lightning</li>
+..                 <li>Spark Wallet</li>
+..                 <li>Burn After Reading</li>
+..                 </ul>
+..             <span class="cd-date">2020 Q4</span>
+..             </div> <!-- cd-timeline-content -->
+..         </div> <!-- cd-timeline-block -->
+
+..         <div class="cd-timeline-block">
+..             <div class="cd-timeline-img cd-location">
+..             </div>
+
+..             <div class="cd-timeline-content">
+..             <h2>entering the fediverse</h2>
+..             <h3>EOS v0.2.10</h3>
+..                 <ul class="content-skills">
+..                 <li>LAN support</li>
+..                 <li>Service Actions</li>
+..                 <li>User-generated private keys</li>
+..                 <li>User-generated passwords</li>
+..                 </ul>
+..             <h3>Services</h3>
+..                 <ul class="content-skills">
+..                 <li>Mastodon</li>
+..                 <li>BTCPay Server</li>
+..                 </ul>
+..             <h3>Team expanded</h3>
+..             <span class="cd-date">2021 Q1</span>
+..             </div> <!-- cd-timeline-content -->
+..         </div> <!-- cd-timeline-block -->
+
+..         <div class="cd-timeline-block">
+..             <div class="cd-timeline-img cd-movie">
+..             </div> <!-- cd-timeline-img -->
+
+..             <div class="cd-timeline-content">
+..             <h2>new use-cases</h2>
+..             <h3>Services</h3>
+..                 <ul class="content-skills">
+..                 <li>Sphinx Chat</li>
+..                 <li>Embassy Pages</li>
+..                 <li>Photoview</li>
+..                 </ul>
+..             <h3>Further team expansion</h3>
+..             <span class="cd-date">2021 Q2</span>
+..             </div> <!-- cd-timeline-content -->
+..         </div> <!-- cd-timeline-block -->
+
+..         <div class="cd-timeline-block">
+..             <div class="cd-timeline-img cd-location">
+..             </div>
+
+..             <div class="cd-timeline-content">
+..             <h2>rebirth of embassyos</h2>
+..             <h3>EOS v0.3.0</h3>
+..             <ul class="content-skills">
+..                 <li>Complete OS overhaul</li>
+..                 <li>External drive support</li>
+..                 <li>OS / Service data segregation</li>
+..                 <li>New streamlined setup, migration, backup, & recovery processes</li>
+..                 <li>Many, many more details coming soon</li>
+..             </ul>
+..             <h3>Services</h3>
+..             <ul class="content-skills">
+..                 <li>Thunderhub</li>
+..                 <li>See wishlist below...</li>
+..             </ul>
+..             <span class="cd-date">2021 Q3</span>
+..             </div> <!-- cd-timeline-content -->
+..         </div> <!-- cd-timeline-block -->
+
+..         <div class="cd-timeline-block">
+..             <div class="cd-timeline-img cd-location">
+..             </div>
+
+..             <div class="cd-timeline-content">
+..             <h2>coming soon...</h2>
+..             <h3>EOS v0.3.x</h3>
+..             <ul class="content-skills">
+..                 <li>Additional storage features</li>
+..                 <li>Additional networking options</li>
+..                 <li>Data encryption</li>
+..                 <li>Remote backups</li>
+..                 <li>Non-Anonymous Hidden Services</li>
+..             </ul>
+..             <h3>Expected Services*</h3>
+..             <ul class="content-skills">
+..                 <li>Bitcoin Wallet Tracker</li>
+..                 <li>Mempool.Space</li>
+..                 <li>Monero</li>
+..                 <li>See wishlist below...</li>
+..             </ul>
+..             <span class="cd-date">2021 Q4</span>
+..             </div> <!-- cd-timeline-content -->
+..         </div> <!-- cd-timeline-block -->
+
+..         <div class="cd-timeline-block">
+..             <div class="cd-timeline-img cd-location">
+..             </div>
+
+..             <div class="cd-timeline-content">
+..             <h2>on the horizon</h2>
+..             <h3>New Embassy form factor</h3>
+..             <h3>Expected Services*</h3>
+..             <ul class="content-skills">
+..                 <li>Nextcloud</li>
+..                 <li>Wireguard</li>
+..                 <li>PiHole</li>
+..                 <li>See wishlist below...</li>
+..             </ul>
+..             <span class="cd-date">2022 Q1</span>
+..             </div> <!-- cd-timeline-content -->
+..         </div> <!-- cd-timeline-block -->
+
+..         <div class="cd-timeline-block">
+..             <div class="cd-timeline-img cd-location">
+..             </div>
+
+..             <div class="cd-timeline-content">
+..             <h2>current research & development</h2>
+..             <h3>New devices</h3>
+..             <h3>Multi-Embassy syncing</h3>
+..             <h3>Advanced networking & mesh capabilities</h3>
+..             <span class="cd-date">2022 and Beyond</span>
+..             </div> <!-- cd-timeline-content -->
+..         </div> <!-- cd-timeline-block -->
+..         </section> <!-- cd-timeline -->
+
+..         <div class="container margin-top-4 margin-bottom-5">
+..         <div class="row justify-content-center">
+..             <div class="col-12 col-md-9">
+..             <h2>*Start9 Services Wishlist</h2>
+..             <p>It is difficult to predict new service releases as some are released in an on-demand fashion, others might be determined
+..             to be a good or bad fit in the moment, and still others can be packaged up by community developers at any time! We do pay
+..             close attention to the community's desire for certain services, which can be monitored on this <a href="https://s9.altweb.me">unofficial list.</a></p>
+..             <h3>Services</h3>
+..             <ul class="content-skills">
+..                 <li>Firefox Sync server</li>
+..                 <li>IPFS</li>
+..                 <li>Home Assistant</li>
+..                 <li>Conduit Matrix implementation</li>
+..                 <li>Zeronet</li>
+..                 <li>Wordpress</li>
+..                 <li>Plex Media Server</li>
+..             </ul>
+..             <h3>Miscellaneous</h3>
+..             <ul class="content-skills">
+..                 <li>2FA hardware key servers</li>
+..                 <li>Bitcoin mixing</li>
+..                 <li>Wikis / notes</li>
+..                 <li>Security camera monitoring</li>
+..                 <li>Search engine</li>
+..             </ul>
+..             <p>To better understand the full potential of Embassy, check out this list of <a href="https://github.com/awesome-selfhosted/awesome-selfhosted" target="_blank">self-hosted services</a>. All of these open-source projects can be made to work with the Start9 Labs Embassy platform.</p>
+..             <p>Is there a particular service you want to see? <a href="/#community">Contact us</a> and let us know.</p>
+..             </div>
+..         </div>
+..         </div>
+..     </section>
+
+..     <footer class="s-footer">
+..         <div class="container">
+..         <div class="row align-items-start s-footer__logo-row">
+..             <div class="col-md-6 col-12 order-2 order-md-1">
+..             <div class="row s-footer__logo">
+..                 <div class="col-2">
+..                 <a href="#top"><img src="images/icon-transparent.png" class="s-footer__logo-img" alt="S9 Logo"></a>
+..                 </div>
+..                 <div class="col-10 s-footer__social invert">
+..                 <a href="https://medium.com/@start9labs" target="_blank" rel="noopener nofollow"><img class="s-footer__social-icon" alt="medium icon" src="images/Medium-new.png" title="Medium"></a>
+..                 <a href="https://github.com/Start9Labs/" target="_blank" rel="noopener nofollow"><img class="s-footer__social-icon" alt="github icon" src="images/developer-community-github-1.png" title="GitHub"></a>
+..                 <a href="https://twitter.com/start9labs?lang=en" target="_blank" rel="noopener nofollow"><img class="s-footer__social-icon" alt="twitter icon" src="images/social-media-twitter.png" title="Twitter"></a>
+..                 <a href="https://t.me/start9_labs" target="_blank" rel="noopener nofollow"><img class="s-footer__social-icon" alt="telegram icon" src="images/telegram.png" title="Telegram"></a>
+..                 <a href="http://privacy34kn4ez3y3nijweec6w4g54i3g54sdv7r5mr6soma3w4begyd.onion" target="_blank" rel="noopener nofollow"><img class="s-footer__social-icon" alt="tor icon" src="images/tor_icon.png" title="Tor Website"></a>
+..                 </div>
+..             </div>
+..             <div class="row padding-top-1">
+..                 <p class="s-footer__logo-copyright">&copy; Copyright 2021 Start9Labs</p>
+..                 <p class="s-footer__logo-copyright">BTC Donations: bc1qdah5dculyuw8c6f3wzzannpjt4w5and4knf87h</p>
+..                 <p class="s-footer__logo-copyright">We have never received a secret government request to hand over user
+..                 information.</p>
+..             </div>
+..             </div>
+..             <div class="col-12 col-md-6 order-1 order-md-2 s-footer__nav">
+..             <div class="row justify-content-end">
+..                 <div class="col-12 col-md-4">
+..                 <h4>company</h4>
+..                 <ul>
+..                     <li><a href="news">Media</a></li>
+..                     <li><a href="/#community">Community</a></li>
+..                     <li><a href="join-us">Careers</a></li>
+..                 </ul>
+..                 </div>
+..                 <div class="col-12 col-md-5">
+..                 <h4>resources</h4>
+..                 <ul>
+..                     <li><a href="https://medium.com/@start9labs" target="_blank" rel="nofollow noopener">Blog</a></li>
+..                     <li><a href="privacy">Privacy Policy</a></li>
+..                     <li><a href="license-v1.0">License</a></li>
+..                 </ul>
+..                 </div>
+..             </div>
+..             </div>
+..         </div>
+..         </div>
+..     </footer>
+
+..     <script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous"></script>
+..     <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
+..     <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script>
+..     <script src="scripts/bundle.js"></script>
+..     </body>
+..     </html>
diff --git a/site/source/support/user-manual/getting-started/device-guides/dg-android.rst b/site/source/support/user-manual/getting-started/device-guides/dg-android.rst
index 2cb9ace..ee2fb6d 100644
--- a/site/source/support/user-manual/getting-started/device-guides/dg-android.rst
+++ b/site/source/support/user-manual/getting-started/device-guides/dg-android.rst
@@ -4,6 +4,8 @@
 Android
 =======
 
+.. note:: Please see Android's :ref:`Known Limitations<lim-android>` to understand what is currently not possible on these devices
+
 Tor Setup (Connectivity)
 ------------------------
 
@@ -13,5 +15,3 @@ Tor Firefox Config (Connectivity)
 ---------------------------------
 
 `Configure Firefox <docs.start9.com/user-manual/configuration/tor-setup/tor-firefox/torff-android>`_ to be able to use the :ref:`Tor Network<tor>` so that you can reach ``.onion`` sites without needing to change browsers.
-
-.. note:: Please see Android's :ref:`Known Limitations<lim-android>` to understand what is currently not possible on these devices
\ No newline at end of file
diff --git a/site/source/support/user-manual/getting-started/device-guides/dg-ios.rst b/site/source/support/user-manual/getting-started/device-guides/dg-ios.rst
index 69a66e6..6886af0 100644
--- a/site/source/support/user-manual/getting-started/device-guides/dg-ios.rst
+++ b/site/source/support/user-manual/getting-started/device-guides/dg-ios.rst
@@ -4,9 +4,9 @@
 iOS
 ===
 
+.. note:: Please see iOS's :ref:`Known Limitations<lim-ios>` to understand what is currently not possible on these devices
+
 LAN Setup (Connectivity, Performance)
 -------------------------------------
 
 `Setup LAN Access <docs.start9.com/user-manual/configuration/lan-setup/lan-ios>`_ for a fast and secure connection while on your Embassy's local network.
-
-.. note:: Please see iOS's :ref:`Known Limitations<lim-ios>` to understand what is currently not possible on these devices
\ No newline at end of file
diff --git a/site/source/support/user-manual/getting-started/device-guides/dg-linux.rst b/site/source/support/user-manual/getting-started/device-guides/dg-linux.rst
index 8382385..87f34ba 100644
--- a/site/source/support/user-manual/getting-started/device-guides/dg-linux.rst
+++ b/site/source/support/user-manual/getting-started/device-guides/dg-linux.rst
@@ -4,19 +4,24 @@
 Linux Guides
 ============
 
+.. note:: Please see Linux's :ref:`Known Limitations<lim-linux>` to understand what is currently not possible on these devices
+
 LAN Setup (Connectivity, Performance)
 -------------------------------------
 
-`Setup LAN Access <docs.start9.com/user-manual/configuration/lan-setup/lan-linux>`_ for a fast and secure connection while on your Embassy's local network.
+`Setup LAN Access <https://docs.start9.com/support/user-manual/configuration/lan-setup/lan-linux>`_ for a fast and secure connection while on your Embassy's local network.
 
 Tor Setup (Connectivity)
 ------------------------
 
-`Setup Tor <docs.start9.com/user-manual/configuration/tor-setup/tor-os/tor-linux>`_ to run natively (in the background) on your device.  This will allow you to use applications on your Linux machine via the :ref:`Tor Network<tor>` so they can communicate with your Embassy.
+`Setup Tor <https://docs.start9.com/support/user-manual/configuration/tor-setup/tor-os/tor-linux>`_ to run natively (in the background) on your device.  This will allow you to use applications on your Linux machine via the :ref:`Tor Network<tor>` so they can communicate with your Embassy.
 
 Tor Firefox Config (Connectivity)
 ---------------------------------
 
-`Configure Firefox <docs.start9.com/user-manual/configuration/tor-setup/tor-firefox/torff-linux>`_ to be able to use the :ref:`Tor Network<tor>` so that you can reach ``.onion`` sites without needing to change browsers.
+`Configure Firefox <https://docs.start9.com/support/user-manual/configuration/tor-setup/tor-firefox/torff-linux>`_ to be able to use the :ref:`Tor Network<tor>` so that you can reach ``.onion`` sites without needing to change browsers.
 
-.. note:: Please see Linux's :ref:`Known Limitations<lim-linux>` to understand what is currently not possible on these devices
\ No newline at end of file
+Embassy Backups (Reliability)
+-----------------------------
+
+`Configure Remote Backup <https://docs.start9.com/support/user-manual/walkthrough/backup/backup-lin>`_ of your Embassy to your Linux machine.  **Backups are supremely important** as they ensure redundancy of your data for convenience, as well as preventing loss in case of disaster.
diff --git a/site/source/support/user-manual/getting-started/device-guides/dg-mac.rst b/site/source/support/user-manual/getting-started/device-guides/dg-mac.rst
index aea5de6..132e201 100644
--- a/site/source/support/user-manual/getting-started/device-guides/dg-mac.rst
+++ b/site/source/support/user-manual/getting-started/device-guides/dg-mac.rst
@@ -4,19 +4,24 @@
 Mac
 ===
 
+.. note:: Please see Mac's :ref:`Known Limitations<lim-mac>` to understand what is currently not possible on these devices
+
 LAN Setup (Connectivity, Performance)
 -------------------------------------
 
-`Setup LAN Access <docs.start9.com/user-manual/configuration/lan-setup/lan-mac>`_ for a fast and secure connection while on your Embassy's local network.
+`Setup LAN Access <https://docs.start9.com/support/user-manual/configuration/lan-setup/lan-mac>`_ for a fast and secure connection while on your Embassy's local network.
 
 Tor Setup (Connectivity)
 ------------------------
 
-`Setup Tor <docs.start9.com/user-manual/configuration/tor-setup/tor-os/tor-mac>`_ to run natively (in the background) on your device.  This will allow you to use applications on your Mac via the :ref:`Tor Network<tor>` so they can communicate with your Embassy.
+`Setup Tor <https://docs.start9.com/support/user-manual/configuration/tor-setup/tor-os/tor-mac>`_ to run natively (in the background) on your device.  This will allow you to use applications on your Mac via the :ref:`Tor Network<tor>` so they can communicate with your Embassy.
 
 Tor Firefox Config (Connectivity)
 ---------------------------------
 
-`Configure Firefox <docs.start9.com/user-manual/configuration/tor-setup/tor-firefox/torff-mac>`_ to be able to use the :ref:`Tor Network<tor>` so that you can reach ``.onion`` sites without needing to change browsers.
+`Configure Firefox <https://docs.start9.com/support/user-manual/configuration/tor-setup/tor-firefox/torff-mac>`_ to be able to use the :ref:`Tor Network<tor>` so that you can reach ``.onion`` sites without needing to change browsers.
 
-.. note:: Please see Mac's :ref:`Known Limitations<lim-mac>` to understand what is currently not possible on these devices
\ No newline at end of file
+Embassy Backups (Reliability)
+-----------------------------
+
+`Configure Remote Backup <https://docs.start9.com/support/user-manual/walkthrough/backup/backup-mac>`_ of your Embassy to your Mac device.  **Backups are supremely important** as they ensure redundancy of your data for convenience, as well as preventing loss in case of disaster.
diff --git a/site/source/support/user-manual/getting-started/device-guides/dg-windows.rst b/site/source/support/user-manual/getting-started/device-guides/dg-windows.rst
index 16ccd1a..913faad 100644
--- a/site/source/support/user-manual/getting-started/device-guides/dg-windows.rst
+++ b/site/source/support/user-manual/getting-started/device-guides/dg-windows.rst
@@ -4,19 +4,24 @@
 Windows
 =======
 
+.. note:: Please see Window's :ref:`Known Limitations<lim-windows>` to understand what is currently not possible on these devices
+
 LAN Setup (Connectivity, Performance)
 -------------------------------------
 
-`Setup LAN Access <docs.start9.com/user-manual/configuration/lan-setup/lan-windows>`_ for a fast and secure connection while on your Embassy's local network.
+`Setup LAN Access <https://docs.start9.com/support/user-manual/configuration/lan-setup/lan-windows>`_ for a fast and secure connection while on your Embassy's local network.
 
 Tor Setup (Connectivity)
 ------------------------
 
-`Setup Tor <docs.start9.com/user-manual/configuration/tor-setup/tor-os/tor-windows>`_ to run natively (in the background) on your device.  This will allow you to use applications on your Windows machine via the :ref:`Tor Network<tor>` so they can communicate with your Embassy.
+`Setup Tor <https://docs.start9.com/support/user-manual/configuration/tor-setup/tor-os/tor-windows>`_ to run natively (in the background) on your device.  This will allow you to use applications on your Windows machine via the :ref:`Tor Network<tor>` so they can communicate with your Embassy.
 
 Tor Firefox Config (Connectivity)
 ---------------------------------
 
-`Configure Firefox <docs.start9.com/user-manual/configuration/tor-setup/tor-firefox/torff-windows>`_ to be able to use the :ref:`Tor Network<tor>` so that you can reach ``.onion`` sites without needing to change browsers.
+`Configure Firefox <https://docs.start9.com/support/user-manual/configuration/tor-setup/tor-firefox/torff-windows>`_ to be able to use the :ref:`Tor Network<tor>` so that you can reach ``.onion`` sites without needing to change browsers.
 
-.. note:: Please see Window's :ref:`Known Limitations<lim-windows>` to understand what is currently not possible on these devices
\ No newline at end of file
+Embassy Backups (Reliability)
+-----------------------------
+
+`Configure Remote Backup <https://docs.start9.com/support/user-manual/walkthrough/backup/backup-win>`_ of your Embassy to your Windows machine.  **Backups are supremely important** as they ensure redundancy of your data for convenience, as well as preventing loss in case of disaster.
diff --git a/site/source/support/user-manual/getting-started/device-guides/index.rst b/site/source/support/user-manual/getting-started/device-guides/index.rst
index 0587359..6174dc5 100644
--- a/site/source/support/user-manual/getting-started/device-guides/index.rst
+++ b/site/source/support/user-manual/getting-started/device-guides/index.rst
@@ -1,8 +1,10 @@
+.. _device-guides:
+
 ======================
-Device-Specific Guides
+Device-Specific Guides - ***NEED TO CHECK ALL LINKS AS THEY ARE NOT REFS (IN ORDER TO OPEN EXTERNALLY)***
 ======================
 
-An overview of EmbassyOS general capabilities.
+Guides to get connected with or improve your Embassy by device-type.
 
 .. toctree::
   :maxdepth: 2
diff --git a/site/source/support/user-manual/index.rst b/site/source/support/user-manual/index.rst
index a4dd29b..2fe9d4f 100644
--- a/site/source/support/user-manual/index.rst
+++ b/site/source/support/user-manual/index.rst
@@ -9,10 +9,10 @@ User Manual
    :hidden:
 
    getting-started/index
+   walkthrough/index
    configuration/index
    troubleshooting/index
    tuning/index
-   walkthrough/index
    services/index
 
 .. panel-box::
@@ -20,11 +20,13 @@ User Manual
   :id: "getting-started"
   :class: my-panel
 
-  EmbassyOS is designed to work out of the box with a minimal setup and immediate practicality.  That being said, there are a great many different use-cases and utilities that can be added at your convenience.  You can get started right away with :ref:`Initial Setup <initial-setup>`.  In the :ref:`User Manual <user-manual>`, you will find information on what EmbassyOS can do for you, as well as configuration and customization options.  Use our :ref:`Knowledge Base <knowledge-base>` to learn more about the technologies behind Embassy, including Frequently Asked Questions.  When you're ready to build, please check out our :ref:`Developer Docs <dev-docs>`.  Please don't hestitate to `Contact Us <https://start9.com/contact>`_ if you have any issues, questions, or suggestions that are not covered here.
+  EmbassyOS is designed to work out of the box with a minimal setup and immediate practicality.  That said, there are many use-cases and utilities that can be added and tweaked at your convenience, which are covered extensively in this manual.  You can get started right away with :ref:`Initial Setup <initial-setup>`, head to our :doc:`Walkthrough <walkthrough/index>` for a guided tour, or learn about :doc:`Services <services/index>` and how to use them.  In the :doc:`Configuration <configuration/index>` and :doc:`Tuning <tuning/index>` chapters, you can put your Embassy to work, and make it unique.  Finally, you can cure common hiccups with :doc:`Troubleshooting <troubleshooting/index>`.
+
+  For further information, check out :ref:`Knowledge Base <knowledge-base>` to learn about the technologies behind Embassy, including Frequently Asked Questions.  When you're ready to build, please check out our :ref:`Developer Docs <dev-docs>`.  Please don't hestitate to :ref:`Contact Us <contact>` if you have any issues, questions, or suggestions.
 
   * :doc:`Getting Started <getting-started/index>` - Initial setup and device-specific guides to connect with your Embassy.
-  * :doc:`Configuration Options <configuration/index>` - Configuration your Embassy.
-  * :doc:`Troubleshooting <troubleshooting/index>` - Resolve any common issues you may encounter.
-  * :doc:`Tuning <tuning/index>` - Customize your Embassy with advanced configuration and external service integrations.
-  * :doc:`Services <services/index>` - Overview of featured Services and general usage on EmbassyOS.
   * :doc:`Walkthrough <walkthrough/index>` - A guided tour of EmbassyOS.
+  * :doc:`Services <services/index>` - Overview of featured Services and general usage on EmbassyOS.
+  * :doc:`Configuration Options <configuration/index>` - Configuration your Embassy.
+  * :doc:`Tuning <tuning/index>` - Customize your Embassy with advanced configuration and external service integrations.
+  * :doc:`Troubleshooting <troubleshooting/index>` - Resolve any common issues you may encounter.
diff --git a/site/source/support/user-manual/tuning/diy.rst b/site/source/support/user-manual/tuning/diy.rst
index 52a0500..0fccbed 100644
--- a/site/source/support/user-manual/tuning/diy.rst
+++ b/site/source/support/user-manual/tuning/diy.rst
@@ -1,7 +1,7 @@
 .. _diy:
 
 =========
-DIY Guide - ***UPDATE BUILD GUIDE LINK***
+DIY Guide - ***CHECK BUILD GUIDE LINK WHEN ON MASTER, ADD PHOTOS OF HARDWARE SETUP***
 =========
 
 .. figure:: /_static/images/diy/pi.png
@@ -44,8 +44,8 @@ Hardware: Components
 
 `*` If you use a fan, **DO NOT** use the official Raspberry Pi fan, as it requires the same GPIO pins as the audio speaker. Instead, we recommend `this fan <https://www.amazon.com/Raspberry-iUniker-30x30x7mm-Brushless-RetroFlag/dp/B076H3TKBP/>`_.
 
-Hardware: Assembly Instructions
-...............................
+Hardware: Assembly
+..................
 
 #. Insert mini speaker/buzzer into GPIO pins 6/8/10/12 with the word "speaker" facing out, `away from the board`.
 
@@ -69,7 +69,7 @@ Depending on your Internet speed, the download should take between 5 and 30 minu
 Getting EmbassyOS: Building from Source
 .......................................
 
-***Placehodler for build guide - https://github.com/Start9Labs/embassy-os/tree/integration/0.3.0/build***
+If you prefer to build EmbassyOS from source, you can do so following our guide `here <https://github.com/Start9Labs/embassy-os/tree/master/build>`_.
 
 Installing EmbassyOS
 --------------------
diff --git a/site/source/support/user-manual/tuning/service-guides/bitcoin.rst b/site/source/support/user-manual/tuning/service-guides/bitcoin.rst
index 0e63934..7b06b79 100644
--- a/site/source/support/user-manual/tuning/service-guides/bitcoin.rst
+++ b/site/source/support/user-manual/tuning/service-guides/bitcoin.rst
@@ -42,6 +42,15 @@ Electrum
 FullyNoded
 ----------
 
+.. note:: Mac only
+
+.. _samourai:
+
+Samourai
+--------
+
+.. note:: Android only
+
 .. _sparrow:
 
 Sparrow
@@ -54,10 +63,14 @@ Specter
 
 .. _trezor:
 
-Trezor
-------
+Trezor Suite
+------------
+
+.. note:: Built for use with Trezor hardware devices
 
 .. _ledger:
 
 Ledger Live
------------
\ No newline at end of file
+-----------
+
+.. note:: Built for use with Ledger hardware devices
diff --git a/site/source/support/user-manual/tuning/service-guides/index.rst b/site/source/support/user-manual/tuning/service-guides/index.rst
index e3b3bec..7feea78 100644
--- a/site/source/support/user-manual/tuning/service-guides/index.rst
+++ b/site/source/support/user-manual/tuning/service-guides/index.rst
@@ -1,3 +1,5 @@
+.. _service-guides:
+
 =======================
 Service-Specific Guides
 =======================
diff --git a/site/source/support/user-manual/walkthrough/updates.rst b/site/source/support/user-manual/walkthrough/updates.rst
index 073fdca..924e745 100644
--- a/site/source/support/user-manual/walkthrough/updates.rst
+++ b/site/source/support/user-manual/walkthrough/updates.rst
@@ -29,4 +29,4 @@ Enable Auto Check for Updates
 Manually Checking Updates
 -------------------------
 
-If you choose not to enable automatic updates, service updates will appear in the `Updates` tab of the Marketplace when ready.
+If you choose not to enable automatic update checks, service updates will still appear in the ``Updates`` tab of the Marketplace when ready.