From 1c9e334e56700173b33b13ffcc77131188abfe86 Mon Sep 17 00:00:00 2001
From: Dan Janosik <dan@47.io>
Date: Thu, 14 Jan 2021 13:20:18 -0500
Subject: [PATCH 1/4] link to macos jekyll installation docs

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2071c76..bd3aac2 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ For regular users, just visit <https://btcguide.github.io/> to see GitHub Pages
 
 ---
 
-For advanced users, you can host this locally with [jekyll](https://jekyllrb.com/) (setup instructions [here](https://jekyllrb.com/docs/installation/ubuntu/)):
+For advanced users, you can host this locally with [jekyll](https://jekyllrb.com/) (setup instructions: [Ubuntu](https://jekyllrb.com/docs/installation/ubuntu/); [macOS](https://jekyllrb.com/docs/installation/macos/)):
 ```bash
 $ bundle exec jekyll serve
 ```

From bbf76f2eee96398d60dbdd80b6ae96fbd3f8533e Mon Sep 17 00:00:00 2001
From: Dan Janosik <dan@47.io>
Date: Thu, 14 Jan 2021 13:54:59 -0500
Subject: [PATCH 2/4] UX improvements:

- "bootstrap native" breadcrumbs
- "alert" wrapper for "Advanced Considerations"
- tweak text related to "advanced" sections
- use some "&raquo;" chars (for "next steps" prefix and before "Advanced Considerations" in titles)
- tweak margins/padding in the base layout to give a little more breathing room
---
 _includes/breadcrumbs.html | 87 ++++++++++++++++++++------------------
 _includes/next_steps.md    | 26 +++++++++---
 _layouts/default.html      | 10 +++--
 3 files changed, 73 insertions(+), 50 deletions(-)

diff --git a/_includes/breadcrumbs.html b/_includes/breadcrumbs.html
index 402ee25..94a4d9c 100644
--- a/_includes/breadcrumbs.html
+++ b/_includes/breadcrumbs.html
@@ -4,45 +4,48 @@
 {% endcomment %}
 
 {% assign crumbs = page.url | remove:'/index.html' | split: '/' %}
-<a href="/">Home</a>
-{% for crumb in crumbs offset: 1 %}
-  {% if forloop.last %}
-    {% if crumb == "advanced" %}
-      &lt;&lt;
-      Advanced
-    {% elsif crumb contains "-advanced" %}
-      &lt;&lt;
-      <a href="{{ crumb | split: "-advanced" | first }}">
-	{% assign words = crumb | split: "-advanced" | first | replace:'-',' ' | remove:'.html' | split: ' ' %}
-	{% for word in words %}
-	  {{ word | capitalize }}
-	{% endfor %}
-      </a>
-      &lt;&lt;
-      Advanced
-    {% else %}
-      &lt;&lt;
-      {{ page.title }}
-    {% endif %}
-  {% else %}
-    &lt;&lt;
-    {% if crumb == "known-issues" %}
-      Known Issues
-    {% elsif crumb == "hosted" %}
-      Hosted
-    {% elsif crumb == "hardware" %}
-      Hardware
-    {% elsif crumb == "software" %}
-      Software
-    {% elsif crumb == "protocols" %}
-      Protocols
-    {% else %}
-      <a href="{% assign crumb_limit = forloop.index | plus: 1 %}{% for crumb in crumbs limit: crumb_limit %}{{ crumb | append: '/' | replace:'without-plugin/','without-plugins/' }}{% endfor %}">
-	{% assign words = crumb | replace:'-',' ' | remove:'.html' | split: ' ' %}
-	{% for word in words %}
-	  {{ word | capitalize }}
-	{% endfor %}
-      </a>
-    {% endif %}
-  {% endif %}
-{% endfor %}
+<nav aria-label="breadcrumb">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><a href="/">Home</a></li>
+    {% for crumb in crumbs offset: 1 %}
+      {% if forloop.last %}
+        {% if crumb == "advanced" %}
+          <li class="breadcrumb-item active" aria-current="page">Advanced Considerations</li>
+        {% elsif crumb contains "-advanced" %}
+          <li class="breadcrumb-item">
+            <a href="{{ crumb | split: "-advanced" | first }}">
+              {% assign words = crumb | split: "-advanced" | first | replace:'-',' ' | remove:'.html' | split: ' ' %}
+              {% for word in words %}
+                {{ word | capitalize }}
+              {% endfor %}
+            </a>
+          </li>
+          <li class="breadcrumb-item active" aria-current="page">Advanced Considerations</li>
+        {% else %}
+          <li class="breadcrumb-item active" aria-current="page">{{ page.title }}</li>
+        {% endif %}
+      {% else %}
+        {% if crumb == "known-issues" %}
+          <li class="breadcrumb-item active" aria-current="page">Known Issues</li>
+        {% elsif crumb == "hosted" %}
+          <li class="breadcrumb-item active" aria-current="page">Hosted</li>
+        {% elsif crumb == "hardware" %}
+          <li class="breadcrumb-item active" aria-current="page">Hardware</li>
+        {% elsif crumb == "software" %}
+          <li class="breadcrumb-item active" aria-current="page">Software</li>
+        {% elsif crumb == "protocols" %}
+          <li class="breadcrumb-item active" aria-current="page">Protocols</li>
+        {% else %}
+          <li class="breadcrumb-item">
+            <a href="{% assign crumb_limit = forloop.index | plus: 1 %}{% for crumb in crumbs limit: crumb_limit %}{{ crumb | append: '/' | replace:'without-plugin/','without-plugins/' }}{% endfor %}">
+              {% assign words = crumb | replace:'-',' ' | remove:'.html' | split: ' ' %}
+              {% for word in words %}
+                {{ word | capitalize }}
+              {% endfor %}
+            </a>
+          </li>
+        {% endif %}
+      {% endif %}
+    {% endfor %}
+  </ol>
+</nav>
\ No newline at end of file
diff --git a/_includes/next_steps.md b/_includes/next_steps.md
index f728072..f9cd610 100644
--- a/_includes/next_steps.md
+++ b/_includes/next_steps.md
@@ -1,13 +1,29 @@
 {% unless page.url contains "advanced" or page.no_advanced_link == true %}
-## Advanced Configuration
-Click
-[here]({% if page.url contains "index" %}advanced{% else %}{{ page.url | split: '.' | first  }}-advanced{% endif %})
-for advanced details on how to improve your security at this step.
+
+<br />
+
+
+<div class="alert alert-primary mb-4">
+	<h4 class="alert-heading mb-3">Advanced Considerations</h4>
+	<p>
+		Comfortable with the concepts in this step?
+	</p>
+	<p class="mb-1">
+		Read the
+		<a href="{% if page.url contains "index" %}advanced{% else %}{{ page.url | split: '.' | first  }}-advanced{% endif %}">advanced considerations</a>
+		that can potentially improve your security here.
+	</p>
+</div>
+
+
+
 {% endunless %}
 
 {% if include.next_url and include.next_name %}
+
 ---
-\>\> 
+
+&raquo; 
 Next Section: [{{ include.next_name }}]({{ include.next_url }})
 {% comment %}TODO: pull-right somehow? {% endcomment %}
 {% endif %}
diff --git a/_layouts/default.html b/_layouts/default.html
index 27fd42e..5a0bb2d 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -61,12 +61,16 @@
     <h1>
       {% if page.url contains "known-issues/" %}Known Issues:{% endif %}
       {{page.title}}
-      {% if page.url == "advanced" or page.url contains "-advanced" %} - Advanced{% endif %}
+      {% if page.url == "advanced" or page.url contains "-advanced" %} &raquo; Advanced Considerations{% endif %}
     </h1>
 
+    <hr />
 
-    {{ content }}
-    <br /><br /> {% comment %}FIXME{% endcomment %}
+    <div class="mb-5">
+      {{ content }}
+    </div>
+    
+    <br /><br /><br /> {% comment %}FIXME{% endcomment %}
 
   </main>
 

From 258ad6f86d57715088e794e18fd88db8512473c7 Mon Sep 17 00:00:00 2001
From: Dan Janosik <dan@47.io>
Date: Thu, 14 Jan 2021 13:59:13 -0500
Subject: [PATCH 3/4] More minor text tweaks

---
 _pages/why-multisig.md | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/_pages/why-multisig.md b/_pages/why-multisig.md
index 301425b..97a6116 100644
--- a/_pages/why-multisig.md
+++ b/_pages/why-multisig.md
@@ -2,17 +2,20 @@
 title: Why Multisig?
 ---
 
-["Your keys, your bitcoin. Not your keys, not your bitcoin."](https://www.youtube.com/watch?v=vt-zXEsJ61U)
 
-While this is certainly true, managing your own keys is **really** hard.
+#### Your keys, your bitcoin. Not your keys, not your bitcoin.
+-- [Andreas Antonopolous](https://www.youtube.com/watch?v=vt-zXEsJ61U)
+
+
+While the above quote is true and important, it's also true that managing your own keys is **really** hard.
 The math behind the bitcoin protocol is bulletproof, but being your own bank requires you to be near perfect in your execution.
 When it comes to cryptography, you are only as strong as your weakest link.
 For traditional single-key signature schemes, the only thing between your bitcoin and an attacker is a single mistake!
 Learn more about some of these risks by listening to [SLP Episode 97 with Michael Flaxman](https://stephanlivera.com/episode/97/). 
 
-The central principle of the guide is to avoid having any single point of failure.
+The central goal of this guide is to help you implement a security scheme with no single points of failure.
 To accomplish this, you will setup your own multisig wallet using multiple hardware wallets from multiple different vendors.
-The goal of this guide is to achieve a basic multisig setup: `2-of-3`signatures from different hardware wallets made by different manufacturers.
+The goal of this guide is to achieve a basic multisig setup: `2-of-3` signatures from different hardware wallets made by different manufacturers.
 
 In order to compromise your multisig setup an attacker must break multiple redundant systems, which, due to [the additive power of multisig](https://twitter.com/mflaxman/status/1146813775380647937), is _incredibly challenging_.
 Therefore, your level of caution/paranoia/effort (vs a traditional single-key scheme) can be much lower and still achieve much higher security.
@@ -22,7 +25,7 @@ This could include things like:
 
 * An exploitable software/firmware bug on your hardware wallet
 * A pwned (or fake) hardware wallet
-* An unscrupulous trusted third party (lawyer/accountant/custodian/etc) with access to a key for recovery
+* An unscrupulous trusted third party (lawyer/accountant/custodian/etc.) with access to a key for recovery
 * A lost/stolen hardware wallet / seed
 * An upstream supply-channel attack
 * A forgotten PIN / passphrase
@@ -32,13 +35,12 @@ This could include things like:
 * Malware on your computer
 * A rogue bank employee snooping in your safe deposit box
 * An eager heir
-* Etc
 
 **While this setup is far more secure than a traditional single-key signature scheme (which has little/no fault tolerance), be mindful that the wrong combination of 2+ major mistakes could be enough to lose all of your bitcoin!**
 
 Switching to fault-tolerant multisig is the most important thing you can do to improve your security.
 A lot of people stick with a bad setup -- trusted custody or a single-key setup -- for fear of change.
-Don't make ["perfect" the enemy of "good"](https://en.wikipedia.org/wiki/Perfect_is_the_enemy_of_good); upgrade to multisig today for a solid foundation and continue to learn and iterate over time!
+Don't let ["perfect" be the enemy of "good"](https://en.wikipedia.org/wiki/Perfect_is_the_enemy_of_good); upgrade to multisig today for a solid foundation and continue to learn and iterate over time!
 
 We support users being as paranoid as they want to be, but think that with proper multisig it is overkill for all but the largest HODLers.
 At each step, there are recommendations for how you can harden your security, and you alone must decide how much time/money you want to spend on hardening your security.

From 841138eb9fd0b974e67f898bce87d8990a09a165 Mon Sep 17 00:00:00 2001
From: Dan Janosik <dan@47.io>
Date: Thu, 14 Jan 2021 14:02:25 -0500
Subject: [PATCH 4/4] Wordlist: Andreas Antonopolous

---
 .wordlist.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.wordlist.txt b/.wordlist.txt
index ecd7b01..405c9cf 100644
--- a/.wordlist.txt
+++ b/.wordlist.txt
@@ -1,5 +1,7 @@
 AML
 Analytics
+Andreas
+Antonopolous
 AWG
 Altcoin
 BIP
