From 2f61c061b7c057c693b7185e5a8bf2297048e64b Mon Sep 17 00:00:00 2001
From: int3l <int3l@users.noreply.github.com>
Date: Sun, 6 Jan 2019 18:34:43 +0200
Subject: [PATCH 1/5] Add favicon asset

Same asset icon file as solokeys.com
---
 docs/images/favicon.ico | Bin 0 -> 15086 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 docs/images/favicon.ico

diff --git a/docs/images/favicon.ico b/docs/images/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..c5dfb6042098ffccbfc195e2cd875a44dc902915
GIT binary patch
literal 15086
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
UFdPkKV3>ECfua3AL>#0K0P1bXcmMzZ

literal 0
HcmV?d00001


From 600b2a61fecde51e5a6c84156274c54b9ac9b1b3 Mon Sep 17 00:00:00 2001
From: int3l <int3l@users.noreply.github.com>
Date: Sun, 6 Jan 2019 18:36:58 +0200
Subject: [PATCH 2/5] Enable custom favicon

---
 mkdocs.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mkdocs.yml b/mkdocs.yml
index 508e6ec..e62a1e7 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -19,3 +19,4 @@ nav:
 theme:
   name: material
   logo: 'images/logo.svg'
+  favicon: 'images/favicon.ico'

From 8c1d716632c7a32db52e17ce995615a702e58f16 Mon Sep 17 00:00:00 2001
From: robbiemacg <robbie.macg@gmail.com>
Date: Mon, 7 Jan 2019 13:47:03 -0400
Subject: [PATCH 3/5] Update fido2-impl.md

Fixed small apparent typo.
---
 docs/fido2-impl.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/fido2-impl.md b/docs/fido2-impl.md
index 4747516..d0d5890 100644
--- a/docs/fido2-impl.md
+++ b/docs/fido2-impl.md
@@ -21,7 +21,7 @@ When you register a service with a FIDO2 or U2F authenticator, the
 authenticator must generate a new keypair unique to that service.  This keypair
 could be stored on the authenticator to be used in subsequent authentications,
 but now a certain amount of memory needs to be allocated for this.  On embedded
-devices, there isn't much memory to spare and users will allows frustratingly
+devices, there isn't much memory to spare and users will always frustratingly
 hit the limit of this memory.
 
 The answer to this problem is to do key wrapping.  The authenticator just

From bdc4c8f9df11a57b963138a5e58ced408338e81f Mon Sep 17 00:00:00 2001
From: Nicolas Stalder <n@stalder.io>
Date: Mon, 7 Jan 2019 22:39:36 +0100
Subject: [PATCH 4/5] Move to solokeys org, host docs under docs.solokeys.io

---
 .gitmodules                        |   4 ++--
 README.md                          |  10 +++++-----
 docs/index.md                      |   4 ----
 docs/repo-readme.md                |   1 -
 docs/{ => solo}/building.md        |   0
 docs/{ => solo}/code-overview.md   |   0
 docs/{ => solo}/contributing.md    |   4 ++--
 docs/{ => solo}/documenting.md     |   0
 docs/{ => solo}/fido2-impl.md      |   0
 docs/{ => solo}/images/favicon.ico | Bin
 docs/{ => solo}/images/logo.svg    |   0
 docs/solo/index.md                 |   4 ++++
 docs/solo/repo-readme.md           |   1 +
 docs/{ => solo}/signed-updates.md  |   0
 docs/{ => solo}/udev.md            |   4 ++--
 mkdocs.yml                         |  29 +++++++++++++++--------------
 16 files changed, 31 insertions(+), 30 deletions(-)
 delete mode 100644 docs/index.md
 delete mode 120000 docs/repo-readme.md
 rename docs/{ => solo}/building.md (100%)
 rename docs/{ => solo}/code-overview.md (100%)
 rename docs/{ => solo}/contributing.md (71%)
 rename docs/{ => solo}/documenting.md (100%)
 rename docs/{ => solo}/fido2-impl.md (100%)
 rename docs/{ => solo}/images/favicon.ico (100%)
 rename docs/{ => solo}/images/logo.svg (100%)
 create mode 100644 docs/solo/index.md
 create mode 120000 docs/solo/repo-readme.md
 rename docs/{ => solo}/signed-updates.md (100%)
 rename docs/{ => solo}/udev.md (92%)

