diff --git a/_archive/possibleecosystem/aiqom/aiqom_internal.md b/_archive/possibleecosystem/aiqom/aiqom_internal.md index a235535..27e35eb 100644 --- a/_archive/possibleecosystem/aiqom/aiqom_internal.md +++ b/_archive/possibleecosystem/aiqom/aiqom_internal.md @@ -1 +1 @@ -!!!wiki.include:aiqom_intro \ No newline at end of file +!!wiki.include page:aiqom_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/artheon/artheon_internal.md b/_archive/possibleecosystem/artheon/artheon_internal.md index de262fe..d647996 100644 --- a/_archive/possibleecosystem/artheon/artheon_internal.md +++ b/_archive/possibleecosystem/artheon/artheon_internal.md @@ -1,3 +1,3 @@ -!!!wiki.include:artheon_intro -!!!wiki.include:artheon_potential -!!!wiki.include:artheon_ops +!!wiki.include page:artheon_intro +!!wiki.include page:artheon_potential +!!wiki.include page:artheon_ops diff --git a/_archive/possibleecosystem/artheon/artheon_intro.md b/_archive/possibleecosystem/artheon/artheon_intro.md index 04b0d08..37395d3 100644 --- a/_archive/possibleecosystem/artheon/artheon_intro.md +++ b/_archive/possibleecosystem/artheon/artheon_intro.md @@ -12,7 +12,7 @@ Artheon is hosted on the ThreeFold_Grid, allowing the museum to share free globa - [Artheon | Vasily Gnuchev (Founder)](https://www.consciousinternet.org/#/people/vasily_gnuchev) - [Artheon | Telegram Group](https://t.me/artheon) -!!!youtube id:Ofk22N2Ew1k +!!youtube id:Ofk22N2Ew1k ## Future diff --git a/_archive/possibleecosystem/aydo/aydo_internal.md b/_archive/possibleecosystem/aydo/aydo_internal.md index fb6fd2d..7d9d7fd 100644 --- a/_archive/possibleecosystem/aydo/aydo_internal.md +++ b/_archive/possibleecosystem/aydo/aydo_internal.md @@ -1 +1 @@ -!!!wiki.include:aydo_intro \ No newline at end of file +!!wiki.include page:aydo_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/aydo/aydo_intro.md b/_archive/possibleecosystem/aydo/aydo_intro.md index ba19dea..0372761 100644 --- a/_archive/possibleecosystem/aydo/aydo_intro.md +++ b/_archive/possibleecosystem/aydo/aydo_intro.md @@ -8,7 +8,7 @@ ## Business Model & Funding -!!!wiki.include:tsc:twin_valuation_intro +!!wiki.include page:tsc:twin_valuation_intro For business use cases other licenses can be asked for. @@ -37,8 +37,8 @@ Funding is part of what we do for Digital_twin ``` -!!!wiki.include:tsc:twin_projects +!!wiki.include page:tsc:twin_projects !!wiki.def alias:aydo -!!!alias aydo_acp \ No newline at end of file +!!alias aydo_acp \ No newline at end of file diff --git a/_archive/possibleecosystem/beliive/beliive_internal.md b/_archive/possibleecosystem/beliive/beliive_internal.md index fed7b33..6f3c9b5 100644 --- a/_archive/possibleecosystem/beliive/beliive_internal.md +++ b/_archive/possibleecosystem/beliive/beliive_internal.md @@ -1 +1 @@ -!!!wiki.include:beliive_intro \ No newline at end of file +!!wiki.include page:beliive_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/businesstwin/businesstwin_internal.md b/_archive/possibleecosystem/businesstwin/businesstwin_internal.md index 4c67858..8b53ce6 100644 --- a/_archive/possibleecosystem/businesstwin/businesstwin_internal.md +++ b/_archive/possibleecosystem/businesstwin/businesstwin_internal.md @@ -1 +1 @@ -!!!wiki.include:businesstwin_intro \ No newline at end of file +!!wiki.include page:businesstwin_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/businesstwin/businesstwin_intro.md b/_archive/possibleecosystem/businesstwin/businesstwin_intro.md index 3fdc120..0556365 100644 --- a/_archive/possibleecosystem/businesstwin/businesstwin_intro.md +++ b/_archive/possibleecosystem/businesstwin/businesstwin_intro.md @@ -85,6 +85,6 @@ Its in the best interest for every business twin owner to convince other people - aim is to have hundreds of thousands of companies registered like this - 100.000 companies -> 80 eur average = +- 100 million USD recurring revenu -!!!alias business_twin +!!alias business_twin -!!!wiki.include:tsc:twin_projects \ No newline at end of file +!!wiki.include page:tsc:twin_projects \ No newline at end of file diff --git a/_archive/possibleecosystem/cicolabs/cicolabs_internal.md b/_archive/possibleecosystem/cicolabs/cicolabs_internal.md index 858fd97..71c6e4f 100644 --- a/_archive/possibleecosystem/cicolabs/cicolabs_internal.md +++ b/_archive/possibleecosystem/cicolabs/cicolabs_internal.md @@ -1 +1 @@ -!!!wiki.include:cicolabs_intro \ No newline at end of file +!!wiki.include page:cicolabs_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/crystalhome/crystalhome_internal.md b/_archive/possibleecosystem/crystalhome/crystalhome_internal.md index f7f62a7..8c789f2 100644 --- a/_archive/possibleecosystem/crystalhome/crystalhome_internal.md +++ b/_archive/possibleecosystem/crystalhome/crystalhome_internal.md @@ -1,2 +1,2 @@ -!!!wiki.include:crystalhome_intro -!!!wiki.include:crystalhome_ops \ No newline at end of file +!!wiki.include page:crystalhome_intro +!!wiki.include page:crystalhome_ops \ No newline at end of file diff --git a/_archive/possibleecosystem/crystallanguage/crystallanguage_internal.md b/_archive/possibleecosystem/crystallanguage/crystallanguage_internal.md index c353116..a629e0b 100644 --- a/_archive/possibleecosystem/crystallanguage/crystallanguage_internal.md +++ b/_archive/possibleecosystem/crystallanguage/crystallanguage_internal.md @@ -1 +1 @@ -!!!wiki.include:crystallanguage_intro \ No newline at end of file +!!wiki.include page:crystallanguage_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/digitaltwin/digitaltwin_aci.md b/_archive/possibleecosystem/digitaltwin/digitaltwin_aci.md index b1b1eee..397b33f 100644 --- a/_archive/possibleecosystem/digitaltwin/digitaltwin_aci.md +++ b/_archive/possibleecosystem/digitaltwin/digitaltwin_aci.md @@ -10,7 +10,7 @@ The Digital Twin assures that only you own your data, and no one else. Access nu Fore more info about the why and how see [Internet 4](threefold:internet4) -!!!wiki.include:tsc:twin_valuation_intro +!!wiki.include page:tsc:twin_valuation_intro ## Experiences On Top Of Digital Twin diff --git a/_archive/possibleecosystem/digitaltwin/digitaltwin_internal.md b/_archive/possibleecosystem/digitaltwin/digitaltwin_internal.md index f2d16d6..7242f88 100644 --- a/_archive/possibleecosystem/digitaltwin/digitaltwin_internal.md +++ b/_archive/possibleecosystem/digitaltwin/digitaltwin_internal.md @@ -1 +1 @@ -!!!wiki.include:digitaltwin_intro \ No newline at end of file +!!wiki.include page:digitaltwin_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/digitaltwin/digitaltwin_intro.md b/_archive/possibleecosystem/digitaltwin/digitaltwin_intro.md index 719fb7e..0dd9490 100644 --- a/_archive/possibleecosystem/digitaltwin/digitaltwin_intro.md +++ b/_archive/possibleecosystem/digitaltwin/digitaltwin_intro.md @@ -86,4 +86,4 @@ More information see [digital twin why](twin:why_digital_twin) See [twin_architecture](twin:twin_architecture) -!!!wiki.include:twin:twin_toc \ No newline at end of file +!!wiki.include page:twin:twin_toc \ No newline at end of file diff --git a/_archive/possibleecosystem/ekofolio/ekofolio_internal.md b/_archive/possibleecosystem/ekofolio/ekofolio_internal.md index ec71dec..218c8d4 100644 --- a/_archive/possibleecosystem/ekofolio/ekofolio_internal.md +++ b/_archive/possibleecosystem/ekofolio/ekofolio_internal.md @@ -1 +1 @@ -!!!wiki.include:ekofolio_intro \ No newline at end of file +!!wiki.include page:ekofolio_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/ekofolio/ekofolio_intro.md b/_archive/possibleecosystem/ekofolio/ekofolio_intro.md index 0d01cab..98cb0a8 100644 --- a/_archive/possibleecosystem/ekofolio/ekofolio_intro.md +++ b/_archive/possibleecosystem/ekofolio/ekofolio_intro.md @@ -39,4 +39,4 @@ Protect land ``` -!!!wiki.include:tsc:carbon_toc \ No newline at end of file +!!wiki.include page:tsc:carbon_toc \ No newline at end of file diff --git a/_archive/possibleecosystem/endpandemics/endpandemics_internal.md b/_archive/possibleecosystem/endpandemics/endpandemics_internal.md index 3377dda..b9d835d 100644 --- a/_archive/possibleecosystem/endpandemics/endpandemics_internal.md +++ b/_archive/possibleecosystem/endpandemics/endpandemics_internal.md @@ -1 +1 @@ -!!!wiki.include:endpandemics_intro \ No newline at end of file +!!wiki.include page:endpandemics_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/endpandemics/endpandemics_intro.md b/_archive/possibleecosystem/endpandemics/endpandemics_intro.md index e903738..5dae6c6 100644 --- a/_archive/possibleecosystem/endpandemics/endpandemics_intro.md +++ b/_archive/possibleecosystem/endpandemics/endpandemics_intro.md @@ -6,7 +6,7 @@ see https://endpandemics.earth A Global Action Campaign to Reduce the Risks of Pandemics by Protecting and Regenerating Nature. -!!!youtube id:cpRT32lcHRM +!!youtube id:cpRT32lcHRM ![](img/endpandemics1.png) @@ -50,4 +50,4 @@ A Global Action Campaign to Reduce the Risks of Pandemics by Protecting and Rege ``` -!!!wiki.include:tsc:carbon_toc \ No newline at end of file +!!wiki.include page:tsc:carbon_toc \ No newline at end of file diff --git a/_archive/possibleecosystem/envirate/envirate_internal.md b/_archive/possibleecosystem/envirate/envirate_internal.md index f1a9782..f9e543d 100644 --- a/_archive/possibleecosystem/envirate/envirate_internal.md +++ b/_archive/possibleecosystem/envirate/envirate_internal.md @@ -1 +1 @@ -!!!wiki.include:envirate_intro \ No newline at end of file +!!wiki.include page:envirate_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/envirate/envirate_intro.md b/_archive/possibleecosystem/envirate/envirate_intro.md index fd13efb..96fc1a6 100644 --- a/_archive/possibleecosystem/envirate/envirate_intro.md +++ b/_archive/possibleecosystem/envirate/envirate_intro.md @@ -2,7 +2,7 @@ # Envirate -!!!youtube id:cw6mzUDSWy8 +!!youtube id:cw6mzUDSWy8 The rationale is simple: we are used to rating hotels, food, travel and so forth; why not do the same for the environment? @@ -43,4 +43,4 @@ The quality of the data itself will be checked for consistency algorithmically a ``` -!!!wiki.include:tsc:carbon_toc +!!wiki.include page:tsc:carbon_toc diff --git a/_archive/possibleecosystem/flowgen/flowgen_internal.md b/_archive/possibleecosystem/flowgen/flowgen_internal.md index ade3be8..9afc122 100644 --- a/_archive/possibleecosystem/flowgen/flowgen_internal.md +++ b/_archive/possibleecosystem/flowgen/flowgen_internal.md @@ -1 +1 @@ -!!!wiki.include:flowgen_intro \ No newline at end of file +!!wiki.include page:flowgen_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/freeflow/freeflow_intro.md b/_archive/possibleecosystem/freeflow/freeflow_intro.md index 9f13660..22af41d 100644 --- a/_archive/possibleecosystem/freeflow/freeflow_intro.md +++ b/_archive/possibleecosystem/freeflow/freeflow_intro.md @@ -1 +1 @@ -!!!wiki.include:freeflow:freeflow \ No newline at end of file +!!wiki.include page:freeflow:freeflow \ No newline at end of file diff --git a/_archive/possibleecosystem/freeflowcircles/freeflowcircles_internal.md b/_archive/possibleecosystem/freeflowcircles/freeflowcircles_internal.md index 7b5e37a..75ff3a0 100644 --- a/_archive/possibleecosystem/freeflowcircles/freeflowcircles_internal.md +++ b/_archive/possibleecosystem/freeflowcircles/freeflowcircles_internal.md @@ -1 +1 @@ -!!!wiki.include:freeflowcircles_intro \ No newline at end of file +!!wiki.include page:freeflowcircles_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/freeflowcircles/freeflowcircles_intro.md b/_archive/possibleecosystem/freeflowcircles/freeflowcircles_intro.md index cd1aebb..6ad6f8a 100644 --- a/_archive/possibleecosystem/freeflowcircles/freeflowcircles_intro.md +++ b/_archive/possibleecosystem/freeflowcircles/freeflowcircles_intro.md @@ -5,7 +5,7 @@ ![](img/freeflow_hub_alternative.png) -!!!wiki.include:twin:freeflow_circles_intro +!!wiki.include page:twin:freeflow_circles_intro ## Structure @@ -17,7 +17,7 @@ ## Business Model & Funding -!!!wiki.include:tsc:twin_valuation_intro +!!wiki.include page:tsc:twin_valuation_intro Funding is part of what we do for Digital_twin @@ -47,6 +47,6 @@ Funding is part of what we do for Digital_twin !!wiki.def alias:freeflow_hub,freeflow_social,freeflow_circles -!!!alias freeflow_hub,freeflow_circles +!!alias freeflow_hub,freeflow_circles -!!!wiki.include:tsc:twin_projects \ No newline at end of file +!!wiki.include page:tsc:twin_projects \ No newline at end of file diff --git a/_archive/possibleecosystem/generationblue/generationblue_internal.md b/_archive/possibleecosystem/generationblue/generationblue_internal.md index 9a5d701..692c316 100644 --- a/_archive/possibleecosystem/generationblue/generationblue_internal.md +++ b/_archive/possibleecosystem/generationblue/generationblue_internal.md @@ -1 +1 @@ -!!!wiki.include:generationblue_intro \ No newline at end of file +!!wiki.include page:generationblue_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/greenedge/greenedge_internal.md b/_archive/possibleecosystem/greenedge/greenedge_internal.md index 3a70a97..ab4ef2b 100644 --- a/_archive/possibleecosystem/greenedge/greenedge_internal.md +++ b/_archive/possibleecosystem/greenedge/greenedge_internal.md @@ -1 +1 @@ -!!!wiki.include:greenedge_intro \ No newline at end of file +!!wiki.include page:greenedge_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/herculesbrowser/herculesbrowser_internal.md b/_archive/possibleecosystem/herculesbrowser/herculesbrowser_internal.md index da51095..2debf89 100644 --- a/_archive/possibleecosystem/herculesbrowser/herculesbrowser_internal.md +++ b/_archive/possibleecosystem/herculesbrowser/herculesbrowser_internal.md @@ -1 +1 @@ -!!!wiki.include:herculesbrowser_intro \ No newline at end of file +!!wiki.include page:herculesbrowser_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/herculesbrowser/herculesbrowser_intro.md b/_archive/possibleecosystem/herculesbrowser/herculesbrowser_intro.md index 33c89b3..a753395 100644 --- a/_archive/possibleecosystem/herculesbrowser/herculesbrowser_intro.md +++ b/_archive/possibleecosystem/herculesbrowser/herculesbrowser_intro.md @@ -3,13 +3,13 @@ # Hercules Browser -!!!wiki.include:twin:hercules_browser_intro +!!wiki.include page:twin:hercules_browser_intro ## More Info > see: [Hercules Browser How Does It Work](twin:hercules_browser_tech) -!!!wiki.include:twin:hercules_browser_benefits +!!wiki.include page:twin:hercules_browser_benefits ## Structure diff --git a/_archive/possibleecosystem/hpe/6/hpe_internal.md b/_archive/possibleecosystem/hpe/6/hpe_internal.md index 7a6d628..4dcaaaf 100644 --- a/_archive/possibleecosystem/hpe/6/hpe_internal.md +++ b/_archive/possibleecosystem/hpe/6/hpe_internal.md @@ -1 +1 @@ -!!!wiki.include:hpe_intro \ No newline at end of file +!!wiki.include page:hpe_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/hpe/hpe_internal.md b/_archive/possibleecosystem/hpe/hpe_internal.md index 7a6d628..4dcaaaf 100644 --- a/_archive/possibleecosystem/hpe/hpe_internal.md +++ b/_archive/possibleecosystem/hpe/hpe_internal.md @@ -1 +1 @@ -!!!wiki.include:hpe_intro \ No newline at end of file +!!wiki.include page:hpe_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/jointidea/jointidea_internal.md b/_archive/possibleecosystem/jointidea/jointidea_internal.md index 75dced1..51bb966 100644 --- a/_archive/possibleecosystem/jointidea/jointidea_internal.md +++ b/_archive/possibleecosystem/jointidea/jointidea_internal.md @@ -1 +1 @@ -!!!wiki.include:jointidea_intro \ No newline at end of file +!!wiki.include page:jointidea_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/kleos/kleos_internal.md b/_archive/possibleecosystem/kleos/kleos_internal.md index 1b2671e..dc00b23 100644 --- a/_archive/possibleecosystem/kleos/kleos_internal.md +++ b/_archive/possibleecosystem/kleos/kleos_internal.md @@ -1 +1 @@ -!!!wiki.include:kleos_intro \ No newline at end of file +!!wiki.include page:kleos_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/kutana/kutana_internal.md b/_archive/possibleecosystem/kutana/kutana_internal.md index 0d4b61b..328835c 100644 --- a/_archive/possibleecosystem/kutana/kutana_internal.md +++ b/_archive/possibleecosystem/kutana/kutana_internal.md @@ -1 +1 @@ -!!!wiki.include:kutana_intro \ No newline at end of file +!!wiki.include page:kutana_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/kutana/kutana_intro.md b/_archive/possibleecosystem/kutana/kutana_intro.md index 45cf37b..6517510 100644 --- a/_archive/possibleecosystem/kutana/kutana_intro.md +++ b/_archive/possibleecosystem/kutana/kutana_intro.md @@ -8,7 +8,7 @@ ## Business Model & Funding -!!!wiki.include:tsc:twin_valuation_intro +!!wiki.include page:tsc:twin_valuation_intro Licenses for corporate & enterprise use cases can be asked for. @@ -37,4 +37,4 @@ Funding is part of what we do for Digital_twin ``` -!!!wiki.include:tsc:twin_projects \ No newline at end of file +!!wiki.include page:tsc:twin_projects \ No newline at end of file diff --git a/_archive/possibleecosystem/lecielfoundation/lecielfoundation_internal.md b/_archive/possibleecosystem/lecielfoundation/lecielfoundation_internal.md index be4e34a..0841d2c 100644 --- a/_archive/possibleecosystem/lecielfoundation/lecielfoundation_internal.md +++ b/_archive/possibleecosystem/lecielfoundation/lecielfoundation_internal.md @@ -1 +1 @@ -!!!wiki.include:lecielfoundation_intro \ No newline at end of file +!!wiki.include page:lecielfoundation_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/mazraa/mazraa_internal.md b/_archive/possibleecosystem/mazraa/mazraa_internal.md index f7de4a3..79a23e4 100644 --- a/_archive/possibleecosystem/mazraa/mazraa_internal.md +++ b/_archive/possibleecosystem/mazraa/mazraa_internal.md @@ -1 +1 @@ -!!!wiki.include:mazraa_intro \ No newline at end of file +!!wiki.include page:mazraa_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/metaverse/metaverse_interanal.md b/_archive/possibleecosystem/metaverse/metaverse_interanal.md index 27f3964..8fd49bc 100644 --- a/_archive/possibleecosystem/metaverse/metaverse_interanal.md +++ b/_archive/possibleecosystem/metaverse/metaverse_interanal.md @@ -1 +1 @@ -!!!wiki.include:metaverse_intro \ No newline at end of file +!!wiki.include page:metaverse_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/mitaa/mitaa_internal.md b/_archive/possibleecosystem/mitaa/mitaa_internal.md index 206fb9b..b92a89d 100644 --- a/_archive/possibleecosystem/mitaa/mitaa_internal.md +++ b/_archive/possibleecosystem/mitaa/mitaa_internal.md @@ -1 +1 @@ -!!!wiki.include:mitaa_intro \ No newline at end of file +!!wiki.include page:mitaa_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/mitaa/mitaa_intro.md b/_archive/possibleecosystem/mitaa/mitaa_intro.md index 65388e1..6531bd2 100644 --- a/_archive/possibleecosystem/mitaa/mitaa_intro.md +++ b/_archive/possibleecosystem/mitaa/mitaa_intro.md @@ -57,7 +57,7 @@ Promising projects with new tokens encounter many barriers and excessive costs t ## Business Model & Funding -!!!wiki.include:tsc:twin_valuation_intro +!!wiki.include page:tsc:twin_valuation_intro Funding is part of what we do for Digital_twin diff --git a/_archive/possibleecosystem/moneyofgood/moneyofgood_internal.md b/_archive/possibleecosystem/moneyofgood/moneyofgood_internal.md index 0a2c66b..596e5bc 100644 --- a/_archive/possibleecosystem/moneyofgood/moneyofgood_internal.md +++ b/_archive/possibleecosystem/moneyofgood/moneyofgood_internal.md @@ -1 +1 @@ -!!!wiki.include:moneyofgood_intro \ No newline at end of file +!!wiki.include page:moneyofgood_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/ootopia/ootopia_internal.md b/_archive/possibleecosystem/ootopia/ootopia_internal.md index 19673d7..f66a570 100644 --- a/_archive/possibleecosystem/ootopia/ootopia_internal.md +++ b/_archive/possibleecosystem/ootopia/ootopia_internal.md @@ -1 +1 @@ -!!!wiki.include:ootopia_intro \ No newline at end of file +!!wiki.include page:ootopia_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/presearch/presearch_internal.md b/_archive/possibleecosystem/presearch/presearch_internal.md index 5622ce3..edce083 100644 --- a/_archive/possibleecosystem/presearch/presearch_internal.md +++ b/_archive/possibleecosystem/presearch/presearch_internal.md @@ -1,3 +1,3 @@ -!!!wiki.include:presearch_intro +!!wiki.include page:presearch_intro > Learn more on Presearch node deployment on TF Grid [HERE](presearch_jukebox). \ No newline at end of file diff --git a/_archive/possibleecosystem/regennetwork/regennetwork_internal.md b/_archive/possibleecosystem/regennetwork/regennetwork_internal.md index 0b9a37e..5897875 100644 --- a/_archive/possibleecosystem/regennetwork/regennetwork_internal.md +++ b/_archive/possibleecosystem/regennetwork/regennetwork_internal.md @@ -1 +1 @@ -!!!wiki.include:regennetwork_intro \ No newline at end of file +!!wiki.include page:regennetwork_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/regennetwork/regennetwork_intro.md b/_archive/possibleecosystem/regennetwork/regennetwork_intro.md index a4dd9a2..8eaba7a 100644 --- a/_archive/possibleecosystem/regennetwork/regennetwork_intro.md +++ b/_archive/possibleecosystem/regennetwork/regennetwork_intro.md @@ -42,4 +42,4 @@ Regeneration is the growth of vitality, viability and evolutionary capacity of a ``` -!!!wiki.include:tsc:carbon_toc +!!wiki.include page:tsc:carbon_toc diff --git a/_archive/possibleecosystem/seeds/seeds_internal.md b/_archive/possibleecosystem/seeds/seeds_internal.md index 2aaadc1..c0ee37d 100644 --- a/_archive/possibleecosystem/seeds/seeds_internal.md +++ b/_archive/possibleecosystem/seeds/seeds_internal.md @@ -1 +1 @@ -!!!wiki.include:seeds_intro \ No newline at end of file +!!wiki.include page:seeds_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/shareitt/shareitt_internal.md b/_archive/possibleecosystem/shareitt/shareitt_internal.md index f9c2405..bc01f3d 100644 --- a/_archive/possibleecosystem/shareitt/shareitt_internal.md +++ b/_archive/possibleecosystem/shareitt/shareitt_internal.md @@ -1 +1 @@ -!!!wiki.include:shareitt_intro \ No newline at end of file +!!wiki.include page:shareitt_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/sikana/sikana_internal.md b/_archive/possibleecosystem/sikana/sikana_internal.md index 759b638..6abdb75 100644 --- a/_archive/possibleecosystem/sikana/sikana_internal.md +++ b/_archive/possibleecosystem/sikana/sikana_internal.md @@ -1 +1 @@ -!!!wiki.include:sikana_intro \ No newline at end of file +!!wiki.include page:sikana_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/solidaridad/solidaridad_internal.md b/_archive/possibleecosystem/solidaridad/solidaridad_internal.md index 21ca0f5..51d86c3 100644 --- a/_archive/possibleecosystem/solidaridad/solidaridad_internal.md +++ b/_archive/possibleecosystem/solidaridad/solidaridad_internal.md @@ -1,2 +1,2 @@ -!!!wiki.include:solidaridad_intro -!!!wiki.include:solidaridad_roadmap \ No newline at end of file +!!wiki.include page:solidaridad_intro +!!wiki.include page:solidaridad_roadmap \ No newline at end of file diff --git a/_archive/possibleecosystem/sourcecode/sourcecode_internal.md b/_archive/possibleecosystem/sourcecode/sourcecode_internal.md index 5651fdb..62627c4 100644 --- a/_archive/possibleecosystem/sourcecode/sourcecode_internal.md +++ b/_archive/possibleecosystem/sourcecode/sourcecode_internal.md @@ -1 +1 @@ -!!!wiki.include:sourcecode_intro \ No newline at end of file +!!wiki.include page:sourcecode_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/spinn/spinn_internal.md b/_archive/possibleecosystem/spinn/spinn_internal.md index efa7558..557b8e9 100644 --- a/_archive/possibleecosystem/spinn/spinn_internal.md +++ b/_archive/possibleecosystem/spinn/spinn_internal.md @@ -1 +1 @@ -!!!wiki.include:spinn_intro \ No newline at end of file +!!wiki.include page:spinn_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/talamanca/talamanca_internal.md b/_archive/possibleecosystem/talamanca/talamanca_internal.md index a593112..ab1e347 100644 --- a/_archive/possibleecosystem/talamanca/talamanca_internal.md +++ b/_archive/possibleecosystem/talamanca/talamanca_internal.md @@ -1 +1 @@ -!!!wiki.include:talamanca_intro \ No newline at end of file +!!wiki.include page:talamanca_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/talamanca/talamanca_intro.md b/_archive/possibleecosystem/talamanca/talamanca_intro.md index 1811186..a4da262 100644 --- a/_archive/possibleecosystem/talamanca/talamanca_intro.md +++ b/_archive/possibleecosystem/talamanca/talamanca_intro.md @@ -2,7 +2,7 @@ # Talamanca Landbank -!!!youtube id:ZXsJIfEXhrQ +!!youtube id:ZXsJIfEXhrQ ![](img/talamanca2.png) @@ -19,7 +19,7 @@ Meet [Jennifer](https://www.threefold.io/aci/people/jennifer_long/), the driving - the land harvest carbon credits - the land sometimes can be used by conscious communities (free) who then have to bring added value to the land & protect as well - the land sometimes can be used to organic farming in form of "food forests" -- The project is a non for profit initiative !!! +- The project is a non for profit initiative !! ## Business model @@ -76,4 +76,4 @@ Meet [Jennifer](https://www.threefold.io/aci/people/jennifer_long/), the driving ``` -!!!wiki.include:tsc:carbon_toc \ No newline at end of file +!!wiki.include page:tsc:carbon_toc \ No newline at end of file diff --git a/_archive/possibleecosystem/tapr/tapr_internal.md b/_archive/possibleecosystem/tapr/tapr_internal.md index 858eafc..d9ba960 100644 --- a/_archive/possibleecosystem/tapr/tapr_internal.md +++ b/_archive/possibleecosystem/tapr/tapr_internal.md @@ -1 +1 @@ -!!!wiki.include:tapr_intro \ No newline at end of file +!!wiki.include page:tapr_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/tapr/tapr_intro.md b/_archive/possibleecosystem/tapr/tapr_intro.md index a975a97..48133b4 100644 --- a/_archive/possibleecosystem/tapr/tapr_intro.md +++ b/_archive/possibleecosystem/tapr/tapr_intro.md @@ -4,7 +4,7 @@ Analyze your dreams. -!!!vimeo id:561708625 +!!vimeo id:561708625 ## Status @@ -22,7 +22,7 @@ First commercial version Q1 2022 - 100k USD for project, will probably not be separate company - business model: added value on top of digital twin. -!!!wiki.include:tsc:twin_valuation_intro +!!wiki.include page:tsc:twin_valuation_intro ```charty @@ -47,4 +47,4 @@ First commercial version Q1 2022 ``` -!!!wiki.include:tsc:twin_projects \ No newline at end of file +!!wiki.include page:tsc:twin_projects \ No newline at end of file diff --git a/_archive/possibleecosystem/taskio/taskio_internal.md b/_archive/possibleecosystem/taskio/taskio_internal.md index 75625e9..21477d7 100644 --- a/_archive/possibleecosystem/taskio/taskio_internal.md +++ b/_archive/possibleecosystem/taskio/taskio_internal.md @@ -1 +1 @@ -!!!wiki.include:taskio_intro \ No newline at end of file +!!wiki.include page:taskio_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/taskio/taskio_intro.md b/_archive/possibleecosystem/taskio/taskio_intro.md index d6e4e06..aecc1e1 100644 --- a/_archive/possibleecosystem/taskio/taskio_intro.md +++ b/_archive/possibleecosystem/taskio/taskio_intro.md @@ -8,7 +8,7 @@ Engage teams, gather data - Taskio gives you back time and lets you work smarter > see https://task.io/ -!!!youtube id:Fbttlrh7_OA +!!youtube id:Fbttlrh7_OA ## Wht does Task.IO do? @@ -44,4 +44,4 @@ Engage teams, gather data - Taskio gives you back time and lets you work smarter ![](img/taskio_.jpg) -!!!wiki.include:tsc:impact_toc \ No newline at end of file +!!wiki.include page:tsc:impact_toc \ No newline at end of file diff --git a/_archive/possibleecosystem/thehumanizedinternet/thehumanizedinternet_internal.md b/_archive/possibleecosystem/thehumanizedinternet/thehumanizedinternet_internal.md index ec4320d..cbdd94a 100644 --- a/_archive/possibleecosystem/thehumanizedinternet/thehumanizedinternet_internal.md +++ b/_archive/possibleecosystem/thehumanizedinternet/thehumanizedinternet_internal.md @@ -1 +1 @@ -!!!wiki.include:thehumanizedinternet_intro \ No newline at end of file +!!wiki.include page:thehumanizedinternet_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/treebuddy/treebuddy_internal.md b/_archive/possibleecosystem/treebuddy/treebuddy_internal.md index 68e8baa..8e31aa6 100644 --- a/_archive/possibleecosystem/treebuddy/treebuddy_internal.md +++ b/_archive/possibleecosystem/treebuddy/treebuddy_internal.md @@ -1 +1 @@ -!!!wiki.include:treebuddy_intro \ No newline at end of file +!!wiki.include page:treebuddy_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/treebuddy/treebuddy_intro.md b/_archive/possibleecosystem/treebuddy/treebuddy_intro.md index a075da9..e8aee6b 100644 --- a/_archive/possibleecosystem/treebuddy/treebuddy_intro.md +++ b/_archive/possibleecosystem/treebuddy/treebuddy_intro.md @@ -10,7 +10,7 @@ The most effective way to fight global biodiversity loss and global warming is t - Tree caring really counts for the long-term effects. Many trees die if not taken care of. -!!!wiki.include:treebuddy_how +!!wiki.include page:treebuddy_how > more info see: https://www.treebuddy.earth/ @@ -41,6 +41,6 @@ The most effective way to fight global biodiversity loss and global warming is t ``` -!!!wiki.include:treebuddy_why +!!wiki.include page:treebuddy_why -!!!wiki.include:tsc:carbon_toc \ No newline at end of file +!!wiki.include page:tsc:carbon_toc \ No newline at end of file diff --git a/_archive/possibleecosystem/ubuntu/ubuntu_internal.md b/_archive/possibleecosystem/ubuntu/ubuntu_internal.md index 02762fb..bec03fc 100644 --- a/_archive/possibleecosystem/ubuntu/ubuntu_internal.md +++ b/_archive/possibleecosystem/ubuntu/ubuntu_internal.md @@ -1 +1 @@ -!!!wiki.include:ubuntu_intro \ No newline at end of file +!!wiki.include page:ubuntu_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/uhuru/uhuru_internal.md b/_archive/possibleecosystem/uhuru/uhuru_internal.md index add5de7..fc29de3 100644 --- a/_archive/possibleecosystem/uhuru/uhuru_internal.md +++ b/_archive/possibleecosystem/uhuru/uhuru_internal.md @@ -1 +1 @@ -!!!wiki.include:uhuru_intro \ No newline at end of file +!!wiki.include page:uhuru_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/unifinity/unifinity_internal.md b/_archive/possibleecosystem/unifinity/unifinity_internal.md index e0967f9..0adbd15 100644 --- a/_archive/possibleecosystem/unifinity/unifinity_internal.md +++ b/_archive/possibleecosystem/unifinity/unifinity_internal.md @@ -1 +1 @@ -!!!wiki.include:unifinity_intro \ No newline at end of file +!!wiki.include page:unifinity_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/unifinity/unifinity_intro.md b/_archive/possibleecosystem/unifinity/unifinity_intro.md index 36e48b7..39bde32 100644 --- a/_archive/possibleecosystem/unifinity/unifinity_intro.md +++ b/_archive/possibleecosystem/unifinity/unifinity_intro.md @@ -17,4 +17,4 @@ We are talking with Unifinity how to help each other, more info soon. -!!!wiki.include:tsc:impact_toc \ No newline at end of file +!!wiki.include page:tsc:impact_toc \ No newline at end of file diff --git a/_archive/possibleecosystem/unit/unit_internal.md b/_archive/possibleecosystem/unit/unit_internal.md index 2b406a0..893ef6d 100644 --- a/_archive/possibleecosystem/unit/unit_internal.md +++ b/_archive/possibleecosystem/unit/unit_internal.md @@ -1 +1 @@ -!!!wiki.include:unit_intro \ No newline at end of file +!!wiki.include page:unit_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/vedamasters/vedamasters_internal.md b/_archive/possibleecosystem/vedamasters/vedamasters_internal.md index bcfabf0..8fcf3c4 100644 --- a/_archive/possibleecosystem/vedamasters/vedamasters_internal.md +++ b/_archive/possibleecosystem/vedamasters/vedamasters_internal.md @@ -1 +1 @@ -!!!wiki.include:vedamasters_intro \ No newline at end of file +!!wiki.include page:vedamasters_intro \ No newline at end of file diff --git a/_archive/possibleecosystem/vedamasters/vedamasters_intro.md b/_archive/possibleecosystem/vedamasters/vedamasters_intro.md index 2b16314..7e03ab6 100644 --- a/_archive/possibleecosystem/vedamasters/vedamasters_intro.md +++ b/_archive/possibleecosystem/vedamasters/vedamasters_intro.md @@ -39,4 +39,4 @@ Was a massive undertaking to get us so far, but the platform is incredible. - [the boats](https://veda-egypt.com/) -!!!wiki.include:tsc:impact_toc \ No newline at end of file +!!wiki.include page:tsc:impact_toc \ No newline at end of file diff --git a/_archive/possibleecosystem/vlinder/vlinder_internal.md b/_archive/possibleecosystem/vlinder/vlinder_internal.md index 4d60e80..eac9447 100644 --- a/_archive/possibleecosystem/vlinder/vlinder_internal.md +++ b/_archive/possibleecosystem/vlinder/vlinder_internal.md @@ -1,3 +1,3 @@ -!!!wiki.include:vlinder_intro -!!!wiki.include:vlinder_potential -!!!wiki.include:vlinder_ops \ No newline at end of file +!!wiki.include page:vlinder_intro +!!wiki.include page:vlinder_potential +!!wiki.include page:vlinder_ops \ No newline at end of file diff --git a/_archive/possibleecosystem/vlinder/vlinder_intro.md b/_archive/possibleecosystem/vlinder/vlinder_intro.md index 01c6dd7..29f7322 100644 --- a/_archive/possibleecosystem/vlinder/vlinder_intro.md +++ b/_archive/possibleecosystem/vlinder/vlinder_intro.md @@ -52,4 +52,4 @@ The trading process is totally transparent: Set the price you are ready to buy o ``` -!!!wiki.include:tsc:carbon_toc \ No newline at end of file +!!wiki.include page:tsc:carbon_toc \ No newline at end of file diff --git a/_archive/possibleecosystem/zetako/zetako_internal.md b/_archive/possibleecosystem/zetako/zetako_internal.md index 3cf344a..3205506 100644 --- a/_archive/possibleecosystem/zetako/zetako_internal.md +++ b/_archive/possibleecosystem/zetako/zetako_internal.md @@ -1,3 +1,3 @@ -!!!wiki.include:zetako_intro -!!!wiki.include:zetako_potential -!!!wiki.include:zetako_ops \ No newline at end of file +!!wiki.include page:zetako_intro +!!wiki.include page:zetako_potential +!!wiki.include page:zetako_ops \ No newline at end of file diff --git a/_archive/technology/consensus3_mechanism/consensus3.md b/_archive/technology/consensus3_mechanism/consensus3.md index 9ba3105..d66c897 100644 --- a/_archive/technology/consensus3_mechanism/consensus3.md +++ b/_archive/technology/consensus3_mechanism/consensus3.md @@ -2,7 +2,7 @@ # DAO Consensus Engine -!!!include:dao_info +!!wiki.include page:dao_info ## DAO Engine @@ -12,8 +12,8 @@ This is a powerful blockchain construct which allows us to run our TFGrid and ma This system has been designed to be compatible with multiple blockchains. -!!!include:consensus3_overview_graph +!!wiki.include page:consensus3_overview_graph -!!!include:consensus3_toc +!!wiki.include page:consensus3_toc -!!!def alias:consensus3,consensus_engine \ No newline at end of file +!!def alias:consensus3,consensus_engine \ No newline at end of file diff --git a/_archive/technology/consensus3_mechanism/consensus3_engine_farming.md b/_archive/technology/consensus3_mechanism/consensus3_engine_farming.md index 1774781..e9416da 100644 --- a/_archive/technology/consensus3_mechanism/consensus3_engine_farming.md +++ b/_archive/technology/consensus3_mechanism/consensus3_engine_farming.md @@ -2,7 +2,7 @@ ### consensus engine in relation to TFT Farming Rewards in TFGrid 3.0 -!!!include:consensus3_overview_graph +!!wiki.include page:consensus3_overview_graph The consensus engine checks the farming rules as defined in @@ -14,4 +14,4 @@ The consensus engine checks the farming rules as defined in All the data of the farmer and the 3nodes are registered on TFChain -!!!include:consensus3_toc \ No newline at end of file +!!wiki.include page:consensus3_toc \ No newline at end of file diff --git a/_archive/technology/consensus3_mechanism/consensus3_oracles.md b/_archive/technology/consensus3_mechanism/consensus3_oracles.md index 0af143f..fad5cf7 100644 --- a/_archive/technology/consensus3_mechanism/consensus3_oracles.md +++ b/_archive/technology/consensus3_mechanism/consensus3_oracles.md @@ -41,4 +41,4 @@ graph TB > TODO: outdated info -!!!include:consensus3_toc \ No newline at end of file +!!wiki.include page:consensus3_toc \ No newline at end of file diff --git a/_archive/technology/consensus3_mechanism/consensus3_principles.md b/_archive/technology/consensus3_mechanism/consensus3_principles.md index 27ab007..097fb92 100644 --- a/_archive/technology/consensus3_mechanism/consensus3_principles.md +++ b/_archive/technology/consensus3_mechanism/consensus3_principles.md @@ -2,7 +2,7 @@ ## Blockchain node components -!!!include:consensus3_overview_graph +!!wiki.include page:consensus3_overview_graph - A Blockchain node (= Substrate node) called TF-Chain, containing all entities interacting with each other on the TF-Grid - An explorer = a Rest + GraphQL interface to TF-Chain (Graphql is a nice query language to make it easy for everyone to query for info) @@ -42,4 +42,4 @@ > TODO: outdated info -!!!include:consensus3_toc \ No newline at end of file +!!wiki.include page:consensus3_toc \ No newline at end of file diff --git a/_archive/technology/consensus3_mechanism/money_blockchain_partity_link.md b/_archive/technology/consensus3_mechanism/money_blockchain_partity_link.md index ae8845e..c05c0f6 100644 --- a/_archive/technology/consensus3_mechanism/money_blockchain_partity_link.md +++ b/_archive/technology/consensus3_mechanism/money_blockchain_partity_link.md @@ -50,4 +50,4 @@ graph TB Above diagram shows how our consensus engine can deal with Substrate and multiple Money Blockchains at same time. -!!!include:consensus3_toc \ No newline at end of file +!!wiki.include page:consensus3_toc \ No newline at end of file diff --git a/_archive/technology/consensus3_mechanism/roadmap_tfchain3.md b/_archive/technology/consensus3_mechanism/roadmap_tfchain3.md index 28f484f..f17e2d7 100644 --- a/_archive/technology/consensus3_mechanism/roadmap_tfchain3.md +++ b/_archive/technology/consensus3_mechanism/roadmap_tfchain3.md @@ -48,5 +48,5 @@ NEW -!!!def alias:tfchain_roadmap,dao_roadmap,tfdao_roadmap +!!def alias:tfchain_roadmap,dao_roadmap,tfdao_roadmap diff --git a/_archive/technology/consensus3_mechanism/tfgrid3_wallets.md b/_archive/technology/consensus3_mechanism/tfgrid3_wallets.md index f054c65..3f4b3ed 100644 --- a/_archive/technology/consensus3_mechanism/tfgrid3_wallets.md +++ b/_archive/technology/consensus3_mechanism/tfgrid3_wallets.md @@ -70,4 +70,4 @@ graph TB ``` -!!!include:consensus3_toc \ No newline at end of file +!!wiki.include page:consensus3_toc \ No newline at end of file diff --git a/_archive/technology/layers/technology_layers.md b/_archive/technology/layers/technology_layers.md index e6ab9c5..ef72ad4 100644 --- a/_archive/technology/layers/technology_layers.md +++ b/_archive/technology/layers/technology_layers.md @@ -1,7 +1,7 @@ -!!!include:capacity_layer_intro +!!wiki.include page:capacity_layer_intro -!!!include:autonomous_layer_intro +!!wiki.include page:autonomous_layer_intro -!!!include:experience_layer_intro +!!wiki.include page:experience_layer_intro diff --git a/_archive/technology/primitives/network/p2pagent.md b/_archive/technology/primitives/network/p2pagent.md index 97f6d77..fee02e4 100644 --- a/_archive/technology/primitives/network/p2pagent.md +++ b/_archive/technology/primitives/network/p2pagent.md @@ -2,4 +2,4 @@ >TODO -!!!include:zos_toc +!!wiki.include page:zos_toc diff --git a/_archive/technology/primitives/network/planetary_network.md b/_archive/technology/primitives/network/planetary_network.md index e3e3c5b..9bd9fac 100644 --- a/_archive/technology/primitives/network/planetary_network.md +++ b/_archive/technology/primitives/network/planetary_network.md @@ -47,8 +47,8 @@ In addition, wireless meshing requires you to know a lot about the network aroun The planetary network is a continuation & implementation of the [Yggdrasil](https://yggdrasil-network.github.io/about.html) network initiative. This technology is in beta but has been proven to work already quite well. -!!!def alias:planet_net,planetary_net,planetary_network,pan +!!def alias:planet_net,planetary_net,planetary_network,pan -!!!include:zos_toc +!!wiki.include page:zos_toc > Click [here](manual:planetary_network_connector) to read more about Planetary Network Connector Installation. Click [here](manual:yggdrasil_client) to read more about Planetary Network Installation (advanced). \ No newline at end of file diff --git a/_archive/technology/primitives/network/webgw.md b/_archive/technology/primitives/network/webgw.md index 4abd665..9ffab32 100644 --- a/_archive/technology/primitives/network/webgw.md +++ b/_archive/technology/primitives/network/webgw.md @@ -54,7 +54,7 @@ For 3.0 we start with a HTTP(S) proxy over Planetary network connection. Not all Further future, we envisage support for many other protocols: sql, redis, udp, ... -!!!def alias:web_gw,zos_web_gateway +!!def alias:web_gw,zos_web_gateway -!!!include:zos_toc +!!wiki.include page:zos_toc diff --git a/_archive/technology/qsss/interfaces_usecases/nft_storage.md b/_archive/technology/qsss/interfaces_usecases/nft_storage.md index fc41947..481aebe 100644 --- a/_archive/technology/qsss/interfaces_usecases/nft_storage.md +++ b/_archive/technology/qsss/interfaces_usecases/nft_storage.md @@ -94,4 +94,4 @@ The object (video,image) can easily be embedded in any website or other represen -!!!def alias:nft_storage,nft_storage_system \ No newline at end of file +!!def alias:nft_storage,nft_storage_system \ No newline at end of file diff --git a/_archive/technology/qsss/interfaces_usecases/s3_interface.md b/_archive/technology/qsss/interfaces_usecases/s3_interface.md index 267ee74..23b003e 100644 --- a/_archive/technology/qsss/interfaces_usecases/s3_interface.md +++ b/_archive/technology/qsss/interfaces_usecases/s3_interface.md @@ -12,4 +12,4 @@ A typical setup would look like: > TODO: link to manual on cloud how to deploy minio, using helm (3.0 release) -!!!def alias:s3_storage \ No newline at end of file +!!def alias:s3_storage \ No newline at end of file diff --git a/_archive/technology/qsss/product/file_system/qss_filesystem.md b/_archive/technology/qsss/product/file_system/qss_filesystem.md index 54c3638..07d5454 100644 --- a/_archive/technology/qsss/product/file_system/qss_filesystem.md +++ b/_archive/technology/qsss/product/file_system/qss_filesystem.md @@ -34,6 +34,6 @@ By using our filesystem inside a Virtual Machine or Kubernetes the TFGrid user c Any storage workload can be deployed on top of the zstor. -!!!def alias:quantumsafe_filesystem,planetary_fs,planet_fs,quantumsafe_file_system,zstor,qsfs +!!def alias:quantumsafe_filesystem,planetary_fs,planet_fs,quantumsafe_file_system,zstor,qsfs -!!!include:qsss_toc \ No newline at end of file +!!wiki.include page:qsss_toc \ No newline at end of file diff --git a/_archive/technology/qsss/product/qss_algorithm.md b/_archive/technology/qsss/product/qss_algorithm.md index b92dfaa..d89f6a8 100644 --- a/_archive/technology/qsss/product/qss_algorithm.md +++ b/_archive/technology/qsss/product/qss_algorithm.md @@ -77,6 +77,6 @@ If someone now wants to download the data the first 10 locations who answer fast The overhead here is much more compared to previous example but stil order of magnitude lower compared to other cdn systems. -!!!def alias:quantumsafe_storage_algo,quantumsafe_storage_algorithm,space_algo,space_algorithm,quantum_safe_storage_algo,qs_algo,qs_codec +!!def alias:quantumsafe_storage_algo,quantumsafe_storage_algorithm,space_algo,space_algorithm,quantum_safe_storage_algo,qs_algo,qs_codec -!!!include:qsss_toc \ No newline at end of file +!!wiki.include page:qsss_toc \ No newline at end of file diff --git a/_archive/technology/qsss/product/qss_datarot.md b/_archive/technology/qsss/product/qss_datarot.md index 9ae4e4e..9db7583 100644 --- a/_archive/technology/qsss/product/qss_datarot.md +++ b/_archive/technology/qsss/product/qss_datarot.md @@ -5,4 +5,4 @@ The storage system provided by ThreeFold intercepts this silent data corruption, > see also https://en.wikipedia.org/wiki/Data_degradation -!!!def alias:bitrot,datarot \ No newline at end of file +!!def alias:bitrot,datarot \ No newline at end of file diff --git a/_archive/technology/qsss/product/qss_zero_knowledge_proof.md b/_archive/technology/qsss/product/qss_zero_knowledge_proof.md index 71f4de3..45b79e5 100644 --- a/_archive/technology/qsss/product/qss_zero_knowledge_proof.md +++ b/_archive/technology/qsss/product/qss_zero_knowledge_proof.md @@ -8,4 +8,4 @@ The quantum save storage system is zero knowledge proof compliant. The storage s The zero proof knowledge compliancy comes from the fact the all the physical storage nodes (3nodes) can proof that they store a valid part of what data the quantum safe storage engine (QSSE) has stored on multiple independent devices. The QSSE can validate that all the QSSE storage devices have a valid part of the original information. The storage devices however have no idea what the original stored data is as they only have a part (description) of the origina data and have no access to the original data part or the complete origal data objects. -!!!def \ No newline at end of file +!!def \ No newline at end of file diff --git a/_archive/technology/qsss/qsss.md b/_archive/technology/qsss/qsss.md index e9b34c4..75700ff 100644 --- a/_archive/technology/qsss/qsss.md +++ b/_archive/technology/qsss/qsss.md @@ -1,2 +1,2 @@ -!!!include:qsss_home \ No newline at end of file +!!wiki.include page:qsss_home \ No newline at end of file diff --git a/_archive/technology/qsss/qsss2_home.md b/_archive/technology/qsss/qsss2_home.md index d62400a..8b56808 100644 --- a/_archive/technology/qsss/qsss2_home.md +++ b/_archive/technology/qsss/qsss2_home.md @@ -4,7 +4,7 @@ Imagine a storage system with the following benefits -!!!include:qss_benefits_ +!!wiki.include page:qss_benefits_ > This is not a dream but does exist and is the underpinning of the TFGrid. @@ -13,9 +13,9 @@ Our storage architecture follows the true peer-to-peer design of the TF grid. An Peer-to-peer provides the unique proposition of selecting storage providers that match your application and service of business criteria. For example, you might be looking to store data for your application in a certain geographic area (for governance and compliance) reasons. Also, you might want to use different "storage policies" for different types of data. Examples are live versus archived data. All of these uses cases are possible with this storage architecture and could be built by using the same building blocks produced by farmers and consumed by developers or end-users. -!!!include:qsss_toc +!!wiki.include page:qsss_toc -!!!def alias:qsss,quantum_safe_storage_system +!!def alias:qsss,quantum_safe_storage_system diff --git a/_archive/technology/tfgrid_primitives.md b/_archive/technology/tfgrid_primitives.md index de46ec7..23d0c87 100644 --- a/_archive/technology/tfgrid_primitives.md +++ b/_archive/technology/tfgrid_primitives.md @@ -37,8 +37,8 @@ Uses [Network Units = SU](cloudunits). ## Zero-OS Advantages -!!!include:zos_advantages +!!wiki.include page:zos_advantages -!!!def alias:tfgrid_primitives,grid_primitives +!!def alias:tfgrid_primitives,grid_primitives diff --git a/_archive/technology/zos/benefits/docker_compatibility.md b/_archive/technology/zos/benefits/docker_compatibility.md index c2e0221..3f35fd3 100644 --- a/_archive/technology/zos/benefits/docker_compatibility.md +++ b/_archive/technology/zos/benefits/docker_compatibility.md @@ -11,4 +11,4 @@ A major step in accepting and importing Docker images is to transpose docker ima - Easy import and transpose facility - deduplicated application deployment simplifying aplication image management and versioning -!!!include:zos_toc \ No newline at end of file +!!wiki.include page:zos_toc \ No newline at end of file diff --git a/_archive/technology/zos/benefits/network_wall.md b/_archive/technology/zos/benefits/network_wall.md index 3e47799..64985cb 100644 --- a/_archive/technology/zos/benefits/network_wall.md +++ b/_archive/technology/zos/benefits/network_wall.md @@ -33,6 +33,6 @@ As a consequence, no tcp/ip is coming in AT ALL, making the full set-up reach un - You don’t have to worry about ‘how to secure my DB’ as my DB is not exposed, only accessible in Wireguard private network. - In containers you can specify to have specific IPv6 address, so deploy reverse proxy in container which has public access, = entry point in the network, deploy reverse tcp connection (=tcp router client), connects to the gateways and allows incoming connection. -!!!def alias:network_wall,net_wall +!!def alias:network_wall,net_wall -!!!include:zos_toc +!!wiki.include page:zos_toc diff --git a/_archive/technology/zos/benefits/p2p_networking.md b/_archive/technology/zos/benefits/p2p_networking.md index a2ed92c..804d50a 100644 --- a/_archive/technology/zos/benefits/p2p_networking.md +++ b/_archive/technology/zos/benefits/p2p_networking.md @@ -27,4 +27,4 @@ At Threefold, we are aware of the existence of private networks, IPsec, VPN, WAN ![](img/network_architecture.jpg) -!!!def alias:quantumsafe_network_concept,qsn_concept \ No newline at end of file +!!def alias:quantumsafe_network_concept,qsn_concept \ No newline at end of file diff --git a/_archive/technology/zos/benefits/zos_monitoring.md b/_archive/technology/zos/benefits/zos_monitoring.md index 90fc551..ae02c7c 100644 --- a/_archive/technology/zos/benefits/zos_monitoring.md +++ b/_archive/technology/zos/benefits/zos_monitoring.md @@ -34,6 +34,6 @@ The Prometheus ecosystem consists of multiple components, many of which are opti - ONLY for OEM partners today -!!!def alias:zos_monitoring +!!def alias:zos_monitoring -!!!include:zos_toc +!!wiki.include page:zos_toc diff --git a/_archive/technology/zos/zos.md b/_archive/technology/zos/zos.md index 5522e68..3a2cc2a 100644 --- a/_archive/technology/zos/zos.md +++ b/_archive/technology/zos/zos.md @@ -5,7 +5,7 @@ ![](img/zero_os_overview.jpg) -!!!include:whatis_zos +!!wiki.include page:whatis_zos ### Imagine an operating system with the following benefits @@ -28,9 +28,9 @@ - **Simplicity**: An operating system should be simple, able to exist anywhere, for anyone, good for the planet. - **Stateless**. In a grid (peer-to-peer) set up, the sum of the components is providing a stable basis for single elements to fail and not bring the whole system down. Therefore, it is necessary for single elements to be stateless, and the state needs to be stored within the grid. - + -!!!def alias:zos,zero-os,threefold_operating_system,tf_os,threefold_os +!!def alias:zos,zero-os,threefold_operating_system,tf_os,threefold_os diff --git a/_archive/technology/zos/zos_compute_storage.md b/_archive/technology/zos/zos_compute_storage.md index 54985b7..78f7d60 100644 --- a/_archive/technology/zos/zos_compute_storage.md +++ b/_archive/technology/zos/zos_compute_storage.md @@ -3,4 +3,4 @@ ![](img/zos_overview_compute_storage.jpg) -!!!include:zos_toc \ No newline at end of file +!!wiki.include page:zos_toc \ No newline at end of file diff --git a/_archive/technology/zos/zos_install_mechanism.md b/_archive/technology/zos/zos_install_mechanism.md index 4bc9043..2b3045f 100644 --- a/_archive/technology/zos/zos_install_mechanism.md +++ b/_archive/technology/zos/zos_install_mechanism.md @@ -18,4 +18,4 @@ The operating system is not installed on any local storage medium (hard disk, ss The mechanism to allow this to work in a safe and efficient manner is a ThreeFold innovation called our container virtual filesystem. This is explained in more detail [here](flist) -!!!def alias:zero_os_install \ No newline at end of file +!!def alias:zero_os_install \ No newline at end of file diff --git a/_archive/technology/zos/zos_network.md b/_archive/technology/zos/zos_network.md index 004175b..39d235b 100644 --- a/_archive/technology/zos/zos_network.md +++ b/_archive/technology/zos/zos_network.md @@ -3,4 +3,4 @@ ![](img/zos_network_overview.jpg) -!!!include:zos_toc +!!wiki.include page:zos_toc diff --git a/_archive/technology/zos_tools/flist_hub.md b/_archive/technology/zos_tools/flist_hub.md index 45caca6..1858639 100644 --- a/_archive/technology/zos_tools/flist_hub.md +++ b/_archive/technology/zos_tools/flist_hub.md @@ -1,4 +1,4 @@ -!!!include:flist_hub_ +!!wiki.include page:flist_hub_ -!!!def alias:tfhub,zflist_hub,flist_hub +!!def alias:tfhub,zflist_hub,flist_hub diff --git a/_archive/tf_tokens/_beta/technology/beta_atomic_swaps.md b/_archive/tf_tokens/_beta/technology/beta_atomic_swaps.md index 4bda535..0e695a3 100644 --- a/_archive/tf_tokens/_beta/technology/beta_atomic_swaps.md +++ b/_archive/tf_tokens/_beta/technology/beta_atomic_swaps.md @@ -1,6 +1,6 @@ [Atomic Swaps Technical Documentation](https://github.com/threefoldfoundation/tfchain/blob/master/doc/atomicswaps/atomicswap.md) ``` -!!!wiki.include +!!wiki.include link = "https://github.com/threefoldfoundation/tfchain/blob/master/doc/atomicswaps/atomicswap.md" ``` diff --git a/_archive/tf_tokens/_beta/technology/proof_of_blockstake.md b/_archive/tf_tokens/_beta/technology/proof_of_blockstake.md index 3b170e6..1140c31 100644 --- a/_archive/tf_tokens/_beta/technology/proof_of_blockstake.md +++ b/_archive/tf_tokens/_beta/technology/proof_of_blockstake.md @@ -1,5 +1,5 @@ ``` -!!!wiki.include +!!wiki.include link = "https://github.com/threefoldtech/rivine/blob/master/doc/ProofOfBlockStake.md" ``` diff --git a/_archive/tf_tokens/how_to_buy/_tft_buy_tfconnect.md b/_archive/tf_tokens/how_to_buy/_tft_buy_tfconnect.md index d49f394..4e17a6f 100644 --- a/_archive/tf_tokens/how_to_buy/_tft_buy_tfconnect.md +++ b/_archive/tf_tokens/how_to_buy/_tft_buy_tfconnect.md @@ -67,4 +67,4 @@ Click `BTC` and select `Withdraw`. - Fill in the amount and Bitcoin address you want to withdraw it to. Keep in mind there is a transaction fee, the site might adjust the amount if you don’t have enough in your account to cover both the amount + fee. - Confirm the transaction. -!!!wiki.include:token_toc \ No newline at end of file +!!wiki.include page:token_toc \ No newline at end of file diff --git a/_archive/tf_tokens/how_to_buy/binance_get_started.md b/_archive/tf_tokens/how_to_buy/binance_get_started.md index 4825896..b4db245 100644 --- a/_archive/tf_tokens/how_to_buy/binance_get_started.md +++ b/_archive/tf_tokens/how_to_buy/binance_get_started.md @@ -29,7 +29,7 @@ Here you can see how the BNB did arrive From here things should be very easy, just click on one of following 2 links: -!!!wiki.include:pancakeswap_1inch +!!wiki.include page:pancakeswap_1inch ## More Info About Defi on Binance Smartchain diff --git a/_archive/tf_tokens/how_to_buy/cc_buytft_lobstr_wallet.md b/_archive/tf_tokens/how_to_buy/cc_buytft_lobstr_wallet.md index 4d07f07..39aa5cb 100644 --- a/_archive/tf_tokens/how_to_buy/cc_buytft_lobstr_wallet.md +++ b/_archive/tf_tokens/how_to_buy/cc_buytft_lobstr_wallet.md @@ -1 +1 @@ -!!!wiki.include:lobstr_wallet \ No newline at end of file +!!wiki.include page:lobstr_wallet \ No newline at end of file diff --git a/_archive/tf_tokens/how_to_buy/cc_buytft_stellarx.md b/_archive/tf_tokens/how_to_buy/cc_buytft_stellarx.md index 63ee15a..0e0db7f 100644 --- a/_archive/tf_tokens/how_to_buy/cc_buytft_stellarx.md +++ b/_archive/tf_tokens/how_to_buy/cc_buytft_stellarx.md @@ -1 +1 @@ -!!!wiki.include:tft_stellarx \ No newline at end of file +!!wiki.include page:tft_stellarx \ No newline at end of file diff --git a/_archive/tf_tokens/how_to_buy/how_to_buy.md b/_archive/tf_tokens/how_to_buy/how_to_buy.md index 8d3bd0a..c55fc23 100644 --- a/_archive/tf_tokens/how_to_buy/how_to_buy.md +++ b/_archive/tf_tokens/how_to_buy/how_to_buy.md @@ -4,7 +4,7 @@ Please find below a table that shows all of the buying options for TFT. If you are new to buying and selling cryptocurrencies, we invite you to visit the [New to Tokens](newtotokens) section. -!!!wiki.include:tft_ways_to_buy_include +!!wiki.include page:tft_ways_to_buy_include ## Withdraw your TFT from Liquid @@ -39,4 +39,4 @@ If you have TFTA that you would like to exchange, you can easily [convert them t If you have any questions, please feel free to use the support chat (blue icon on the bottom of this page) or use [our forum](https://forum.threefold.io). -!!!wiki.include:legal:tft_not_investment \ No newline at end of file +!!wiki.include page:legal:tft_not_investment \ No newline at end of file diff --git a/_archive/tf_tokens/how_to_buy/liquidity_provider.md b/_archive/tf_tokens/how_to_buy/liquidity_provider.md index 87b9ed4..c3d7902 100644 --- a/_archive/tf_tokens/how_to_buy/liquidity_provider.md +++ b/_archive/tf_tokens/how_to_buy/liquidity_provider.md @@ -55,4 +55,4 @@ Anyone interested in providing Liquidity to the ThreeFold pools on PancakeSwap will be incentivized and rewarded with trading fees. 0.17% of all trading fees of all transactions go to Liquidity providers. -!!!wiki.include:token_toc \ No newline at end of file +!!wiki.include page:token_toc \ No newline at end of file diff --git a/_archive/tf_tokens/how_to_buy/manual/coinbase_fiat_xlm_tft/coinbase_fiat.md b/_archive/tf_tokens/how_to_buy/manual/coinbase_fiat_xlm_tft/coinbase_fiat.md index 011db34..19e448d 100644 --- a/_archive/tf_tokens/how_to_buy/manual/coinbase_fiat_xlm_tft/coinbase_fiat.md +++ b/_archive/tf_tokens/how_to_buy/manual/coinbase_fiat_xlm_tft/coinbase_fiat.md @@ -42,4 +42,4 @@ Congratulations! You now have XLM in your wallet and you are ready to buy ThreeF - [Getting started](https://help.coinbase.com/en/coinbase/getting-started) - [How do I buy cryptocurrency](https://help.coinbase.com/en/coinbase/trading-and-funding/buying-selling-or-converting-crypto/how-do-i-buy-digital-currency) -!!!wiki.include:legal:tft_not_investment \ No newline at end of file +!!wiki.include page:legal:tft_not_investment \ No newline at end of file diff --git a/_archive/tf_tokens/how_to_buy/manual/coinbase_fiat_xlm_tft/fiat_to_tft.md b/_archive/tf_tokens/how_to_buy/manual/coinbase_fiat_xlm_tft/fiat_to_tft.md index 14dda01..7bb70be 100644 --- a/_archive/tf_tokens/how_to_buy/manual/coinbase_fiat_xlm_tft/fiat_to_tft.md +++ b/_archive/tf_tokens/how_to_buy/manual/coinbase_fiat_xlm_tft/fiat_to_tft.md @@ -18,4 +18,4 @@ Use [a digital currency wallet like Solar to convert from XLM to TFT](solar_wall Many other web or desktop wallets can be used to go from XLM to TFT, its an easy process. -!!!wiki.include:legal:tft_not_investment \ No newline at end of file +!!wiki.include page:legal:tft_not_investment \ No newline at end of file diff --git a/_archive/tf_tokens/how_to_buy/tft_btc_alpha.md b/_archive/tf_tokens/how_to_buy/tft_btc_alpha.md index bc71f3e..91a19e7 100644 --- a/_archive/tf_tokens/how_to_buy/tft_btc_alpha.md +++ b/_archive/tf_tokens/how_to_buy/tft_btc_alpha.md @@ -58,4 +58,4 @@ Then, click under your name (top-right), then "Enable Two-factor Authentication, 3. Now you can start buying TFT - To trade BTC, click [here](https://btc-alpha.com/en/exchange/TFT_BTC) -!!!wiki.include:legal:tft_not_investment \ No newline at end of file +!!wiki.include page:legal:tft_not_investment \ No newline at end of file diff --git a/_archive/tf_tokens/how_to_buy/tft_btc_alpha_later.md b/_archive/tf_tokens/how_to_buy/tft_btc_alpha_later.md index 79b2617..31ed731 100644 --- a/_archive/tf_tokens/how_to_buy/tft_btc_alpha_later.md +++ b/_archive/tf_tokens/how_to_buy/tft_btc_alpha_later.md @@ -164,4 +164,4 @@ Here are the steps: 5. Wait until the transaction is fully processed, this typically takes up to 40 minutes. -!!!wiki.include:legal:tft_not_investment \ No newline at end of file +!!wiki.include page:legal:tft_not_investment \ No newline at end of file diff --git a/_archive/tf_tokens/how_to_buy/tft_liquid.md b/_archive/tf_tokens/how_to_buy/tft_liquid.md index 1b91c92..284bd98 100644 --- a/_archive/tf_tokens/how_to_buy/tft_liquid.md +++ b/_archive/tf_tokens/how_to_buy/tft_liquid.md @@ -46,4 +46,4 @@ It's quite simple to set up two-factor authentication (2FA) – and from a secur Liquid also has a Quick Exchange, which allows you to buy TFT with a Visa card. Learn more [here](tft_liquid_quick_exchange). -!!!wiki.include:token_toc \ No newline at end of file +!!wiki.include page:token_toc \ No newline at end of file diff --git a/_archive/tf_tokens/how_to_buy/tft_mazraa.md b/_archive/tf_tokens/how_to_buy/tft_mazraa.md index df0c8c3..5e824fe 100644 --- a/_archive/tf_tokens/how_to_buy/tft_mazraa.md +++ b/_archive/tf_tokens/how_to_buy/tft_mazraa.md @@ -59,6 +59,6 @@ As soon as Mazraa has received the transaction details from Transcoin, they will Keep in mind it might take some time to receive your tokens. -!!!wiki.include:legal:tft_not_investment +!!wiki.include page:legal:tft_not_investment -!!!wiki.include:token_toc \ No newline at end of file +!!wiki.include page:token_toc \ No newline at end of file diff --git a/_archive/tf_tokens/how_to_buy/tft_otc.md b/_archive/tf_tokens/how_to_buy/tft_otc.md index cdb0f74..e01663a 100644 --- a/_archive/tf_tokens/how_to_buy/tft_otc.md +++ b/_archive/tf_tokens/how_to_buy/tft_otc.md @@ -16,6 +16,6 @@ Please specify the following data in your email: 4. Preferred purchase/sell options 5. Preferred price -!!!wiki.include:legal:tft_not_investment +!!wiki.include page:legal:tft_not_investment -!!!wiki.include:token_toc \ No newline at end of file +!!wiki.include page:token_toc \ No newline at end of file diff --git a/_archive/tf_tokens/how_to_buy/tft_polkadot_kusama.md b/_archive/tf_tokens/how_to_buy/tft_polkadot_kusama.md index 34e742d..5d10552 100644 --- a/_archive/tf_tokens/how_to_buy/tft_polkadot_kusama.md +++ b/_archive/tf_tokens/how_to_buy/tft_polkadot_kusama.md @@ -11,4 +11,4 @@ Stay tuned, we will announce soon how this will work. We believe this is an exci more info see https://www.parity.io/defi-on-polkadot-an-ecosystem-overview/ -!!!wiki.include:token_toc \ No newline at end of file +!!wiki.include page:token_toc \ No newline at end of file diff --git a/_archive/tf_tokens/how_to_buy/tft_with_btc.md b/_archive/tf_tokens/how_to_buy/tft_with_btc.md index 4f4f17a..5ee0dac 100644 --- a/_archive/tf_tokens/how_to_buy/tft_with_btc.md +++ b/_archive/tf_tokens/how_to_buy/tft_with_btc.md @@ -24,4 +24,4 @@ Mazraa will through replying directly to your email (always double check this) w When Mazraa has received the BTC in their wallet, they on their turn will wire the TFT to the address you provided. -!!!wiki.include:token_toc \ No newline at end of file +!!wiki.include page:token_toc \ No newline at end of file diff --git a/_archive/tf_tokens/how_to_buy/tfta_to_tft.md b/_archive/tf_tokens/how_to_buy/tfta_to_tft.md index 7b13d03..ca19bdf 100644 --- a/_archive/tf_tokens/how_to_buy/tfta_to_tft.md +++ b/_archive/tf_tokens/how_to_buy/tfta_to_tft.md @@ -10,4 +10,4 @@ If you would like migrate TFTA to TFT, it's super easy, just send your TFTA to a and it will return as TFT, we suggest you try with 1 TFTA (-: -!!!wiki.include:token_toc \ No newline at end of file +!!wiki.include page:token_toc \ No newline at end of file diff --git a/_archive/tf_tokens/how_to_buy/wallets/lobstr_wallet.md b/_archive/tf_tokens/how_to_buy/wallets/lobstr_wallet.md index 67c4007..9506a46 100644 --- a/_archive/tf_tokens/how_to_buy/wallets/lobstr_wallet.md +++ b/_archive/tf_tokens/how_to_buy/wallets/lobstr_wallet.md @@ -47,4 +47,4 @@ You can now start exchanging your digital currencies for TFTs through the Trade see [Lobstr Wallet](solar_wallet) -!!!wiki.include:legal:tft_not_investment \ No newline at end of file +!!wiki.include page:legal:tft_not_investment \ No newline at end of file diff --git a/_archive/tf_tokens/how_to_buy/wallets/solar_wallet.md b/_archive/tf_tokens/how_to_buy/wallets/solar_wallet.md index 586ccbc..7367cfb 100644 --- a/_archive/tf_tokens/how_to_buy/wallets/solar_wallet.md +++ b/_archive/tf_tokens/how_to_buy/wallets/solar_wallet.md @@ -64,9 +64,9 @@ The TFT icon will now show in your Wallet overview. ### Step 5: buy TFT - + -!!!vimeo id:417197931 +!!vimeo id:417197931 1. Click on one of the currencies in the top bar to go to your wallet overview 2. Click ThreeFold_Token (TFT) @@ -77,11 +77,11 @@ The TFT icon will now show in your Wallet overview. 7. Confirm the Sell order and wait for the TFT to show up in your wallet -!!!wiki.include:wallet_key_important +!!wiki.include page:wallet_key_important # Alternative Wallet Lobstr see [Lobstr Wallet](lobstr_wallet) -!!!wiki.include:legal:tft_not_investment \ No newline at end of file +!!wiki.include page:legal:tft_not_investment \ No newline at end of file diff --git a/_archive/tf_tokens/how_to_buy/wallets/tft_interstellar.md b/_archive/tf_tokens/how_to_buy/wallets/tft_interstellar.md index 61cd62f..8acbb3a 100644 --- a/_archive/tf_tokens/how_to_buy/wallets/tft_interstellar.md +++ b/_archive/tf_tokens/how_to_buy/wallets/tft_interstellar.md @@ -82,4 +82,4 @@ Now that the account is set up and funded and you have the TFT asset listed in y ![image](img/interstellar_account_overview_3.jpg) -!!!wiki.include:legal:tft_not_investment \ No newline at end of file +!!wiki.include page:legal:tft_not_investment \ No newline at end of file diff --git a/_archive/tf_tokens/how_to_buy/wallets/tft_stellar_dex.md b/_archive/tf_tokens/how_to_buy/wallets/tft_stellar_dex.md index 5dfd76f..5ad3072 100644 --- a/_archive/tf_tokens/how_to_buy/wallets/tft_stellar_dex.md +++ b/_archive/tf_tokens/how_to_buy/wallets/tft_stellar_dex.md @@ -37,4 +37,4 @@ Choose one of the following mechanisms to go from a digital currency like XLM to Please let us know which method you prefer. -!!!wiki.include:legal:tft_not_investment \ No newline at end of file +!!wiki.include page:legal:tft_not_investment \ No newline at end of file diff --git a/_archive/tf_tokens/how_to_buy/wallets/tft_stellarx.md b/_archive/tf_tokens/how_to_buy/wallets/tft_stellarx.md index f5569c8..b1fa89b 100644 --- a/_archive/tf_tokens/how_to_buy/wallets/tft_stellarx.md +++ b/_archive/tf_tokens/how_to_buy/wallets/tft_stellarx.md @@ -50,4 +50,4 @@ TFT now shows up in your wallet section (click wallet in top menu) ![image alt text](img/stellar_x_image_10.jpg) -!!!wiki.include:legal:tft_not_investment \ No newline at end of file +!!wiki.include page:legal:tft_not_investment \ No newline at end of file diff --git a/_archive/tf_tokens/newtotokens.md b/_archive/tf_tokens/newtotokens.md index eed18ec..b969fcb 100644 --- a/_archive/tf_tokens/newtotokens.md +++ b/_archive/tf_tokens/newtotokens.md @@ -69,7 +69,7 @@ Find instructions on how to buy TFT in the [Get TFT](how_to_buy) section. > It is incredibly important to take the process of signing up and buying tokens seriously and to follow all the steps carefully. While there's nothing to be scared of, you'll need to give it your full attention. There are many resources online to guide you through the process. -!!!wiki.include:tft_safe +!!wiki.include page:tft_safe -!!!wiki.include:token_toc +!!wiki.include page:token_toc diff --git a/_archive/tf_tokens/stats/special_accounts/tft_account_ga7opn.md b/_archive/tf_tokens/stats/special_accounts/tft_account_ga7opn.md index eb0485e..386c2a2 100644 --- a/_archive/tf_tokens/stats/special_accounts/tft_account_ga7opn.md +++ b/_archive/tf_tokens/stats/special_accounts/tft_account_ga7opn.md @@ -2,7 +2,7 @@ Liquid Exchange account #1 -!!!tokens type:account-info id:GA7OPN4A3JNHLPHPEWM4PJDOYYDYNZOM7ES6YL3O7NC3PRY3V3UX6ANM +!!tokens type:account-info id:GA7OPN4A3JNHLPHPEWM4PJDOYYDYNZOM7ES6YL3O7NC3PRY3V3UX6ANM diff --git a/_archive/tf_tokens/stats/special_accounts/tft_account_gai4c2.md b/_archive/tf_tokens/stats/special_accounts/tft_account_gai4c2.md index 7038495..4d077e5 100644 --- a/_archive/tf_tokens/stats/special_accounts/tft_account_gai4c2.md +++ b/_archive/tf_tokens/stats/special_accounts/tft_account_gai4c2.md @@ -2,6 +2,6 @@ TF Promotion Wisdom -!!!tokens type:account-info id:GAI4C2BGOA3YHVQZZW7OW4FHOGGYWTUBEVNHB6MW4ZAFG7ZAA7D5IPC3 +!!tokens type:account-info id:GAI4C2BGOA3YHVQZZW7OW4FHOGGYWTUBEVNHB6MW4ZAFG7ZAA7D5IPC3 diff --git a/_archive/tf_tokens/stats/special_accounts/tft_account_gamt37.md b/_archive/tf_tokens/stats/special_accounts/tft_account_gamt37.md index 9f83f42..56a71ae 100644 --- a/_archive/tf_tokens/stats/special_accounts/tft_account_gamt37.md +++ b/_archive/tf_tokens/stats/special_accounts/tft_account_gamt37.md @@ -3,5 +3,5 @@ Account as managed by Liquid Exchange (foundation deposit). Used for liquidity purposes. -!!!tokens type:account-info id:GAMT37U3JASMVGI5GR4TD7HV7ECOUUY7I4A7NZPOVNJKBY27ET7NQFQ2 +!!tokens type:account-info id:GAMT37U3JASMVGI5GR4TD7HV7ECOUUY7I4A7NZPOVNJKBY27ET7NQFQ2 diff --git a/_archive/tf_tokens/stats/special_accounts/tft_account_gaqxbl.md b/_archive/tf_tokens/stats/special_accounts/tft_account_gaqxbl.md index 11392e8..5b1e803 100644 --- a/_archive/tf_tokens/stats/special_accounts/tft_account_gaqxbl.md +++ b/_archive/tf_tokens/stats/special_accounts/tft_account_gaqxbl.md @@ -2,6 +2,6 @@ TF Team Wisdom -!!!tokens type:account-info id:GAQXBLFG4BZGIVY6DBJVWE5EAP3UNHMIA2PYCUVLY2JUSPVWPUF36BW4 +!!tokens type:account-info id:GAQXBLFG4BZGIVY6DBJVWE5EAP3UNHMIA2PYCUVLY2JUSPVWPUF36BW4 diff --git a/_archive/tf_tokens/stats/special_accounts/tft_account_gaugos.md b/_archive/tf_tokens/stats/special_accounts/tft_account_gaugos.md index 9083434..4fb6a6b 100644 --- a/_archive/tf_tokens/stats/special_accounts/tft_account_gaugos.md +++ b/_archive/tf_tokens/stats/special_accounts/tft_account_gaugos.md @@ -2,6 +2,6 @@ Wisdom Council Locked -!!!tokens type:account-info id:GAUGOSYLCX7JZTQYF2K7RIMHFWKSA3WSI2OQ4IRKXMDMVE6ABJIJMFQR +!!tokens type:account-info id:GAUGOSYLCX7JZTQYF2K7RIMHFWKSA3WSI2OQ4IRKXMDMVE6ABJIJMFQR diff --git a/_archive/tf_tokens/stats/special_accounts/tft_account_gawogi.md b/_archive/tf_tokens/stats/special_accounts/tft_account_gawogi.md index fb3cb23..20e6681 100644 --- a/_archive/tf_tokens/stats/special_accounts/tft_account_gawogi.md +++ b/_archive/tf_tokens/stats/special_accounts/tft_account_gawogi.md @@ -3,4 +3,4 @@ Account as managed by Liquid Exchange (foundation deposit). Used for liquidity purposes. -!!!tokens type:account-info id:GAWOGIOPVKMWKYJHAMJCFPVOFAE44DEEZP3KALR4MCCZ2X35YRHIJTLR +!!tokens type:account-info id:GAWOGIOPVKMWKYJHAMJCFPVOFAE44DEEZP3KALR4MCCZ2X35YRHIJTLR diff --git a/_archive/tf_tokens/stats/special_accounts/tft_account_gb2c5h.md b/_archive/tf_tokens/stats/special_accounts/tft_account_gb2c5h.md index 538cf79..813e3d8 100644 --- a/_archive/tf_tokens/stats/special_accounts/tft_account_gb2c5h.md +++ b/_archive/tf_tokens/stats/special_accounts/tft_account_gb2c5h.md @@ -2,7 +2,7 @@ TF DAY2DAY operations -!!!tokens type:account-info id:GB2C5HCZYWNGVM6JGXDWQBJTMUY4S2HPPTCAH63HFAQVL2ALXDW7SSJ7 +!!tokens type:account-info id:GB2C5HCZYWNGVM6JGXDWQBJTMUY4S2HPPTCAH63HFAQVL2ALXDW7SSJ7 diff --git a/_archive/tf_tokens/stats/special_accounts/tft_account_gbb6kr.md b/_archive/tf_tokens/stats/special_accounts/tft_account_gbb6kr.md index 6905ffc..5185bbd 100644 --- a/_archive/tf_tokens/stats/special_accounts/tft_account_gbb6kr.md +++ b/_archive/tf_tokens/stats/special_accounts/tft_account_gbb6kr.md @@ -3,4 +3,4 @@ Account as managed by Liquid Exchange (foundation deposit). Used for liquidity purposes. -!!!tokens type:account-info id:GBB6KRI2N55DOKYPLSGZ3TXJHZFLLHKXSKDCBJBOMAZK3MRAQA2Q4YND +!!tokens type:account-info id:GBB6KRI2N55DOKYPLSGZ3TXJHZFLLHKXSKDCBJBOMAZK3MRAQA2Q4YND diff --git a/_archive/tf_tokens/stats/special_accounts/tft_account_gbqhn7.md b/_archive/tf_tokens/stats/special_accounts/tft_account_gbqhn7.md index 1882893..a4ce204 100644 --- a/_archive/tf_tokens/stats/special_accounts/tft_account_gbqhn7.md +++ b/_archive/tf_tokens/stats/special_accounts/tft_account_gbqhn7.md @@ -2,7 +2,7 @@ Gettft.com storage account -!!!tokens type:account-info id:GBQHN7RL4LSRPR2TT74ID2UJPZ2AXCHQY2WKGCTDLJM3NXVJ7GQHUCOD +!!tokens type:account-info id:GBQHN7RL4LSRPR2TT74ID2UJPZ2AXCHQY2WKGCTDLJM3NXVJ7GQHUCOD diff --git a/_archive/tf_tokens/stats/special_accounts/tft_account_gbtpax.md b/_archive/tf_tokens/stats/special_accounts/tft_account_gbtpax.md index b86058e..f451120 100644 --- a/_archive/tf_tokens/stats/special_accounts/tft_account_gbtpax.md +++ b/_archive/tf_tokens/stats/special_accounts/tft_account_gbtpax.md @@ -2,7 +2,7 @@ Account Info BTC-Alpha Exchange -!!!tokens type:account-info id:GBTPAXXP6534UPC4MLNGFGJWCD6DNSRVIPPOZWXAQAWI4FKTLOJY2A2S +!!tokens type:account-info id:GBTPAXXP6534UPC4MLNGFGJWCD6DNSRVIPPOZWXAQAWI4FKTLOJY2A2S diff --git a/_archive/tf_tokens/stats/special_accounts/tft_account_gbv734.md b/_archive/tf_tokens/stats/special_accounts/tft_account_gbv734.md index b31e65f..b7eac62 100644 --- a/_archive/tf_tokens/stats/special_accounts/tft_account_gbv734.md +++ b/_archive/tf_tokens/stats/special_accounts/tft_account_gbv734.md @@ -2,6 +2,6 @@ Liquidity/Ecosystem Contribution Wisdom -!!!tokens type:account-info id:GBV734I2SV4YDDPVJMYXU3IZ2AIU5GEAJRAD4E4BQG7CA2N63NXSPMD6 +!!tokens type:account-info id:GBV734I2SV4YDDPVJMYXU3IZ2AIU5GEAJRAD4E4BQG7CA2N63NXSPMD6 diff --git a/_archive/tf_tokens/stats/special_accounts/tft_account_gcbfrq.md b/_archive/tf_tokens/stats/special_accounts/tft_account_gcbfrq.md index e433df8..d4e9663 100644 --- a/_archive/tf_tokens/stats/special_accounts/tft_account_gcbfrq.md +++ b/_archive/tf_tokens/stats/special_accounts/tft_account_gcbfrq.md @@ -3,5 +3,5 @@ Account as managed by Liquid Exchange (foundation deposit). Used for liquidity purposes. -!!!tokens type:account-info id:GCBFRQU4CR6KCLZERUBRMOPTGJ3RXKPCUUWHGCLBZVKIQSX73AWGPO75 +!!tokens type:account-info id:GCBFRQU4CR6KCLZERUBRMOPTGJ3RXKPCUUWHGCLBZVKIQSX73AWGPO75 diff --git a/_archive/tf_tokens/stats/special_accounts/tft_account_gcej7d.md b/_archive/tf_tokens/stats/special_accounts/tft_account_gcej7d.md index aa8405d..92ebe38 100644 --- a/_archive/tf_tokens/stats/special_accounts/tft_account_gcej7d.md +++ b/_archive/tf_tokens/stats/special_accounts/tft_account_gcej7d.md @@ -2,6 +2,6 @@ TF Grants Wisdom wallet. -!!!tokens type:account-info id:GCEJ7DMULFTT25UH4FAAGOZ6KER4WXAYQGJUSIITQD527DGTKSXKBQGR +!!tokens type:account-info id:GCEJ7DMULFTT25UH4FAAGOZ6KER4WXAYQGJUSIITQD527DGTKSXKBQGR diff --git a/_archive/tf_tokens/stats/special_accounts/tft_account_gcwhwd.md b/_archive/tf_tokens/stats/special_accounts/tft_account_gcwhwd.md index 7b25af2..944caf7 100644 --- a/_archive/tf_tokens/stats/special_accounts/tft_account_gcwhwd.md +++ b/_archive/tf_tokens/stats/special_accounts/tft_account_gcwhwd.md @@ -2,6 +2,6 @@ TF Team Wallet -!!!tokens type:account-info id:GCWHWDRXYPXQAOYMQKB66SZPLM6UANKGMSL4SP7LSOIA6OTTOYQ6HBIH +!!tokens type:account-info id:GCWHWDRXYPXQAOYMQKB66SZPLM6UANKGMSL4SP7LSOIA6OTTOYQ6HBIH diff --git a/_archive/tf_tokens/stats/special_accounts/tft_account_gd4oi4.md b/_archive/tf_tokens/stats/special_accounts/tft_account_gd4oi4.md index 96431f2..432ab41 100644 --- a/_archive/tf_tokens/stats/special_accounts/tft_account_gd4oi4.md +++ b/_archive/tf_tokens/stats/special_accounts/tft_account_gd4oi4.md @@ -3,5 +3,5 @@ Account as managed by Liquid Exchange (foundation deposit). Used for liquidity purposes. -!!!tokens type:account-info id:GD4OI4VVLWZQHCEPYZXCBEFREH34SWGQZBR5YNLKPXMSHXKXOY7WFYBN +!!tokens type:account-info id:GD4OI4VVLWZQHCEPYZXCBEFREH34SWGQZBR5YNLKPXMSHXKXOY7WFYBN diff --git a/_archive/tf_tokens/stats/special_accounts/tft_account_gdijy6.md b/_archive/tf_tokens/stats/special_accounts/tft_account_gdijy6.md index d1e76b6..6942d80 100644 --- a/_archive/tf_tokens/stats/special_accounts/tft_account_gdijy6.md +++ b/_archive/tf_tokens/stats/special_accounts/tft_account_gdijy6.md @@ -2,6 +2,6 @@ Account Info ThreeFold Carbon Credit Funding -!!!tokens type:account-info id:GDIJY6K2BBRIRX423ZFUYKKFDN66XP2KMSBZFQSE2PSNDZ6EDVQTRLSU +!!tokens type:account-info id:GDIJY6K2BBRIRX423ZFUYKKFDN66XP2KMSBZFQSE2PSNDZ6EDVQTRLSU diff --git a/_archive/tf_tokens/stats/special_accounts/tft_account_gdkxtu.md b/_archive/tf_tokens/stats/special_accounts/tft_account_gdkxtu.md index 6715977..1f08b39 100644 --- a/_archive/tf_tokens/stats/special_accounts/tft_account_gdkxtu.md +++ b/_archive/tf_tokens/stats/special_accounts/tft_account_gdkxtu.md @@ -2,6 +2,6 @@ TF Grants Wallet -!!!tokens type:account-info id:GDKXTUYNW4BJKDM2L7B5XUYFUISV52KUU4G7VPNLF4ZSIKBURM622YPZ +!!tokens type:account-info id:GDKXTUYNW4BJKDM2L7B5XUYFUISV52KUU4G7VPNLF4ZSIKBURM622YPZ diff --git a/_archive/tf_tokens/stats/special_accounts/tft_account_gdlvib.md b/_archive/tf_tokens/stats/special_accounts/tft_account_gdlvib.md index 0aa44dc..66140fc 100644 --- a/_archive/tf_tokens/stats/special_accounts/tft_account_gdlvib.md +++ b/_archive/tf_tokens/stats/special_accounts/tft_account_gdlvib.md @@ -2,6 +2,6 @@ TF Promotion Wallet -!!!tokens type:account-info id:GDLVIB44LVONM5K67LUPSFZMSX7G2RLYVBM5MMHUJ4NAQJU7CH4HBJBO +!!tokens type:account-info id:GDLVIB44LVONM5K67LUPSFZMSX7G2RLYVBM5MMHUJ4NAQJU7CH4HBJBO diff --git a/_archive/tf_tokens/stats/special_accounts/tft_account_gdskfy.md b/_archive/tf_tokens/stats/special_accounts/tft_account_gdskfy.md index 734cdcf..df79ce3 100644 --- a/_archive/tf_tokens/stats/special_accounts/tft_account_gdskfy.md +++ b/_archive/tf_tokens/stats/special_accounts/tft_account_gdskfy.md @@ -1,6 +1,6 @@ Account Info Liquid Exchange account #2 -!!!tokens type:account-info id:GDSKFYNMZWTB3V5AN26CEAQ27643Q3KB4X6MY4UTO2LIIDFND4SPQZYU +!!tokens type:account-info id:GDSKFYNMZWTB3V5AN26CEAQ27643Q3KB4X6MY4UTO2LIIDFND4SPQZYU diff --git a/_archive/tf_tokens/stats/stats_special_wallets.md b/_archive/tf_tokens/stats/stats_special_wallets.md index 5eb7f02..e67d085 100644 --- a/_archive/tf_tokens/stats/stats_special_wallets.md +++ b/_archive/tf_tokens/stats/stats_special_wallets.md @@ -1,6 +1,6 @@ # ThreeFold Special Wallets -!!!tokens type:special-wallets-table +!!tokens type:special-wallets-table @@ -13,5 +13,5 @@ ### Token Information -!!!wiki.include:stats_toc +!!wiki.include page:stats_toc diff --git a/_archive/tf_tokens/stats/stats_test.md b/_archive/tf_tokens/stats/stats_test.md index d28a872..5d3ec05 100644 --- a/_archive/tf_tokens/stats/stats_test.md +++ b/_archive/tf_tokens/stats/stats_test.md @@ -2,7 +2,7 @@ >TODO: don't understand this ### Vesting Accounts -!!!tokens type:account-vesting id:GDRFR3QGMRO5PG3BMSTFGBMDFXNVAB6HUZZS34S7QODXXFZX7YBNUQOE +!!tokens type:account-vesting id:GDRFR3QGMRO5PG3BMSTFGBMDFXNVAB6HUZZS34S7QODXXFZX7YBNUQOE ### Locked Amounts -!!!tokens type:account-locked id:GDRFR3QGMRO5PG3BMSTFGBMDFXNVAB6HUZZS34S7QODXXFZX7YBNUQOE +!!tokens type:account-locked id:GDRFR3QGMRO5PG3BMSTFGBMDFXNVAB6HUZZS34S7QODXXFZX7YBNUQOE diff --git a/_archive/tf_tokens/stats/stats_token_overview.md b/_archive/tf_tokens/stats/stats_token_overview.md index 996706d..278fbf4 100644 --- a/_archive/tf_tokens/stats/stats_token_overview.md +++ b/_archive/tf_tokens/stats/stats_token_overview.md @@ -3,20 +3,20 @@ ## Current Distribution Values -!!!tokens type:current-distribution +!!tokens type:current-distribution ## Liquid Tokens In Relation To Total -!!!tokens type:total-liquid tftprice:0.12 +!!tokens type:total-liquid tftprice:0.12 -!!!tokens type:total-liquid-chart +!!tokens type:total-liquid-chart ## Total Distribution -!!!tokens type:total-distribution +!!tokens type:total-distribution ### Token Information -!!!wiki.include:stats_toc +!!wiki.include page:stats_toc diff --git a/_archive/tf_tokens/stats/stats_token_overview_farmed.md b/_archive/tf_tokens/stats/stats_token_overview_farmed.md index 220705e..55e0d81 100644 --- a/_archive/tf_tokens/stats/stats_token_overview_farmed.md +++ b/_archive/tf_tokens/stats/stats_token_overview_farmed.md @@ -3,42 +3,42 @@ > Overview for TFT already farmed genesispool included. **Total**: -!!!tokens type:value id:total-tokens +!!tokens type:value id:total-tokens **Accounts:** -!!!tokens type:value id:total-accounts +!!tokens type:value id:total-accounts **Maximum Tokens:** **4 Billion** ## Tokens distribution -!!!tokens type:distribution +!!tokens type:distribution Total locked tokens: -!!!tokens type:value id:total-locked-tokens +!!tokens type:value id:total-locked-tokens Total vested tokens: -!!!tokens type:value id:total-vested-tokens +!!tokens type:value id:total-vested-tokens Total liquid foundation tokens: -!!!tokens type:value id:total-liquid-foundation-tokens +!!tokens type:value id:total-liquid-foundation-tokens Total illiquid wisdom council and foundation tokens: -!!!tokens type:value id:total-illiquid-foundation-tokens +!!tokens type:value id:total-illiquid-foundation-tokens Total liquid tokens: -!!!tokens type:value id:total-liquid-tokens +!!tokens type:value id:total-liquid-tokens > Vested accounts unlock following [vesting scheme as defined here](vesting_overview). ## Locked tokens -!!!tokens type:locked-chart +!!tokens type:locked-chart > Details see [here](tokens_locked) ### Token Information -!!!wiki.include:stats_toc +!!wiki.include page:stats_toc diff --git a/_archive/tf_tokens/stats/tokens_locked.md b/_archive/tf_tokens/stats/tokens_locked.md index 58ed24f..224e63f 100644 --- a/_archive/tf_tokens/stats/tokens_locked.md +++ b/_archive/tf_tokens/stats/tokens_locked.md @@ -5,12 +5,12 @@ Next to this hardlock, a lot of tokens are vested see [this token overview page] -!!!tokens type:locked-chart +!!tokens type:locked-chart ## Detailed List -!!!tokens type:locked-table +!!tokens type:locked-table ### Token Information -!!!wiki.include:stats_toc +!!wiki.include page:stats_toc diff --git a/_archive/tf_tokens/stats/tokens_locked_table.md b/_archive/tf_tokens/stats/tokens_locked_table.md index 8a088f0..c3ace52 100644 --- a/_archive/tf_tokens/stats/tokens_locked_table.md +++ b/_archive/tf_tokens/stats/tokens_locked_table.md @@ -2,4 +2,4 @@ -!!!tokens type:locked-table +!!tokens type:locked-table diff --git a/_archive/tf_tokens/stellar_migration/tft_tfta_migration_process_technical.md b/_archive/tf_tokens/stellar_migration/tft_tfta_migration_process_technical.md index fb4ce73..7f6016b 100644 --- a/_archive/tf_tokens/stellar_migration/tft_tfta_migration_process_technical.md +++ b/_archive/tf_tokens/stellar_migration/tft_tfta_migration_process_technical.md @@ -13,7 +13,7 @@ Before the conversion, all addresses on tfchain will be locked by unauthorizing - At conversion time (week 1 or 2 in May), all the Rivine blockchain accounts get locked, this means no-one can transact on Rivine any longer. - Only the user knows the private key so it's impossible for any script to transfer the money from Rivine to Stellar. - At time of the users convenience, the user logs into the ThreeFold Wallet (ThreeFold Connect) and the following process happens - - The wallet creates an account on Stellar with the same private key (which is only visible by the user !!!) + - The wallet creates an account on Stellar with the same private key (which is only visible by the user !!) - The stellar account creation can only happen by the wallet on the phone for security purposes and is 100% decentralized. - A [Locked Conversion Transaction](https://github.com/threefoldfoundation/tft-stellar/blob/master/specs/conversion/locked_conversion_transaction.md) is started to allow the funds to switch blockchain. - The TFTA is created on Stellar and sent to the users stellar account, the Rivine lock transaction hash is attached to this stellar transaction to make sure there is 100% transparency while the switch happens. @@ -24,4 +24,4 @@ From a valuation perspective TFTA is 100% the same as a TFT, this is just a tech Source of this info see: [https://github.com/threefoldfoundation/tft-stellar/blob/master/specs/conversion/conversion.md](https://github.com/threefoldfoundation/tft-stellar/blob/master/specs/conversion/conversion.md) -!!!wiki.include:legal:tft_not_investment +!!wiki.include page:legal:tft_not_investment diff --git a/_archive/tf_tokens/tft_limited_supply.md b/_archive/tf_tokens/tft_limited_supply.md index d594883..e2ab5ec 100644 --- a/_archive/tf_tokens/tft_limited_supply.md +++ b/_archive/tf_tokens/tft_limited_supply.md @@ -74,7 +74,7 @@ In March/April 2021 existing token holders decided to vest their tokens accordin See more about Vesting Pool [here](vesting_overview). -!!!alias token_limited_supply,tft_limited_supply,token_supply +!!alias token_limited_supply,tft_limited_supply,token_supply -!!!wiki.include:token_toc \ No newline at end of file +!!wiki.include page:token_toc \ No newline at end of file diff --git a/_archive/tf_tokens/tft_safe.md b/_archive/tf_tokens/tft_safe.md index a4efc9f..3ffcbe3 100644 --- a/_archive/tf_tokens/tft_safe.md +++ b/_archive/tf_tokens/tft_safe.md @@ -20,4 +20,4 @@ Think of this like your email address, but instead of mail it can receive TFT. I If you lose access to your wallet, you’ll lose access to your funds. Your wallet should give you instructions on protecting against this (e.g. writing down your seed phrase). Be sure to follow them carefully – in most cases, no one can help you if you lose access to your wallet. -!!!wiki.include:tft_important_notes \ No newline at end of file +!!wiki.include page:tft_important_notes \ No newline at end of file diff --git a/_archive/tf_tokens/tft_xlm_wallets.md b/_archive/tf_tokens/tft_xlm_wallets.md index 236a871..56c44a5 100644 --- a/_archive/tf_tokens/tft_xlm_wallets.md +++ b/_archive/tf_tokens/tft_xlm_wallets.md @@ -21,4 +21,4 @@ Because TFT is on the Stellar network - #TODO: this page is prob not used -!!!wiki.include:token_toc \ No newline at end of file +!!wiki.include page:token_toc \ No newline at end of file diff --git a/_archive/tf_tokens/token_features_.md b/_archive/tf_tokens/token_features_.md index 7f0215a..064cb2d 100644 --- a/_archive/tf_tokens/token_features_.md +++ b/_archive/tf_tokens/token_features_.md @@ -38,4 +38,4 @@ While the ThreeFold_Grid can expand, a maximum of 4 Billion TFTs can be in circu The market for farming, cultivating and exchanging TFT is open to all. Anyone with internet connection, power supply and the necessary hardware can become a Farmer or exchange ThreeFold_Tokens (TFT). -!!!wiki.include:token_toc \ No newline at end of file +!!wiki.include page:token_toc \ No newline at end of file diff --git a/_archive/tf_tokens/token_overview.md b/_archive/tf_tokens/token_overview.md index 8d34bc2..55c50af 100644 --- a/_archive/tf_tokens/token_overview.md +++ b/_archive/tf_tokens/token_overview.md @@ -16,13 +16,13 @@ Proof of Utility Distribution Flow: ## TFT Marketcap -!!!tokens type:total-liquid tftprice:0.12 +!!tokens type:total-liquid tftprice:0.12 ## Remarks -!!!wiki.include:stats_toc +!!wiki.include page:stats_toc - [ThreeFold Token & Grid History](threefold_history) -!!!wiki.include:token_toc +!!wiki.include page:token_toc -!!!alias token_distribution,token_overview +!!alias token_distribution,token_overview diff --git a/_archive/tf_tokens/token_toc.md b/_archive/tf_tokens/token_toc.md index 2fa7aba..8b261de 100644 --- a/_archive/tf_tokens/token_toc.md +++ b/_archive/tf_tokens/token_toc.md @@ -15,4 +15,4 @@ ## Disclaimer -!!!wiki.include:legal:tft_not_investment \ No newline at end of file +!!wiki.include page:legal:tft_not_investment \ No newline at end of file diff --git a/_archive/tf_tokens/token_what.md b/_archive/tf_tokens/token_what.md index 3b722c0..18275d9 100644 --- a/_archive/tf_tokens/token_what.md +++ b/_archive/tf_tokens/token_what.md @@ -18,7 +18,7 @@ Apart from providing Internet capacity discounts and enabling transactions, TFT The ThreeFold_Token is the first utility token in the world that gives access to decentralized Internet (compute, storage and network) capacity. Users, developers, and enterprises use TFT to store data, build applications, and create peer-to-peer ecosystems on the ThreeFold Grid. -!!!wiki.include:utility_token_model +!!wiki.include page:utility_token_model But TFT is much more than that. It energizes the ThreeFold Grid and the expansion of a truly decentralized Internet that can scale any current or future technologies to the far edges of our world. @@ -48,4 +48,4 @@ The ThreeFold_Token economy was also designed to have the necessary deflationary > Note: With partnership developments, ThreeFold is looking at ways for the ThreeFold community to be able to donate ThreeFold_Token to global projects that aim to improve the lives of people and regenerate our planet. -!!!wiki.include:token_toc \ No newline at end of file +!!wiki.include page:token_toc \ No newline at end of file diff --git a/_archive/tf_tokens/tokenomics.md b/_archive/tf_tokens/tokenomics.md index 047ec4e..2c01e2a 100644 --- a/_archive/tf_tokens/tokenomics.md +++ b/_archive/tf_tokens/tokenomics.md @@ -41,4 +41,4 @@ Many tokens are in vesting wallets see [Vesting](vesting_overview). [Token Distribution](token_overview) -!!!wiki.include:token_toc \ No newline at end of file +!!wiki.include page:token_toc \ No newline at end of file diff --git a/_archive/tf_tokens/tokens_home.md b/_archive/tf_tokens/tokens_home.md index 8a99321..afbce14 100644 --- a/_archive/tf_tokens/tokens_home.md +++ b/_archive/tf_tokens/tokens_home.md @@ -6,7 +6,7 @@ Welcome to our knowledge base around the ThreeFold Token called TFT. In this section, you will learn about what the token is, its features, tokenomics, how to buy, sell, store & more. - + ![](img/tft_like_btc_.jpg) diff --git a/_archive/tf_tokens/vesting/how_to_vest.md b/_archive/tf_tokens/vesting/how_to_vest.md index 4a8a7e8..56720da 100644 --- a/_archive/tf_tokens/vesting/how_to_vest.md +++ b/_archive/tf_tokens/vesting/how_to_vest.md @@ -1,6 +1,6 @@ ## How to vest ThreeFold Tokens -!!!wiki.include:how_to_vest_tf_connect +!!wiki.include page:how_to_vest_tf_connect ### Option 2: The Vesting Dashboard diff --git a/_archive/tf_tokens/vesting/how_to_vest_tf_connect.md b/_archive/tf_tokens/vesting/how_to_vest_tf_connect.md index 5322146..74c3f4b 100644 --- a/_archive/tf_tokens/vesting/how_to_vest_tf_connect.md +++ b/_archive/tf_tokens/vesting/how_to_vest_tf_connect.md @@ -38,6 +38,6 @@ A blue message box will confirm your transaction has been processed successfully ![](img/wallet_vest_tokens_vested.jpg ':size=300') -!!!wiki.include:vesting_toc +!!wiki.include page:vesting_toc diff --git a/_archive/tf_tokens/vesting/how_vesting_works.md b/_archive/tf_tokens/vesting/how_vesting_works.md index 84169bc..2ecea20 100644 --- a/_archive/tf_tokens/vesting/how_vesting_works.md +++ b/_archive/tf_tokens/vesting/how_vesting_works.md @@ -38,4 +38,4 @@ The address is in the red box in the example. If you input that into ![](img/wallet_vest_address_lookup.jpg ':size=300') -!!!wiki.include:vesting_toc \ No newline at end of file +!!wiki.include page:vesting_toc \ No newline at end of file diff --git a/_archive/tf_tokens/vesting/vesting_pool.md b/_archive/tf_tokens/vesting/vesting_pool.md index 859171c..e589598 100644 --- a/_archive/tf_tokens/vesting/vesting_pool.md +++ b/_archive/tf_tokens/vesting/vesting_pool.md @@ -37,4 +37,4 @@ If you are in for the long run, then by vesting your tokens (which you would pro !!wiki.def alias:accelerated_vesting_pool,vesting_pool -!!!wiki.include:vesting_toc \ No newline at end of file +!!wiki.include page:vesting_toc \ No newline at end of file diff --git a/_archive/tf_tokens/vesting/vesting_simulator_howto.md b/_archive/tf_tokens/vesting/vesting_simulator_howto.md index bfd34ea..40ab837 100644 --- a/_archive/tf_tokens/vesting/vesting_simulator_howto.md +++ b/_archive/tf_tokens/vesting/vesting_simulator_howto.md @@ -14,4 +14,4 @@ The table shows how unlocking of tokens happen in line to those 2 parameters. [simulator is on this link](https://secure.threefold.me/sheet/#/2/sheet/view/1n-dKvn0uImvw9y72Wai1eXhVtKLP5-gRnNT4ZmO3dQ/) -!!!wiki.include:vesting_toc \ No newline at end of file +!!wiki.include page:vesting_toc \ No newline at end of file diff --git a/_archive/tf_tokens/wallets/lobstr_wallet.md b/_archive/tf_tokens/wallets/lobstr_wallet.md index b10de57..2e56ce8 100644 --- a/_archive/tf_tokens/wallets/lobstr_wallet.md +++ b/_archive/tf_tokens/wallets/lobstr_wallet.md @@ -40,4 +40,4 @@ For advanced traders Lobstr provides access to the full orderbook trading functi ![image alt text](img/lobstr_trade_tft.jpg) -!!!wiki.include:legal:tft_not_investment +!!wiki.include page:legal:tft_not_investment diff --git a/_archive/tf_tokens/wallets/solar_wallet.md b/_archive/tf_tokens/wallets/solar_wallet.md index 586ccbc..7367cfb 100644 --- a/_archive/tf_tokens/wallets/solar_wallet.md +++ b/_archive/tf_tokens/wallets/solar_wallet.md @@ -64,9 +64,9 @@ The TFT icon will now show in your Wallet overview. ### Step 5: buy TFT - + -!!!vimeo id:417197931 +!!vimeo id:417197931 1. Click on one of the currencies in the top bar to go to your wallet overview 2. Click ThreeFold_Token (TFT) @@ -77,11 +77,11 @@ The TFT icon will now show in your Wallet overview. 7. Confirm the Sell order and wait for the TFT to show up in your wallet -!!!wiki.include:wallet_key_important +!!wiki.include page:wallet_key_important # Alternative Wallet Lobstr see [Lobstr Wallet](lobstr_wallet) -!!!wiki.include:legal:tft_not_investment \ No newline at end of file +!!wiki.include page:legal:tft_not_investment \ No newline at end of file diff --git a/_archive/tf_tokens/wallets/tft_interstellar.md b/_archive/tf_tokens/wallets/tft_interstellar.md index f937bfc..f0f5f67 100644 --- a/_archive/tf_tokens/wallets/tft_interstellar.md +++ b/_archive/tf_tokens/wallets/tft_interstellar.md @@ -14,7 +14,7 @@ Interstellar provides a complete digital currency experience to easily create, s 8. Now your account is setup and funded and you can start trading. To learn more on how to trade on interstellar, visit their [documentation](https://interstellar.exchange/docs/). -!!!wiki.include:legal:tft_not_investment +!!wiki.include page:legal:tft_not_investment ## Details: Buying and Storing TFT on Interstellar wallet @@ -97,4 +97,4 @@ Now that the account is set up and funded and you have the [TFT](/tokens/threefo ![image](img/interstellar_account_overview_3.jpg) -!!!wiki.include:legal:tft_not_investment \ No newline at end of file +!!wiki.include page:legal:tft_not_investment \ No newline at end of file diff --git a/_archive/tf_tokens/wallets/tft_stellar_dex.md b/_archive/tf_tokens/wallets/tft_stellar_dex.md index f193249..f52adcb 100644 --- a/_archive/tf_tokens/wallets/tft_stellar_dex.md +++ b/_archive/tf_tokens/wallets/tft_stellar_dex.md @@ -13,4 +13,4 @@ At this time, we recommend one of the following ways to buy TFT on Stellar: - [Interstellar](tft_interstellar) = wallet and exchange with both web based and desktop based versions available -!!!wiki.include:legal:tft_not_investment \ No newline at end of file +!!wiki.include page:legal:tft_not_investment \ No newline at end of file diff --git a/_archive/tf_tokens/wallets/tft_stellarx.md b/_archive/tf_tokens/wallets/tft_stellarx.md index c146e82..11d3dd6 100644 --- a/_archive/tf_tokens/wallets/tft_stellarx.md +++ b/_archive/tf_tokens/wallets/tft_stellarx.md @@ -52,4 +52,4 @@ TFT now shows up in your wallet section (click wallet in top menu) ![image alt text](img/stellar_x_image_10.jpg) -!!!wiki.include:legal:tft_not_investment \ No newline at end of file +!!wiki.include page:legal:tft_not_investment \ No newline at end of file diff --git a/_archive/tf_tokens/wallets/threefold_connect.md b/_archive/tf_tokens/wallets/threefold_connect.md index eb70e4b..4173735 100644 --- a/_archive/tf_tokens/wallets/threefold_connect.md +++ b/_archive/tf_tokens/wallets/threefold_connect.md @@ -20,7 +20,7 @@ ThreeFold Connect is an app that is more than just a wallet. It is: - **Step 2:** Create a 3Bot name and connect it to your email address. - **Step 3:** A 24 word seed phrase will be generated to secure your wallet when signing up. -!!!wiki.include:tft_important_notes +!!wiki.include page:tft_important_notes ### Transfer TFT to/ from your account @@ -47,6 +47,6 @@ You can also receive a QR code from your recipient that shall fill up all of the > Note: If you find any issues across any of the above, don't hesitate to contact our support team on our website or web presence with the chat icon on the bottom right of the screen. -!!!wiki.include:legal:tft_not_investment +!!wiki.include page:legal:tft_not_investment !!wiki.def alias:tf_connect,tf_connect_app \ No newline at end of file diff --git a/_archive/tf_tokens/wallets/threefold_wallets.md b/_archive/tf_tokens/wallets/threefold_wallets.md index 5004f7e..f2e59e3 100644 --- a/_archive/tf_tokens/wallets/threefold_wallets.md +++ b/_archive/tf_tokens/wallets/threefold_wallets.md @@ -4,7 +4,7 @@ ThreeFold community members store TFT in wallets, as long-term believers in the *Wallets are key to your digital future as they allow you to store and manage your funds, and keep them safe. If you want to learn more about wallets, click [here](https://www.coinbase.com/learn/crypto-basics/what-is-a-crypto-wallet).* -!!!wiki.include:tft_safe +!!wiki.include page:tft_safe ### TFT Compatible Wallets diff --git a/_archive/tf_tokens/wallets_tft_bsc_bridge/tft_bsc_bridge.md b/_archive/tf_tokens/wallets_tft_bsc_bridge/tft_bsc_bridge.md index a075543..d9c658d 100644 --- a/_archive/tf_tokens/wallets_tft_bsc_bridge/tft_bsc_bridge.md +++ b/_archive/tf_tokens/wallets_tft_bsc_bridge/tft_bsc_bridge.md @@ -86,4 +86,4 @@ Please find instructions [here](liquidity_provider). -!!!wiki.include:legal:tft_not_investment \ No newline at end of file +!!wiki.include page:legal:tft_not_investment \ No newline at end of file diff --git a/_archive/tf_tokens/wallets_tft_bsc_bridge/tft_bsc_metamask.md b/_archive/tf_tokens/wallets_tft_bsc_bridge/tft_bsc_metamask.md index f0b679a..7b928db 100644 --- a/_archive/tf_tokens/wallets_tft_bsc_bridge/tft_bsc_metamask.md +++ b/_archive/tf_tokens/wallets_tft_bsc_bridge/tft_bsc_metamask.md @@ -19,4 +19,4 @@ Once this configuration is done, your TFT wallet is ready. More info on the configuration can be found in the [Official Binance guide](https://academy.binance.com/en/articles/connecting-metamask-to-binance-smart-chain) -!!!wiki.include:legal:tft_not_investment \ No newline at end of file +!!wiki.include page:legal:tft_not_investment \ No newline at end of file diff --git a/_archive/tf_tokens/wallets_tft_bsc_bridge/tft_bsc_trustwallet.md b/_archive/tf_tokens/wallets_tft_bsc_bridge/tft_bsc_trustwallet.md index 0e5890a..e39c8c0 100644 --- a/_archive/tf_tokens/wallets_tft_bsc_bridge/tft_bsc_trustwallet.md +++ b/_archive/tf_tokens/wallets_tft_bsc_bridge/tft_bsc_trustwallet.md @@ -24,4 +24,4 @@ Once this configuration is done, your TFT wallet is ready. ![](img/trustwallet_tft_added.jpg ':size=300') -!!!wiki.include:legal:tft_not_investment \ No newline at end of file +!!wiki.include page:legal:tft_not_investment \ No newline at end of file diff --git a/_archive/tf_vision/strategy/strategy_headlines.md b/_archive/tf_vision/strategy/strategy_headlines.md index 34e6d42..32ee265 100644 --- a/_archive/tf_vision/strategy/strategy_headlines.md +++ b/_archive/tf_vision/strategy/strategy_headlines.md @@ -6,7 +6,7 @@ Only the top important headlines are listed here. ![](img/grid_operational.png) -We are the antidote for the crypto world !!!! +We are the antidote for the crypto world !!! - our TFT will be valuable because of utilization and size of network - our technology is usable and has huge potential diff --git a/_archive/tf_vision/tf_vision_position.md b/_archive/tf_vision/tf_vision_position.md index 0f49b84..d5c35b2 100644 --- a/_archive/tf_vision/tf_vision_position.md +++ b/_archive/tf_vision/tf_vision_position.md @@ -130,7 +130,7 @@ See currently active [**Projects**](projects_toc) building on top of us. ## Are we different? -!!!wiki.include:tf_comparison_highlevel +!!wiki.include page:tf_comparison_highlevel >TODO: complete by linking to a document for each part @@ -157,4 +157,4 @@ Planetary Network works with a web gateway mechanism that allows the exposure of See: [TFTech overview](tf_vision_tech). -!!!alias tfvision \ No newline at end of file +!!alias tfvision \ No newline at end of file diff --git a/_archive/tfgrid/concepts/grid_consensus.md b/_archive/tfgrid/concepts/grid_consensus.md index c7f9630..da5652a 100644 --- a/_archive/tfgrid/concepts/grid_consensus.md +++ b/_archive/tfgrid/concepts/grid_consensus.md @@ -1,5 +1,5 @@ -!!!wiki.include:tfdao +!!wiki.include page:tfdao -!!!wiki.include:grid_toc \ No newline at end of file +!!wiki.include page:grid_toc \ No newline at end of file diff --git a/_archive/tfgrid/concepts/grid_intro.md b/_archive/tfgrid/concepts/grid_intro.md index b08cead..a912736 100644 --- a/_archive/tfgrid/concepts/grid_intro.md +++ b/_archive/tfgrid/concepts/grid_intro.md @@ -4,7 +4,7 @@ # Introduction -!!!wiki.include:whatis_tfgrid +!!wiki.include page:whatis_tfgrid ## Our Values diff --git a/_archive/tfgrid/concepts/grid_valuation.md b/_archive/tfgrid/concepts/grid_valuation.md index db33d82..ae079c8 100644 --- a/_archive/tfgrid/concepts/grid_valuation.md +++ b/_archive/tfgrid/concepts/grid_valuation.md @@ -54,4 +54,4 @@ A comparison of the compute and storage capacity price of ThreeFold vs market le > Disclaimer: Please note that we can't and won't make price predictions on TFT valuation and that all calculations made here are purely hypothetical. Use the simulator to make your own estimations. -!!!alias tft_valuation,token_valuation +!!alias tft_valuation,token_valuation diff --git a/_archive/tfgrid/concepts/roadmap.md b/_archive/tfgrid/concepts/roadmap.md index 01767c7..6f0aff5 100644 --- a/_archive/tfgrid/concepts/roadmap.md +++ b/_archive/tfgrid/concepts/roadmap.md @@ -1,2 +1,2 @@ -!!!wiki.include:roadmap_grid +!!wiki.include page:roadmap_grid diff --git a/_archive/tfgrid/concepts/whatis_tfgrid.md b/_archive/tfgrid/concepts/whatis_tfgrid.md index 23d4b0f..affaba6 100644 --- a/_archive/tfgrid/concepts/whatis_tfgrid.md +++ b/_archive/tfgrid/concepts/whatis_tfgrid.md @@ -2,5 +2,5 @@ The Threefold Grid is an open-source Internet infrastructure that leverages autonomous cloud and high-performance, permissionless blockchain technology. It represents the first full-stack, decentralized, peer-to-peer Internet infrastructure in the world that connects compute (in the form of highly-optimized containers), storage and network (to run network services) capacity all-in-one. -!!!wiki.include:tfgrid_is_large +!!wiki.include page:tfgrid_is_large diff --git a/_archive/tfgrid/farming/certified/certified_farming.md b/_archive/tfgrid/farming/certified/certified_farming.md index abf15e4..1a57571 100644 --- a/_archive/tfgrid/farming/certified/certified_farming.md +++ b/_archive/tfgrid/farming/certified/certified_farming.md @@ -1,5 +1,5 @@ # Certified Farming -!!!wiki.include:farming_certification_benefits +!!wiki.include page:farming_certification_benefits !!wiki.def alias:certified_farming \ No newline at end of file diff --git a/_archive/tfgrid/farming/certified/farming_certified_requirements.md b/_archive/tfgrid/farming/certified/farming_certified_requirements.md index b44a521..3aea2d2 100644 --- a/_archive/tfgrid/farming/certified/farming_certified_requirements.md +++ b/_archive/tfgrid/farming/certified/farming_certified_requirements.md @@ -44,7 +44,7 @@ #### Terms and Conditions need to be signed -!!!wiki.include:farming_certification_terms_conditions +!!wiki.include page:farming_certification_terms_conditions ### Bandwidth Requirement for archive/storage usecase example. diff --git a/_archive/tfgrid/farming/certified/farming_types.md b/_archive/tfgrid/farming/certified/farming_types.md index f38eba4..45d54be 100644 --- a/_archive/tfgrid/farming/certified/farming_types.md +++ b/_archive/tfgrid/farming/certified/farming_types.md @@ -16,5 +16,5 @@ - Certification report given by TFTech or partners to describe farming situation (H2 2021). - see [farming certified requirements](farming_certified_requirements) -!!!wiki.include:farming_certification_benefits +!!wiki.include page:farming_certification_benefits diff --git a/_archive/tfgrid/farming/farming_intro.md b/_archive/tfgrid/farming/farming_intro.md index be33169..e0727e3 100644 --- a/_archive/tfgrid/farming/farming_intro.md +++ b/_archive/tfgrid/farming/farming_intro.md @@ -61,4 +61,4 @@ By participating in the expansion of the ThreeFold Grid, Farmers earn TFT on a m Learn more about Farming Rewards [here](@farming_reward). --> -!!!alias become_a_farmer \ No newline at end of file +!!alias become_a_farmer \ No newline at end of file diff --git a/_archive/tfgrid/farming/poc_dao_rules.md b/_archive/tfgrid/farming/poc_dao_rules.md index 894e221..a37b7af 100644 --- a/_archive/tfgrid/farming/poc_dao_rules.md +++ b/_archive/tfgrid/farming/poc_dao_rules.md @@ -20,7 +20,7 @@ - Make sure you have 50GB SSD capacity min available per logical core (physical core times number of threads it can run), if not your calculated CU will be lower. - Make sure your network connection is good enough, in future it will be measured and part of the Service Level Agreement. -!!!wiki.include:tfgrid_min_sla +!!wiki.include page:tfgrid_min_sla ## Automatic staking of farming rewards @@ -66,9 +66,9 @@ Suggestions will be made to improve PoC, the DAO will have to come to consensus - Because we are a DAO, everything is open for change as long as consensus of community in accordance of TFDAO has been achieved. -!!!wiki.include:farming_toc +!!wiki.include page:farming_toc -!!!wiki.include:wisdom_council_approval_jan22 +!!wiki.include page:wisdom_council_approval_jan22 diff --git a/_archive/tfgrid/farming/proof_of_utilization.md b/_archive/tfgrid/farming/proof_of_utilization.md index 2f600ad..c9aadcd 100644 --- a/_archive/tfgrid/farming/proof_of_utilization.md +++ b/_archive/tfgrid/farming/proof_of_utilization.md @@ -37,7 +37,7 @@ Every hour, the utilization is recorded in TFChain and the user is charged for t - For Certified Farming, [ThreeFold Tech](threefold_tech0) can define the solution & sales channel parameters, these are channels as provided by ThreeFold Tech. - Burning can be lowered to 25% if too many tokens would be burned, ThreeFold DAO consensus needs to be achieved. -!!!wiki.include:wisdom_council_approval_jan22 +!!wiki.include page:wisdom_council_approval_jan22 ### Other Ways TFT are required diff --git a/_archive/tfgrid/pricing/cloudunits_pricing.md b/_archive/tfgrid/pricing/cloudunits_pricing.md index a18ab7a..5470690 100644 --- a/_archive/tfgrid/pricing/cloudunits_pricing.md +++ b/_archive/tfgrid/pricing/cloudunits_pricing.md @@ -62,8 +62,8 @@ To use a dedicated node, you will have to reserve a 3node for yourself in your a - See [here for more info about planet positive certification](certified_farming) - Pricing is done based on cloud units, see [cloudunits](cloudunits) -!!!wiki.include:staking_discount_levels +!!wiki.include page:staking_discount_levels !!wiki.def alias:tfpricing,cloudunit_pricing,threefold_pricing -!!!tfpriceinfo +!!tfpriceinfo diff --git a/_archive/tfgrid/pricing/pricing.md b/_archive/tfgrid/pricing/pricing.md index 68873d6..11a8a7b 100644 --- a/_archive/tfgrid/pricing/pricing.md +++ b/_archive/tfgrid/pricing/pricing.md @@ -8,7 +8,7 @@ Cloud units are the basis for buying & selling capacity on the ThreeFold_Grid (f Below you can see how the market prices these cloud units. -!!!wiki.include:cloudunits_pricing +!!wiki.include page:cloudunits_pricing
diff --git a/_archive/tfgrid/pricing/staking_discount_levels.md b/_archive/tfgrid/pricing/staking_discount_levels.md index aa8aa09..1409c4b 100644 --- a/_archive/tfgrid/pricing/staking_discount_levels.md +++ b/_archive/tfgrid/pricing/staking_discount_levels.md @@ -1,4 +1,4 @@ ## Discount Levels -!!!wiki.include page:staking_discount_levels0 +!!wiki.include page:staking_discount_levels0 diff --git a/books/manual/SUMMARY.md b/books/manual/SUMMARY.md index c74de50..b778136 100644 --- a/books/manual/SUMMARY.md +++ b/books/manual/SUMMARY.md @@ -229,7 +229,7 @@ - [Installing Terraform](system_administrators/terraform/terraform_install.md) - [Terraform Basics](system_administrators/terraform/terraform_basics.md) - [Full VM Deployment](system_administrators/terraform/terraform_full_vm.md) - - [Terrafprm Basics](system_administrators/terraform/terraform_basics.md) + - [Terraform Basics](system_administrators/terraform/terraform_basics.md) - [Resources](system_administrators/terraform/resources/terraform_resources_readme.md) - [Using Scheduler](system_administrators/terraform/resources/terraform_scheduler.md) - [Virtual Machine](system_administrators/terraform/resources/terraform_vm.md) @@ -278,7 +278,7 @@ - [Redis](system_administrators/advanced/grid3_redis.md) - [IPFS](system_administrators/advanced/ipfs/ipfs_toc.md) - [IPFS on a Full VM](system_administrators/advanced/ipfs/ipfs_fullvm.md) - - [IPFS on a Micro VM](system_administrators/advanced/ipfs/ipfs_microvm.md) + - [IPFS on a Micro VM](system_administrators/advanced/ipfs/ipfs_microvm.md) - [MinIO Operator with Helm3](system_administrators/advanced/minio_helm3.md) - [Hummingbot](system_administrators/advanced/hummingbot.md) - [AI & ML Workloads](system_administrators/advanced/ai_ml_workloads/ai_ml_workloads_toc.md) diff --git a/books/test copy.html b/books/test copy.html new file mode 100644 index 0000000..c009575 --- /dev/null +++ b/books/test copy.html @@ -0,0 +1,266 @@ + + + + + + File Manager Overview + + + + +
+
+ Home / Documents / Current Folder +
+

File Manager

+ +
+ +
+ + + +
+ + + + + + + + \ No newline at end of file diff --git a/books/test.html b/books/test.html new file mode 100644 index 0000000..e3cfa02 --- /dev/null +++ b/books/test.html @@ -0,0 +1,285 @@ + + + + + + File Manager Overview + + + + +
+
+ Home / Documents / Current Folder +
+

File Manager

+ +
+ +
+ + + +
+ + + + + + + + \ No newline at end of file diff --git a/books/test/SUMMARY.md b/books/test/SUMMARY.md deleted file mode 100644 index addcedd..0000000 --- a/books/test/SUMMARY.md +++ /dev/null @@ -1 +0,0 @@ -- [Test Page](test/test.md) \ No newline at end of file diff --git a/books/test2.html b/books/test2.html new file mode 100644 index 0000000..aafb2d7 --- /dev/null +++ b/books/test2.html @@ -0,0 +1,168 @@ + + + + + + File Storage Interface + + + +

File Storage Interface

+ + +

File List

+ + + + + \ No newline at end of file diff --git a/books/tfgrid4specs/SUMMARY.md b/books/tfgrid4specs/SUMMARY.md index 787adfc..0f54351 100644 --- a/books/tfgrid4specs/SUMMARY.md +++ b/books/tfgrid4specs/SUMMARY.md @@ -1,3 +1,12 @@ - [Intro](tfgrid4specs/intro.md) -- [Test](tfgrid4specs/test.md) -- [Test2](tech/energy_efficient.md) +- [bootstrap](tfgrid4specs/bootstrap.md) + - [bootstrap_zos](tfgrid4specs/bootstrap_zos.md) +- [zinit 2](tfgrid4specs/zinit2.md) + - [zinit_registration](tfgrid4specs/zinit_registration.md) + - [zinit_units_config](tfgrid4specs/zinit_units_config.md) + - [zinit_flist.md](tfgrid4specs/zinit_flist.md) + - [zinit_runc.md](tfgrid4specs/zinit_runc.md) +- [components](tfgrid4specs/components.md) + - [components_tech](tfgrid4specs/components_tech.md) +- [openrpc](tfgrid4specs/openrpc.md) + - [openrpc_openapi_spec](tfgrid4specs/openrpc_openapi_spec.md) diff --git a/collections/cloud/pricing/cloudunits_pricing.md b/collections/cloud/pricing/cloudunits_pricing.md index ad83204..dac7f68 100644 --- a/collections/cloud/pricing/cloudunits_pricing.md +++ b/collections/cloud/pricing/cloudunits_pricing.md @@ -62,7 +62,7 @@ To use a dedicated node, you will have to reserve a 3node for yourself in your a - See [here for more info about planet positive certification](certified_farming) - Pricing is done based on cloud units, see [cloudunits](cloudunits) -!!!include:staking_discount_levels +!!wiki.include page:staking_discount_levels -!!!tfpriceinfo +!!tfpriceinfo diff --git a/collections/cloud/resource_units_calc_cloudunits.md b/collections/cloud/resource_units_calc_cloudunits.md index 4d5a740..7aa7bc6 100644 --- a/collections/cloud/resource_units_calc_cloudunits.md +++ b/collections/cloud/resource_units_calc_cloudunits.md @@ -70,7 +70,7 @@ su = hru / 1200 + sru * 0.8 / 200 - 1 SU costs 200 / 8 = 25 for SSD - + ## Change Log diff --git a/collections/companies/tfdao.md b/collections/companies/tfdao.md index 61182f7..77b4811 100644 --- a/collections/companies/tfdao.md +++ b/collections/companies/tfdao.md @@ -6,7 +6,7 @@ The ThreeFold DAO allows autonomous operation of the TFChain and TFGrid . Amongst others the DAO needs to arrange -!!!wiki.include:utility_token_model +!!wiki.include page:utility_token_model As well as @@ -21,7 +21,7 @@ As well as - rewards for sales channels, solution providers (v3.2+) -!!!wiki.include:dao_more_info +!!wiki.include page:dao_more_info !!wiki.def alias:tf_dao,tfdao diff --git a/collections/companies/threefold_token.md b/collections/companies/threefold_token.md index 218978b..f79fd40 100644 --- a/collections/companies/threefold_token.md +++ b/collections/companies/threefold_token.md @@ -1,4 +1,4 @@ -!!!wiki.include:token_what +!!wiki.include page:token_what !!wiki.def alias:TFT,TFToken,Threefold_Token,TFGrid_Token,threefold_token name:TFT diff --git a/collections/dashboard/solutions/img/casper4.png b/collections/dashboard/solutions/img/casper4.png index 17bd144..5c49862 100644 Binary files a/collections/dashboard/solutions/img/casper4.png and b/collections/dashboard/solutions/img/casper4.png differ diff --git a/collections/dashboard/solutions/img/solutions_caprover_ipaddress.png b/collections/dashboard/solutions/img/solutions_caprover_ipaddress.png new file mode 100644 index 0000000..a654f78 Binary files /dev/null and b/collections/dashboard/solutions/img/solutions_caprover_ipaddress.png differ diff --git a/collections/dashboard/solutions/img/solutions_caprover_json.png b/collections/dashboard/solutions/img/solutions_caprover_json.png new file mode 100644 index 0000000..3f2913c Binary files /dev/null and b/collections/dashboard/solutions/img/solutions_caprover_json.png differ diff --git a/collections/dashboard/solutions/img/solutions_caprover_leader.png b/collections/dashboard/solutions/img/solutions_caprover_leader.png index 218931d..89b100f 100644 Binary files a/collections/dashboard/solutions/img/solutions_caprover_leader.png and b/collections/dashboard/solutions/img/solutions_caprover_leader.png differ diff --git a/collections/dashboard/solutions/img/solutions_caprover_workers.png b/collections/dashboard/solutions/img/solutions_caprover_workers.png index 0b12a69..795fc07 100644 Binary files a/collections/dashboard/solutions/img/solutions_caprover_workers.png and b/collections/dashboard/solutions/img/solutions_caprover_workers.png differ diff --git a/collections/dashboard/solutions/nextcloud.md b/collections/dashboard/solutions/nextcloud.md index da22681..19b9ea4 100644 --- a/collections/dashboard/solutions/nextcloud.md +++ b/collections/dashboard/solutions/nextcloud.md @@ -170,7 +170,7 @@ In this section, we cover how to make a BorgBackup on the Nextcloud VM and we al In the section **Backup and restore**, you can set a [BorgBackup](https://www.borgbackup.org/) of your Nextcloud instance. -* Add a mount point and a directory name for your backup (e.g. **/mnt/backup**) and click **Submit backup location**. +* Add a mount point and a directory name for your backup (e.g. **/mnt/data/backup**) and click **Submit backup location**. * After the creation of the backup location, write down the **encryption password for backups** somewhere safe and offline. * Click **Create backup** to create a BorgBackup of your Nextcloud instance. * This will stop all containers, run the backup container and create the backup. @@ -188,7 +188,7 @@ After the first manual backup of your Nextcloud instance is complete, you can se To allow for another layer of redundancy, you can set a secondary VM on the grid and make a daily backup from the BorgBackup of your Nextcloud instance to the secondary VM. The following shows how to do this. It is based on the [File Transfer section](system_administrators@@file_transfer) of the manual. -For the following, we take into account that the BorgBackup is located at `/mnt/backup` on the VM running Nextcloud. +For the following, we take into account that the BorgBackup is located at `/mnt/data/backup` on the VM running Nextcloud. You will need to deploy a full VM on the TFGrid and SSH into this secondary VM. @@ -249,7 +249,7 @@ nano /root/rsync_nextcloud_backup.sh ``` #!/bin/bash -sudo rsync -avz --progress --delete --log-file=/root/nextcloud_backup/rsync_nextcloud_storage.log /root/nextcloud_backup/ root@:/mnt/backup +sudo rsync -avz --progress --delete --log-file=/root/nextcloud_backup/rsync_nextcloud_storage.log root@:/mnt/data/backup /root/nextcloud_backup/ ``` * Give permission to execute the script ``` diff --git a/collections/developers/grid_deployment/grid_deployment_full_vm.md b/collections/developers/grid_deployment/grid_deployment_full_vm.md index 2c739a4..b799868 100644 --- a/collections/developers/grid_deployment/grid_deployment_full_vm.md +++ b/collections/developers/grid_deployment/grid_deployment_full_vm.md @@ -71,26 +71,30 @@ We show the steps to prepare the VM to run the network instance. If you are deploying on testnet or devnet, simply replace `mainnet` by the proper network in the following lines. +- Set the prerequisites + ``` + apt update && apt install -y git nano ufw + ``` - Download the ThreeFold Tech `grid_deployment` repository - ``` - git clone https://github.com/threefoldtech/grid_deployment - cd grid_deployment/docker-compose/mainnet - ``` + ``` + git clone https://github.com/threefoldtech/grid_deployment + cd grid_deployment/docker-compose/mainnet + ``` - Generate a TFChain node key with `subkey` - Note: If you deploy the 3 network instances, you can use the same node key for all 3 networks. But it is recommended to use 3 different keys to facilitate management. - ``` - echo .subkey_mainnet >> .gitignore - ../subkey generate-node-key > .nodekey_mainnet - cat .nodekey_mainnet - ``` +``` +echo .nodekey_mainnet >> .gitignore +../../apps/subkey generate-node-key > .nodekey_mainnet +cat .nodekey_mainnet +``` - Create and the set environment variables file - ``` - cp .secrets.env-example .secrets.env - ``` + ``` + cp .secrets.env-example .secrets.env + ``` - Adjust the environment file - ``` - nano .secrets.env - ``` + ``` + nano .secrets.env + ``` - To adjust the `.secrets.env` file, take into account the following: - **DOMAIN**="example.com" - Write your own domain diff --git a/collections/farming/certified/certified_farming.md b/collections/farming/certified/certified_farming.md index 26141ff..35c6884 100644 --- a/collections/farming/certified/certified_farming.md +++ b/collections/farming/certified/certified_farming.md @@ -1,4 +1,4 @@ # Certified Farming -!!!include:farming_certification_benefits +!!wiki.include page:farming_certification_benefits diff --git a/collections/farming/certified/farming_certified_requirements.md b/collections/farming/certified/farming_certified_requirements.md index 887f0e7..3aea2d2 100644 --- a/collections/farming/certified/farming_certified_requirements.md +++ b/collections/farming/certified/farming_certified_requirements.md @@ -44,7 +44,7 @@ #### Terms and Conditions need to be signed -!!!include:farming_certification_terms_conditions +!!wiki.include page:farming_certification_terms_conditions ### Bandwidth Requirement for archive/storage usecase example. diff --git a/collections/farming/certified/farming_types.md b/collections/farming/certified/farming_types.md index c35b1f6..45d54be 100644 --- a/collections/farming/certified/farming_types.md +++ b/collections/farming/certified/farming_types.md @@ -16,5 +16,5 @@ - Certification report given by TFTech or partners to describe farming situation (H2 2021). - see [farming certified requirements](farming_certified_requirements) -!!!include:farming_certification_benefits +!!wiki.include page:farming_certification_benefits diff --git a/collections/farming/farming_intro.md b/collections/farming/farming_intro.md index 50da7fb..07bb83c 100644 --- a/collections/farming/farming_intro.md +++ b/collections/farming/farming_intro.md @@ -61,4 +61,4 @@ By participating in the expansion of the ThreeFold Grid, Farmers earn TFT on a m Learn more about Farming Rewards [here](@farming_reward). --> -!!!alias become_a_farmer \ No newline at end of file +!!alias become_a_farmer \ No newline at end of file diff --git a/collections/freeflow/community_principles/community_principles.md b/collections/freeflow/community_principles/community_principles.md index d26e027..d52d85c 100644 --- a/collections/freeflow/community_principles/community_principles.md +++ b/collections/freeflow/community_principles/community_principles.md @@ -44,7 +44,7 @@ Radical Self-Expression arises from the unique Gifts of the Individual. No one other than the individual or a collaborating group can determine its content. It is offered as a Gift to others. In this spirit, the Giver should respect the rights and liberties of the recipient. -"We are to take Individual Self-Expression as far as WE possibly can and Dream into Reality a much better World!!! Express yourselves. Start doing the things you love. Life is simple. Open your heart, mind and arms to new things and new people. WE are United in our differences..." +"We are to take Individual Self-Expression as far as WE possibly can and Dream into Reality a much better World!! Express yourselves. Start doing the things you love. Life is simple. Open your heart, mind and arms to new things and new people. WE are United in our differences..." ## Community diff --git a/collections/system_administrators/getstarted/sidebar.md b/collections/system_administrators/getstarted/sidebar.md index b7edb51..1e589a7 100644 --- a/collections/system_administrators/getstarted/sidebar.md +++ b/collections/system_administrators/getstarted/sidebar.md @@ -1,4 +1,4 @@ - [**Manual Home**](@manual3_home_new) --------- **Get Started** -!!!include:getstarted_toc \ No newline at end of file + \ No newline at end of file diff --git a/collections/system_administrators/getstarted/tfgrid_deployments.md b/collections/system_administrators/getstarted/tfgrid_deployments.md index 930f529..af63008 100644 --- a/collections/system_administrators/getstarted/tfgrid_deployments.md +++ b/collections/system_administrators/getstarted/tfgrid_deployments.md @@ -32,8 +32,8 @@ You can deploy infrastructure-as-code with Pulumi and Terraform/OpenTofu. You can use our Go and Javascript/TypeScript command line interface tools to deploy workloads on the grid. - [Go Grid Client](developers@@grid3_go_readme) - - [TFCMD](developers@@tfcmd/tfcmd) - - [TFRobot](developers@@tfrobot/tfrobot) + - [TFCMD](developers@@tfcmd) + - [TFRobot](developers@@tfrobot) - [TypeScript Grid Client](developers@@grid3_javascript_readme) ## GPU Workloads diff --git a/collections/system_administrators/terraform/grid3_terraform_home.md b/collections/system_administrators/terraform/grid3_terraform_home.md index 82e6155..69be806 100644 --- a/collections/system_administrators/terraform/grid3_terraform_home.md +++ b/collections/system_administrators/terraform/grid3_terraform_home.md @@ -1 +1 @@ -!!!include:terraform_readme +!!wiki.include page:terraform_readme diff --git a/collections/system_administrators/terraform/resources/terraform_resources_readme.md b/collections/system_administrators/terraform/resources/terraform_resources_readme.md index ad2c79e..b7984b2 100644 --- a/collections/system_administrators/terraform/resources/terraform_resources_readme.md +++ b/collections/system_administrators/terraform/resources/terraform_resources_readme.md @@ -3,10 +3,10 @@

Table of Contents

- [Using Scheduler](terraform_scheduler.md) -- [Virtual Machine](./terraform_vm.html) -- [Web Gateway](./terraform_vm_gateway.html) -- [Kubernetes Cluster](./terraform_k8s.html) -- [ZDB](./terraform_zdb.html) -- [Zlogs](./terraform_zlogs.md) +- [Virtual Machine](terraform_vm.md) +- [Web Gateway](terraform_vm_gateway.md) +- [Kubernetes Cluster](terraform_k8s.md) +- [ZDB](terraform_zdb.md) +- [Zlogs](terraform_zlogs.md) - [Quantum Safe Filesystem](terraform_qsfs.md) -- [CapRover](./terraform_caprover.html) +- [CapRover](terraform_caprover.md) diff --git a/collections/tfgrid4specs/bootstrap.md b/collections/tfgrid4specs/bootstrap.md new file mode 100644 index 0000000..66962bb --- /dev/null +++ b/collections/tfgrid4specs/bootstrap.md @@ -0,0 +1,34 @@ + +# Bootstrap + +```mermaid +flowchart TD + + subgraph TFV1[TF Validator Stack] + TFH(TFBoot Server) + TFR(TFRegistrar) + FARMP1(FarmingPool Coordinator) + end + + subgraph TFV2[TF Validator Stack] + TFH2(TFBoot Server) + TFR2(TFRegistrar) + FARMP2(FarmingPool Coordinator) + end + + + subgraph ZOS1[Zero OS] + Kernel --- ZINIT(ZInit) + ZOS(Bootstrap on ZOS) --- Kernel + MY(Mycelium Agent) + ZINIT --> MY + TFH ---|Internet| ZOS + TFH2 --- ZOS + ZINIT -->|Mycelium| FARMP1 + ZINIT --> |Mycelium| FARMP2 + ZINIT -->TFR + ZINIT --> TFR2 + end + + +``` diff --git a/collections/tfgrid4specs/bootstrap_zos.md b/collections/tfgrid4specs/bootstrap_zos.md new file mode 100644 index 0000000..5f2c31b --- /dev/null +++ b/collections/tfgrid4specs/bootstrap_zos.md @@ -0,0 +1,61 @@ + +# Bootstrap ZOS + +- automated build process for arm64, amd64 +- recent kernel +- the configuration of the zinit is done on Bootstrap server (which registrars to connect to, the config file) +- download the intitial needed binaries and config files from the bootstrap server + - when downloading the files check an md5 and check the signature with the specified pub key of bootstrap server + - is done by means of a list (text file) which describes the files which need to be downloaded and hash + - the list is signed with priv key of the bootstrap server + - binaries we need are zinit, mycelium, youki, ttyd and other minimum required components + +when booting the node we specify, + +is then part part of the iso or image created + +- md5 of bootstrap config file +- public key of the bootstrap server (to verify the list of binary files) +- url of Bootstrap server (can be http(s), ...) +- farmerid (no longer going to tfchain, for now just used and put a value in zos we can query) +- farmingpoolid (for now just used and put a value in zos we can query) + +### the config file + +content + +- registrars see zinit config +- size of root partition (if 0 then ramdisk) +- which mycelium nodes to connect to +- debug mode, see ttyd,if debug mode specify which mycelium nodes can connect as debugger +- root ttyd (for debug purposes, is not enabled by default, needs passwd and mycelium only) +- description (so the user using bootstrap can see what is going on) +- different location (by name) of the binaries e.g. useful for debug +- ? + +the person who sets up (admin) a bootstrap server can specify different config files, +when creating the image the user can chose which config file, if only 1 then no +choice. + +the admin can create more than 1 dir with the binary files needed. +there is a tool which creates a list of the dir and signs this list with the private key of the bootstrap server. + + +## requirements + +- good decent logging to screen if user asks to see +- no need to download an flist to get through the bootstrap (the intial used files are downloaded directly from bootstrap server) +- small image +- everyone an build their own bootstrap server + +## remarks + +- maybe zinit should be part of the bootstrap in the image, and zinit can download the required binaries like ttyd, mycelium,youki +- maybe a small 1 GB root parition should be created to have just these intital files, so it doesn't have to be downloaded all the time. + +## alternatives + +- use flist approach, want to try to keep all as simple as possible though, this +widens the components needed, if we use flists then need to be part of same +bootstrap server, so we basically have it all embedded in one easy to use +component. diff --git a/collections/tfgrid4specs/components.md b/collections/tfgrid4specs/components.md new file mode 100644 index 0000000..30aef7a --- /dev/null +++ b/collections/tfgrid4specs/components.md @@ -0,0 +1,26 @@ + +# Implementation Details for the components + +## TFBoot Server + +- existing boot server with required add ons + +## TFRegistrar + +- openrpc/vlang +- first version uses postgresql replicated cluster + + +## FarmingPool Coordinator + +- openrpc/vlang +- first version uses postgresql replicated cluster + +## Zinit + +- started as part of bootstrap +- connects back to TFRegistrar, to see what needs to be done if anything + +## Mycelium Agent + +- starts from zinit diff --git a/collections/tfgrid4specs/components_tech.md b/collections/tfgrid4specs/components_tech.md new file mode 100644 index 0000000..be190c4 --- /dev/null +++ b/collections/tfgrid4specs/components_tech.md @@ -0,0 +1,30 @@ + + +## TFBoot Server + +- abilty to generate an ISO, PXE bootable image, ... to boot a node +- the chosen server will boot over the network and connect back to the TFBoot server which created the image. + +## TFRegistrar + +- a service that will register the node on the TFGrid 4.x network +- is new for 4.x, no longer uses TFChain +- initial functions + - identity management (users, farmers, kyc/aml, peerreview... ) + - farming pool registrar (which farming pools exist, ...) + - bootstrap init (initial bootstrap of the network, also failback mechanism in case of disaster) + + +## FarmingPool Coordinator + +- node management (register, unregister, ...) +- reward distribution (to farmers who are part of pool) +- marketplace, find cloud,AI, ... slices or other services +- yield management (make sure nodes are filled up as good as possible) +- fiat to TFT/INCA conversion (optional) +- monitoring for the nodes in the farmingpool +- service level management (SLA, ...) + +## Mycelium Agent + +- our overlay network which gives end2end encryption, connectivity, ... diff --git a/collections/tfgrid4specs/intro.md b/collections/tfgrid4specs/intro.md index 1082667..2890785 100644 --- a/collections/tfgrid4specs/intro.md +++ b/collections/tfgrid4specs/intro.md @@ -1,2 +1,18 @@ -# Specifications TFGrid 4 +# Specs for TFGrid 4 Bootstap process + +Our aim is to simplify the way how we bootstrap our TFGrid 4, +The bootstrap can run on existing linux as well as on ZOS 4. + + +## WHY + +- more modular development +- ready for slices, ... +- easier to debug +- no more tfchain +- ready for serverless functions +- ready for billing, ... +- ready to run on more platforms (windows, osx, linux, zos, ...) through zinit as base workload manager + +this will allow us to also roll out agents (hero) much faster and easier. diff --git a/collections/tfgrid4specs/openrpc.md b/collections/tfgrid4specs/openrpc.md new file mode 100644 index 0000000..3ba8d26 --- /dev/null +++ b/collections/tfgrid4specs/openrpc.md @@ -0,0 +1,45 @@ +# OpenRPC + +we use OpenRPC on the Registrar and other services. + + +The OpenRPC is exposed over rest (and later over other protocols). + +- rpc_in + - rpc_id (string) : a unique id for the rpc call + - method_name + - params (json as text, encrypted with the mycelium pubkey of the rpc server) + - pubkey (string) : the pubkey of the caller mycelium agent + - signature (rpc_id+method_name+params+return_url+returl_topic signed with Mycelium Agent Priv key of the sender) + - async (bool) : if the call should be async, if async will send as message back over mycelium to source, if return url will use that one + - return_url (string) : the url to return the result, optional to async return the result to sender (source) + - return_topic (string): for the sender to know what the return is for +- rpc_return (for async return) + - rpc_id (string) : a unique id for the rpc call needs to correspond to the rpc_in and source caller + - method_name + - pubkey (string) : the pubkey of the rpc server + - signature (the result is signed with Mycelium Agent of the server for: rpc_id+method_name+params+result) + - topic (string) + - result (json as text, encrypted with the mycelium pubkey of the source caller) +- rpc_check returns the status of the rpc call which is done, error, running or pending + - rpc_id + - signature (of rpc_id from the caller) +- rpc_kill stop the rpc if it is running and would e.g. take too long + - rpc_id + - signature (of rpc_id from the caller) + +Because of signatures on the caller can stop a call or check status + +if return_url is provided: + +- the server will process and if async send result back as json over mycelium to the source or over http to the return_url + +the rpc_return is called by an rpc_server to return results to the caller + +see [openrpc_openapi_spec](openrpc_openapi_spec.md) for the OpenRPC spec on top of Rest. + +## Implementation Details + +- the state of the calls on server is kept in redis +- timeouts need to be implemented on the server +- the encryption & signing is used to provide security diff --git a/collections/tfgrid4specs/openrpc_openapi_spec.md b/collections/tfgrid4specs/openrpc_openapi_spec.md new file mode 100644 index 0000000..3524ae2 --- /dev/null +++ b/collections/tfgrid4specs/openrpc_openapi_spec.md @@ -0,0 +1,286 @@ +## openapi spec as endpoint for OpenRPC Rest Server + +copy paste in https://editor.swagger.io/ + +```json +{ + "openapi": "3.0.0", + "info": { + "title": "Mycelium Agent RPC API", + "description": "An API for Mycelium Agent for handling asynchronous tasks, returning results, and managing RPC call statuses.", + "version": "1.0.0" + }, + "paths": { + "/rpc_in": { + "post": { + "summary": "Initiates an RPC call", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/RPCIn" + } + } + } + }, + "responses": { + "200": { + "description": "RPC initiated", + "content": { + "application/json": { + "schema": { + "type": "object", + "properties": { + "rpc_id": { + "type": "string", + "description": "Unique identifier of the initiated RPC call" + } + } + } + } + } + } + } + } + }, + "/rpc_return": { + "post": { + "summary": "Handles an asynchronous return of an RPC call result", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/RPCReturn" + } + } + } + }, + "responses": { + "200": { + "description": "RPC return received", + "content": { + "application/json": { + "schema": { + "type": "object", + "properties": { + "confirmation": { + "type": "string", + "example": "RPC return successfully received" + } + } + } + } + } + } + } + } + }, + "/rpc_check": { + "get": { + "summary": "Checks the status of an RPC call", + "parameters": [ + { + "name": "rpc_id", + "in": "query", + "required": true, + "schema": { + "type": "string" + }, + "description": "The unique identifier of the RPC call" + }, + { + "name": "signature", + "in": "query", + "required": true, + "schema": { + "type": "string" + }, + "description": "Signature of the rpc_id, signed by the caller" + } + ], + "responses": { + "200": { + "description": "Status of the RPC call", + "content": { + "application/json": { + "schema": { + "type": "string", + "enum": ["done", "error", "running", "pending"] + } + } + } + } + } + } + }, + "/rpc_kill": { + "post": { + "summary": "Stops an RPC call that is running", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/RPCKill" + } + } + } + }, + "responses": { + "200": { + "description": "RPC call stopped", + "content": { + "application/json": { + "schema": { + "type": "object", + "properties": { + "confirmation": { + "type": "string", + "example": "RPC call 12345 has been stopped" + } + } + } + } + } + } + } + } + } + }, + "components": { + "schemas": { + "RPCIn": { + "type": "object", + "required": [ + "rpc_id", + "method_name", + "params", + "pubkey", + "signature", + "async" + ], + "properties": { + "rpc_id": { + "type": "string", + "description": "A unique identifier for the RPC call." + }, + "method_name": { + "type": "string", + "description": "The name of the method being called." + }, + "params": { + "type": "object", + "description": "The parameters for the method call in JSON format, is encrypted." + }, + "pubkey": { + "type": "string", + "description": "The public key of the Mycelium Agent making the call." + }, + "signature": { + "type": "string", + "description": "A signature of rpc_id + method_name + params + return_url + return_topic, signed with the Mycelium Agent private key." + }, + "async": { + "type": "boolean", + "description": "Indicates whether the call should be asynchronous." + }, + "return_url": { + "type": "string", + "nullable": true, + "description": "The URL to return the result. Optional, used when async is true." + }, + "return_topic": { + "type": "string", + "description": "The topic for the sender to know what the return result is related to." + } + }, + "example": { + "rpc_id": "12345", + "method_name": "get_data", + "params": { "key": "value" }, + "pubkey": "abc123", + "signature": "signeddata", + "async": true, + "return_url": "http://callback.url/result", + "return_topic": "my_topic" + } + }, + "RPCReturn": { + "type": "object", + "required": [ + "rpc_id", + "method_name", + "params", + "pubkey", + "signature", + "topic", + "result" + ], + "properties": { + "rpc_id": { + "type": "string", + "description": "The unique identifier of the RPC call, corresponding to the original call." + }, + "method_name": { + "type": "string", + "description": "The name of the method being returned." + }, + "params": { + "type": "object", + "description": "The parameters of the original method in JSON format." + }, + "pubkey": { + "type": "string", + "description": "The public key of the RPC server." + }, + "signature": { + "type": "string", + "description": "Signature of rpc_id + method_name + params + result, signed with the server's private key." + }, + "topic": { + "type": "string", + "description": "The topic to identify the return message." + }, + "result": { + "type": "object", + "description": "The result of the RPC call in JSON format." + } + }, + "example": { + "rpc_id": "12345", + "method_name": "get_data", + "params": { "key": "value" }, + "pubkey": "server_pubkey", + "signature": "signed_result_data", + "topic": "my_topic", + "result": { "data": "returned_value" } + } + }, + "RPCKill": { + "type": "object", + "required": [ + "rpc_id", + "signature" + ], + "properties": { + "rpc_id": { + "type": "string", + "description": "The unique identifier of the RPC call to stop." + }, + "signature": { + "type": "string", + "description": "The signature of the rpc_id, signed by the caller." + } + }, + "example": { + "rpc_id": "12345", + "signature": "signed_rpc_id" + } + } + } + } +} + +``` diff --git a/collections/tfgrid4specs/test.md b/collections/tfgrid4specs/test.md deleted file mode 100644 index c3aede4..0000000 --- a/collections/tfgrid4specs/test.md +++ /dev/null @@ -1,4 +0,0 @@ - -# test - -- link [link](tfgrid4:architecture.md) \ No newline at end of file diff --git a/collections/tfgrid4specs/zinit2.md b/collections/tfgrid4specs/zinit2.md new file mode 100644 index 0000000..7333454 --- /dev/null +++ b/collections/tfgrid4specs/zinit2.md @@ -0,0 +1,47 @@ +# Zinit 2 + +- zinit will register over openrpc with TFRegistrar(s) +- zinit needs support for flists +- zinit needs support for runc +- zinit can modify its zinit unit files for properly signed instructions from TFRegistrar(s) + +## multiplatform + +- can run in ZOS4 +- can run on top of Ubuntu 24.04 and Arch Linux (probably more later) + +## config file + +zinit2 can be started with following config file, this will tell zinit2 to talk to a registrar and take instructions. + +```json +{ + "TFRegistrarServers": [ + { + "name": "Registrar1", + "url": "http://192.168.1.1:8080", + "pub_key": "abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890" + }, + { + "name": "Registrar2", + "url": "http://192.168.1.2:8081", + "pub_key": "fedcba0987654321fedcba0987654321fedcba0987654321fedcba0987654321" + }, + { + "name": "Registrar3", + "url": "http://192.168.1.3:8082", + "pub_key": "1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef" + } + ], + "min_servers_required_for_signing": 2, + "debug": false +} + +``` + +url can be ipv6 or a name, also https + + +## implementation + +Have a driver which uses zinit, keep zinit small, do in V. diff --git a/collections/tfgrid4specs/zinit_flist.md b/collections/tfgrid4specs/zinit_flist.md new file mode 100644 index 0000000..28d9bf3 --- /dev/null +++ b/collections/tfgrid4specs/zinit_flist.md @@ -0,0 +1,15 @@ +# Zinit Flist + +- add ability to download flists and use as rootfs for the zinit process +- md5 of flist can be set, and zinit will check if the flist is still valid +- we need a workdir into zinit, which then is the root of the flist +- specify if its read only or we allow write (with overlayfs) + +## implementation + +Have a driver which uses zinit, keep zinit small, do in V. + +## todo first + +- make tutorial how to mount flist, how to use the new flist hub, how to mount it readonly-readwrite +- check how to use runc to mount an flist diff --git a/collections/tfgrid4specs/zinit_registration.md b/collections/tfgrid4specs/zinit_registration.md new file mode 100644 index 0000000..dd4e6bc --- /dev/null +++ b/collections/tfgrid4specs/zinit_registration.md @@ -0,0 +1,62 @@ + +## registration + + + +Zinit needs tools to get this info and report it to the registrar. + +```go +struct Registration { + pub_key string //public key of the node mycelium + mycelium_address string //the ipv6 addr + capacity Capacity + pub_key_signature string //signed pubkey with TPM on motherboard +} + +struct Capacity { + memory_gb f64 // Memory size in GB + disks []Disk // List of disks (both SSDs and HDDs) + cpu CPU // Enum for CPU type +} + +struct CPU { + cpu_type CPUType // Size of the disk in GB + description string + cpu_vcores int // Number of CPU virtual cores +} + + +struct Disk { + size_gb f64 // Size of the disk in GB + disk_type DiskType // Enum for disk type (SSD or HDD) +} + +// Enum for disk types +enum DiskType { + ssd + hdd +} +// Enum for CPU types +enum CPUType { + intel_xeon + amd_epyc + intel_core9 +} + + +``` + +the registration is done to all known registrars using openrpc + +- register +- json payload +- ... see the openrpc spec rest server + +failsafe + +- zinit does this every hour on each know registrar, will be used for watchdog +- zinit at start keeps on trying for at least 1h on all servers each 5 sec, once a registrar found go to maintenance mode (which is once an hour) + +## implementation + +Have a driver which uses zinit, keep zinit small, do in V. diff --git a/collections/tfgrid4specs/zinit_runc.md b/collections/tfgrid4specs/zinit_runc.md new file mode 100644 index 0000000..17f102e --- /dev/null +++ b/collections/tfgrid4specs/zinit_runc.md @@ -0,0 +1,24 @@ +# Zinit RunC + +- json as defined in https://github.com/opencontainers/runtime-spec +- use https://github.com/containers/youki (maybe even better integrate it in our zinit binary) to execute +- allow flist in mounts (so we can mount an flist in a runc container) +- allow to attach https://github.com/tsl0922/ttyd to the runc container (can be separate process in zinit) + - set passwd, set listening port & host interface (e.g. mycelium) + + +## todo first + +- tutorial how to use runc spec and mount it +- make example how to use ttyd with runc +- make example e.g. postgresql running in runc starting from our podman/buildah (hercontainers). we have that installer + +try ai prompt + +``` +can we export the runc json from podman, and how can we run it manually using runc ourselves +``` + +## implementation + +Have a driver which uses zinit, keep zinit small, do in V. diff --git a/collections/tfgrid4specs/zinit_units_config.md b/collections/tfgrid4specs/zinit_units_config.md new file mode 100644 index 0000000..c9d1e05 --- /dev/null +++ b/collections/tfgrid4specs/zinit_units_config.md @@ -0,0 +1,40 @@ + +## Units Config + +- zinit is using unit files (which describes a service) +- the functionality described here allows zinit to reconfigure itself so we can always get out of issues + +there are 3 main reasons to have this functionality + +1. debug/development (only if debug flag is set in config) +2. fallback/disaster recovery +3. bootstrap, for the first initial setup, a node will receive the required setup in zinit, e.g. connect to farmingpool... + +in normal mode the zinit will contact the registrar once an hour and check if there is something to be done. + +there are 2 modes + +- maintenance: check every 1h +- active: check every 5 sec + +some prinpciples + +- each instruction given to zero-os needs to be properly signed by the required amount of registrars. +- each instruction is a openrpc instruction where we use the openrpc return mechanism as described in [openrpc.md](openrpc.md). + +## available instructions + +- method_name: mode_active + - params: + - enddate : int (epoch time when to switch to maintenance mode, can never be longer than 2h) + - nothing to return +- method_name: zinit_list + - returns list of all units (service files) and their status +- method_name: zinit_set + - set a zinit unit file (service file) with all possibilities (see zinit specs) +- method_name: zinit_delete + - name of the zinit unit file + + ## implementation + + Have a driver which uses zinit, keep zinit small, do in V. diff --git a/collections/tfgridsimulation_farming/nodes/node_1u.md b/collections/tfgridsimulation_farming/nodes/node_1u.md index 039bc2f..647d6a9 100644 --- a/collections/tfgridsimulation_farming/nodes/node_1u.md +++ b/collections/tfgridsimulation_farming/nodes/node_1u.md @@ -2,4 +2,4 @@ -!!!tfgridsimulation_farming.node_wiki name:'1u' +!!tfgridsimulation_farming.node_wiki name:'1u' diff --git a/collections/tfgridsimulation_farming/regionalinternet.md b/collections/tfgridsimulation_farming/regionalinternet.md index b052d24..acfd286 100644 --- a/collections/tfgridsimulation_farming/regionalinternet.md +++ b/collections/tfgridsimulation_farming/regionalinternet.md @@ -2,4 +2,4 @@ ## Regional Internets -!!!tfgridsimulation_farming.regionalinternet_wiki name:'znz' \ No newline at end of file +!!tfgridsimulation_farming.regionalinternet_wiki name:'znz' \ No newline at end of file diff --git a/heroscript/manual/sshkey.md b/heroscript/manual/sshkey.md deleted file mode 100644 index 85acfe6..0000000 --- a/heroscript/manual/sshkey.md +++ /dev/null @@ -1,14 +0,0 @@ - -```js -!!sshagent.key_add - name:'books' - privkey:' - -----BEGIN OPENSSH PRIVATE KEY----- - b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW - QyNTUxOQAAACDXf9Z/2AH8/8a1ppagCplQdhWyQ8wZAieUw3nNcxsDiQAAAIhb3ybRW98m - 0QAAAAtzc2gtZWQyNTUxOQAAACDXf9Z/2AH8/8a1ppagCplQdhWyQ8wZAieUw3nNcxsDiQ - AAAEC+fcDBPqdJHlJOQJ2zXhU2FztKAIl3TmWkaGCPnyts49d/1n/YAfz/xrWmlqAKmVB2 - FbJDzBkCJ5TDec1zGwOJAAAABWJvb2tz - -----END OPENSSH PRIVATE KEY----- - ' -``` \ No newline at end of file diff --git a/heroscript/sysadmins/sshkey.md b/heroscript/sysadmins/sshkey.md index 85acfe6..2069c58 100644 --- a/heroscript/sysadmins/sshkey.md +++ b/heroscript/sysadmins/sshkey.md @@ -1,5 +1,4 @@ - -```js + \ No newline at end of file diff --git a/heroscript/tfgrid4specs/SUMMARY.md b/heroscript/tfgrid4specs/SUMMARY.md new file mode 120000 index 0000000..fe57dc8 --- /dev/null +++ b/heroscript/tfgrid4specs/SUMMARY.md @@ -0,0 +1 @@ +../../books/tfgrid4specs/SUMMARY.md \ No newline at end of file diff --git a/heroscript/tfgrid4specs/context.md b/heroscript/tfgrid4specs/context.md deleted file mode 100644 index a8f5892..0000000 --- a/heroscript/tfgrid4specs/context.md +++ /dev/null @@ -1,11 +0,0 @@ - -```js - -!!books.configure - buildroot:'~/hero/var/mdbuild' - publishroot:'~/hero/www/info' - install:true - reset:false - -``` - diff --git a/heroscript/tfgrid4specs/develop.sh b/heroscript/tfgrid4specs/develop.sh new file mode 100755 index 0000000..195f82e --- /dev/null +++ b/heroscript/tfgrid4specs/develop.sh @@ -0,0 +1,8 @@ +#!/bin/bash +set -ex + +#~/code/github/freeflowuniverse/crystallib/cli/hero/compile_debug.sh + +hero mdbook -u https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/development/heroscript/tfgrid4specs -o + + diff --git a/heroscript/tfgrid4specs/sshkey.md b/heroscript/tfgrid4specs/sshkey.md deleted file mode 100644 index 85acfe6..0000000 --- a/heroscript/tfgrid4specs/sshkey.md +++ /dev/null @@ -1,14 +0,0 @@ - -```js -!!sshagent.key_add - name:'books' - privkey:' - -----BEGIN OPENSSH PRIVATE KEY----- - b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW - QyNTUxOQAAACDXf9Z/2AH8/8a1ppagCplQdhWyQ8wZAieUw3nNcxsDiQAAAIhb3ybRW98m - 0QAAAAtzc2gtZWQyNTUxOQAAACDXf9Z/2AH8/8a1ppagCplQdhWyQ8wZAieUw3nNcxsDiQ - AAAEC+fcDBPqdJHlJOQJ2zXhU2FztKAIl3TmWkaGCPnyts49d/1n/YAfz/xrWmlqAKmVB2 - FbJDzBkCJ5TDec1zGwOJAAAABWJvb2tz - -----END OPENSSH PRIVATE KEY----- - ' -``` \ No newline at end of file diff --git a/heroscript/tfgrid4specs/sync_production.sh b/heroscript/tfgrid4specs/sync_production.sh new file mode 100755 index 0000000..2942ee7 --- /dev/null +++ b/heroscript/tfgrid4specs/sync_production.sh @@ -0,0 +1,3 @@ +#!/bin/bash +hero mdbook -u https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/heroscript/tfgrid4specs +rsync -rv --delete ~/hero/www/info/tfgrid4specs/ root@info.ourworld.tf:/root/hero/www/info/tfgrid4specs/