collections/about/roadmap/releasenotes/img/.done

@@ -0,0 +1 @@
+releasenotes.png

collections/about/threefold_ag.md

@@ -17,14 +17,4 @@ While there are activities done at this time, we are preparing for future activi
 
 - Promotion of ThreeFold, specifically in Zug Communities (CH).
 
-<!-- 
-
-## Structure: March 2020
-
-TODO: need link to official doc, address, ...
-
-<!-- TODO: are we part of https://cryptovalley.swiss/ , if yes link to it
-
-!!!def alias:threefold_ag,tf_ag,threefold_ch,tf_ch,ThreeFold_Switzerland,TF_Switzerland -->
-
 ![](img/crypto_valley_zug_.jpg)

collections/about/token_overview/special_wallets/stats_special_wallets.md

@@ -8,7 +8,6 @@
 - [Wisdom Council Wallets](#wisdom-council-wallets)
 - [Important Note](#important-note)
 - [Remarks](#remarks)
-- [Proof-of-Utilization Wallets](#proof-of-utilization-wallets)
 
 ***
 
@@ -20,30 +19,30 @@ We present special wallets that hold a given amount of TFT.
 
 | **Description**    | **TFT Balance** | **Address**                                                                      |
 | ------------------ | ----------- | -------------------------------------------------------------------------------- |
-| Liquid Exchange #1 |  {{#include ./wallet_data/GA7OPN4A3JNHLPHPEWM4PJDOYYDYNZOM7ES6YL3O7NC3PRY3V3UX6ANM.md}}      | [GA7OPN4A3JNHLPHPEWM4PJDOYYDYNZOM7ES6YL3O7NC3PRY3V3UX6ANM](https://stellar.expert/explorer/public/account/GA7OPN4A3JNHLPHPEWM4PJDOYYDYNZOM7ES6YL3O7NC3PRY3V3UX6ANM) |
-| Liquid Exchange #2 | {{#include ./wallet_data/GDSKFYNMZWTB3V5AN26CEAQ27643Q3KB4X6MY4UTO2LIIDFND4SPQZYU.md}}           | [GDSKFYNMZWTB3V5AN26CEAQ27643Q3KB4X6MY4UTO2LIIDFND4SPQZYU](https://stellar.expert/explorer/public/account/GDSKFYNMZWTB3V5AN26CEAQ27643Q3KB4X6MY4UTO2LIIDFND4SPQZYU) |
-| gettft.com         | {{#include ./wallet_data/GBQHN7RL4LSRPR2TT74ID2UJPZ2AXCHQY2WKGCTDLJM3NXVJ7GQHUCOD.md}}     | [GBQHN7RL4LSRPR2TT74ID2UJPZ2AXCHQY2WKGCTDLJM3NXVJ7GQHUCOD](https://stellar.expert/explorer/public/account/GBQHN7RL4LSRPR2TT74ID2UJPZ2AXCHQY2WKGCTDLJM3NXVJ7GQHUCOD) |
-| BTC-Alpha Exchange | {{#include ./wallet_data/GBTPAXXP6534UPC4MLNGFGJWCD6DNSRVIPPOZWXAQAWI4FKTLOJY2A2S.md}}     | [GBTPAXXP6534UPC4MLNGFGJWCD6DNSRVIPPOZWXAQAWI4FKTLOJY2A2S](https://stellar.expert/explorer/public/account/GBTPAXXP6534UPC4MLNGFGJWCD6DNSRVIPPOZWXAQAWI4FKTLOJY2A2S) |
+| Liquid Exchange #1 |  !!wiki.include page:'manual:ga7opn4a3jnhlphpewm4pjdoyydynzom7es6yl3o7nc3pry3v3ux6anm.md' | [GA7OPN4A3JNHLPHPEWM4PJDOYYDYNZOM7ES6YL3O7NC3PRY3V3UX6ANM](https://stellar.expert/explorer/public/account/GA7OPN4A3JNHLPHPEWM4PJDOYYDYNZOM7ES6YL3O7NC3PRY3V3UX6ANM) |
+| Liquid Exchange #2 |  !!wiki.include page:'manual:gdskfynmzwtb3v5an26ceaq27643q3kb4x6my4uto2liidfnd4spqzyu.md'           | [GDSKFYNMZWTB3V5AN26CEAQ27643Q3KB4X6MY4UTO2LIIDFND4SPQZYU](https://stellar.expert/explorer/public/account/GDSKFYNMZWTB3V5AN26CEAQ27643Q3KB4X6MY4UTO2LIIDFND4SPQZYU) |
+| gettft.com         | !!wiki.include page:'manual:gbqhn7rl4lsrpr2tt74id2ujpz2axchqy2wkgctdljm3nxvj7gqhucod.md'    | [GBQHN7RL4LSRPR2TT74ID2UJPZ2AXCHQY2WKGCTDLJM3NXVJ7GQHUCOD](https://stellar.expert/explorer/public/account/GBQHN7RL4LSRPR2TT74ID2UJPZ2AXCHQY2WKGCTDLJM3NXVJ7GQHUCOD) |
+| BTC-Alpha Exchange | !!wiki.include page:'manual:gbtpaxxp6534upc4mlngfgjwcd6dnsrvippozwxaqawi4fktlojy2a2s.md'     | [GBTPAXXP6534UPC4MLNGFGJWCD6DNSRVIPPOZWXAQAWI4FKTLOJY2A2S](https://stellar.expert/explorer/public/account/GBTPAXXP6534UPC4MLNGFGJWCD6DNSRVIPPOZWXAQAWI4FKTLOJY2A2S) |
 
 ## ThreeFold Contribution Wallets
 
 | **Description**                 | **TFT Balance** | **Address**                                                                      |
 | ------------------------------- | ----------- | -------------------------------------------------------------------------------- |
-| TF DAY2DAY operations           | {{#include ./wallet_data/GB2C5HCZYWNGVM6JGXDWQBJTMUY4S2HPPTCAH63HFAQVL2ALXDW7SSJ7.md}}    | [GB2C5HCZYWNGVM6JGXDWQBJTMUY4S2HPPTCAH63HFAQVL2ALXDW7SSJ7](https://stellar.expert/explorer/public/account/GB2C5HCZYWNGVM6JGXDWQBJTMUY4S2HPPTCAH63HFAQVL2ALXDW7SSJ7) |
-| TF Promotion Wallet             | {{#include ./wallet_data/GDLVIB44LVONM5K67LUPSFZMSX7G2RLYVBM5MMHUJ4NAQJU7CH4HBJBO.md}}    | [GDLVIB44LVONM5K67LUPSFZMSX7G2RLYVBM5MMHUJ4NAQJU7CH4HBJBO](https://stellar.expert/explorer/public/account/GDLVIB44LVONM5K67LUPSFZMSX7G2RLYVBM5MMHUJ4NAQJU7CH4HBJBO) |
-| TF Grants Wallet                | {{#include ./wallet_data/GDKXTUYNW4BJKDM2L7B5XUYFUISV52KUU4G7VPNLF4ZSIKBURM622YPZ.md}}    | [GDKXTUYNW4BJKDM2L7B5XUYFUISV52KUU4G7VPNLF4ZSIKBURM622YPZ](https://stellar.expert/explorer/public/account/GDKXTUYNW4BJKDM2L7B5XUYFUISV52KUU4G7VPNLF4ZSIKBURM622YPZ) |
-| ThreeFold Carbon Credit Funding | {{#include ./wallet_data/GDIJY6K2BBRIRX423ZFUYKKFDN66XP2KMSBZFQSE2PSNDZ6EDVQTRLSU.md}}     | [GDIJY6K2BBRIRX423ZFUYKKFDN66XP2KMSBZFQSE2PSNDZ6EDVQTRLSU](https://stellar.expert/explorer/public/account/GDIJY6K2BBRIRX423ZFUYKKFDN66XP2KMSBZFQSE2PSNDZ6EDVQTRLSU) |
-| TF Team Wallet                  | {{#include ./wallet_data/GCWHWDRXYPXQAOYMQKB66SZPLM6UANKGMSL4SP7LSOIA6OTTOYQ6HBIH.md}}      | [GCWHWDRXYPXQAOYMQKB66SZPLM6UANKGMSL4SP7LSOIA6OTTOYQ6HBIH](https://stellar.expert/explorer/public/account/GCWHWDRXYPXQAOYMQKB66SZPLM6UANKGMSL4SP7LSOIA6OTTOYQ6HBIH) |
+| TF DAY2DAY operations           | !!wiki.include page:'manual:gb2c5hczywngvm6jgxdwqbjtmuy4s2hpptcah63hfaqvl2alxdw7ssj7.md'    | [GB2C5HCZYWNGVM6JGXDWQBJTMUY4S2HPPTCAH63HFAQVL2ALXDW7SSJ7](https://stellar.expert/explorer/public/account/GB2C5HCZYWNGVM6JGXDWQBJTMUY4S2HPPTCAH63HFAQVL2ALXDW7SSJ7) |
+| TF Promotion Wallet             | !!wiki.include page:'manual:gdlvib44lvonm5k67lupsfzmsx7g2rlyvbm5mmhuj4naqju7ch4hbjbo.md'    | [GDLVIB44LVONM5K67LUPSFZMSX7G2RLYVBM5MMHUJ4NAQJU7CH4HBJBO](https://stellar.expert/explorer/public/account/GDLVIB44LVONM5K67LUPSFZMSX7G2RLYVBM5MMHUJ4NAQJU7CH4HBJBO) |
+| TF Grants Wallet                | !!wiki.include page:'manual:gdkxtuynw4bjkdm2l7b5xuyfuisv52kuu4g7vpnlf4zsikburm622ypz.md'     | [GDKXTUYNW4BJKDM2L7B5XUYFUISV52KUU4G7VPNLF4ZSIKBURM622YPZ](https://stellar.expert/explorer/public/account/GDKXTUYNW4BJKDM2L7B5XUYFUISV52KUU4G7VPNLF4ZSIKBURM622YPZ) |
+| ThreeFold Carbon Credit Funding | !!wiki.include page:'manual:gdijy6k2bbrirx423zfuykkfdn66xp2kmsbzfqse2psndz6edvqtrlsu.md'     | [GDIJY6K2BBRIRX423ZFUYKKFDN66XP2KMSBZFQSE2PSNDZ6EDVQTRLSU](https://stellar.expert/explorer/public/account/GDIJY6K2BBRIRX423ZFUYKKFDN66XP2KMSBZFQSE2PSNDZ6EDVQTRLSU) |
+| TF Team Wallet                  | !!wiki.include page:'manual:gcwhwdrxypxqaoymqkb66szplm6uankgmsl4sp7lsoia6ottoyq6hbih.md'      | [GCWHWDRXYPXQAOYMQKB66SZPLM6UANKGMSL4SP7LSOIA6OTTOYQ6HBIH](https://stellar.expert/explorer/public/account/GCWHWDRXYPXQAOYMQKB66SZPLM6UANKGMSL4SP7LSOIA6OTTOYQ6HBIH) |
 
 ## Wisdom Council Wallets
 
 | **Description**                         | **TFT Balance** | **Address**                                                                      |
 | --------------------------------------- | ----------- | -------------------------------------------------------------------------------- |
-| Liquidity/Ecosystem Contribution Wisdom | {{#include ./wallet_data/GBV734I2SV4YDDPVJMYXU3IZ2AIU5GEAJRAD4E4BQG7CA2N63NXSPMD6.md}}    | [GBV734I2SV4YDDPVJMYXU3IZ2AIU5GEAJRAD4E4BQG7CA2N63NXSPMD6](https://stellar.expert/explorer/public/account/GBV734I2SV4YDDPVJMYXU3IZ2AIU5GEAJRAD4E4BQG7CA2N63NXSPMD6) |
-| TF Promotion Wisdom                     | {{#include ./wallet_data/GAI4C2BGOA3YHVQZZW7OW4FHOGGYWTUBEVNHB6MW4ZAFG7ZAA7D5IPC3.md}}         | [GAI4C2BGOA3YHVQZZW7OW4FHOGGYWTUBEVNHB6MW4ZAFG7ZAA7D5IPC3](https://stellar.expert/explorer/public/account/GAI4C2BGOA3YHVQZZW7OW4FHOGGYWTUBEVNHB6MW4ZAFG7ZAA7D5IPC3) |
-| TF Grants Wisdom                        | {{#include ./wallet_data/GCEJ7DMULFTT25UH4FAAGOZ6KER4WXAYQGJUSIITQD527DGTKSXKBQGR.md}}    | [GCEJ7DMULFTT25UH4FAAGOZ6KER4WXAYQGJUSIITQD527DGTKSXKBQGR](https://stellar.expert/explorer/public/account/GCEJ7DMULFTT25UH4FAAGOZ6KER4WXAYQGJUSIITQD527DGTKSXKBQGR) |
-| TF Team Wisdom                          | {{#include ./wallet_data/GAQXBLFG4BZGIVY6DBJVWE5EAP3UNHMIA2PYCUVLY2JUSPVWPUF36BW4.md}}     | [GAQXBLFG4BZGIVY6DBJVWE5EAP3UNHMIA2PYCUVLY2JUSPVWPUF36BW4](https://stellar.expert/explorer/public/account/GAQXBLFG4BZGIVY6DBJVWE5EAP3UNHMIA2PYCUVLY2JUSPVWPUF36BW4) |
-| Wisdom Council Locked                   | {{#include ./wallet_data/GAUGOSYLCX7JZTQYF2K7RIMHFWKSA3WSI2OQ4IRKXMDMVE6ABJIJMFQR.md}}    | [GAUGOSYLCX7JZTQYF2K7RIMHFWKSA3WSI2OQ4IRKXMDMVE6ABJIJMFQR](https://stellar.expert/explorer/public/account/GAUGOSYLCX7JZTQYF2K7RIMHFWKSA3WSI2OQ4IRKXMDMVE6ABJIJMFQR) |
+| Liquidity/Ecosystem Contribution Wisdom | !!wiki.include page:'manual:gbv734i2sv4yddpvjmyxu3iz2aiu5geajrad4e4bqg7ca2n63nxspmd6.md'     | [GBV734I2SV4YDDPVJMYXU3IZ2AIU5GEAJRAD4E4BQG7CA2N63NXSPMD6](https://stellar.expert/explorer/public/account/GBV734I2SV4YDDPVJMYXU3IZ2AIU5GEAJRAD4E4BQG7CA2N63NXSPMD6) |
+| TF Promotion Wisdom                     | !!wiki.include page:'manual:gai4c2bgoa3yhvqzzw7ow4fhoggywtubevnhb6mw4zafg7zaa7d5ipc3.md'        | [GAI4C2BGOA3YHVQZZW7OW4FHOGGYWTUBEVNHB6MW4ZAFG7ZAA7D5IPC3](https://stellar.expert/explorer/public/account/GAI4C2BGOA3YHVQZZW7OW4FHOGGYWTUBEVNHB6MW4ZAFG7ZAA7D5IPC3) |
+| TF Grants Wisdom                        | !!wiki.include page:'manual:gcej7dmulftt25uh4faagoz6ker4wxayqgjusiitqd527dgtksxkbqgr.md'    | [GCEJ7DMULFTT25UH4FAAGOZ6KER4WXAYQGJUSIITQD527DGTKSXKBQGR](https://stellar.expert/explorer/public/account/GCEJ7DMULFTT25UH4FAAGOZ6KER4WXAYQGJUSIITQD527DGTKSXKBQGR) |
+| TF Team Wisdom                          | !!wiki.include page:'manual:gaqxblfg4bzgivy6dbjvwe5eap3unhmia2pycuvly2juspvwpuf36bw4.md'      | [GAQXBLFG4BZGIVY6DBJVWE5EAP3UNHMIA2PYCUVLY2JUSPVWPUF36BW4](https://stellar.expert/explorer/public/account/GAQXBLFG4BZGIVY6DBJVWE5EAP3UNHMIA2PYCUVLY2JUSPVWPUF36BW4) |
+| Wisdom Council Locked                   | !!wiki.include page:'manual:gaugosylcx7jztqyf2k7rimhfwksa3wsi2oq4irkxmdmve6abjijmfqr.md'    | [GAUGOSYLCX7JZTQYF2K7RIMHFWKSA3WSI2OQ4IRKXMDMVE6ABJIJMFQR](https://stellar.expert/explorer/public/account/GAUGOSYLCX7JZTQYF2K7RIMHFWKSA3WSI2OQ4IRKXMDMVE6ABJIJMFQR) |
 
 ## Important Note
  
@@ -55,51 +54,3 @@ ThreeFold DMCC (Dubai) is in the process of acquiring a substantial number of to
 - All foundation wallets are protected by members of the foundation (4 on 6 need to sign)
 - Signatures can be checked by going to detail of account and then to the stellar link
 - The foundation will never spend tokens if the markets cannot support it and all proceeds are 100% used for the benefit of the ThreeFold project.
-
-## Proof-of-Utilization Wallets
-
-There are some wallets associated with [proof-of-utilization](../../../farming/proof_of_utilization.md). These wallets are on TFChain.
-
-The addresses are the following:
-
-- Mainnet ThreeFold Foundation: 5DCaGQfz2PH35EMJTHFMjc6Tk5SkqhjekVvrycY5M5xiYzis
-- Mainnet Default Solution Provider: 5Dd6adUJH8wvqb9SPC96JdZ85nK1671MeMSxkPZ6Q7rE4byc
-- Testnet ThreeFold Foundation: 5H6XYX17yJyjazoLVZqxxEPwMdGn99wginjmFBKtjvk8iJ3e
-- Testnet Default Solution Provider: 5Esq6iLLBGGJFsCEXpoFhxHhqcaGqTvDasdwy8jPFDH1jYaM
-- Staking Pool: 5CNposRewardAccount11111111111111111111111111FSU
-
-To check the balance of any of those wallets, follow those steps:
-
-- Go to the Polkadot API ([Mainnet](https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Ftfchain.grid.tf#/chainstate), [Testnet](https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Ftfchain.test.grid.tf#/chainstate))
-- Under `selected state query`, select `system`
-- On the right drop down menu, select `account(AccountId32): FrameSystemAccountInfo`
-- Under `Option<AccountId32>`, write the wallet address of one of the three accounts displayed above
-- Click on the `plus` button on the far right of the `selected state query` line.
-
-As a general example, here's what it looks like:
-
-![Wallet example](./img/polkadot_wallet_example.png)
-
-Here are the outputs for three wallets shown above:
-
-- Mainnet ThreeFold Foundation
-
-![Mainnet TF Foundation Wallet](./img/wallet_tf_foundation_main.png)
-
-- Mainnet Default Solution Provider
-
-![Mainnet Solution Provider Wallet](./img/wallet_solution_provider_main.png)
-
-- Testnet ThreeFold Foundation
-
-![Testnet TF Foundation Wallet](./img/wallet_tf_foundation_test.png)
-
-- Testnet Default Solution Provider
-
-![Testnet Solution Provider Wallet](./img/wallet_solution_provider_test.png)
-
-- Staking Pool
-
-![Staking Pool Wallet](./img/wallet_staking_pool.png)
-
-> Note: To get the proper TFT amount, you need to account fo the fact that TFT uses 7 decimal places. For this reason, to get the proper quantity in TFT, move the decimal place by dividing by 1e7 (i.e. 1x10⁷).

collections/about/token_overview/special_wallets/wallet_data/GDLVIB44LVONM5K67LUPSFZMSX7G2RLYVBM5MMHUJ4NAQJU7CH4HBJBO.md

@@ -1 +0,0 @@
-14181682.63

collections/about/token_overview/special_wallets/wallet_data/gdlvib44lvonm5k67lupsfzmsx7g2rlyvbm5mmhuj4naqju7ch4hbjbo.md

@@ -0,0 +1 @@
+14784445.77

collections/about/token_overview/token_overview.md

@@ -69,8 +69,8 @@ The TFT market price and marketcap are as follows:
 
 | **Description**           | **Value**     |
 | ------------------------- | ------------- |
-| TFT Market Price       | {{#include ../../../values/tft_value.md}} USD |
-| TFT Market Cap | {{#include ../../../values/tft_marketcap.md}}  USD |
+| TFT Market Price       | !!wiki.include page:'manual:tft_value.md' USD |
+| TFT Market Cap | !!wiki.include page:'manual:tft_marketcap.md'  USD |
 
 The market cap is equal to the product of the TFT market price and the circulating supply.
 

collections/collaboration/collaboration_tools/img/.done

@@ -0,0 +1,8 @@
+column.png
+emoji.png
+fork.png
+signin.png
+taiga.png
+threecolumnsdone.png
+twocolumnsdone.png
+vscode.png

collections/farmers/3node_building/img/.done

@@ -0,0 +1 @@
+farming_30.png

collections/farmers/complete_diy_guides/3node_diy_desktop/img/.done

@@ -0,0 +1,19 @@
+3node_diy_desktop_111.png
+3node_diy_desktop_114.png
+3node_diy_desktop_115.png
+3node_diy_desktop_116.png
+3node_diy_desktop_117.png
+3node_diy_desktop_118.png
+3node_diy_desktop_119.png
+3node_diy_desktop_120.png
+3node_diy_desktop_121.png
+3node_diy_desktop_122.png
+3node_diy_desktop_123.png
+3node_diy_desktop_124.png
+3node_diy_desktop_125.png
+3node_diy_desktop_126.png
+3node_diy_desktop_127.png
+3node_diy_desktop_128.png
+3node_diy_desktop_129.png
+3node_diy_desktop_130.png
+farming_30.png