diff --git a/.gitmodules b/.gitmodules
index 889b2af..05c9e6f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,7 +3,7 @@
 	url = https://github.com/intel/tinycbor
 [submodule "python-fido2"]
 	path = python-fido2
-	url = https://github.com/SoloKeysSec/python-fido2
+	url = https://github.com/solokeys/python-fido2
 [submodule "crypto/micro-ecc"]
 	path = crypto/micro-ecc
 	url = https://github.com/kmackay/micro-ecc.git
@@ -12,4 +12,4 @@
     url = https://github.com/kokke/tiny-AES-c
 [submodule "targets/stm32l442/dfuse-tool"]
 	path = targets/stm32l442/dfuse-tool
-    url = https://github.com/SoloKeysSec/dfuse-tool
+    url = https://github.com/solokeys/dfuse-tool
diff --git a/README.md b/README.md
index e95130f..0634920 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-[![License](https://img.shields.io/github/license/solokeyssec/solo.svg)](https://github.com/SoloKeysSec/solo/blob/master/LICENSE)
-[![Build Status](https://travis-ci.com/SoloKeysSec/solo.svg?branch=master)](https://travis-ci.com/SoloKeysSec/solo)
+[![License](https://img.shields.io/github/license/solokeys/solo.svg)](https://github.com/solokeys/solo/blob/master/LICENSE)
+[![Build Status](https://travis-ci.com/solokeys/solo.svg?branch=master)](https://travis-ci.com/solokeys/solo)
 [![Discourse Users](https://img.shields.io/discourse/https/discourse.solokeys.com/users.svg)](https://discourse.solokeys.com)
 [![Keybase Chat](https://img.shields.io/badge/chat-on%20keybase-brightgreen.svg)](https://keybase.io/team/solokeys.public)
 
@@ -37,7 +37,7 @@ You can only buy Solo for Hacker at [solokeys.com](https://solokeys.com), as we
 If you have a Solo for Hacker, here's how you can load your own code on it. You can find more details, including how to permanently lock it, in our [documentation](https://solo.solokeys.io/building/).
 
 ```bash
-git clone --recurse-submodules https://github.com/SoloKeysSec/solo
+git clone --recurse-submodules https://github.com/solokeys/solo
 cd solo
 
 cd targets/stm32l432
@@ -52,7 +52,7 @@ python tools/solotool.py program targets/stm32l432/solo.hex
 
 If you forgot the `--recurse-submodules` when cloning, simply `git submodule update --init --recursive`.
 
-For example, if you want to turn off any blue light emission, you can edit [`led_rgb()`](https://github.com/SoloKeysSec/solo/blob/master/targets/stm32l432/src/led.c#L15) and force:
+For example, if you want to turn off any blue light emission, you can edit [`led_rgb()`](https://github.com/solokeys/solo/blob/master/targets/stm32l432/src/led.c#L15) and force:
 ```
 uint32_t b = 0;
 ```
@@ -69,7 +69,7 @@ A frequently asked question is whether Solo for Hacker is less secure than regul
 Clone Solo and build it
 
 ```bash
-git clone --recurse-submodules https://github.com/SoloKeysSec/solo
+git clone --recurse-submodules https://github.com/solokeys/solo
 cd solo
 make all
 ```
diff --git a/docs/index.md b/docs/index.md
deleted file mode 100644
index b29e554..0000000
--- a/docs/index.md
+++ /dev/null
@@ -1,4 +0,0 @@
-Welcome to the technical documentation for [solokeyssec/solo](https://github.com/solokeyssec/solo).
-
-For now, you can read the repository `README.md`, more documentation to come!
-
diff --git a/docs/repo-readme.md b/docs/repo-readme.md
deleted file mode 120000
index 32d46ee..0000000
--- a/docs/repo-readme.md
+++ /dev/null
@@ -1 +0,0 @@
-../README.md
\ No newline at end of file
diff --git a/docs/building.md b/docs/solo/building.md
similarity index 100%
rename from docs/building.md
rename to docs/solo/building.md
diff --git a/docs/code-overview.md b/docs/solo/code-overview.md
similarity index 100%
rename from docs/code-overview.md
rename to docs/solo/code-overview.md
diff --git a/docs/contributing.md b/docs/solo/contributing.md
similarity index 71%
rename from docs/contributing.md
rename to docs/solo/contributing.md
index a200f01..1728356 100644
--- a/docs/contributing.md
+++ b/docs/solo/contributing.md
@@ -1,6 +1,6 @@
 We are very open to contributions!
 
-[Currently](https://github.com/solokeyssec/solo/issues), most work will go towards
+[Currently](https://github.com/solokeys/solo/issues), most work will go towards
 
 * implementing STM32L432
 * implementing NFC
@@ -8,7 +8,7 @@ We are very open to contributions!
 
 In the future, we would love to see creative plugins/extensions, putting the TRNG and other features of the STM32L432 to good use! 
 
-Feel free to send a [pull request](https://github.com/SoloKeysSec/solo/pulls) at any time, we don't currently have a formal contribution process.
+Feel free to send a [pull request](https://github.com/solokeys/solo/pulls) at any time, we don't currently have a formal contribution process.
 
 If you want to discuss your plans in quasi-realtime beforehand, you can also join our [solokeys.public](https://keybase.io/team/solokeys.public) Keybase team.
 
diff --git a/docs/documenting.md b/docs/solo/documenting.md
similarity index 100%
rename from docs/documenting.md
rename to docs/solo/documenting.md
diff --git a/docs/fido2-impl.md b/docs/solo/fido2-impl.md
similarity index 100%
rename from docs/fido2-impl.md
rename to docs/solo/fido2-impl.md
diff --git a/docs/images/favicon.ico b/docs/solo/images/favicon.ico
similarity index 100%
rename from docs/images/favicon.ico
rename to docs/solo/images/favicon.ico
diff --git a/docs/images/logo.svg b/docs/solo/images/logo.svg
similarity index 100%
rename from docs/images/logo.svg
rename to docs/solo/images/logo.svg
diff --git a/docs/solo/index.md b/docs/solo/index.md
new file mode 100644
index 0000000..ab5ffdb
--- /dev/null
+++ b/docs/solo/index.md
@@ -0,0 +1,4 @@
+Welcome to the technical documentation for [solokeys/solo](https://github.com/solokeys/solo).
+
+For now, you can read the repository `README.md`, more documentation to come!
+
diff --git a/docs/solo/repo-readme.md b/docs/solo/repo-readme.md
new file mode 120000
index 0000000..fe84005
--- /dev/null
+++ b/docs/solo/repo-readme.md
@@ -0,0 +1 @@
+../../README.md
\ No newline at end of file
diff --git a/docs/signed-updates.md b/docs/solo/signed-updates.md
similarity index 100%
rename from docs/signed-updates.md
rename to docs/solo/signed-updates.md
diff --git a/docs/udev.md b/docs/solo/udev.md
similarity index 92%
rename from docs/udev.md
rename to docs/solo/udev.md
index d8ad228..4959b13 100644
--- a/docs/udev.md
+++ b/docs/solo/udev.md
@@ -1,6 +1,6 @@
 # tl;dr
 
-Create [`/etc/udev/99-solo.rules`](https://github.com/SoloKeysSec/solo/blob/master/99-solo.rules) and add the following (which assumes your user is in group `plugdev`):
+Create [`/etc/udev/99-solo.rules`](https://github.com/solokeys/solo/blob/master/99-solo.rules) and add the following (which assumes your user is in group `plugdev`):
 
 ```
 # Solo
@@ -69,4 +69,4 @@ udevadm trigger
 | U2F Zero | 0483 | a2ca |
 
 ## You got this all wrong, I can't believe it!
-Are you suffering from [us being wrong](https://xkcd.com/386/)? Please, send us a [pull request](https://github.com/SoloKeysSec/solo/pulls) and prove us wrong :D
+Are you suffering from [us being wrong](https://xkcd.com/386/)? Please, send us a [pull request](https://github.com/solokeys/solo/pulls) and prove us wrong :D
diff --git a/mkdocs.yml b/mkdocs.yml
index e62a1e7..60b1618 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,22 +1,23 @@
 site_name: Solo
 site_author: SoloKeys
 site_description: 'Documentation for the SoloKeys solo software'
-repo_url: 'https://github.com/solokeyssec/solo'
-repo_name: 'solokeyssec/solo'
-copyright: 'Copyright &copy; 2018 SoloKeys'
+site_url: 'https://docs.solokeys.io/solo/'
+repo_url: 'https://github.com/solokeys/solo'
+repo_name: 'solokeys/solo'
+copyright: 'Copyright &copy; 2018-2019 SoloKeys'
 
 nav:
-    - Home: index.md
-    - README.md: repo-readme.md
-    - FIDO2 Implementation: fido2-impl.md
-    - Signed update process: signed-updates.md
-    - Building: building.md
-    - Code documentation: code-overview.md
-    - Contributing Code: contributing.md
-    - Contributing Docs: documenting.md
-    - What the udev?!: udev.md
+    - Home: solo/index.md
+    - README.md: solo/repo-readme.md
+    - FIDO2 Implementation: solo/fido2-impl.md
+    - Signed update process: solo/signed-updates.md
+    - Building: solo/building.md
+    - Code documentation: solo/code-overview.md
+    - Contributing Code: solo/contributing.md
+    - Contributing Docs: solo/documenting.md
+    - What the udev?!: solo/udev.md
 
 theme:
   name: material
-  logo: 'images/logo.svg'
-  favicon: 'images/favicon.ico'
+  logo: 'solo/images/logo.svg'
+  favicon: 'solo/images/favicon.ico'

From ea210320c68b686a2efd41b12a561dbc7a379a52 Mon Sep 17 00:00:00 2001
From: Nicolas Stalder <n@stalder.io>
Date: Mon, 7 Jan 2019 23:07:55 +0100
Subject: [PATCH 5/5] Fix some old links

---
 README.md                   | 6 +++---
 targets/stm32l432/README.md | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 0634920..343554c 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ Solo for Hacker is a special version of Solo that let you customize its firmware
 
 You can only buy Solo for Hacker at [solokeys.com](https://solokeys.com), as we don't sell it on Amazon and other places to avoid confusing customers. If you buy a Hacker, you can permanently lock it into a regular Solo, but viceversa you can NOT take a regular Solo and turn it a Hacker.
 
-If you have a Solo for Hacker, here's how you can load your own code on it. You can find more details, including how to permanently lock it, in our [documentation](https://solo.solokeys.io/building/).
+If you have a Solo for Hacker, here's how you can load your own code on it. You can find more details, including how to permanently lock it, in our [documentation](https://docs.solokeys.io/solo/building/).
 
 ```bash
 git clone --recurse-submodules https://github.com/solokeys/solo
@@ -97,12 +97,12 @@ Or any client example such as:
 python python-fido2/examples/credential.py
 ```
 
-You can find more details in our [documentation](https://solo.solokeys.io), including how to build on the the NUCLEO-L432KC development board.
+You can find more details in our [documentation](https://docs.solokeys.io/solo/), including how to build on the the NUCLEO-L432KC development board.
 
 
 # Documentation
 
-Check out our [official documentation](https://solo.solokeys.io).
+Check out our [official documentation](https://docs.solokeys.io/solo/).
 
 
 # Contributors
diff --git a/targets/stm32l432/README.md b/targets/stm32l432/README.md
index be55b7a..58af397 100644
--- a/targets/stm32l432/README.md
+++ b/targets/stm32l432/README.md
@@ -1,4 +1,4 @@
-# STM32L4xx Solo
+# STM32L432 Solo
 
-Check out our [official documentation](https://solo.solokeys.io/building/)
+Check out our [official documentation](https://docs.solokeys.io/solo/building/)
 for instructions on building and programming!