diff --git a/README.md b/README.md index c02b62f..d306e35 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ - [Basic Hero mdBook Commands](#basic-hero-mdbook-commands) - [Install and Use Hero](#install-and-use-hero) - [Create a New mdBook](#create-a-new-mdbook) +- [Use Hero with Docker](#use-hero-with-docker) - [Contribute](#contribute) ## Overview @@ -50,6 +51,10 @@ To install and use Hero on a full VM running on the grid, read the [full VM guid To create a new mdbook, read the [mdbook creation guide](https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/docs/hero_create_mdbook.md). +## Use Hero with Docker + +You can use Hero with Docker. Read the docs [here](https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/docs/hero_mdbook_docker.md). + ## Contribute To contribute to this repository, make a pull request of your changes. diff --git a/collections/technology/.collection b/_archive/technology/.collection similarity index 100% rename from collections/technology/.collection rename to _archive/technology/.collection diff --git a/collections/technology/architecture/cloud_architecture_.md b/_archive/technology/architecture/cloud_architecture_.md similarity index 100% rename from collections/technology/architecture/cloud_architecture_.md rename to _archive/technology/architecture/cloud_architecture_.md diff --git a/collections/technology/architecture/cloud_wallet_.md b/_archive/technology/architecture/cloud_wallet_.md similarity index 100% rename from collections/technology/architecture/cloud_wallet_.md rename to _archive/technology/architecture/cloud_wallet_.md diff --git a/collections/technology/architecture/evdc_qsfs_get_started_.md b/_archive/technology/architecture/evdc_qsfs_get_started_.md similarity index 100% rename from collections/technology/architecture/evdc_qsfs_get_started_.md rename to _archive/technology/architecture/evdc_qsfs_get_started_.md diff --git a/collections/technology/architecture/img/3bot_wallet_detail.jpg b/_archive/technology/architecture/img/3bot_wallet_detail.jpg similarity index 100% rename from collections/technology/architecture/img/3bot_wallet_detail.jpg rename to _archive/technology/architecture/img/3bot_wallet_detail.jpg diff --git a/collections/technology/architecture/img/3layers_tf_.jpg b/_archive/technology/architecture/img/3layers_tf_.jpg similarity index 100% rename from collections/technology/architecture/img/3layers_tf_.jpg rename to _archive/technology/architecture/img/3layers_tf_.jpg diff --git a/collections/technology/architecture/img/architecture_why_us.jpg b/_archive/technology/architecture/img/architecture_why_us.jpg similarity index 100% rename from collections/technology/architecture/img/architecture_why_us.jpg rename to _archive/technology/architecture/img/architecture_why_us.jpg diff --git a/collections/technology/architecture/img/planet_fs.jpg b/_archive/technology/architecture/img/planet_fs.jpg similarity index 100% rename from collections/technology/architecture/img/planet_fs.jpg rename to _archive/technology/architecture/img/planet_fs.jpg diff --git a/collections/technology/architecture/img/planetaryfs_add_node.jpg b/_archive/technology/architecture/img/planetaryfs_add_node.jpg similarity index 100% rename from collections/technology/architecture/img/planetaryfs_add_node.jpg rename to _archive/technology/architecture/img/planetaryfs_add_node.jpg diff --git a/collections/technology/architecture/img/planetaryfs_bootstrap_ready.jpg b/_archive/technology/architecture/img/planetaryfs_bootstrap_ready.jpg similarity index 100% rename from collections/technology/architecture/img/planetaryfs_bootstrap_ready.jpg rename to _archive/technology/architecture/img/planetaryfs_bootstrap_ready.jpg diff --git a/collections/technology/architecture/img/planetaryfs_enable_qs.jpg b/_archive/technology/architecture/img/planetaryfs_enable_qs.jpg similarity index 100% rename from collections/technology/architecture/img/planetaryfs_enable_qs.jpg rename to _archive/technology/architecture/img/planetaryfs_enable_qs.jpg diff --git a/collections/technology/architecture/img/planetaryfs_farm.jpg b/_archive/technology/architecture/img/planetaryfs_farm.jpg similarity index 100% rename from collections/technology/architecture/img/planetaryfs_farm.jpg rename to _archive/technology/architecture/img/planetaryfs_farm.jpg diff --git a/collections/technology/architecture/img/planetaryfs_pay.jpg b/_archive/technology/architecture/img/planetaryfs_pay.jpg similarity index 100% rename from collections/technology/architecture/img/planetaryfs_pay.jpg rename to _archive/technology/architecture/img/planetaryfs_pay.jpg diff --git a/collections/technology/architecture/img/planetaryfs_zstor_config.jpg b/_archive/technology/architecture/img/planetaryfs_zstor_config.jpg similarity index 100% rename from collections/technology/architecture/img/planetaryfs_zstor_config.jpg rename to _archive/technology/architecture/img/planetaryfs_zstor_config.jpg diff --git a/collections/tech/qsss/img/quantum_safe_storage.jpg b/_archive/technology/architecture/img/quantum_safe_storage.jpg similarity index 100% rename from collections/tech/qsss/img/quantum_safe_storage.jpg rename to _archive/technology/architecture/img/quantum_safe_storage.jpg diff --git a/collections/technology/architecture/img/quantum_safe_storage_scale.jpg b/_archive/technology/architecture/img/quantum_safe_storage_scale.jpg similarity index 100% rename from collections/technology/architecture/img/quantum_safe_storage_scale.jpg rename to _archive/technology/architecture/img/quantum_safe_storage_scale.jpg diff --git a/collections/technology/architecture/threefold_filesystem.md b/_archive/technology/architecture/threefold_filesystem.md similarity index 100% rename from collections/technology/architecture/threefold_filesystem.md rename to _archive/technology/architecture/threefold_filesystem.md diff --git a/collections/technology/concepts/buying_storing_tft.md b/_archive/technology/concepts/buying_storing_tft.md similarity index 100% rename from collections/technology/concepts/buying_storing_tft.md rename to _archive/technology/concepts/buying_storing_tft.md diff --git a/collections/technology/concepts/concepts_readme.md b/_archive/technology/concepts/concepts_readme.md similarity index 100% rename from collections/technology/concepts/concepts_readme.md rename to _archive/technology/concepts/concepts_readme.md diff --git a/collections/technology/concepts/contract_grace_period.md b/_archive/technology/concepts/contract_grace_period.md similarity index 100% rename from collections/technology/concepts/contract_grace_period.md rename to _archive/technology/concepts/contract_grace_period.md diff --git a/collections/technology/concepts/grid3_components.md b/_archive/technology/concepts/grid3_components.md similarity index 100% rename from collections/technology/concepts/grid3_components.md rename to _archive/technology/concepts/grid3_components.md diff --git a/collections/technology/concepts/grid3_iac.md b/_archive/technology/concepts/grid3_iac.md similarity index 100% rename from collections/technology/concepts/grid3_iac.md rename to _archive/technology/concepts/grid3_iac.md diff --git a/collections/technology/concepts/grid3_whatsnew.md b/_archive/technology/concepts/grid3_whatsnew.md similarity index 100% rename from collections/technology/concepts/grid3_whatsnew.md rename to _archive/technology/concepts/grid3_whatsnew.md diff --git a/collections/technology/concepts/grid_primitives.md b/_archive/technology/concepts/grid_primitives.md similarity index 100% rename from collections/technology/concepts/grid_primitives.md rename to _archive/technology/concepts/grid_primitives.md diff --git a/collections/technology/concepts/img/.done b/_archive/technology/concepts/img/.done similarity index 100% rename from collections/technology/concepts/img/.done rename to _archive/technology/concepts/img/.done diff --git a/collections/technology/concepts/img/layers.jpg b/_archive/technology/concepts/img/layers.jpg similarity index 100% rename from collections/technology/concepts/img/layers.jpg rename to _archive/technology/concepts/img/layers.jpg diff --git a/collections/technology/concepts/img/manual_grace_period_graphql_node.png b/_archive/technology/concepts/img/manual_grace_period_graphql_node.png similarity index 100% rename from collections/technology/concepts/img/manual_grace_period_graphql_node.png rename to _archive/technology/concepts/img/manual_grace_period_graphql_node.png diff --git a/collections/technology/concepts/img/manual_grace_period_graphql_rent.png b/_archive/technology/concepts/img/manual_grace_period_graphql_rent.png similarity index 100% rename from collections/technology/concepts/img/manual_grace_period_graphql_rent.png rename to _archive/technology/concepts/img/manual_grace_period_graphql_rent.png diff --git a/collections/technology/concepts/img/manual_grace_period_gridproxy.png b/_archive/technology/concepts/img/manual_grace_period_gridproxy.png similarity index 100% rename from collections/technology/concepts/img/manual_grace_period_gridproxy.png rename to _archive/technology/concepts/img/manual_grace_period_gridproxy.png diff --git a/collections/technology/concepts/img/manual_grace_period_polkadot_ui.png b/_archive/technology/concepts/img/manual_grace_period_polkadot_ui.png similarity index 100% rename from collections/technology/concepts/img/manual_grace_period_polkadot_ui.png rename to _archive/technology/concepts/img/manual_grace_period_polkadot_ui.png diff --git a/collections/technology/concepts/img/manual_grace_period_weblets.png b/_archive/technology/concepts/img/manual_grace_period_weblets.png similarity index 100% rename from collections/technology/concepts/img/manual_grace_period_weblets.png rename to _archive/technology/concepts/img/manual_grace_period_weblets.png diff --git a/collections/technology/concepts/img/payment.png b/_archive/technology/concepts/img/payment.png similarity index 100% rename from collections/technology/concepts/img/payment.png rename to _archive/technology/concepts/img/payment.png diff --git a/collections/technology/concepts/img/tft.png b/_archive/technology/concepts/img/tft.png similarity index 100% rename from collections/technology/concepts/img/tft.png rename to _archive/technology/concepts/img/tft.png diff --git a/collections/technology/concepts/proof_of_utilization.md b/_archive/technology/concepts/proof_of_utilization.md similarity index 100% rename from collections/technology/concepts/proof_of_utilization.md rename to _archive/technology/concepts/proof_of_utilization.md diff --git a/collections/technology/concepts/tfchain.md b/_archive/technology/concepts/tfchain.md similarity index 100% rename from collections/technology/concepts/tfchain.md rename to _archive/technology/concepts/tfchain.md diff --git a/collections/technology/concepts/tfgrid_by_design.md b/_archive/technology/concepts/tfgrid_by_design.md similarity index 100% rename from collections/technology/concepts/tfgrid_by_design.md rename to _archive/technology/concepts/tfgrid_by_design.md diff --git a/collections/technology/consensus3_mechanism/consensus3.md b/_archive/technology/consensus3_mechanism/consensus3.md similarity index 100% rename from collections/technology/consensus3_mechanism/consensus3.md rename to _archive/technology/consensus3_mechanism/consensus3.md diff --git a/collections/technology/consensus3_mechanism/consensus3_engine_farming.md b/_archive/technology/consensus3_mechanism/consensus3_engine_farming.md similarity index 100% rename from collections/technology/consensus3_mechanism/consensus3_engine_farming.md rename to _archive/technology/consensus3_mechanism/consensus3_engine_farming.md diff --git a/collections/technology/consensus3_mechanism/consensus3_oracles.md b/_archive/technology/consensus3_mechanism/consensus3_oracles.md similarity index 100% rename from collections/technology/consensus3_mechanism/consensus3_oracles.md rename to _archive/technology/consensus3_mechanism/consensus3_oracles.md diff --git a/collections/technology/consensus3_mechanism/consensus3_overview_graph.md b/_archive/technology/consensus3_mechanism/consensus3_overview_graph.md similarity index 100% rename from collections/technology/consensus3_mechanism/consensus3_overview_graph.md rename to _archive/technology/consensus3_mechanism/consensus3_overview_graph.md diff --git a/collections/technology/consensus3_mechanism/consensus3_principles.md b/_archive/technology/consensus3_mechanism/consensus3_principles.md similarity index 100% rename from collections/technology/consensus3_mechanism/consensus3_principles.md rename to _archive/technology/consensus3_mechanism/consensus3_principles.md diff --git a/collections/technology/consensus3_mechanism/consensus3_toc.md b/_archive/technology/consensus3_mechanism/consensus3_toc.md similarity index 100% rename from collections/technology/consensus3_mechanism/consensus3_toc.md rename to _archive/technology/consensus3_mechanism/consensus3_toc.md diff --git a/collections/technology/consensus3_mechanism/img/grid_header.jpg b/_archive/technology/consensus3_mechanism/img/grid_header.jpg similarity index 100% rename from collections/technology/consensus3_mechanism/img/grid_header.jpg rename to _archive/technology/consensus3_mechanism/img/grid_header.jpg diff --git a/collections/technology/consensus3_mechanism/img/limitedsupply_.png b/_archive/technology/consensus3_mechanism/img/limitedsupply_.png similarity index 100% rename from collections/technology/consensus3_mechanism/img/limitedsupply_.png rename to _archive/technology/consensus3_mechanism/img/limitedsupply_.png diff --git a/collections/technology/consensus3_mechanism/money_blockchain_partity_link.md b/_archive/technology/consensus3_mechanism/money_blockchain_partity_link.md similarity index 100% rename from collections/technology/consensus3_mechanism/money_blockchain_partity_link.md rename to _archive/technology/consensus3_mechanism/money_blockchain_partity_link.md diff --git a/collections/technology/consensus3_mechanism/roadmap_tfchain3.md b/_archive/technology/consensus3_mechanism/roadmap_tfchain3.md similarity index 100% rename from collections/technology/consensus3_mechanism/roadmap_tfchain3.md rename to _archive/technology/consensus3_mechanism/roadmap_tfchain3.md diff --git a/collections/technology/consensus3_mechanism/tfgrid3_wallets.md b/_archive/technology/consensus3_mechanism/tfgrid3_wallets.md similarity index 100% rename from collections/technology/consensus3_mechanism/tfgrid3_wallets.md rename to _archive/technology/consensus3_mechanism/tfgrid3_wallets.md diff --git a/collections/technology/consensus3_mechanism/tfgrid_db_models.v b/_archive/technology/consensus3_mechanism/tfgrid_db_models.v similarity index 100% rename from collections/technology/consensus3_mechanism/tfgrid_db_models.v rename to _archive/technology/consensus3_mechanism/tfgrid_db_models.v diff --git a/collections/technology/grid3_howitworks.md b/_archive/technology/grid3_howitworks.md similarity index 100% rename from collections/technology/grid3_howitworks.md rename to _archive/technology/grid3_howitworks.md diff --git a/collections/technology/img/layer0_.jpg b/_archive/technology/img/layer0_.jpg similarity index 100% rename from collections/technology/img/layer0_.jpg rename to _archive/technology/img/layer0_.jpg diff --git a/collections/technology/img/tech_architecture1.jpg b/_archive/technology/img/tech_architecture1.jpg similarity index 100% rename from collections/technology/img/tech_architecture1.jpg rename to _archive/technology/img/tech_architecture1.jpg diff --git a/collections/technology/img/tech_header.jpg b/_archive/technology/img/tech_header.jpg similarity index 100% rename from collections/technology/img/tech_header.jpg rename to _archive/technology/img/tech_header.jpg diff --git a/collections/technology/img/technology_home_.jpg b/_archive/technology/img/technology_home_.jpg similarity index 100% rename from collections/technology/img/technology_home_.jpg rename to _archive/technology/img/technology_home_.jpg diff --git a/collections/technology/layers/autonomous_layer_intro.md b/_archive/technology/layers/autonomous_layer_intro.md similarity index 100% rename from collections/technology/layers/autonomous_layer_intro.md rename to _archive/technology/layers/autonomous_layer_intro.md diff --git a/collections/technology/layers/capacity_layer_intro.md b/_archive/technology/layers/capacity_layer_intro.md similarity index 100% rename from collections/technology/layers/capacity_layer_intro.md rename to _archive/technology/layers/capacity_layer_intro.md diff --git a/collections/technology/layers/experience_layer_intro.md b/_archive/technology/layers/experience_layer_intro.md similarity index 100% rename from collections/technology/layers/experience_layer_intro.md rename to _archive/technology/layers/experience_layer_intro.md diff --git a/collections/technology/layers/technology_layers.md b/_archive/technology/layers/technology_layers.md similarity index 100% rename from collections/technology/layers/technology_layers.md rename to _archive/technology/layers/technology_layers.md diff --git a/collections/technology/primitives/compute/beyond_containers.md b/_archive/technology/primitives/compute/beyond_containers.md similarity index 100% rename from collections/technology/primitives/compute/beyond_containers.md rename to _archive/technology/primitives/compute/beyond_containers.md diff --git a/collections/technology/primitives/compute/compute_toc.md b/_archive/technology/primitives/compute/compute_toc.md similarity index 100% rename from collections/technology/primitives/compute/compute_toc.md rename to _archive/technology/primitives/compute/compute_toc.md diff --git a/collections/technology/primitives/compute/corex.md b/_archive/technology/primitives/compute/corex.md similarity index 100% rename from collections/technology/primitives/compute/corex.md rename to _archive/technology/primitives/compute/corex.md diff --git a/collections/technology/primitives/compute/img/container_native.jpg b/_archive/technology/primitives/compute/img/container_native.jpg similarity index 100% rename from collections/technology/primitives/compute/img/container_native.jpg rename to _archive/technology/primitives/compute/img/container_native.jpg diff --git a/collections/technology/primitives/compute/img/corex.jpg b/_archive/technology/primitives/compute/img/corex.jpg similarity index 100% rename from collections/technology/primitives/compute/img/corex.jpg rename to _archive/technology/primitives/compute/img/corex.jpg diff --git a/collections/technology/primitives/compute/img/kubernetes_0_.jpg b/_archive/technology/primitives/compute/img/kubernetes_0_.jpg similarity index 100% rename from collections/technology/primitives/compute/img/kubernetes_0_.jpg rename to _archive/technology/primitives/compute/img/kubernetes_0_.jpg diff --git a/collections/technology/primitives/compute/img/tfgrid_compute_.jpg b/_archive/technology/primitives/compute/img/tfgrid_compute_.jpg similarity index 100% rename from collections/technology/primitives/compute/img/tfgrid_compute_.jpg rename to _archive/technology/primitives/compute/img/tfgrid_compute_.jpg diff --git a/collections/technology/primitives/compute/img/zkube_architecture_.jpg b/_archive/technology/primitives/compute/img/zkube_architecture_.jpg similarity index 100% rename from collections/technology/primitives/compute/img/zkube_architecture_.jpg rename to _archive/technology/primitives/compute/img/zkube_architecture_.jpg diff --git a/collections/technology/primitives/compute/img/zmachine_zos_.jpg b/_archive/technology/primitives/compute/img/zmachine_zos_.jpg similarity index 100% rename from collections/technology/primitives/compute/img/zmachine_zos_.jpg rename to _archive/technology/primitives/compute/img/zmachine_zos_.jpg diff --git a/collections/technology/primitives/compute/tfgrid_compute.md b/_archive/technology/primitives/compute/tfgrid_compute.md similarity index 100% rename from collections/technology/primitives/compute/tfgrid_compute.md rename to _archive/technology/primitives/compute/tfgrid_compute.md diff --git a/collections/technology/primitives/compute/zkube.md b/_archive/technology/primitives/compute/zkube.md similarity index 100% rename from collections/technology/primitives/compute/zkube.md rename to _archive/technology/primitives/compute/zkube.md diff --git a/collections/technology/primitives/compute/zmachine.md b/_archive/technology/primitives/compute/zmachine.md similarity index 100% rename from collections/technology/primitives/compute/zmachine.md rename to _archive/technology/primitives/compute/zmachine.md diff --git a/collections/technology/primitives/network/img/overlay_net1.jpg b/_archive/technology/primitives/network/img/overlay_net1.jpg similarity index 100% rename from collections/technology/primitives/network/img/overlay_net1.jpg rename to _archive/technology/primitives/network/img/overlay_net1.jpg diff --git a/collections/tech/primitives/network/img/planet_net_.jpg b/_archive/technology/primitives/network/img/planet_net_.jpg similarity index 100% rename from collections/tech/primitives/network/img/planet_net_.jpg rename to _archive/technology/primitives/network/img/planet_net_.jpg diff --git a/collections/technology/primitives/network/img/planetary_lan.jpg b/_archive/technology/primitives/network/img/planetary_lan.jpg similarity index 100% rename from collections/technology/primitives/network/img/planetary_lan.jpg rename to _archive/technology/primitives/network/img/planetary_lan.jpg diff --git a/collections/technology/primitives/network/img/planetary_net.jpg b/_archive/technology/primitives/network/img/planetary_net.jpg similarity index 100% rename from collections/technology/primitives/network/img/planetary_net.jpg rename to _archive/technology/primitives/network/img/planetary_net.jpg diff --git a/collections/technology/primitives/network/img/redundant_net.jpg b/_archive/technology/primitives/network/img/redundant_net.jpg similarity index 100% rename from collections/technology/primitives/network/img/redundant_net.jpg rename to _archive/technology/primitives/network/img/redundant_net.jpg diff --git a/collections/technology/primitives/network/img/webgateway.jpg b/_archive/technology/primitives/network/img/webgateway.jpg similarity index 100% rename from collections/technology/primitives/network/img/webgateway.jpg rename to _archive/technology/primitives/network/img/webgateway.jpg diff --git a/collections/technology/primitives/network/img/webgw_scaling.jpg b/_archive/technology/primitives/network/img/webgw_scaling.jpg similarity index 100% rename from collections/technology/primitives/network/img/webgw_scaling.jpg rename to _archive/technology/primitives/network/img/webgw_scaling.jpg diff --git a/collections/technology/primitives/network/img/znet_redundancy.jpg b/_archive/technology/primitives/network/img/znet_redundancy.jpg similarity index 100% rename from collections/technology/primitives/network/img/znet_redundancy.jpg rename to _archive/technology/primitives/network/img/znet_redundancy.jpg diff --git a/collections/technology/primitives/network/img/znet_znic.jpg b/_archive/technology/primitives/network/img/znet_znic.jpg similarity index 100% rename from collections/technology/primitives/network/img/znet_znic.jpg rename to _archive/technology/primitives/network/img/znet_znic.jpg diff --git a/collections/technology/primitives/network/img/znet_znic1.jpg b/_archive/technology/primitives/network/img/znet_znic1.jpg similarity index 100% rename from collections/technology/primitives/network/img/znet_znic1.jpg rename to _archive/technology/primitives/network/img/znet_znic1.jpg diff --git a/collections/technology/primitives/network/img/zos_network_overlay.jpg b/_archive/technology/primitives/network/img/zos_network_overlay.jpg similarity index 100% rename from collections/technology/primitives/network/img/zos_network_overlay.jpg rename to _archive/technology/primitives/network/img/zos_network_overlay.jpg diff --git a/collections/technology/primitives/network/network_toc.md b/_archive/technology/primitives/network/network_toc.md similarity index 100% rename from collections/technology/primitives/network/network_toc.md rename to _archive/technology/primitives/network/network_toc.md diff --git a/collections/technology/primitives/network/p2pagent.md b/_archive/technology/primitives/network/p2pagent.md similarity index 100% rename from collections/technology/primitives/network/p2pagent.md rename to _archive/technology/primitives/network/p2pagent.md diff --git a/collections/technology/primitives/network/planetary_network.md b/_archive/technology/primitives/network/planetary_network.md similarity index 100% rename from collections/technology/primitives/network/planetary_network.md rename to _archive/technology/primitives/network/planetary_network.md diff --git a/collections/technology/primitives/network/tfgrid_network.md b/_archive/technology/primitives/network/tfgrid_network.md similarity index 100% rename from collections/technology/primitives/network/tfgrid_network.md rename to _archive/technology/primitives/network/tfgrid_network.md diff --git a/collections/technology/primitives/network/webgw.md b/_archive/technology/primitives/network/webgw.md similarity index 100% rename from collections/technology/primitives/network/webgw.md rename to _archive/technology/primitives/network/webgw.md diff --git a/collections/technology/primitives/network/webgw3.md b/_archive/technology/primitives/network/webgw3.md similarity index 100% rename from collections/technology/primitives/network/webgw3.md rename to _archive/technology/primitives/network/webgw3.md diff --git a/collections/technology/primitives/network/znet.md b/_archive/technology/primitives/network/znet.md similarity index 100% rename from collections/technology/primitives/network/znet.md rename to _archive/technology/primitives/network/znet.md diff --git a/collections/technology/primitives/network/znic.md b/_archive/technology/primitives/network/znic.md similarity index 100% rename from collections/technology/primitives/network/znic.md rename to _archive/technology/primitives/network/znic.md diff --git a/collections/technology/primitives/primitives_toc.md b/_archive/technology/primitives/primitives_toc.md similarity index 100% rename from collections/technology/primitives/primitives_toc.md rename to _archive/technology/primitives/primitives_toc.md diff --git a/collections/technology/primitives/storage/img/zdb_arch.jpg b/_archive/technology/primitives/storage/img/zdb_arch.jpg similarity index 100% rename from collections/technology/primitives/storage/img/zdb_arch.jpg rename to _archive/technology/primitives/storage/img/zdb_arch.jpg diff --git a/collections/technology/primitives/storage/img/zmount.jpg b/_archive/technology/primitives/storage/img/zmount.jpg similarity index 100% rename from collections/technology/primitives/storage/img/zmount.jpg rename to _archive/technology/primitives/storage/img/zmount.jpg diff --git a/collections/technology/primitives/storage/img/zos_zstor.jpg b/_archive/technology/primitives/storage/img/zos_zstor.jpg similarity index 100% rename from collections/technology/primitives/storage/img/zos_zstor.jpg rename to _archive/technology/primitives/storage/img/zos_zstor.jpg diff --git a/collections/technology/primitives/storage/qsfs.md b/_archive/technology/primitives/storage/qsfs.md similarity index 100% rename from collections/technology/primitives/storage/qsfs.md rename to _archive/technology/primitives/storage/qsfs.md diff --git a/collections/technology/primitives/storage/storage_toc.md b/_archive/technology/primitives/storage/storage_toc.md similarity index 100% rename from collections/technology/primitives/storage/storage_toc.md rename to _archive/technology/primitives/storage/storage_toc.md diff --git a/collections/technology/primitives/storage/zdb.md b/_archive/technology/primitives/storage/zdb.md similarity index 100% rename from collections/technology/primitives/storage/zdb.md rename to _archive/technology/primitives/storage/zdb.md diff --git a/collections/technology/primitives/storage/zdisk.md b/_archive/technology/primitives/storage/zdisk.md similarity index 100% rename from collections/technology/primitives/storage/zdisk.md rename to _archive/technology/primitives/storage/zdisk.md diff --git a/collections/technology/primitives/storage/zmount.md b/_archive/technology/primitives/storage/zmount.md similarity index 100% rename from collections/technology/primitives/storage/zmount.md rename to _archive/technology/primitives/storage/zmount.md diff --git a/collections/technology/primitives/storage/zos_fs.md b/_archive/technology/primitives/storage/zos_fs.md similarity index 100% rename from collections/technology/primitives/storage/zos_fs.md rename to _archive/technology/primitives/storage/zos_fs.md diff --git a/collections/technology/qsss/img/filesystem_abstract.jpg b/_archive/technology/qsss/img/filesystem_abstract.jpg similarity index 100% rename from collections/technology/qsss/img/filesystem_abstract.jpg rename to _archive/technology/qsss/img/filesystem_abstract.jpg diff --git a/collections/technology/qsss/img/qsss_intro_0_.jpg b/_archive/technology/qsss/img/qsss_intro_0_.jpg similarity index 100% rename from collections/technology/qsss/img/qsss_intro_0_.jpg rename to _archive/technology/qsss/img/qsss_intro_0_.jpg diff --git a/collections/technology/qsss/interfaces_usecases/img/filesystem.jpg b/_archive/technology/qsss/interfaces_usecases/img/filesystem.jpg similarity index 100% rename from collections/technology/qsss/interfaces_usecases/img/filesystem.jpg rename to _archive/technology/qsss/interfaces_usecases/img/filesystem.jpg diff --git a/collections/technology/qsss/interfaces_usecases/img/http.jpg b/_archive/technology/qsss/interfaces_usecases/img/http.jpg similarity index 100% rename from collections/technology/qsss/interfaces_usecases/img/http.jpg rename to _archive/technology/qsss/interfaces_usecases/img/http.jpg diff --git a/collections/technology/qsss/interfaces_usecases/img/hyperdrive.jpg b/_archive/technology/qsss/interfaces_usecases/img/hyperdrive.jpg similarity index 100% rename from collections/technology/qsss/interfaces_usecases/img/hyperdrive.jpg rename to _archive/technology/qsss/interfaces_usecases/img/hyperdrive.jpg diff --git a/collections/technology/qsss/interfaces_usecases/img/ipfs.jpg b/_archive/technology/qsss/interfaces_usecases/img/ipfs.jpg similarity index 100% rename from collections/technology/qsss/interfaces_usecases/img/ipfs.jpg rename to _archive/technology/qsss/interfaces_usecases/img/ipfs.jpg diff --git a/collections/tech/qsss/img/nft_architecture.jpg b/_archive/technology/qsss/interfaces_usecases/img/nft_architecture.jpg similarity index 100% rename from collections/tech/qsss/img/nft_architecture.jpg rename to _archive/technology/qsss/interfaces_usecases/img/nft_architecture.jpg diff --git a/collections/tech/qsss/img/nft_storage.jpg b/_archive/technology/qsss/interfaces_usecases/img/nft_storage.jpg similarity index 100% rename from collections/tech/qsss/img/nft_storage.jpg rename to _archive/technology/qsss/interfaces_usecases/img/nft_storage.jpg diff --git a/collections/tech/qsss/img/storage_architecture_1.jpg b/_archive/technology/qsss/interfaces_usecases/img/storage_architecture_1.jpg similarity index 100% rename from collections/tech/qsss/img/storage_architecture_1.jpg rename to _archive/technology/qsss/interfaces_usecases/img/storage_architecture_1.jpg diff --git a/collections/technology/qsss/interfaces_usecases/img/syncthing.jpg b/_archive/technology/qsss/interfaces_usecases/img/syncthing.jpg similarity index 100% rename from collections/technology/qsss/interfaces_usecases/img/syncthing.jpg rename to _archive/technology/qsss/interfaces_usecases/img/syncthing.jpg diff --git a/collections/technology/qsss/interfaces_usecases/nft_storage.md b/_archive/technology/qsss/interfaces_usecases/nft_storage.md similarity index 100% rename from collections/technology/qsss/interfaces_usecases/nft_storage.md rename to _archive/technology/qsss/interfaces_usecases/nft_storage.md diff --git a/collections/technology/qsss/interfaces_usecases/qss_use_cases.md b/_archive/technology/qsss/interfaces_usecases/qss_use_cases.md similarity index 100% rename from collections/technology/qsss/interfaces_usecases/qss_use_cases.md rename to _archive/technology/qsss/interfaces_usecases/qss_use_cases.md diff --git a/collections/technology/qsss/interfaces_usecases/s3_interface.md b/_archive/technology/qsss/interfaces_usecases/s3_interface.md similarity index 100% rename from collections/technology/qsss/interfaces_usecases/s3_interface.md rename to _archive/technology/qsss/interfaces_usecases/s3_interface.md diff --git a/collections/technology/qsss/manual/qsfs_setup.md b/_archive/technology/qsss/manual/qsfs_setup.md similarity index 100% rename from collections/technology/qsss/manual/qsfs_setup.md rename to _archive/technology/qsss/manual/qsfs_setup.md diff --git a/collections/technology/qsss/product/concept/img/create_png b/_archive/technology/qsss/product/concept/img/create_png similarity index 100% rename from collections/technology/qsss/product/concept/img/create_png rename to _archive/technology/qsss/product/concept/img/create_png diff --git a/collections/technology/qsss/product/concept/img/data_origin.mmd b/_archive/technology/qsss/product/concept/img/data_origin.mmd similarity index 100% rename from collections/technology/qsss/product/concept/img/data_origin.mmd rename to _archive/technology/qsss/product/concept/img/data_origin.mmd diff --git a/collections/technology/qsss/product/concept/img/data_substitution.mmd b/_archive/technology/qsss/product/concept/img/data_substitution.mmd similarity index 100% rename from collections/technology/qsss/product/concept/img/data_substitution.mmd rename to _archive/technology/qsss/product/concept/img/data_substitution.mmd diff --git a/collections/technology/qsss/product/concept/img/qsfs_principle.mmd b/_archive/technology/qsss/product/concept/img/qsfs_principle.mmd similarity index 100% rename from collections/technology/qsss/product/concept/img/qsfs_principle.mmd rename to _archive/technology/qsss/product/concept/img/qsfs_principle.mmd diff --git a/collections/technology/qsss/product/concept/img/quantum_safe_architecture.mmd b/_archive/technology/qsss/product/concept/img/quantum_safe_architecture.mmd similarity index 100% rename from collections/technology/qsss/product/concept/img/quantum_safe_architecture.mmd rename to _archive/technology/qsss/product/concept/img/quantum_safe_architecture.mmd diff --git a/collections/technology/qsss/product/file_system/img/create_png b/_archive/technology/qsss/product/file_system/img/create_png similarity index 100% rename from collections/technology/qsss/product/file_system/img/create_png rename to _archive/technology/qsss/product/file_system/img/create_png diff --git a/collections/technology/qsss/product/file_system/img/qsss_intro_.jpg b/_archive/technology/qsss/product/file_system/img/qsss_intro_.jpg similarity index 100% rename from collections/technology/qsss/product/file_system/img/qsss_intro_.jpg rename to _archive/technology/qsss/product/file_system/img/qsss_intro_.jpg diff --git a/collections/technology/qsss/product/file_system/img/qsstorage_architecture.jpg b/_archive/technology/qsss/product/file_system/img/qsstorage_architecture.jpg similarity index 100% rename from collections/technology/qsss/product/file_system/img/qsstorage_architecture.jpg rename to _archive/technology/qsss/product/file_system/img/qsstorage_architecture.jpg diff --git a/collections/technology/qsss/product/file_system/qss_filesystem.md b/_archive/technology/qsss/product/file_system/qss_filesystem.md similarity index 100% rename from collections/technology/qsss/product/file_system/qss_filesystem.md rename to _archive/technology/qsss/product/file_system/qss_filesystem.md diff --git a/collections/technology/qsss/product/file_system/qss_system.mmd b/_archive/technology/qsss/product/file_system/qss_system.mmd similarity index 100% rename from collections/technology/qsss/product/file_system/qss_system.mmd rename to _archive/technology/qsss/product/file_system/qss_system.mmd diff --git a/collections/technology/qsss/product/img/create_png b/_archive/technology/qsss/product/img/create_png similarity index 100% rename from collections/technology/qsss/product/img/create_png rename to _archive/technology/qsss/product/img/create_png diff --git a/collections/technology/qsss/product/img/data_origin.mmd b/_archive/technology/qsss/product/img/data_origin.mmd similarity index 100% rename from collections/technology/qsss/product/img/data_origin.mmd rename to _archive/technology/qsss/product/img/data_origin.mmd diff --git a/collections/technology/qsss/product/img/data_substitution.mmd b/_archive/technology/qsss/product/img/data_substitution.mmd similarity index 100% rename from collections/technology/qsss/product/img/data_substitution.mmd rename to _archive/technology/qsss/product/img/data_substitution.mmd diff --git a/collections/technology/qsss/product/img/qsfs_principle.mmd b/_archive/technology/qsss/product/img/qsfs_principle.mmd similarity index 100% rename from collections/technology/qsss/product/img/qsfs_principle.mmd rename to _archive/technology/qsss/product/img/qsfs_principle.mmd diff --git a/collections/technology/qsss/product/img/qss_system.jpg b/_archive/technology/qsss/product/img/qss_system.jpg similarity index 100% rename from collections/technology/qsss/product/img/qss_system.jpg rename to _archive/technology/qsss/product/img/qss_system.jpg diff --git a/collections/tech/qsss/img/quantumsafe_storage_algo.jpg b/_archive/technology/qsss/product/img/quantumsafe_storage_algo.jpg similarity index 100% rename from collections/tech/qsss/img/quantumsafe_storage_algo.jpg rename to _archive/technology/qsss/product/img/quantumsafe_storage_algo.jpg diff --git a/collections/technology/qsss/product/img/tf_banner_grid_.jpg b/_archive/technology/qsss/product/img/tf_banner_grid_.jpg similarity index 100% rename from collections/technology/qsss/product/img/tf_banner_grid_.jpg rename to _archive/technology/qsss/product/img/tf_banner_grid_.jpg diff --git a/collections/technology/qsss/product/qss_algorithm.md b/_archive/technology/qsss/product/qss_algorithm.md similarity index 100% rename from collections/technology/qsss/product/qss_algorithm.md rename to _archive/technology/qsss/product/qss_algorithm.md diff --git a/collections/technology/qsss/product/qss_datarot.md b/_archive/technology/qsss/product/qss_datarot.md similarity index 100% rename from collections/technology/qsss/product/qss_datarot.md rename to _archive/technology/qsss/product/qss_datarot.md diff --git a/collections/technology/qsss/product/qss_zero_knowledge_proof.md b/_archive/technology/qsss/product/qss_zero_knowledge_proof.md similarity index 100% rename from collections/technology/qsss/product/qss_zero_knowledge_proof.md rename to _archive/technology/qsss/product/qss_zero_knowledge_proof.md diff --git a/collections/technology/qsss/qss_benefits.md b/_archive/technology/qsss/qss_benefits.md similarity index 100% rename from collections/technology/qsss/qss_benefits.md rename to _archive/technology/qsss/qss_benefits.md diff --git a/collections/technology/qsss/qss_benefits_.md b/_archive/technology/qsss/qss_benefits_.md similarity index 100% rename from collections/technology/qsss/qss_benefits_.md rename to _archive/technology/qsss/qss_benefits_.md diff --git a/collections/technology/qsss/qsss.md b/_archive/technology/qsss/qsss.md similarity index 100% rename from collections/technology/qsss/qsss.md rename to _archive/technology/qsss/qsss.md diff --git a/collections/technology/qsss/qsss2_home.md b/_archive/technology/qsss/qsss2_home.md similarity index 100% rename from collections/technology/qsss/qsss2_home.md rename to _archive/technology/qsss/qsss2_home.md diff --git a/collections/technology/qsss/qsss_home.md b/_archive/technology/qsss/qsss_home.md similarity index 100% rename from collections/technology/qsss/qsss_home.md rename to _archive/technology/qsss/qsss_home.md diff --git a/collections/technology/qsss/qsss_toc.md b/_archive/technology/qsss/qsss_toc.md similarity index 100% rename from collections/technology/qsss/qsss_toc.md rename to _archive/technology/qsss/qsss_toc.md diff --git a/collections/technology/qsss/roadmap/img/roadmap.jpg b/_archive/technology/qsss/roadmap/img/roadmap.jpg similarity index 100% rename from collections/technology/qsss/roadmap/img/roadmap.jpg rename to _archive/technology/qsss/roadmap/img/roadmap.jpg diff --git a/collections/technology/qsss/roadmap/quantumsafe_roadmap.md b/_archive/technology/qsss/roadmap/quantumsafe_roadmap.md similarity index 100% rename from collections/technology/qsss/roadmap/quantumsafe_roadmap.md rename to _archive/technology/qsss/roadmap/quantumsafe_roadmap.md diff --git a/collections/technology/qsss/sidebar.md b/_archive/technology/qsss/sidebar.md similarity index 100% rename from collections/technology/qsss/sidebar.md rename to _archive/technology/qsss/sidebar.md diff --git a/collections/technology/qsss/specs_todo/img/specs_header.jpg b/_archive/technology/qsss/specs_todo/img/specs_header.jpg similarity index 100% rename from collections/technology/qsss/specs_todo/img/specs_header.jpg rename to _archive/technology/qsss/specs_todo/img/specs_header.jpg diff --git a/collections/technology/qsss/specs_todo/policy.md b/_archive/technology/qsss/specs_todo/policy.md similarity index 100% rename from collections/technology/qsss/specs_todo/policy.md rename to _archive/technology/qsss/specs_todo/policy.md diff --git a/collections/technology/qsss/specs_todo/qss_specs.md b/_archive/technology/qsss/specs_todo/qss_specs.md similarity index 100% rename from collections/technology/qsss/specs_todo/qss_specs.md rename to _archive/technology/qsss/specs_todo/qss_specs.md diff --git a/collections/technology/qsss/specs_todo/quantum_safe_filesystem.md b/_archive/technology/qsss/specs_todo/quantum_safe_filesystem.md similarity index 100% rename from collections/technology/qsss/specs_todo/quantum_safe_filesystem.md rename to _archive/technology/qsss/specs_todo/quantum_safe_filesystem.md diff --git a/collections/technology/qsss/specs_todo/quantum_safe_filesystem_2_6.md b/_archive/technology/qsss/specs_todo/quantum_safe_filesystem_2_6.md similarity index 100% rename from collections/technology/qsss/specs_todo/quantum_safe_filesystem_2_6.md rename to _archive/technology/qsss/specs_todo/quantum_safe_filesystem_2_6.md diff --git a/collections/technology/qsss/specs_todo/quantum_safe_filesystem_architecture.md b/_archive/technology/qsss/specs_todo/quantum_safe_filesystem_architecture.md similarity index 100% rename from collections/technology/qsss/specs_todo/quantum_safe_filesystem_architecture.md rename to _archive/technology/qsss/specs_todo/quantum_safe_filesystem_architecture.md diff --git a/collections/technology/qsss/specs_todo/quantum_safe_filesystem_sequence_graph.md b/_archive/technology/qsss/specs_todo/quantum_safe_filesystem_sequence_graph.md similarity index 100% rename from collections/technology/qsss/specs_todo/quantum_safe_filesystem_sequence_graph.md rename to _archive/technology/qsss/specs_todo/quantum_safe_filesystem_sequence_graph.md diff --git a/collections/technology/qsss/testplan/img/failure_points.jpg b/_archive/technology/qsss/testplan/img/failure_points.jpg similarity index 100% rename from collections/technology/qsss/testplan/img/failure_points.jpg rename to _archive/technology/qsss/testplan/img/failure_points.jpg diff --git a/collections/technology/qsss/testplan/img/testplan_points.mmd b/_archive/technology/qsss/testplan/img/testplan_points.mmd similarity index 100% rename from collections/technology/qsss/testplan/img/testplan_points.mmd rename to _archive/technology/qsss/testplan/img/testplan_points.mmd diff --git a/collections/technology/qsss/testplan/testplan.md b/_archive/technology/qsss/testplan/testplan.md similarity index 100% rename from collections/technology/qsss/testplan/testplan.md rename to _archive/technology/qsss/testplan/testplan.md diff --git a/collections/technology/smartcontract_it/img/iac_overview.jpg b/_archive/technology/smartcontract_it/img/iac_overview.jpg similarity index 100% rename from collections/technology/smartcontract_it/img/iac_overview.jpg rename to _archive/technology/smartcontract_it/img/iac_overview.jpg diff --git a/collections/technology/smartcontract_it/img/smart_contract_it_.jpg b/_archive/technology/smartcontract_it/img/smart_contract_it_.jpg similarity index 100% rename from collections/technology/smartcontract_it/img/smart_contract_it_.jpg rename to _archive/technology/smartcontract_it/img/smart_contract_it_.jpg diff --git a/collections/technology/smartcontract_it/img/smartcontract3_flow.jpg b/_archive/technology/smartcontract_it/img/smartcontract3_flow.jpg similarity index 100% rename from collections/technology/smartcontract_it/img/smartcontract3_flow.jpg rename to _archive/technology/smartcontract_it/img/smartcontract3_flow.jpg diff --git a/collections/technology/smartcontract_it/img/smartcontract_3bot.jpg b/_archive/technology/smartcontract_it/img/smartcontract_3bot.jpg similarity index 100% rename from collections/technology/smartcontract_it/img/smartcontract_3bot.jpg rename to _archive/technology/smartcontract_it/img/smartcontract_3bot.jpg diff --git a/collections/technology/smartcontract_it/img/smartcontract_iac.jpg b/_archive/technology/smartcontract_it/img/smartcontract_iac.jpg similarity index 100% rename from collections/technology/smartcontract_it/img/smartcontract_iac.jpg rename to _archive/technology/smartcontract_it/img/smartcontract_iac.jpg diff --git a/collections/technology/smartcontract_it/img/smartcontract_it.jpg b/_archive/technology/smartcontract_it/img/smartcontract_it.jpg similarity index 100% rename from collections/technology/smartcontract_it/img/smartcontract_it.jpg rename to _archive/technology/smartcontract_it/img/smartcontract_it.jpg diff --git a/collections/technology/smartcontract_it/smartcontract_3bot.md b/_archive/technology/smartcontract_it/smartcontract_3bot.md similarity index 100% rename from collections/technology/smartcontract_it/smartcontract_3bot.md rename to _archive/technology/smartcontract_it/smartcontract_3bot.md diff --git a/collections/technology/smartcontract_it/smartcontract_iac.md b/_archive/technology/smartcontract_it/smartcontract_iac.md similarity index 100% rename from collections/technology/smartcontract_it/smartcontract_iac.md rename to _archive/technology/smartcontract_it/smartcontract_iac.md diff --git a/collections/technology/smartcontract_it/smartcontract_it.md b/_archive/technology/smartcontract_it/smartcontract_it.md similarity index 100% rename from collections/technology/smartcontract_it/smartcontract_it.md rename to _archive/technology/smartcontract_it/smartcontract_it.md diff --git a/collections/technology/smartcontract_it/smartcontract_tfgrid3.md b/_archive/technology/smartcontract_it/smartcontract_tfgrid3.md similarity index 100% rename from collections/technology/smartcontract_it/smartcontract_tfgrid3.md rename to _archive/technology/smartcontract_it/smartcontract_tfgrid3.md diff --git a/collections/technology/smartcontract_it/smartcontract_toc.md b/_archive/technology/smartcontract_it/smartcontract_toc.md similarity index 100% rename from collections/technology/smartcontract_it/smartcontract_toc.md rename to _archive/technology/smartcontract_it/smartcontract_toc.md diff --git a/collections/technology/technology_toc.md b/_archive/technology/technology_toc.md similarity index 100% rename from collections/technology/technology_toc.md rename to _archive/technology/technology_toc.md diff --git a/collections/technology/tfgrid_primitives.md b/_archive/technology/tfgrid_primitives.md similarity index 100% rename from collections/technology/tfgrid_primitives.md rename to _archive/technology/tfgrid_primitives.md diff --git a/collections/technology/zos/benefits/deterministic_deployment.md b/_archive/technology/zos/benefits/deterministic_deployment.md similarity index 100% rename from collections/technology/zos/benefits/deterministic_deployment.md rename to _archive/technology/zos/benefits/deterministic_deployment.md diff --git a/collections/technology/zos/benefits/docker_compatibility.md b/_archive/technology/zos/benefits/docker_compatibility.md similarity index 100% rename from collections/technology/zos/benefits/docker_compatibility.md rename to _archive/technology/zos/benefits/docker_compatibility.md diff --git a/collections/technology/zos/benefits/img/network_architecture.jpg b/_archive/technology/zos/benefits/img/network_architecture.jpg similarity index 100% rename from collections/technology/zos/benefits/img/network_architecture.jpg rename to _archive/technology/zos/benefits/img/network_architecture.jpg diff --git a/collections/technology/zos/benefits/img/network_architecture2.jpg b/_archive/technology/zos/benefits/img/network_architecture2.jpg similarity index 100% rename from collections/technology/zos/benefits/img/network_architecture2.jpg rename to _archive/technology/zos/benefits/img/network_architecture2.jpg diff --git a/collections/technology/zos/benefits/network_wall.md b/_archive/technology/zos/benefits/network_wall.md similarity index 100% rename from collections/technology/zos/benefits/network_wall.md rename to _archive/technology/zos/benefits/network_wall.md diff --git a/collections/technology/zos/benefits/p2p_networking.md b/_archive/technology/zos/benefits/p2p_networking.md similarity index 100% rename from collections/technology/zos/benefits/p2p_networking.md rename to _archive/technology/zos/benefits/p2p_networking.md diff --git a/collections/technology/zos/benefits/unbreakable_storage.md b/_archive/technology/zos/benefits/unbreakable_storage.md similarity index 100% rename from collections/technology/zos/benefits/unbreakable_storage.md rename to _archive/technology/zos/benefits/unbreakable_storage.md diff --git a/collections/technology/zos/benefits/zero_boot.md b/_archive/technology/zos/benefits/zero_boot.md similarity index 100% rename from collections/technology/zos/benefits/zero_boot.md rename to _archive/technology/zos/benefits/zero_boot.md diff --git a/collections/technology/zos/benefits/zero_hacking_surface.md b/_archive/technology/zos/benefits/zero_hacking_surface.md similarity index 100% rename from collections/technology/zos/benefits/zero_hacking_surface.md rename to _archive/technology/zos/benefits/zero_hacking_surface.md diff --git a/collections/technology/zos/benefits/zero_install.md b/_archive/technology/zos/benefits/zero_install.md similarity index 100% rename from collections/technology/zos/benefits/zero_install.md rename to _archive/technology/zos/benefits/zero_install.md diff --git a/collections/technology/zos/benefits/zos_advantages.md b/_archive/technology/zos/benefits/zos_advantages.md similarity index 100% rename from collections/technology/zos/benefits/zos_advantages.md rename to _archive/technology/zos/benefits/zos_advantages.md diff --git a/collections/technology/zos/benefits/zos_advantages_toc.md b/_archive/technology/zos/benefits/zos_advantages_toc.md similarity index 100% rename from collections/technology/zos/benefits/zos_advantages_toc.md rename to _archive/technology/zos/benefits/zos_advantages_toc.md diff --git a/collections/technology/zos/benefits/zos_monitoring.md b/_archive/technology/zos/benefits/zos_monitoring.md similarity index 100% rename from collections/technology/zos/benefits/zos_monitoring.md rename to _archive/technology/zos/benefits/zos_monitoring.md diff --git a/collections/technology/zos/benefits/zos_protect.md b/_archive/technology/zos/benefits/zos_protect.md similarity index 100% rename from collections/technology/zos/benefits/zos_protect.md rename to _archive/technology/zos/benefits/zos_protect.md diff --git a/collections/technology/zos/img/zero_os_overview.jpg b/_archive/technology/zos/img/zero_os_overview.jpg similarity index 100% rename from collections/technology/zos/img/zero_os_overview.jpg rename to _archive/technology/zos/img/zero_os_overview.jpg diff --git a/collections/technology/zos/img/zos22.png b/_archive/technology/zos/img/zos22.png similarity index 100% rename from collections/technology/zos/img/zos22.png rename to _archive/technology/zos/img/zos22.png diff --git a/collections/technology/zos/img/zos_network_overview.jpg b/_archive/technology/zos/img/zos_network_overview.jpg similarity index 100% rename from collections/technology/zos/img/zos_network_overview.jpg rename to _archive/technology/zos/img/zos_network_overview.jpg diff --git a/collections/technology/zos/img/zos_overview_compute_storage.jpg b/_archive/technology/zos/img/zos_overview_compute_storage.jpg similarity index 100% rename from collections/technology/zos/img/zos_overview_compute_storage.jpg rename to _archive/technology/zos/img/zos_overview_compute_storage.jpg diff --git a/collections/technology/zos/zos.md b/_archive/technology/zos/zos.md similarity index 100% rename from collections/technology/zos/zos.md rename to _archive/technology/zos/zos.md diff --git a/collections/technology/zos/zos_compute_storage.md b/_archive/technology/zos/zos_compute_storage.md similarity index 100% rename from collections/technology/zos/zos_compute_storage.md rename to _archive/technology/zos/zos_compute_storage.md diff --git a/collections/technology/zos/zos_install.md b/_archive/technology/zos/zos_install.md similarity index 100% rename from collections/technology/zos/zos_install.md rename to _archive/technology/zos/zos_install.md diff --git a/collections/technology/zos/zos_install_mechanism.md b/_archive/technology/zos/zos_install_mechanism.md similarity index 100% rename from collections/technology/zos/zos_install_mechanism.md rename to _archive/technology/zos/zos_install_mechanism.md diff --git a/collections/technology/zos/zos_network.md b/_archive/technology/zos/zos_network.md similarity index 100% rename from collections/technology/zos/zos_network.md rename to _archive/technology/zos/zos_network.md diff --git a/collections/technology/zos_advantages.md b/_archive/technology/zos_advantages.md similarity index 100% rename from collections/technology/zos_advantages.md rename to _archive/technology/zos_advantages.md diff --git a/collections/technology/zos_toc.md b/_archive/technology/zos_toc.md similarity index 100% rename from collections/technology/zos_toc.md rename to _archive/technology/zos_toc.md diff --git a/collections/technology/zos_tools/flist_hub.md b/_archive/technology/zos_tools/flist_hub.md similarity index 100% rename from collections/technology/zos_tools/flist_hub.md rename to _archive/technology/zos_tools/flist_hub.md diff --git a/collections/technology/zos_tools/flist_hub_.md b/_archive/technology/zos_tools/flist_hub_.md similarity index 100% rename from collections/technology/zos_tools/flist_hub_.md rename to _archive/technology/zos_tools/flist_hub_.md diff --git a/books/duniayetu_dar/SUMMARY.md b/books/duniayetu_dar/SUMMARY.md index 9d44af8..a8d0c09 100644 --- a/books/duniayetu_dar/SUMMARY.md +++ b/books/duniayetu_dar/SUMMARY.md @@ -1,47 +1,39 @@ - -- [Why](why/why.md) - - [Cloud Too Centralized](why/current_cloud_too_centralized.md) - - [Countries don't have their Internet](why/countries_no_internet.md) - - [Human Right](why/internet_human_right.md) - - [Social Warming](why/social_warming.md) -- [Farming](farming/farming.md) - - [TFNodes](farming/tfnodes.md) +- [Dunia Yetu](dy_intro/dunia_yetu/dunia_yetu.md) + - [About Us](dy_intro/dunia_yetu/about_us.md) + - [Our Core Values](dy_intro/dunia_yetu/our_core_values.md) + - [What We Offer](dy_intro/what_we_offer/what_we_offer.md) + - [A New Internet](dy_intro/what_we_offer/new_internet.md) + - [Coding Academy](dy_intro/what_we_offer/coding_academy.md) + - [Innovation Hubs](dy_intro/what_we_offer/innovation_hubs.md) + - [How You Can Participate](dy_intro/how_you_can_participate/participate.md) + - [Host a Node](dy_intro/how_you_can_participate/host_a_node.md) + - [Build on Top of Tanzania's Decentralised Internet](dy_intro/how_you_can_participate/build.md) + - [Join Our Coding Academy](dy_intro/how_you_can_participate/coding_participate.md) + - [Join Our Community](dy_intro/how_you_can_participate/community_participate.md) - [Vision](values/values.md) - [Planet and People First](values/planet_people_first.md) - - [Proof of Authenticity](values/poa.md) + - [Proof of Authenticity](p2p/poa.md) +- [Why](why/why.md) + - [Cloud Too Centralized](why/current_cloud_too_centralized.md) + - [Countries Don't Have Their Own Internet](why/countries_no_internet.md) + - [Human Right](why/internet_human_right.md) + - [Social Warming](why/social_warming.md) - [Problems](problems/problems.md) - - [painkillers and onions](problems/no_pain_killer.md) - - [Clouds are C omplicated](problems/cd_issues_cloud_not_enough.md) - - [Content Delivery is Expensive](problems/cd_issues_cost.md) + - [Painkillers and Onions](problems/no_pain_killer.md) + - [Clouds Are Complicated](problems/cd_issues_cloud_not_enough.md) + - [Content Delivery is Expensive](problems/cd_issues_cost.md) - [Solutions](solutions/solutions.md) - - [Decentralized Cloud](solutions/cloud/cloud.md) - [Content Providers](solutions/content_providers/content_providers.md) + - [FreeFlow Self](web4/freeflowself/freeflowself.md) + - [Actor Based Development](web4/actor_based/actor_based_approach.md) + - [Vlang](web4/vlang/vlang.md) - - [Web4](WEB4/web4.md) +- [Farming](farming_v4/farming.md) + - [TFNodes](farming_v4/tf_nodes.md) + - [TFRouters](farming_v4/tf_routers.md) - [FreeFlow Movement](freeflow/freeflow_movement.md) - [Community Principles](freeflow/community_principles/community_principles.md) - [Social Media Protocols](social_media_protocols/protocols.md) - [Nostr Protocol](social_media_protocols/nostr.md) - [Activity Pub](social_media_protocols/activitypub.md) - - [Activity Pub 2](social_media_protocols/activitypub2.md) -- [Technology](web4/web4.md) - - [FreeFlow Self](web4/freeflowself/freeflowself.md) - - [Actor Based Development](web4/actor_based/actor_based_approach.md) - - [Vlang](web4/vlang/vlang.md) -- [Dunia Yetu](dy_intro/dunia_yetu/dunia_yetu.md) - - [About Us](dy_intro/dunia_yetu/about_us.md) - - [Our Core Values](dy_intro/dunia_yetu/our_core_values.md) - - [What We Offer](dy_intro/what_we_offer/what_we_offer.md) - - [A New Internet](dy_intro/what_we_offer/new_internet.md) - - [Coding Academy](dy_intro/what_we_offer/coding_academy.md) - - [Innovation Hubs](dy_intro/what_we_offer/innovation_hubs.md) - - [How you can Participate](dy_intro/how_you_can_participate/participate.md) - - [Host a Node](dy_intro/how_you_can_participate/host_a_node.md) - - [Build on top of Tanzania's decentralised Internet](dy_intro/how_you_can_participate/build.md) - - [Join Our Coding Academy](dy_intro/how_you_can_participate/coding_participate.md) - - [Join Our Community](dy_intro/how_you_can_participate/community_participate.md) -- [SASHA sidebar](sasha/ilovezanzibar.md) - - - diff --git a/books/earthhub/SUMMARY.md b/books/earthhub/SUMMARY.md index 1e5dbbe..ee784bd 100644 --- a/books/earthhub/SUMMARY.md +++ b/books/earthhub/SUMMARY.md @@ -1,8 +1,9 @@ -- [Intro](earthhub/intro.md) -- [Faq](earthhub/faq.md) +- [Introduction](earthhub/intro.md) - [Roadmap](earthhub/roadmap.md) - [Federated Protocols](social_media_protocols/protocols.md) - [Utilization](earthhub/utilization.md) - - [matrix](social_media_protocols/matrix.md) - - [activitypub](social_media_protocols/activitypub.md) - - [nostr](social_media_protocols/nostr.md) \ No newline at end of file + - [Matrix](social_media_protocols/matrix.md) + - [ActivityPub](social_media_protocols/activitypub.md) + - [Nostr](social_media_protocols/nostr.md) +- [FAQ](earthhub/faq.md) + diff --git a/books/kristof/SUMMARY.md b/books/kristof/SUMMARY.md index cabc765..09c2207 100644 --- a/books/kristof/SUMMARY.md +++ b/books/kristof/SUMMARY.md @@ -1,5 +1,5 @@ -- [Intro](kristof/kristof.md) +- [Introduction](kristof/kristof.md) - [eBook Sustainable Life](kristof/sustainable_world.md) - [Projects Personal](kristof/projects_personal.md) - [Projects Tech](kristof/projects_tech.md) diff --git a/books/legal/SUMMARY.md b/books/legal/SUMMARY.md index 178fda8..6317e3e 100644 --- a/books/legal/SUMMARY.md +++ b/books/legal/SUMMARY.md @@ -1,10 +1,8 @@ - - [Legal](legal/legal_home.md) -- [Terms Conditions](legal/terms_conditions_all3.md) - [Definitions](legal/definitions_legal.md) - [Disclaimer](legal/disclaimer.md) -- [farmer_terms_conditions](legal/terms_conditions_farmer3.md) -- [terms_conditions_websites](legal/terms_conditions_websites.md) -- [terms_conditions_grid](legal/terms_conditions_tfgrid3.md) -- [privacypolicy](legal/privacypolicy.md) -- [T&C TFTech](legal/terms_conditions_sales.md) \ No newline at end of file +- [Terms and Conditions Websites](legal/terms_conditions_websites.md) +- [Terms and Conditions Users](legal/terms_conditions_tfgrid3.md) +- [Terms and Conditions Farmers](legal/terms_conditions_farmer3.md) +- [Terms and Conditions Sales](legal/terms_conditions_sales.md) +- [Privacy Policy](legal/privacypolicy.md) \ No newline at end of file diff --git a/books/mbweni/SUMMARY.md b/books/mbweni/SUMMARY.md index 01f1749..e3ff783 100644 --- a/books/mbweni/SUMMARY.md +++ b/books/mbweni/SUMMARY.md @@ -38,7 +38,7 @@ - [Island Tours](mbweni/tours/island_tours.md) - [Spice Farm](mbweni/tours/spice_farm.md) - [Mangroves Tours](mbweni/tours/mangroves.md) - - [Wildlife conservations](mbweni/tours/wildlife.md) + - [Wildlife Conservations](mbweni/tours/wildlife.md) - [Kilimanjaro Tours](mbweni/tours/kilimanjaro.md) - [Safari Tours](mbweni/tours/safari.md) - [Maasai Village](mbweni/tours/maasai.md) diff --git a/books/new_mdbook/SUMMARY.md b/books/new_mdbook/SUMMARY.md deleted file mode 100644 index f1b73f3..0000000 --- a/books/new_mdbook/SUMMARY.md +++ /dev/null @@ -1,2 +0,0 @@ -- [Example 1](new_mdbook/new_mdbook_example1.md) -- [Example 2](new_mdbook/new_mdbook_example2.md) \ No newline at end of file diff --git a/books/projectinca/SUMMARY.md b/books/projectinca/SUMMARY.md index ec4101b..5eba44c 100644 --- a/books/projectinca/SUMMARY.md +++ b/books/projectinca/SUMMARY.md @@ -1,11 +1,12 @@ -- [Intro](projectinca/intro.md) +- [Introduction](projectinca/intro.md) - [The Plan](projectinca/theplan_c.md) - [Funding](projectinca/funding.md) - [P2P Promotion](projectinca/peer2peer_promotion.md) - [Liquidity](projectinca/liquidity.md) -- [INCA tokenomics](projectinca/tokens.md) +- [INCA Tokenomics](projectinca/tokens.md) - [INCA](projectinca/inca.md) + - [TFT](projectinca/tft.md) - [INCA Grants](projectinca/grants.md) - [v3.x Grants](projectinca/grants_tft.md) - [Deploy AI Blocks](projectinca/grant_aiblock.md) @@ -15,12 +16,13 @@ - [Contributor Rewards](projectinca/contributor_rewards.md) - [Chapter Tanzania](projectinca/chapter_tanzania.md) - [Chapter Brazil](projectinca/chapter_brazil.md) - - [Biz dev rewards](projectinca/biz_dev_rewards.md) + - [Biz Dev Rewards](projectinca/biz_dev_rewards.md) - [Code TFGrid 3.13](projectinca/grant_tf_3_13.md) - [Code TFGrid 3.14](projectinca/grant_tf_3_14.md) - [Establish Thorchain DEX](projectinca/grant_thorchain.md) - [v4.x Grants](projectinca/grants_inca.md) -- [INCA marketplace](projectinca/marketplace.md) + - [Grant Voting Process](projectinca/grant_voting_process.md) +- [INCA Marketplace](projectinca/marketplace.md) - [Pricing](projectinca/marketplace_pricing.md) - [AI Blocks](tfgrid4/aiblock.md) - [Cloud Blocks](tfgrid4/cloudblock.md) @@ -44,39 +46,36 @@ - [Holochain](partners_utilization/holochain.md) - [Helium](partners_utilization/helium.md) - [Sikana](partners_utilization/sikana.md) - - [vindo](partners_utilization/vindo.md) - - [vverse](partners_utilization/vverse.md) + - [Vindo](partners_utilization/vindo.md) + - [Vverse](partners_utilization/vverse.md) - [Tier S Datacenter](partners_utilization/tier_s_datacenter.md) - [Engineering](projectinca/engineering.md) - [INCA Grid 4.0](projectinca/tfgrid4.md) - - [AI Blocks](tfgrid4/aiblock.md) - - [Cloud Blocks](tfgrid4/cloudblock.md) - - [Storage Blocks](tfgrid4/storageblock.md) -- [Project Info](projectinca/proj_info.md) - - [About us](tfgrid3/who_are_we.md) - - [The Internet today](tech/internet_today.md) - - [history c64](tech/history/c64.md) - - [too many layers](tech/history/layers.md) +- [Project Info](projectinca/project_info.md) + - [About Us](tfgrid3/who_are_we.md) + - [The Internet Today](tech/internet_today.md) + - [History of Computers](tech/history/c64.md) + - [Too Many Layers](tech/history/layers.md) - [Values](values/planet_people_first.md) - [Tech Key Innovations](tech/key_innovations_overview.md) - [Mycelium Network](tech/mycelium_innovation.md) - [Zero-OS](tech/zos_innovation.md) - [Quantum Safe Storage](tech/zstor_innovation.md) - [Quantum Safe Filesystem](tech/qsfs_innovation.md) - - [FList: better OS Images](tech/flist_innovation.md) + - [Flist: Better OS Images](tech/flist_innovation.md) - [FungiStor](tech/fungistor_innovation.md) - [Network Wall](tech/network_wall_innovation.md) - [Technology](tech/technology.md) - [Architecture](tech/architecture.md) - [Energy Efficient](tech/energy_efficient.md) - - [Why A New Cloud](why/why.md) + - [Why TFGrid](why/why.md) - [Cloud Too Centralized](why/current_cloud_too_centralized.md) - - [Countries don't have their Internet](why/countries_no_internet.md) + - [Countries Don't Have Their Internet](why/countries_no_internet.md) - [Human Right](why/internet_human_right.md) - [Social Warming](why/social_warming.md) - [INCA Cloud Core Capabilities](tech/features.md) - [Compute](tech/compute.md) - - [Zero-OS](tech/zero_os.md) + - [Zero-OS](tech/zos.md) - [Infrastructure As Code](tech/smartcontract_iac.md) - [CoreX](tech/corex.md) - [Storage](tech/qsss_home.md) @@ -88,3 +87,8 @@ - [Network](tech/networking.md) - [Mycelium](tech/mycelium.md) - [Web Gateway](tech/webgw.md) +- [Appendix](projectinca/appendix.md) + - [TFConnect NG Spec](projectinca/tfconnect.md) + - [Tokenomics TFGrid 3.14](tfgrid3/tokenomics.md) + - [Farming Reward TFGrid 3](tfgrid3/farming_reward.md) + - [Tokens Overview TFGrid 3](tfgrid3/tokens_overview.md) diff --git a/books/projectmycelium/SUMMARY.md b/books/projectmycelium/SUMMARY.md index 15a01da..cbc03a0 100644 --- a/books/projectmycelium/SUMMARY.md +++ b/books/projectmycelium/SUMMARY.md @@ -1,37 +1,37 @@ -- [Intro](projectmycelium/intro.md) +- [Introduction](projectmycelium/intro.md) - [Product Vision](projectmycelium/product_slides.md) - [Tokenomics](projectmycelium/tokenomics.md) - [Tokens](projectmycelium/tokens.md) - [Solana Launch](projectmycelium/solana.md) - [Mycelium Routers & Nodes](projectmycelium/farming.md) - - [TF Nodes](projectmycelium/mycelium_nodes.md) - - [TF Routers](projectmycelium/mycelium_routers.md) + - [Mycelium Nodes](projectmycelium/mycelium_nodes.md) + - [Mycelium Routers](projectmycelium/mycelium_routers.md) - [Network Map](projectinca/networkmap.md) - [Planet and People First Values](values/planet_people_first.md) - [Layers](projectmycelium/participants.md) - [Decentralized Cloud](bestkeptsecret/tfgrid_intro.md) - [ThreeFold Cloud Intro](bestkeptsecret/tf_architecture.md) - [ThreeFold Links](bestkeptsecret/references.md) - - [Hero Layer](projectmycelium/participants_todo.md) - - [Mycelium Layer](projectmycelium/participants_todo.md) - - [Transactional Layer](projectmycelium/participants_todo.md) - - [Digital Freezone Layer](projectmycelium/participants_todo.md) -- [Appendix Internet/Cloud](projectmycelium/appendix.md) + - [Hero Layer](projectmycelium/hero_layer.md) + - [Mycelium Layer](projectmycelium/mycelium_layer.md) + - [Transactional Layer](projectmycelium/transactional_layer.md) + - [Digital Freezone Layer](projectmycelium/digital_freezone_layer.md) +- [Appendix Internet and Cloud](projectmycelium/appendix.md) - [ThreeFold Cloud in Nutshell](tfgrid3/who_are_we.md) - - [Background: what is Internet](bestkeptsecret/concept.md) - - [Internet is Broken](tech/internet_today.md) + - [Background: What is Internet](bestkeptsecret/concept.md) + - [The Internet is Broken](tech/internet_today.md) - [Build Internet from Scratch](bestkeptsecret/we_have_all_needed.md)- - [The Internet today](tech/internet_today.md) - - [history c64](tech/history/c64.md) - - [too many layers](tech/history/layers.md) + - [History of Computers](tech/history/c64.md) + - [Too Many Layers](tech/history/layers.md) - [Why New Internet](why/why.md) - [Cloud Too Centralized](why/current_cloud_too_centralized.md) - - [Countries don't have their Internet](why/countries_no_internet.md) + - [Countries Don't Have Their Own Internet](why/countries_no_internet.md) - [Human Right](why/internet_human_right.md) - [Social Warming](why/social_warming.md) - [Solutions to Problems](problems/problems.md) - - [painkillers and onions](problems/no_pain_killer.md) + - [Painkillers and Onions](problems/no_pain_killer.md) - [Clouds are Complicated](problems/cd_issues_cloud_not_enough.md) - [Content Delivery is Expensive](solutions/cdn_cost.md) - [Governance](projectmycelium/governance.md) diff --git a/books/tech/SUMMARY.md b/books/tech/SUMMARY.md index 6b7e372..f483fb3 100644 --- a/books/tech/SUMMARY.md +++ b/books/tech/SUMMARY.md @@ -1,15 +1,15 @@ -- [Intro](tech/technology.md) -- [The Internet today](tech/internet_today.md) - - [history c64](tech/history/c64.md) - - [too many layers](tech/history/layers.md) -- [The Internet re-invented](tech/how_does_it_work.md) +- [Introduction](tech/technology.md) +- [The Internet Today](tech/internet_today.md) + - [History of Computers](tech/history/c64.md) + - [Too Many Layers](tech/history/layers.md) +- [The Internet Re-invented](tech/how_does_it_work.md) - [World Records](tech/world_records.md) - [Key Innovations](tech/key_innovations_overview.md) - [Mycelium Network](tech/mycelium_innovation.md) - [Zero-OS](tech/zos_innovation.md) - [Quantum Safe Storage](tech/zstor_innovation.md) - [Quantum Safe Filesystem](tech/qsfs_innovation.md) - - [FList: better OS Images](tech/flist_innovation.md) + - [FList: Better OS Images](tech/flist_innovation.md) - [FungiStor](tech/fungistor_innovation.md) - [Network Wall](tech/network_wall_innovation.md) - [Architecture](tech/architecture.md) diff --git a/books/test/SUMMARY.md b/books/test/SUMMARY.md index d7613ec..addcedd 100644 --- a/books/test/SUMMARY.md +++ b/books/test/SUMMARY.md @@ -1,3 +1 @@ - -- [Why](why/why.md) -- [org](tfgrid_org/cf.md) +- [Test Page](test/test.md) \ No newline at end of file diff --git a/books/tfgrid4/SUMMARY.md b/books/tfgrid4/SUMMARY.md index d4e1621..6434085 100644 --- a/books/tfgrid4/SUMMARY.md +++ b/books/tfgrid4/SUMMARY.md @@ -1,13 +1,13 @@ -- [Intro](bestkeptsecret/home.md) +- [Introduction](bestkeptsecret/home.md) - [Why](why/why.md) - [Cloud Too Centralized](why/current_cloud_too_centralized.md) - - [Countries don't have their Internet](why/countries_no_internet.md) + - [Countries Don't Have Their Own Internet](why/countries_no_internet.md) - [Human Right](why/internet_human_right.md) - [Social Warming](why/social_warming.md) -- [Farming](farming/farming.md) - - [TF Nodes](farming/tf_nodes.md) - - [TF Routers](farming/tf_routers.md) - - [Network Map](farming/networkmap.md) +- [Farming](farming_v4/farming.md) + - [TF Nodes](farming_v4/tf_nodes.md) + - [TF Routers](farming_v4/tf_routers.md) + - [Network Map](farming_v4/networkmap.md) - [Grid Economy](economy/economy.md) - [INCA](economy/inca.md) - [INCA Reserve](economy/incareserve.md) @@ -15,10 +15,10 @@ - [Mutual Credit](p2p/mutualcredit.md) - [Proof of Authenticity](p2p/poa.md) - [Partners Utilization](partners_utilization/partners.md) - - [sikana](partners_utilization/sikana.md) - - [vindo](partners_utilization/vindo.md) - - [mkondo](partners_utilization/mkondo.md) - - [vverse](partners_utilization/vverse.md) + - [Sikana](partners_utilization/sikana.md) + - [Vindo](partners_utilization/vindo.md) + - [Mkondo](partners_utilization/mkondo.md) + - [Vverse](partners_utilization/vverse.md) - [Earth Wallet](partners_utilization/earth_wallet.md) - [Elestio](partners_utilization/elestio.md) - [OW Freezone](partners_utilization/freezone.md) @@ -29,17 +29,17 @@ - [Solutions](solutions/solutions.md) - [Decentralized Cloud](solutions/cloud/cloud.md) - [Content Providers](solutions/content_providers/content_providers.md) - - [Web4](WEB4/web4.md) -- [Tech](tech/tech.md) + - [Web4](web4/web4.md) +- [Technology](tech/technology.md) - [Key Innovations](tech/key_innovations.md) - [Vision](values/values.md) - [Planet and People First](values/planet_people_first.md) - [Solutions to Problems](problems/problems.md) - - [painkillers and onions](problems/no_pain_killer.md) - - [Clouds are Complicated](problems/cd_issues_cloud_not_enough.md) + - [Painkillers and Onions](problems/no_pain_killer.md) + - [Clouds Are Complicated](problems/cd_issues_cloud_not_enough.md) - [Content Delivery is Expensive](solutions/cdn_cost.md) -- [How you can Participate](dy_intro/how_you_can_participate/participate.md) +- [How You Can Participate](dy_intro/how_you_can_participate/participate.md) - [Host a Node](dy_intro/how_you_can_participate/host_a_node.md) - - [Build on top of Tanzania's decentralised Internet](dy_intro/how_you_can_participate/build.md) + - [Build on Top of Tanzania's Decentralised Internet](dy_intro/how_you_can_participate/build.md) - [Join Our Coding Academy](dy_intro/how_you_can_participate/coding_participate.md) - - [Join Our Community](dy_intro/how_you_can_participate/community_participate.md) + - [Join Our Community](dy_intro/how_you_can_participate/community_participate.md) \ No newline at end of file diff --git a/collections/bestkeptsecret/concept.md b/collections/bestkeptsecret/concept.md index ccf8216..4804d1d 100644 --- a/collections/bestkeptsecret/concept.md +++ b/collections/bestkeptsecret/concept.md @@ -1,8 +1,11 @@ ## Concept -The Internet roughly needs 3 layers to function: (1) a network which allows us to communicate, (2) servers providing compute and storage space, and (3) applications delivering the Internet experiences to you. +The Internet roughly needs 3 layers to function: +1. A network which allows us to communicate +2. Servers providing compute and storage space +3. Applications delivering the Internet experiences to you ![image alt text](img/compute_net_app.png) @@ -12,4 +15,4 @@ The current architecture is implemented in a flawed manner, where our digital pr We cannot solve these problems by using the same thinking that created them over the last 30 years. Our tech founders, who are among the original Internet pioneers, have been inventing and creating solutions to overcome the biggest bottlenecks facing the Internet today. Furthermore, this was done, not on the application level, but at the lower infrastructure level. -We welcome the emergence of Web3 and the current decentralized physical infrastructure networks (DePIN) movement; however, it's important to note that many of these projects are still relying on centralized infrastructures, such as Amazon Web Services (AWS), Microsoft Azure and other centralized data centers. For true decentralization to be achieved, projects such as ours are essential. +We welcome the emergence of Web3 and the current decentralized physical infrastructure networks (DePIN) movement; however, it's important to note that many of these projects are still relying on centralized infrastructures, such as Amazon Web Services (AWS), Microsoft Azure and other centralized data centers. For true decentralization to be achieved, projects such as ours are essential. \ No newline at end of file diff --git a/collections/bestkeptsecret/home.md b/collections/bestkeptsecret/home.md index 9fad197..7286f09 100644 --- a/collections/bestkeptsecret/home.md +++ b/collections/bestkeptsecret/home.md @@ -1,13 +1,13 @@ -# ThreeFold, the best kept secret of the Internet & DePIN Space. +# ThreeFold, The Best Kept Secret of the Internet & DePIN Space + +ThreeFold is the best kept secret of the Internet and has the power to reshape how the Internet works. We are now ready to go viral in our 3-phase journey, and we hope you will join us on our exciting path. -ThreeFold is the best kept secret of the Internet and has the power to reshape how the Internet works. -We are now ready to go viral in our 3-phase journey, and we hope you will join us on our exciting path. !!wiki.include page:concept !!wiki.include page:tfgrid_intro -!!wiki.include page:architecture +!!wiki.include page:tf_architecture !!wiki.include page:next_phase @@ -17,6 +17,4 @@ We are now ready to go viral in our 3-phase journey, and we hope you will join u !!wiki.include page:references - -This is part of *TFGRID - +This is part of *TFGrid. \ No newline at end of file diff --git a/collections/bestkeptsecret/image.png b/collections/bestkeptsecret/img/autonomous_computing.png similarity index 100% rename from collections/bestkeptsecret/image.png rename to collections/bestkeptsecret/img/autonomous_computing.png diff --git a/collections/bestkeptsecret/lets_have_fun.md b/collections/bestkeptsecret/lets_have_fun.md index fce857e..236cc71 100644 --- a/collections/bestkeptsecret/lets_have_fun.md +++ b/collections/bestkeptsecret/lets_have_fun.md @@ -1,23 +1,23 @@ -![](fun.png) - -## Let's have fun - -> it's a game, let's create our own Internet, viral expansion - -Only for true believers, not for the pump and dumpers. Invitation only basis. You need to receive a referral code from a friend before you can access our portal and be part of our phase 2 rollout. - -### Node Expansion - -* Claim your area on our Global Map and deploy a computer (TFNode) and optionally also offer wireless connectivity (meshed peer-to-peer) to people around you. -* For each active node deployed in a "red zone" who achieves uptime of 99%, you will receive the option to buy a certain amount of TFT at 0.15 USD (our entry price of INCA). This means that, as our token goes up in value, you will have the option to buy TFT cheaper compared to the market price. -* The first 100,000 nodes as deployed in an "orange or red zone" will receive reward boosters (1.5x) - -### User Expansion - -* Become part of our viral movement: for each person you bring into the system who shows ownership of at least 10,000 TFT, you will receive the option to buy 2,000 TFT at 0.15 USD (limited to 100m TFT). -* These TFT can be exchanged to INCA, which is our mutual credit currency for the our Grid -(our new Internet) and the ONLY way to sell/buy services on that network of capacity. - -![image alt text](img/stats.png) - -The above shows the current deployed capacity… and this is only the beginning! +![](fun.png) + +## Let's have fun + +> it's a game, let's create our own Internet, viral expansion + +Only for true believers, not for the pump and dumpers. Invitation only basis. You need to receive a referral code from a friend before you can access our portal and be part of our phase 2 rollout. + +### Node Expansion + +* Claim your area on our Global Map and deploy a computer (TFNode) and optionally also offer wireless connectivity (meshed peer-to-peer) to people around you. +* For each active node deployed in a "red zone" who achieves uptime of 99%, you will receive the option to buy a certain amount of TFT at 0.15 USD (our entry price of INCA). This means that, as our token goes up in value, you will have the option to buy TFT cheaper compared to the market price. +* The first 100,000 nodes as deployed in an "orange or red zone" will receive reward boosters (1.5x) + +### User Expansion + +* Become part of our viral movement: for each person you bring into the system who shows ownership of at least 10,000 TFT, you will receive the option to buy 2,000 TFT at 0.15 USD (limited to 100m TFT). +* These TFT can be exchanged to INCA, which is our mutual credit currency for the our Grid +(our new Internet) and the ONLY way to sell/buy services on that network of capacity. + +![image alt text](img/stats.png) + +The above shows the current deployed capacity… and this is only the beginning! diff --git a/collections/bestkeptsecret/next_phase.md b/collections/bestkeptsecret/next_phase.md index 3999793..16a0b7f 100644 --- a/collections/bestkeptsecret/next_phase.md +++ b/collections/bestkeptsecret/next_phase.md @@ -1,10 +1,12 @@ -![alt text](next_phase.png) + ## We are ready to go to our next phase -### Phase 1: We made the TFGrid technology work +![alt text](next_phase.png) -#### ThreeFold Grid is alive and the most incredible technology has been proven to work. +### Phase 1: We Made the TFGrid Technology Work + +#### ThreeFold Grid is alive and the most incredible technology has been proven to work We had to achieve what seemed impossible. Can we develop a new foundational layer that could serve as the base layer for any web2 or web3 project in the world to deploy upon? Can we tackle and potentially resolve some of the most challenging issues for the infrastructure layer that empowers our digital life? @@ -16,17 +18,17 @@ It has taken us over 20 years to prove that: * A new Storage System can be created which is more efficient, hyper scalable and cannot be hacked, not even by quantum computers. * A new Network System can be created which has the power to let us communicate over any possible medium (5G, fiber, satellite), is end-to-end encrypted, is capable of restoring any broken connection in real time, and is always looking for the shortest path between participants on this network. -#### To arrive at this point: +#### To Arrive at This Point * Over the past two decades, 7 companies have been created with the goal of tackling some of these challenging problems. These companies have since been acquired by larger corporations, and their technology is widely used today, significantly contributing to the Internet. * Within ThreeFold itself, $50,000,000 has been invested by our community members, TF farmers, and technology companies. The TFT token symbolizes the collective effort of our ecosystem. -* The TFT has played a crucial role in enabling the funding and growth of this highly ambitious project. The maximum supply of TFT is set at 1,000,000,000 TFT, which we anticipate reaching in the coming months. Currently, our market capitalization stands at just $15,000,000. +* TFT has played a crucial role in enabling the funding and growth of this highly ambitious project. The maximum supply of TFT is set at 1,000,000,000 TFT, which we anticipate reaching in the coming months. Currently, our market capitalization stands at just $15,000,000. * A venture creator has been established in Mauritius with a focus on emerging countries to deploy this new type of Internet system, and two countries have already signed up for it. * We have developed additional incredible technologies to address the challenges associated with this radically new approach. -### Phase 2: We go viral +### Phase 2: We Go Viral -> let's buy our tokens back and deploy +10,000 additional nodes +> Let's buy our tokens back and deploy +10,000 additional nodes It's now time to go viral, we want to use the power of human networks to expand and grow our project before going mainstream in phase 3. @@ -36,17 +38,16 @@ Our aim for phase 2: * We want to grow our network 50x as soon as we can. * We are confident then people will start noticing the value we create and will buy as many TFT as they can. - -### Phase 3: We are the underlying layer for a new Internet +### Phase 3: We Are the Underlying Layer for a New Internet We want to be part of the DePIN ecosystem. ![image alt text](img/top_depin.png) -In our opinion, we are just at the beginning of the journey for DePIN. ThreeFold a lot of compute and storage capacity and more foundational relevant technology compared to any projects displayed above. +In our opinion, we are just at the beginning of the journey for DePIN. ThreeFold has a lot of compute and storage capacity and more foundational relevant technology compared to any projects displayed above. > We are not a competitor: we deliver a layer which is needed by all those projects. We are a true decentralized cloud layer which can serve as a basis for all those projects. -**Each of the players above can be deployed on top of ThreeFold, while ThreeFold can not live on top of them. ** +**Each of the players above can be deployed on top of ThreeFold, while ThreeFold can not live on top of them.** -**With appropriate team and funding, we have all it takes to be a top 10 player.** +**With appropriate team and funding, we have all it takes to be a top 10 player.** \ No newline at end of file diff --git a/collections/bestkeptsecret/references.md b/collections/bestkeptsecret/references.md index ba9074f..b579253 100644 --- a/collections/bestkeptsecret/references.md +++ b/collections/bestkeptsecret/references.md @@ -1,9 +1,9 @@ -![](references.png) - ## References -* [Statistics of our network](img/https://next.dashboard.grid.tf/#/tf-grid/node-statistics/) -* [Dashboard for our community](img/https://next.dashboard.grid.tf/) -* [Manual for system administrators](img/https://manual.grid.tf/system_administrators/system_administrators.html) -* [Manual for farmers](img/https://manual.grid.tf/farmers/farmers.html) (current version, new one is changing). -* [Manual for developers](img/https://manual.grid.tf/developers/developers.html) +* [Network Statistics](https://stats.grid.tf/) +* [ThreeFold Dashboard](https://dashboard.grid.tf/) +* [Manuals for System Administrators](https://manual.grid.tf/documentation/system_administrators/system_administrators.html) +* [Manual for Farmers](https://manual.grid.tf/documentation/farmers/farmers.html) +* [Manual for Developers](https://manual.grid.tf/documentation/developers/developers.html) + +![](references.png) \ No newline at end of file diff --git a/collections/bestkeptsecret/tf_architecture.md b/collections/bestkeptsecret/tf_architecture.md index 704dceb..d9e2224 100644 --- a/collections/bestkeptsecret/tf_architecture.md +++ b/collections/bestkeptsecret/tf_architecture.md @@ -1,18 +1,17 @@ +## Production-Ready Autonomous Computing +Our system offers autonomous computing. -![alt text](image.png) - -## Our Decentralized Cloud System - +![autonomous computing](autonomous_computing.png) +## Cloud Innovations Our system comprises several innovative components, with the three main ones being: * Zero-OS, our open-source low-level operating system, which enables anyone to become a cloud provider. This operating system supports all required Web2 and Web3 workloads. -* Mycelium, our software networking layer (not to be confused by Project Mycelium), which can create networks on both physical and logical levels, fully interconnecting with existing Internet networks. It offers privacy and redundancy that are currently not possible elsewhere. In version 4.0 we will be supporting meshed wireless, lorawan (like helium) and even 5G base stations. +* Mycelium, our software networking layer (not to be confused by Project Mycelium), which can create networks on both physical and logical levels, fully interconnecting with existing Internet networks. It offers privacy and redundancy that are currently not possible elsewhere. In version 4.0, we will be supporting meshed wireless, LoRaWAN (like Helium) and even 5G base stations. * Our Quantum Safe Storage system, which is capable of storing data in ways that are indestructible, efficient, and ultra-scalable. Previous versions of this system are widely used to store Zetabytes of information by large organizations. ![image alt text](img/3node_simple.png) - > More info see [Technology](https://info.ourworld.tf/tech/tech/key_innovations_overview.html) \ No newline at end of file diff --git a/collections/bestkeptsecret/tfgrid_intro.md b/collections/bestkeptsecret/tfgrid_intro.md index 1764692..5489878 100644 --- a/collections/bestkeptsecret/tfgrid_intro.md +++ b/collections/bestkeptsecret/tfgrid_intro.md @@ -1,13 +1,13 @@ -## The ThreeFold Grid +## ThreeFold Grid: Our Decentralized Internet & Cloud System + +The ThreeFold Grid is a decentralized Internet and cloud system that is already in production mode in more than 60 countries. Thousands of nodes are part of the grid and new nodes are added constantly. ![](tfgrid8.png) -Our Decentralized Internet & Cloud System - What we provide is not simply an algorithm, but a foundational layer, and this layer is a requirement for other projects to be successful in a true decentralized manner. ![image alt text](img/cloud_close_to_use.png) We represent the foundational layer on top of which many other layers may be built. -![image alt text](img/cloud_close_to_use2.png) +![image alt text](img/cloud_close_to_use2.png) \ No newline at end of file diff --git a/collections/bestkeptsecret/tft_vs_inca.md b/collections/bestkeptsecret/tft_vs_inca.md index d78cb41..495fe21 100644 --- a/collections/bestkeptsecret/tft_vs_inca.md +++ b/collections/bestkeptsecret/tft_vs_inca.md @@ -1,8 +1,6 @@ +## TFT and INCA -![image alt text](img/inca_mutual_credit.png) - - -## TFT vs INCA +We envision a great symbiosis and strong interactions between the two tokens TFT and INCA. TFT - our reserved currency, the result of having created our system (1 billion TFT) - TFT is needed to be able to buy INCA which is needed to buy Cloud and Internet Connectivity. @@ -14,3 +12,8 @@ TFT - our reserved currency, the result of having created our system (1 billion For the first year, there is a 1-1 mapping between TFT & INCA, for each INCA in the system there needs to be 1 TFT in the wallet of the user. The Internet Cloud & Connectivity is +1 trillion USD Business. Our current market cap of TFT is 15m USD. +## INCA Mutual Credit + +Here's an overview of the mutual credit that we propose where TFT acts as a reserve currency. + +![image alt text](img/inca_mutual_credit.png) \ No newline at end of file diff --git a/collections/bestkeptsecret/we_have_all_needed.md b/collections/bestkeptsecret/we_have_all_needed.md index c462509..3748f28 100644 --- a/collections/bestkeptsecret/we_have_all_needed.md +++ b/collections/bestkeptsecret/we_have_all_needed.md @@ -1,9 +1,10 @@ +# We have all the tech required to build an Internet from scratch if that would be needed -## We have all the tech required to build an Internet from scratch if that would be needed +Companies or individuals can invest in computers, ThreeFold wireless routers, or even 5G mobile antennas to provide Internet and Cloud Services to those around them. Our innovation lies in simplifying something incredibly complex, making it accessible and deployable by everyone. ![image alt text](img/network_layout.png) -Companies or individuals can invest in computers, ThreeFold wireless routers, or even 5G mobile antennas to provide Internet and Cloud Services to those around them. Our innovation lies in simplifying something incredibly complex, making it accessible and deployable by everyone. We have developed technology that enables anyone to become a Cloud and Internet service provider by creating an autonomous system capable of self-management without the need for human intervention. +We have developed technology that enables anyone to become a Cloud and Internet service provider by creating an autonomous system capable of self-management without the need for human intervention. Everyone can now: @@ -18,4 +19,4 @@ The results are astonishing: * More than 90% of all data can be localized, reducing bandwidth requirements to the rest of the Internet by 90%. By acting as a content delivery network (CDN), you help save on bandwidth costs for everyone, while also enhancing performance. * This platform enables new use cases, such as streaming virtual and augmented reality directly from the cloud to your mobile phone, offering ultra-realistic video quality without the need for expensive equipment. * The system is designed to withstand war or natural disasters: as long as there are enough nodes and the Mycelium network is operational, it can continue providing connectivity at any time. -* Our data and applications are truly sovereign, allowing us to choose where our digital life resides. This could fundamentally change how the Internet works. +* Our data and applications are truly sovereign, allowing us to choose where our digital life resides. This could fundamentally change how the Internet works. \ No newline at end of file diff --git a/collections/companies/bettertoken.md b/collections/companies/bettertoken.md new file mode 100644 index 0000000..81ff291 --- /dev/null +++ b/collections/companies/bettertoken.md @@ -0,0 +1,33 @@ +

BetterToken NV

+ +

Table of Contents

+ +- [Introduction](#introduction) +- [Income](#income) +- [Structure](#structure) +- [Expected Changes](#expected-changes) + +*** + +## Introduction + +European Farming Cooperative for the foundation: + +- Operates a data center in Lochristi (Belgium) offering hosting and connectivity for TF Farmers +- Currently, 100+ nodes – many of them are owned by TF farmers +- [ThreeFold Tech](./threefold_tech.md) NV uses some of their equipment today for development +- Sale of small servers to TF Farmers, was done mainly via an online webshop + +## Income + +- Hosting fees for the maintenance & running of the farmer pool + +## Structure + +- Started 30 November 2016 +- [limited liable company in belgium](http://www.ejustice.just.fgov.be/tsv_pdf/2016/11/30/16324281.pdf) +- Peter Van der Henst is the managing director + +## Expected Changes + +BetterToken continues to be farming cooperative for Europe. Right now there is not much happening in BetterToken. \ No newline at end of file diff --git a/collections/companies/threefold_ag.md b/collections/companies/threefold_ag.md new file mode 100644 index 0000000..2d1c69f --- /dev/null +++ b/collections/companies/threefold_ag.md @@ -0,0 +1,20 @@ +

ThreeFold Switzerland

+ +

Table of Contents

+ +- [Introduction](#introduction) +- [Some Plans](#some-plans) + +*** + +## Introduction + +ThreeFold Switzerland is officially called ThreeFold AG. + +While there are activities done at this time, we are preparing for future activities. + +## Some Plans + +- Promotion of ThreeFold, specifically in Zug Communities (CH). + +![](img/crypto_valley_zug_.jpg) \ No newline at end of file diff --git a/collections/companies/threefold_vzw.md b/collections/companies/threefold_vzw.md new file mode 100644 index 0000000..584653f --- /dev/null +++ b/collections/companies/threefold_vzw.md @@ -0,0 +1,48 @@ +

ThreeFold VZW

+ +

Table of Contents

+ +- [Introduction](#introduction) +- [Functions](#functions) +- [Some History](#some-history) +- [Belgium Official Doc](#belgium-official-doc) + +*** + +## Introduction + +ThreeFold VZW is a non for profit organization based in Belgium. + +A **VZW** has no shareholders, only members. + + + +## Functions + +- owner of the wisdom_council +- eventuallly ThreeFold VZW will own some decentralized organizations as operating in the ThreeFold world e.g. [TF Dubai](./threefold_dubai.md) + +## Some History + +We all started in Belgium from Korenlei 22, a super old building in the middle of the town. It dates back to 1731. + +![](img/korenlei_22.jpg) + +![](img/korenlei_old.jpg) + +Now the foundation has another address in Lochristi. + + + +## Belgium Official Doc + +![](img/threefold_vzw_official_doc.jpg) + + + +See also https://trendstop.knack.be/en/detail/747872572/threefold-foundation.aspx \ No newline at end of file diff --git a/collections/dy_intro/dunia_yetu/about_us.md b/collections/dy_intro/dunia_yetu/about_us.md index 632afc8..49d5c34 100644 --- a/collections/dy_intro/dunia_yetu/about_us.md +++ b/collections/dy_intro/dunia_yetu/about_us.md @@ -1,12 +1,13 @@ ![Image](img/about.png#medium#mx-auto) ## About Us -### Who we are +### Who We Are Dunia Yetu, which means "Our World" in Swahili, is not just a name; it's a powerful symbol of collective empowerment and a vision of a digital future where Tanzanians are in control of their own destiny. It embodies unity, autonomy, and a commitment to digital sovereignty. As a people-powered movement, Dunia Yetu aims to redefine Tanzania's digital ecosystem, emphasising collective ownership and a self-reliant digital future shaped by the community. Envision a future where Tanzanians create and oversee their digital experiences, tailored to the nation’s unique needs. Through Dunia Yetu, this vision becomes reality. ### Our Mission + Our mission is to unite a community, enhancing Tanzanian autonomy and independence. Empowering citizens to collectively shape Tanzania's future starts with regaining control of the nation’s Internet infrastructure and establishing a self-reliant digital ecosystem. In the next two years, we aim to empower thousands of coders with an innovative network and toolkit. Beyond technology, our initiative signifies more—an independent digital ecosystem proudly owned and managed by East Africans. The Internet was meant to be a peer-to-peer infrastructure where we are at the centre of our data and digital lives. Inspired by the past, we’re building an Internet how “the” Internet was originally intended. diff --git a/collections/dy_intro/dunia_yetu/dunia_yetu.md b/collections/dy_intro/dunia_yetu/dunia_yetu.md index 757cd4d..e6a57b0 100644 --- a/collections/dy_intro/dunia_yetu/dunia_yetu.md +++ b/collections/dy_intro/dunia_yetu/dunia_yetu.md @@ -2,3 +2,8 @@ ![Image](img/dunia2.png#medium#mx-auto) +Together with a group of tech community leaders and innovators from Dar Es Salaam, we have kicked off a project called Dunia Yetu (Our World, in Swahili). + +The primary goal of Dunia Yetu is to deliver a set of tools and a platform which will allow many thousands of coders in East Africa to create their own digital sovereign Internet. For now, it begins with the deployment of local ThreeFold infrastructure and a series of events and gatherings. + +Learn more about the project and the initial steps by reading this book. \ No newline at end of file diff --git a/collections/dy_intro/how_you_can_participate/build.md b/collections/dy_intro/how_you_can_participate/build.md index 5d9f695..b5789e1 100644 --- a/collections/dy_intro/how_you_can_participate/build.md +++ b/collections/dy_intro/how_you_can_participate/build.md @@ -1,6 +1,6 @@ ![image](img/build2.png "image_tooltip") -## Build on top of Tanzania’s decentralised internet +## Build on Top of Tanzania’s Decentralised Internet **True digital sovereignty for open-source builders** diff --git a/collections/dy_intro/how_you_can_participate/host_a_node.md b/collections/dy_intro/how_you_can_participate/host_a_node.md index 6fc6ab3..2c055a5 100644 --- a/collections/dy_intro/how_you_can_participate/host_a_node.md +++ b/collections/dy_intro/how_you_can_participate/host_a_node.md @@ -1,4 +1,4 @@ -## Host a node +## Host a Node You can help make Tanzania’s own sovereign internet a reality by hosting a node. @@ -6,19 +6,19 @@ By connecting hardware at your home or office – or anywhere you’d like – y ![image](img/node.png "image_tooltip") -### How to build a node +### How to Build a Node **Step 1 -** Obtain the hardware for a node which can be purchased [here](https://marketplace.3node.global/index.php) -**Step 2 -** Follow this [instruction manual](https://manual.grid.tf/farmers/3node_building/3node_building.html) to set up your node +**Step 2 -** Follow the [instruction manual](https://manual.grid.tf/documentation/farmers/3node_building/3node_building.html) to set up your node -**Step 3 -** Earn TFT [(learn more)](https://manual.grid.tf/farmers/farming_optimization/farming_optimization.html) +**Step 3 -** Earn TFT ([Learn more](https://manual.grid.tf/documentation/farmers/farming_optimization/calculate_roi.html)) We have a team on the ground in Dar Es Salaam for all the necessary support that you might need with setting up your node. -### How to earn TFT +### How to Earn TFT -Farmers earn TFT according to the amount of Internet capacity their Nodes connect to the ThreeFold Grid. The Internet capacity is verified by the ThreeFold Blockchain on an ongoing basis using the “Proof-of-Capacity” algorithm. Learn more [here](https://manual.grid.tf/threefold_token/threefold_token.html). +Farmers earn TFT according to the amount of Internet capacity their Nodes connect to the ThreeFold Grid. The Internet capacity is verified by the ThreeFold Blockchain on an ongoing basis using the “Proof-of-Capacity” algorithm. Learn more [here](https://manual.grid.tf/documentation/threefold_token/threefold_token.html). ![image](img/tft.png "image_tooltip") diff --git a/collections/dy_intro/how_you_can_participate/participate.md b/collections/dy_intro/how_you_can_participate/participate.md index 50adabc..05e1750 100644 --- a/collections/dy_intro/how_you_can_participate/participate.md +++ b/collections/dy_intro/how_you_can_participate/participate.md @@ -1,4 +1,4 @@ -# How you can participate +# How You Can Participate ![Image](img/participate.png#medium#mx-auto) diff --git a/collections/earthhub/faq.md b/collections/earthhub/faq.md index c9d3f17..a395f13 100644 --- a/collections/earthhub/faq.md +++ b/collections/earthhub/faq.md @@ -1,19 +1,30 @@ # FAQ -### Decentralization +# Earth Hub Benefits +## Decentralization -### Security? +Having a decentralized protocol on centralized servers can be somewhat sub-optimal. -- The protocols by itself have quite some security but this security also makes it sometimes just a little harder to use. +Earth Hub provides decentralization thanks to its workload being run on the Mycelium network by decentralized nodes. With Mycelium nodes, the shortest path is taken and we can then deliver real edge cloud results. We do not rely heavily on big data center but can disperse workloads and be compliants with local conditions, e.g. being GDPR compliant. -### Scalability? +## Security -- The systems are capable to be super scalable but because people don't want to operate themselves its somewhat more limited. +The protocols discussed in this book by itself have quite some security, but this security also makes it sometimes just a little harder to use. -### Is the data secure and protected? +Earth Hub allows for a very simple process that is self-healing by design. -- Thanks to EarthHub we can store the data on a quantum safe storage system which will allow more reliability and security. +## Scalability + +The protocols discussed in this book are capable of being super scalable, but since people don't want to operate those protocols themselves this somewhat limits scalability. + +With Earth Hub, there is no need to install and main server: this fact can drastically increase the scalability factor by enabling anyone to get set up easily without technical knowledge required. + +### Data Protection + +While there can be a level of data protection with the protocols described in the book, it stays limited. + +Thanks to Earth Hub, we can store the data on a quantum safe storage system which will allow more reliability and security. diff --git a/collections/earthhub/intro.md b/collections/earthhub/intro.md index 1bf99f8..98239ad 100644 --- a/collections/earthhub/intro.md +++ b/collections/earthhub/intro.md @@ -2,54 +2,64 @@ ![](img/earthhub0.png) -Earthhub is a novel way how to re-invent how the social networks work based on existing protocols and apps. +Earth Hub is a novel way how to re-invent how the social networks work based on existing protocols and apps. -There are very good protocols out there like +There are very good protocols out there, such as: -- matrix -- activitypub -- nostr +- Matrix +- ActivityPub +- Nostr Each have their own speciality and the app support by now is marvelous. -> more than 280,000,000 users are now on decentralized platforms based on the 3 above chosen protocols. +> More than 280,000,000 users are now on decentralized platforms based on the 3 above chosen protocols. -## There are still some elements slowing it down: +## There are still some elements slowing it down -- no monetization of the hosters of the servers -- complexity to install, maintain a server -- different protocols, not being interlinked (need more bridges) -- hard to find users and define your interest groups -- redundancy: how do we know my data is safe? +- Monetizatio + - No monetization of the hosters of the servers +- Complexity + - Complexity to install and maintain a server +- Different protocols + - Not being interlinked, they need more bridges +- Search limited + - Hard to find users and define your interest groups +- Redundancy + - Hard to know with certainty if your data is safe - -## How do we resolve these issues +## How We Resolve These Issues ### Monetization -- Thanks to EarthWallet micropayments are done to automatically reward the relays, nodes, bandwidth points for utilization. -- Cost: having full blown sovereign social network app capabilities doesn't have to be expensive, a couple of USD per month should be enough. There is not something as a free lunch. -- Customers will not feel it, they will only pay for what they use which will be super small. +- Automatic micropayment: + - Thanks to Earth Wallet micropayments are done to automatically to reward the relays, nodes and bandwidth points for utilization. +- Minimal cost: + - Having full blown sovereign social network app capabilities doesn't have to be expensive: a couple of USD per month should be enough. *There is no such thing as a free lunch!.* +- Fulfilled customers: + - Customers will not feel it, they will only pay for what they use which will be super small. ### Complexity -EarthHub adds the following: +Earth Hub adds the following: -- Single Sign On -- Unified Naming System -- No need to maintain/install nodes. -- Mycelium as network interconnects all nodes over all protocols and provides an ultra safe connectivity for all. -- All is done with full self healing capabilities. +- Single sign on +- Unified Naming System (UNS) +- No need to maintain/install nodes +- The Mycelium Network interconnects all nodes over all protocols and provides an ultra safe connectivity for all +- All is done with full self healing capabilities -### Find Users (user experience) +### How to Find Users -- at each Hub we do single sign on and make it super easy for people to find each other. +It's easy to find users with Earth Hub. + +- At each Hub, we do single sign on and make it super easy for people to find each other ### Redundancy -- thanks to EarthHub all data is stored on a storage system (quantum safe) which makes sure data can never be corrupted nor lost. +With EarthHub, all data is stored on a storage system (quantum safe) which makes sure data can never be corrupted nor lost. -## What extra will we add +## Additional Features -- personal e-book + website publishing platform with support for CDN in Mycelium -- personal S3 server which serves as backend for all above (also the backup of your social media exposure) \ No newline at end of file +We will be able to add personal e-book and website publishing platform with support for CND in Mycelium. + +We set a S3 server as a backend for all the above (also the backup of your social media exposure). \ No newline at end of file diff --git a/collections/earthhub/roadmap.md b/collections/earthhub/roadmap.md index 177c4fd..dbb06e0 100644 --- a/collections/earthhub/roadmap.md +++ b/collections/earthhub/roadmap.md @@ -1,12 +1,12 @@ # Roadmap -## Announcement when Earth wallet goes mainnet +## Announcement When Earth Wallet Goes Mainnet -- serious collaboration between TF & EarthWallet -- people can buy Earth Hub NFT's for personal name & position in the Earth Hub Federation +We are currently in serious collaborations with Earth Wallet. + +People can buy Earth Hub NFT's for personal name & position in the Earth Hub Federation. ## End May -- first 1000 people early testers - +We aim to have by the end of May the first 1000 testers on the grid. Those will server as our early testers and will set the ground for the expansion of the Earth Wallet community and ecosystem. diff --git a/collections/earthhub/utilization.md b/collections/earthhub/utilization.md index 7d9fba5..8ec3e92 100644 --- a/collections/earthhub/utilization.md +++ b/collections/earthhub/utilization.md @@ -1,29 +1,29 @@ # Utilization -> more than 280,000,000 users are now on decentralized platforms based on the 3 chosen protocols. +## Introduction -### ActivityPub: +150,000,000 +There are currently more than 280,000,000 users interacting on decentralized platforms based on the 3 protocols present. -- **Overview**: ActivityPub is a decentralized social networking protocol that powers a wide range of social media platforms and applications, the most notable being Mastodon. It enables users across different platforms to interact with each other. -- **User Count**: Mastodon, the largest platform using ActivityPub, +14.4 million, spurred by a significant influx of new users around that time. The total number of ActivityPub users across all platforms is way higher when including other services like Pleroma, PeerTube, and Pixelfed, Threats (meta) - -### Matrix: +115,000,000 - -![alt text](matrix.png) +## Matrix: +115,000,000 users - **Overview**: Matrix is an open network for secure, decentralized communication, supporting instant messaging, VoIP, and video calling features. It's used by a variety of clients and services, both for personal messaging and organizational communication. - **User Count**: As of early 2023, Matrix had over 60 million addressable users. This number represents the total users that can be reached within the Matrix network, though active user numbers may be lower. The growth of Matrix has been consistent, driven by both community adoption and organizational use, including several governmental bodies. Today its more than 115,000,000 users. -### NOSTR +## ActivityPub: +150,000,000 users -- **Overview**: NOSTR (Notes and Other Stuff Transmitted by Relays) is a relatively new and simple decentralized protocol for open and censorship-resistant social networks. Being in its early stages, it has attracted attention for its simplicity and potential for privacy-focused social networking. -- **User Count**: +-400k but hard to know exact. Adoption is currently much lower than for ActivityPub or Matrix, but interest in the protocol is growing within certain communities focused on privacy and decentralization. +- **Overview**: ActivityPub is a decentralized social networking protocol that powers a wide range of social media platforms and applications, the most notable being Mastodon. It enables users across different platforms to interact with each other. +- **User Count**: Mastodon, the largest platform using ActivityPub, +14.4 million, spurred by a significant influx of new users around that time. The total number of ActivityPub users across all platforms is way higher when including other services like Pleroma, PeerTube, and Pixelfed, Threats (meta). -### Remarks +## Nostr +25,000,000 -- **Growth and Adoption**: While ActivityPub has seen widespread adoption due to platforms like Mastodon, Matrix is also significantly growing, particularly among tech-savvy users and organizations needing secure communication. NOSTR, being newer, has a smaller user base but is of interest to those deeply invested in decentralization and privacy. +- **Overview**: Nostr (Notes and Other Stuff Transmitted by Relays) is a relatively new and simple decentralized protocol for open and censorship-resistant social networks. Being in its early stages, it has attracted attention for its simplicity and potential for privacy-focused social networking. +- **User Count**: Hard to know exactly, but the [Nostr stats website indicates](https://stats.nostr.band/) that there are currently 25 million users as of May 2024. Adoption is currently much lower than for ActivityPub or Matrix, but interest in the protocol is growing within certain communities focused on privacy and decentralization. + +## Remarks + +- **Growth and Adoption**: While ActivityPub has seen widespread adoption due to platforms like Mastodon, Matrix is also significantly growing, particularly among tech-savvy users and organizations needing secure communication. Nostr, being newer, has a smaller user base, but is of interest to those deeply invested in decentralization and privacy. - **Measurement Challenges**: Measuring the exact number of users on decentralized networks is inherently challenging. Many instances or servers do not publicly report their user numbers, and users can have multiple accounts across different servers. -## conclusion +## Conclusion -While ActivityPub currently leads in terms of user adoption mainly because of Mastodon's popularity, Matrix is also a significant player in the decentralized communication space with a strong user base. NOSTR is an emerging protocol with potential for growth as it gains more recognition and development support. \ No newline at end of file +While ActivityPub currently leads in terms of user adoption mainly because of Mastodon's popularity, Matrix is also a significant player in the decentralized communication space with a strong user base. Nostr is an emerging protocol with potential for growth as it gains more recognition and development support. \ No newline at end of file diff --git a/collections/economy/.collection b/collections/economy/.collection new file mode 100644 index 0000000..e69de29 diff --git a/collections/economy/economy.md b/collections/economy/economy.md new file mode 100644 index 0000000..d23f823 --- /dev/null +++ b/collections/economy/economy.md @@ -0,0 +1,3 @@ +# Economy + +We present the overall economy of the grid and the interactions between the different tokens that are part of the ecosystem. \ No newline at end of file diff --git a/collections/economy/img/.done b/collections/economy/img/.done new file mode 100644 index 0000000..cc7fa0c --- /dev/null +++ b/collections/economy/img/.done @@ -0,0 +1,5 @@ +mutual_credit.png +chi.png +chi2.png +chireserve.png +incaprojects.png diff --git a/collections/economy/img/chi.png b/collections/economy/img/chi.png new file mode 100644 index 0000000..0a19854 Binary files /dev/null and b/collections/economy/img/chi.png differ diff --git a/collections/economy/img/chi2.png b/collections/economy/img/chi2.png new file mode 100644 index 0000000..d7a418f Binary files /dev/null and b/collections/economy/img/chi2.png differ diff --git a/collections/economy/img/chireserve.png b/collections/economy/img/chireserve.png new file mode 100644 index 0000000..872dc82 Binary files /dev/null and b/collections/economy/img/chireserve.png differ diff --git a/collections/economy/img/incaprojects.png b/collections/economy/img/incaprojects.png new file mode 100644 index 0000000..b4fe877 Binary files /dev/null and b/collections/economy/img/incaprojects.png differ diff --git a/collections/economy/img/mutual_credit.png b/collections/economy/img/mutual_credit.png new file mode 100644 index 0000000..8d1e872 Binary files /dev/null and b/collections/economy/img/mutual_credit.png differ diff --git a/collections/economy/inca.md b/collections/economy/inca.md new file mode 100644 index 0000000..910cca7 --- /dev/null +++ b/collections/economy/inca.md @@ -0,0 +1,69 @@ + + +![](img/chi2.png) + +# INCA Fuel a stable asset backed currency + +INCA is ThreeFold's native, asset-backed[Mutual Credit](p2p:mutualcredit) currency. It enables individuals to earn income by serving as cloud providers, while allowing others to pay for the cloud services received. + +> We are greatly inspired by Holochain and their Mutual Credit Currency called HOLOFUEL and have decided to model our utility currency similarly. For more information on how HoloFuel functions, you can visit Holo's FAQ on HOLOFUEL. We extend our gratitude to Holochain for their pioneering work and the example they've set. This article is a modified version of their article. + +## How does it work + +INCA is a contractual service obligation, redeemable for a service as deliverd on [TFGrid](def:tfgrid.md). + +INCA Fuel is a mutual-credit accounting system capable of performing billions of daily microtransactions. Its primary use is for a [Cloud Developer](def:cloud_dev.md) to pay a [Cloud Provider](def:cloud_provider.md) for their services. + +INCA Fuel is not really a digital currency, it can be used as such but practically its a mutual credit, a promise to something in the futurel, that promise is recorded in each INCA Promise. The INCA Note's (the mutal credit) can be transfered to someone else but the properties stay the same. + +## INCA Fuel benefits: + +- A completely peer-to-peer crypto currency. +- Optimized for high speed and minimal fees. +- Currency you earn for hosting cloud services on Holo, and redeem to pay your bills. + +Completely accountable and transparent crypto-accounting, operating by known and shared rules running on every host machine. + +## Practical + +- for the first 6 months 'INCA' is valued at 0.15 USD which corresponds to fully diluted marketcap of 150m +- if you need INCA you can become a [Cloud Provider](def:cloud_provider.md) or you buy INCA using any of the supported currencies (see [inca reserve doc](reserve.md)). + + +## How is INCA different? + +- **Mutual Credit:** Unlike other cryptocurrencies which are primarily used for speculation, INCA is not tokens created from nothing. It is a double-entry crypto-accounting framework in which units are created, transferred, or destroyed at transaction time. +- **Asset-Backed:** INCA is backed by the computing,storage, network power of hosts like you across the globe. That means it can be redeemed for a product with real utility. +- **Value-Stable:** The value of INCA is connected to provided services of the tfgrid. This capacity evolves and changes slowly and isn't subject to huge spikes and crashes the way other speculative tokens are. +- **Scalable:** INCA is designed for micro-transactions, which means it needs to support millions of global value exchanges per second at fractional values. This is possible thanks to our massively parallel design. + +## How can I use INCA? + +- Spend it through a variety of apps and online marketplaces. +- Redeem INCA earned by providing cloud services for other currencies to pay your bills. +- Borrow it, based on your proven hosting track record, to pay for things. + +## Details + +INCA marks the beginning of a new era of cryptocurrencies backed by the capacity provided by people. All of the currency supply is correlated to providing cloud services. Unlike other systems you don't have to be a technical specialist to be able to become a cloud provider. + +Most cryptocurrencies are modeled as digital objects tracked on a global ledger. With INCA, each user has their own ledger showing their account balance and transaction history. Each transaction requires an agreement between two people, which is then recorded on their respective ledgers and validated by peers in the network. + +Mutual credit means that every credit (positive) has an equally matching debit (negative), giving a net supply of zero and a dynamic circulating supply that’s responsive to the actual market behavior of its users. + +Credit limits are directly connected to a demonstrated capacity to repay a negative balance by providing hosting resources. INCA is directly redeemable for cloud services. INCA is therefore backed by cloud services, a valuable modern asset. + +Being asset-backed and having a dynamic supply means that INCA can be value-stable without being static or requiring a peg (first 6 months we link to USD). INCA can optimize the market value of its units in relation to the cost of hosting, creating a steady and stable trajectory. + +The agent-centric design allows for the transactions per second (TPS) to increase the more people use it, mirroring how the English language’s “words per second” increases as more people speak it. Therefore, INCA is scalable for mass adoption. + +There is no mining or staking involved in earning CHI—only the useful work of cloud services. Anyone can become a cloud provider (a host) and be compensated by application providers who want their hApp served to the web. + +## More Information + +- [a very good arcticle how mutual credit system works and where it came from](https://blog.holochain.org/mutual-credit-part-1-a-new-type-of-cryptocurrency-as-old-as-civilisation/) + + + + +!!wiki.def alias:'inca' \ No newline at end of file diff --git a/collections/economy/incaprojects.md b/collections/economy/incaprojects.md new file mode 100644 index 0000000..a1c112c --- /dev/null +++ b/collections/economy/incaprojects.md @@ -0,0 +1,12 @@ +![](img/incaprojects.png) + +# INCA Projects + +These are projects as endorsed by the TF Cooperative and have INCA as reward mechanism. + +The resulting INCA can be redrawn 10% per month out of the reserve. + +- [sikana](actions:sikana.md) +- [mkondo](actions:mkondo.md) +- [partners](actions:partners.md) + diff --git a/collections/economy/incareserve.md b/collections/economy/incareserve.md new file mode 100644 index 0000000..4b2d40a --- /dev/null +++ b/collections/economy/incareserve.md @@ -0,0 +1,57 @@ + +![](img/chireserve.png) + +# INCA Reserve + +Reserves are accounts that can sell INCA against a credit limit as long as certain conditions are met: the total amount of INCA must be below a system-wide cap based on platform capacity metrics. Each reserve works with a paired currency and there must be demand for that currency from hosts. + +​Anyone can buy INCA at a reserve account, but only INCA earned through being a [Cloud Provider](def:cloud_provider.md) or realizing [INCA Projects](incaprojects.md) can be redeemed there. This creates a circular flow where new INCA bought from a reserve enters the general circulating supply until it is spent on hosting. At that point a host could either sell it on an exchange or redeem it, depending on pricing. + +Reserves will be created by [ThreeFold COOP](def:tfcoop.md) for practical reasons. Reserves need liquidity to function well, so we will ensure that critical mass is achieved before each additional reserve is created. There will be a regulatory complexity involved that must be managed, and reserves obviously have systemic impact by design, so we need to be careful with the roll out. + +### Practical **1 INCA = 0.15 USD** + +- INCA can be bought using TFT on the INCA Reserve + - the price of 1 INCA = 1 TFT (if price of TFT goes above 0.15 this will be adjusted) +- TFT is priced starting at 0.15 USD per TFT (means min marketcap of 150m USD) +- INCA can also be bought with one of following currencies + - HOLOCHAIN currency HOLO + - HIVEMAPPER currency HONEY + - HELIUM currency HNT + - USDC + - EARTHWALLET + +### Initial Provisioning + +- Intial INCA Reserve Mix + - max 1 billion INCA as result of TFT coming into the TFT reserve (max amount of TFT in world) + - max 0.5 billion INCA as result of HOLO, HONEY, HNT, USDC coming in the MIX reserve +- After this a Reserve can only grow id there is demand from hosters for a specific currency, e.g. a hoster wants to provide cloud service and needs to define which currencies they wants to receive (can be more than 1) + +### Lending to INCA Hosters & INCA Projects + +Participants in our ecosystem can receive loans upto a certain amount for INCA, they they need to earn INCA back which can be by providing services which can be paid back by customers or the ThreeFold COOP treasury. + +- upto 20m INCA for INCA Projects +- upto 100m INCA as credit line towards Cloud Providers (hosters) + +The projects can be seen in [projects](incaprojects.md) + + +### Reserve as Treasury + +- all money coming in the reserve wallets (multisigned) make up the treasure, the sender gets INCA in return +- any digital currency can always be re-drawn out of treasury after 1 year lockup + - e.g. someone coming in with HOLO can exchange CHI back to HOLO at same conditions but min 1 year later if there is still HOLO left in the HOLO reserve +- + +### How can people go from INCA back to one of the participating currencies + +- the money in + + + + +### More Info + +> we are learning from [https://medium.com/h-o-l-o/holo-fuel-economics(https://medium.com/h-o-l-o/holo-fuel-economics-101-c9631d63014a) and many of their concepts will be implemented in our reserve. \ No newline at end of file diff --git a/collections/economy/validators.md b/collections/economy/validators.md new file mode 100644 index 0000000..0406094 --- /dev/null +++ b/collections/economy/validators.md @@ -0,0 +1,13 @@ +# Validators + +Validators & staking is happening in TFGrid 4.0. + +- 9 guardians are needed +- they run a full TF Validator Stack (technically) +- anyone can stake TFT on that stack + +reward + +- X percent of revenue over TFGrid in TFT or INCA +- a validator gets a monthly income to support his/her work as well in e.g. INCA or TFT + diff --git a/collections/farming_v4/.collection b/collections/farming_v4/.collection new file mode 100644 index 0000000..e69de29 diff --git a/collections/farming_v4/farming.md b/collections/farming_v4/farming.md new file mode 100644 index 0000000..d687589 --- /dev/null +++ b/collections/farming_v4/farming.md @@ -0,0 +1,108 @@ +## ThreeFold Farming = **Become a Cloud Service Provider** + +![](img/bl_7840c.png) + +Farming means a person offers compute, storage and network capacity to the network. + +- Farmers buy a 3node or mnode (500-2000 USD) +- A farmer connects the node(s) to internet and get rewards for providing capacity +- A farmer earns rewards +- A farmer is helping their community to get access to sovereign Internet & Cloud applications on an unbreakabale co-owned Internet and Cloud + +### Income for the Farmers + +The farmers make capacity available and specify their price. + +The recommended pricing is: + +- $1-5 per person for a digital self (per month) +- $0.01-0.2 for 1 GB Transfer (bandwidth) +- $0.005-0.02 for 1 GB Storage (per month) +- $0.005-4 for Compute/GPU Capacity (gpu, AI, VM, ...) (per hour) +- $0.01-0.2 for 1000 messages over LoraWAN (long range wifi) + +> 80% of these fees goes to farmer, 20% to the *TFCOOP, exception for a digital self (twin) which is 50-50% split. + +### Farming Boosters + +Our aim is to have millions of nodes in the field to eventually create the biggest network of Cloud & Internet Capacity in the world, displaying the amount of nodes in a TFGrid Cell. + +Cell's get colors in line to need of service: + +- Green + - There is enough nodes + - No rewards +- Yellow + - There is a need for some nodes + - Rewards +- Red + - There is a big need for nodes + - This region needs help + - Highest rewards + +### How to Become a Farmer + +- Buy a [TFNode](./tf_nodes.md) or a [TFRouter](./tf_routers.md) (Mycelium Network Node). +- Build your own TFNode + - Our software makes it easy to get started. + + +### Rewards for Being a Farmer + +Typically a farmer can earn the investment of their node back 2 to 10 times over 5 years if succesful. + +> For a [simulation based on twins with storage and bandwidth check here](https://docs.google.com/spreadsheets/d/1D6Q3Yav_SS356zAILwN4SrmqwYfLibT3E6oWrVPU4c8/edit#gid=170998100) + +### Farming Pools + +Some farmers will chose to not manage, market or operate their 3node. In that case, they can join a farming pool. + +A Farming pool takes care of: + +- Marketing the capacity +- Giving support to the userbase (developers) +- Managing the best possible pricing +- Monitor all nodes and optimize uptime +- Monitor available bandwidth and make optimizations where possible. + +If a farmer uses a farming pool, they will have to give a part of their reward to the farming pool, each farming pool can decide how much that needs to be. + +### Advanced: Compute Box + +The more advanced farmers can chose to define compute boxes in their node. A compute box is an amount of CPU, MEM, GPU, SSD as specified by farmer. When users select a node to deploy a VM on they can use one or more of these compute boxes. + +Example a node with 64 GB of memory, 2 TB of SSD and 24 virtual cores. + +- 15 compute boxes each: + - 4 GB of memory (60 GB total) + - 120 GB of SSD capacity + - 6.4 logical CPU core (oversubscription of 4, which means user can max use 4x CPU capacity if system allows) +- when a user choses the full machine, then they will have reserved all compute boxes capacity which means the machine is now dedicated/reserved for the user, the hoster specifies the discount for this (typically 50%). On a dedicated machine, the user has full access to the GPU. +- As a buffer, a minimum of 1GB of memory and 10% of SSD capacity are needed + +How does it work: + +- When a developer wants to deploy a virtual machine + - They need to define the required capacity and will be able to make a choice based on these compute boxes, each compute box has different base specs (mem, ssd, gpu, cpu) and reputation + - The developer can now make a selection of how many of these compute boxes need to be given to the virtual machine. +- This defines the monthly price which will have to be paid as well as capacity available to the VM. + +## Remarks + +### Network Rewards Requires Unblocked Incoming Internet + +Incoming internet traffic should be enabled to earn rewards from network bandwidth. + +If a farmer lacks this capability, their TFNode will connect to a neighboring TFNode with good internet connectivity and public incoming access. In this case, the neighbor farmer will earn money from the internet traffic, while the farmer will continue to earn rewards for compute and storage. + +All traffic is end2end encrypted over the Mycelium network = our P2P Network which lives on top of current Internet. + +**There are 3 ways incoming traffic is possible.** + +- IPv6 public ip address available +- IPv4 public ip address available (harder) +- Portforwarding or hole punching support for UDP + +Mycelium will try a lot of tricks to allow traffic to go to your network. + + diff --git a/collections/farming_v4/img/.done b/collections/farming_v4/img/.done new file mode 100644 index 0000000..3da83c9 --- /dev/null +++ b/collections/farming_v4/img/.done @@ -0,0 +1,9 @@ +bl_7840.png +bl_7840c.png +bl_silver.png +mnode.png +mnode_2.png +mnode_2b.png +mnode_lr.png +mnode_physical.png +networkmap.png diff --git a/collections/farming_v4/img/bl_7840.png b/collections/farming_v4/img/bl_7840.png new file mode 100644 index 0000000..e74766a Binary files /dev/null and b/collections/farming_v4/img/bl_7840.png differ diff --git a/collections/farming_v4/img/bl_7840b.png b/collections/farming_v4/img/bl_7840b.png new file mode 100644 index 0000000..97a4044 Binary files /dev/null and b/collections/farming_v4/img/bl_7840b.png differ diff --git a/collections/farming_v4/img/bl_7840c.png b/collections/farming_v4/img/bl_7840c.png new file mode 100644 index 0000000..409f395 Binary files /dev/null and b/collections/farming_v4/img/bl_7840c.png differ diff --git a/collections/farming_v4/img/bl_silver.png b/collections/farming_v4/img/bl_silver.png new file mode 100644 index 0000000..25fecf4 Binary files /dev/null and b/collections/farming_v4/img/bl_silver.png differ diff --git a/collections/farming_v4/img/loran.png b/collections/farming_v4/img/loran.png new file mode 100644 index 0000000..6c8fcc1 Binary files /dev/null and b/collections/farming_v4/img/loran.png differ diff --git a/collections/farming_v4/img/networkmap.png b/collections/farming_v4/img/networkmap.png new file mode 100644 index 0000000..3d3e314 Binary files /dev/null and b/collections/farming_v4/img/networkmap.png differ diff --git a/collections/farming_v4/img/smallest_3node.png b/collections/farming_v4/img/smallest_3node.png new file mode 100644 index 0000000..bb506b5 Binary files /dev/null and b/collections/farming_v4/img/smallest_3node.png differ diff --git a/collections/farming_v4/img/tfrouter.png b/collections/farming_v4/img/tfrouter.png new file mode 100644 index 0000000..783b8c6 Binary files /dev/null and b/collections/farming_v4/img/tfrouter.png differ diff --git a/collections/farming_v4/img/tfrouter_2.png b/collections/farming_v4/img/tfrouter_2.png new file mode 100644 index 0000000..b305b50 Binary files /dev/null and b/collections/farming_v4/img/tfrouter_2.png differ diff --git a/collections/farming_v4/img/tfrouter_2b.png b/collections/farming_v4/img/tfrouter_2b.png new file mode 100644 index 0000000..7fc9676 Binary files /dev/null and b/collections/farming_v4/img/tfrouter_2b.png differ diff --git a/collections/farming_v4/img/tfrouter_lr.png b/collections/farming_v4/img/tfrouter_lr.png new file mode 100644 index 0000000..29c42c3 Binary files /dev/null and b/collections/farming_v4/img/tfrouter_lr.png differ diff --git a/collections/farming_v4/img/tfrouter_physical.png b/collections/farming_v4/img/tfrouter_physical.png new file mode 100644 index 0000000..bf1059c Binary files /dev/null and b/collections/farming_v4/img/tfrouter_physical.png differ diff --git a/collections/farming_v4/networkmap.md b/collections/farming_v4/networkmap.md new file mode 100644 index 0000000..f1ae9bd --- /dev/null +++ b/collections/farming_v4/networkmap.md @@ -0,0 +1,7 @@ +# Network Map + +ThreeFold aims to have a map to visualize all of the ThreeFold nodes, routers and devices, from farmers and partners. + +As an example, Helium offers the following map: + +![](img/networkmap.png) diff --git a/collections/farming_v4/tf_nodes.md b/collections/farming_v4/tf_nodes.md new file mode 100644 index 0000000..2445fb4 --- /dev/null +++ b/collections/farming_v4/tf_nodes.md @@ -0,0 +1,52 @@ + +# Available TFNodes + + + +### TFNode Silver + +![](img/smallest_3node.png) + +- 16 GB Memory +- 512 GB SSD +- min 4 logical CPU cores + +It will cost less than 500 USD. + +### TFNode Gold + +![](img/bl_silver.png) + +- 32 GB Memory +- 1000 GB SSD +- min 8 logical CPU cores + +It will cost less than 1000 USD. + +### TFNode Platinum + +![](img/bl_7840c.png) + +- 64 GB Memory +- 2000 GB SSD +- 4000 GB HDD +- min 16 logical CPU cores + +It will cost less than 1800 USD. + +### TFNode Datacenter + +- Put your own TFNode in a datacenter of choice + - Make sure you have great and cost effective reliable connectivity to internet +- The Farmer buys their own hardware, ThreeFold supports the farmer to get up and running + +### TFNode Dedicated Rental + +- Rent a node in a dacenter +- Make sure you have good capacity in that datacenter + - Companies like OVH and Hetzner come to mind as reliable and cost effective + + +## Remarks + +We are still working on the exact logistics, the look and feel can be different, but the minimal resources will be the same. diff --git a/collections/farming_v4/tf_routers.md b/collections/farming_v4/tf_routers.md new file mode 100644 index 0000000..91bffab --- /dev/null +++ b/collections/farming_v4/tf_routers.md @@ -0,0 +1,54 @@ + +## TFRouters + +The TFRouters allow everyone to connect the users of our network with the *TFNODE. + +### TFRouter Indoor + +We are partnering with WiFi device vendors to extend the Mycelium Network in a full peer-to-peer fashion. + +WiFi 6 is now a reality and a native capacity from our first chosen node. The TFRouter Indoor can be purchased starting now. + +It's an exciting node with a reasonable price point and enough CPU capacity to run the Mycelium Network stack within the node itself. + +More than 1 node can be installed in a larger office, hotel, home, etc., and they will automatically mesh together. + +Each node runs our ZeroNet Operating System, allowing for native integration into the TFGrid network. This operating system allows to create distributed networking on a planetary scale and allows our farmers to provide network capacity to the grid ecosystem. + +Zero-OS Nodes are seamlessly integrated with the Zero-Net nodes by design, requiring minimal configuration. They are part of our Autonomous Zero-OS Stack. + +![](tfrouter_physical.png) + + +### TFRouter Edge + +The TFRouter Edge is a powerhouse, equipped with a strong CPU and lots of memory to run edge network functions. This router can be connected to multiple uplinks (satellite, cable, fiber, 5G), ... + +Mycelium ensures that the shortest and fastest path is always used, and all communication is end-to-end encrypted between an TFRouter or even your mobile or computer if you have the Mycelium agent installed. + +The integrated antennas are powerful, with a long range, and are controlled independently. The Zero-Net Software manages the accounting and mutual credit billing system. + + +![](img/TFRouter_2.png) + +This TFRouter is super fast and has lots of connectivity. + +![](img/TFRouter_2b.png) + +> This TFRouter can be bought right now. + +### TFRouter Outdoor + Long Range + +We are in the process of selecting the appropriate network equipment to bridge between two locations and enable the creation of meshed wireless networks at the lowest cost. + +Currently, we rely on fiber or existing internet connections to link between locations, but wouldn't it be cool if we could create our own long-range network connections? + +![](img/TFRouter_lr.png) + +> We are looking for volunteers who will be rewarded to do reasearch and experiment with chosen equipment to test performance in real life situations, let us know if you want to help. + +## Lo-RAN + +![](img/loran.png) + + \ 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 9aa9a5c..d26e027 100644 --- a/collections/freeflow/community_principles/community_principles.md +++ b/collections/freeflow/community_principles/community_principles.md @@ -1,14 +1,9 @@ - - # FreeFlow Community Principles -> TODO: Page needs to be improved - ## Inclusion ![](img/principles_01.png) - “If not US, then who? If not NOW then when?” Anyone may be a part of FreeFlowCommunity. We welcome and respect the stranger. No pre-requisites exist for participation in our community. @@ -66,7 +61,7 @@ We value civil society. Community members who organize events should assume resp "We return to Responsible Community Building" -## Leave no Trace = Planet First +## Leave No Trace = Planet First ![](img/principles_08_.jpg) diff --git a/collections/hero/storage/qsss.md b/collections/hero/storage/qsss.md deleted file mode 100644 index 164ecd5..0000000 --- a/collections/hero/storage/qsss.md +++ /dev/null @@ -1,16 +0,0 @@ - - -Here is a detailed explanation of how the storage system works based on the context documents: - -The storage system is designed to be decentralized and operate in a peer-to-peer manner across a network of nodes called 3Nodes. Data is dispersed and split into fragments that are distributed across multiple 3Nodes in a quantum-safe way, so no single node contains all the information to reconstruct the data. - -This dispersed storage approach provides extreme resilience against data loss or corruption. Even if multiple nodes fail, the data can be rebuilt from the remaining fragments. The system actively monitors for and fixes any data rot that could occur. - -The storage algorithm manages the distributed fragments and provides interfaces for storage and retrieval. This allows various storage applications to be built on top, like S3 object storage, filesystems, backups etc. - -A key component is the Zero-Stor storage engine which handles dispersing data across nodes. It requires only 20% overhead to be resilient to 4 simultaneous node failures, far less than the 400% overhead needed by traditional storage systems. - -The system provides data sovereignty as users have full control over where data is stored. Data remains in the country rather than relying on external centralized providers. - -It also utilizes end-to-end encryption for secure data transmission. The quantum-safe dispersal makes it impervious to hacking, even by quantum computers. - diff --git a/collections/legal/definitions_legal.md b/collections/legal/definitions_legal.md index 1a526cb..24badad 100644 --- a/collections/legal/definitions_legal.md +++ b/collections/legal/definitions_legal.md @@ -9,7 +9,7 @@ Threefold is a peer-to-peer network of network, storage an compute capacity for All the ideas and content created for this concept are opensource and stored in github A group of volunteers and the ThreeFold Foundation maintain these repositories. -See https://github.com/threefoldfoundation +See the [ThreeFold Foundation](https://github.com/threefoldfoundation) on GitHub. ## ThreeFold Foundation (TFF) @@ -86,7 +86,7 @@ Group of blockchain related technologies as used by ThreeFold to accomplish the The Zero-OS is the software which makes it possible to convert any pool of hardware to become a pool of resource for the ThreeFold_Grid. -see [Zero-OS](https://github.com/threefoldtech/zos) = Efficient Stateless Operating System +See [Zero-OS](https://github.com/threefoldtech/zos), our efficient stateless operating system based on the Linux kernel. ## User diff --git a/collections/legal/disclaimer.md b/collections/legal/disclaimer.md index f14f67c..7b2b389 100644 --- a/collections/legal/disclaimer.md +++ b/collections/legal/disclaimer.md @@ -1,10 +1,10 @@ # General Warning And Disclaimer -Your use of the TFGrid and/or TFTs, as well as the IT capacity made available from the TFGrid to the Internet, as well as any tools provided to work with TFGrid or TFTokens (hereinafter collectively also referred to as the "Services") will be subject to the warnings, limitations, acknowledgements and disclaimers set out hereinafter. These statements and disclaimers are made by and on behalf of (1) the TF Foundation (ThreeFold_Dubai), (2) each individual or entity acting as a ThreeFold Farmer (3) , TFTech NV (4) any of the companies or individuals related to these entities, and (5) any person contributing or otherwise assisting in developing, marketing or distributing the Services (hereinafter collectively referred to as "ThreeFold"). +Your use of the TFGrid and/or TFTs, as well as the IT capacity made available from the TFGrid to the Internet, as well as any tools provided to work with TFGrid or TFTokens (hereinafter collectively also referred to as the "Services") will be subject to the warnings, limitations, acknowledgements and disclaimers set out hereinafter. These statements and disclaimers are made by and on behalf of (1) the TF Foundation (ThreeFold_Dubai), (2) each individual or entity acting as a ThreeFold Farmer (3) , TFTech NV (4) any of the companies or individuals related to these entities, and (5) any person contributing or otherwise assisting in developing, marketing or distributing the Services (hereinafter collectively referred to as “ThreeFold”). ### Disclaimer -TO THE FULLEST EXTENT PERMITTED BY APPLICABLE LAW THE SERVICES ARE PROVIDED ON AN "AS IS" AND "AS AVAILABLE" BASIS WITHOUT WARRANTIES OF ANY KIND, AND THREEFOLD EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES AS TO THE SERVICES, INCLUDING, WITHOUT LIMITATION, IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT; (B) THREEFOLD DOES NOT REPRESENT OR WARRANT THAT THE SERVICES ARE ACCURATE, COMPLETE, RELIABLE, CURRENT OR ERROR-FREE, MEET YOUR REQUIREMENTS, OR THAT DEFECTS IN THE SERVICES WILL BE CORRECTED; AND (C) THREEFOLD CANNOT AND DOES NOT REPRESENT OR WARRANT THAT THE SERVICES, OR THE SERVERS USED TO PROVIDE SUCH SERVICES, ARE FREE OF VIRUSES OR OTHER HARMFUL COMPONENTS. +TO THE FULLEST EXTENT PERMITTED BY APPLICABLE LAW THE SERVICES ARE PROVIDED ON AN "AS IS" AND “AS AVAILABLE” BASIS WITHOUT WARRANTIES OF ANY KIND, AND THREEFOLD EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES AS TO THE SERVICES, INCLUDING, WITHOUT LIMITATION, IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT; (B) THREEFOLD DOES NOT REPRESENT OR WARRANT THAT THE SERVICES ARE ACCURATE, COMPLETE, RELIABLE, CURRENT OR ERROR-FREE, MEET YOUR REQUIREMENTS, OR THAT DEFECTS IN THE SERVICES WILL BE CORRECTED; AND (C) THREEFOLD CANNOT AND DOES NOT REPRESENT OR WARRANT THAT THE SERVICES, OR THE SERVERS USED TO PROVIDE SUCH SERVICES, ARE FREE OF VIRUSES OR OTHER HARMFUL COMPONENTS. By using the Services, you acknowledge that: @@ -33,4 +33,4 @@ If and to the extend you have purchased or otherwise acquired tokens from ThreeF - Prescription. No action in any form arising out of or in connection with this Agreement may be brought by the Purchaser more than one (1) year after the cause of action has accrued. - No limitations for own intent. Nothing in this Agreement shall (or shall be deemed to, or construed to) exclude or restrict any liability either Party may incur as a result of fraud, willful intent or for any death or personal injury resulting from its gross negligence or that of its employees, agents or subcontractors. -!!wiki.include page:the_single_source_truth \ No newline at end of file +!!wiki.include page:'legal:the_single_source_truth.md' \ No newline at end of file diff --git a/collections/legal/intro/legal_home.md b/collections/legal/intro/legal_home.md index 842c03d..517a213 100644 --- a/collections/legal/intro/legal_home.md +++ b/collections/legal/intro/legal_home.md @@ -6,17 +6,13 @@ THESE TERMS AND CONDITIONS (THE "**AGREEMENTS**") CONSTITUTE A LEGAL AGREEMENT B > BY USING THE TFGRID OR ANY OF THE THREEFOLD PROVIDED SOFTWARE OR SERVICES YOU ACCEPT FOLLOWING AGREEMENTS: -- [X] [Disclaimer](disclaimer) -- [X] [Privacy Policy](privacypolicy) -- [X] [Terms & Conditions ThreeFold Related Websites](terms_conditions_websites) -- [X] [Terms & Conditions TFGrid Users](terms_conditions_griduser) -- [X] [Terms & Conditions TFGrid Farmers](terms_conditions_farmer) : only relevant if you are a TFGrid Farmer - +- [Disclaimer](disclaimer.md) +- [Definitions](definitions_legal.md) +- [Privacy Policy](privacypolicy.md) +- [Terms & Conditions ThreeFold Related Websites](terms_conditions_websites.md) +- [Terms & Conditions TFGrid Users TFGrid 3](terms_conditions_griduser.md) +- [Terms & Conditions TFGrid Farmers TFGrid 3](terms_conditions_farmer3.md) -Our single source of truth for our legal docs is on https://github.com/threefoldfoundation/info_legal +Our single source of truth for our legal docs is available [here](https://github.com/threefoldfoundation/info_legal). -> You can see the history of each file on github, useful to see the right version of the file in relation to the date when you signed a document or contract which linked into one of the above documents. - - - -Definitions see [definitions](definitions_legal). \ No newline at end of file +> You can see the history of each file on GitHub. This is useful to see the right version of the file in relation to the date when you signed a document or contract which linked into one of the above documents. \ No newline at end of file diff --git a/collections/legal/privacypolicy.md b/collections/legal/privacypolicy.md index a5d206a..a1f780c 100644 --- a/collections/legal/privacypolicy.md +++ b/collections/legal/privacypolicy.md @@ -71,7 +71,6 @@ If you make a request, we have one month to respond to you. If you would like to * email: dataprivacy@threefold.io -* post address: !!wiki.include page:threefold_fzc_address ### What are cookies? diff --git a/collections/legal/sub/the_single_source_truth.md b/collections/legal/sub/the_single_source_truth.md index afdb2b0..db24c10 100644 --- a/collections/legal/sub/the_single_source_truth.md +++ b/collections/legal/sub/the_single_source_truth.md @@ -2,9 +2,4 @@ Our single source of truth for our legal docs is stored on [Github: https://github.com/threefoldfoundation/info_legal/tree/master/](https://github.com/threefoldfoundation/info_legal) -> You can see the history of each file on github, useful to see the right version of the file in relation to the date when you signed a document or contract which linked into one of the above documents. - - - - -!!core.todo descr:'change link to new repo' \ No newline at end of file +> You can see the history of each file on github, useful to see the right version of the file in relation to the date when you signed a document or contract which linked into one of the above documents. \ No newline at end of file diff --git a/collections/legal/terms_conditions_farmer_parts/part_2_farmer_services.md b/collections/legal/terms_conditions_farmer_parts/part_2_farmer_services.md index e4afbe9..eae5868 100644 --- a/collections/legal/terms_conditions_farmer_parts/part_2_farmer_services.md +++ b/collections/legal/terms_conditions_farmer_parts/part_2_farmer_services.md @@ -4,7 +4,7 @@ The Farmer may provide IT Capacity on the ThreeFold_Grid (the "**Farmer Services By entering into this Agreement you receive a non-exclusive, non-sublicensable, non-transferable right to provide the Farmer Services pursuant to this Agreement during the Term hereof solely for your internal business purposes subject to the limitations set forth herein. -The Software consists of open source code and is made available to you pursuant to the terms of the open-source license agreement(s) as located on https://github.com/threefoldtech and https://github.com/threefoldfoundation (the "**Open Source License(s)**"). Your use of the Software or any other Content (Information) is conditioned upon your compliance at all times with the terms of all applicable Open Source License(s). [Example license for Zero-OS can be found here](https://github.com/threefoldtech/zos/blob/master/LICENCE). +The Software consists of open source code and is made available to you pursuant to the terms of the open-source license agreement(s) as located on https://github.com/threefoldtech and https://github.com/threefoldfoundation (the "**Open Source License(s)**"). Your use of the Software or any other Content (Information) is conditioned upon your compliance at all times with the terms of all applicable Open Source License(s). [Example license for Zero-OS can be found here](https://github.com/threefoldtech/zos/blob/main/LICENSE). Including without limitation all provisions governing access to source code, modification, and/or reverse engineering. You are responsible for complying with any applicable documentation, meaning any information that describes the ThreeFold_Grid, provides instructions or recommendations related to the configuration and/or use of the ThreeFold_Grid, or otherwise informs Users of the intended use of the ThreeFold_Grid, including, but not limited to content provided directly to User or published at [https://library.threefold.me](https://library.threefold.me), [https://library.threefold.me](https://library.threefold.me), [https://forum.threefold.io](https://forum.threefold.io) or otherwise made available in conjunction with the ThreeFold_Grid, the ThreeFold_Token or the Software ("**Documentation**") and for satisfying all technical requirements of the Software, including any requirements set forth in the Documentation for ensuring that the Software performs properly. diff --git a/collections/legal/terms_conditions_farmer_parts/part_9_capacity_utilization3.md b/collections/legal/terms_conditions_farmer_parts/part_9_capacity_utilization3.md index 42b6756..9e2efda 100644 --- a/collections/legal/terms_conditions_farmer_parts/part_9_capacity_utilization3.md +++ b/collections/legal/terms_conditions_farmer_parts/part_9_capacity_utilization3.md @@ -8,11 +8,11 @@ ThreeFold_Tokens (TFTs) are used to buy IT Capacity as delivered by the TFNodes #### 9.2 Utilization Mechanism -IT capacity is expressed in network, compute & storage units. +IT capacity is expressed in [network, compute & storage units](tfgrid3:cloudunits). -- CU = [Compute Units](tfgrid3:cloudunits) -- SU = [Storage Units](tfgrid3:cloudunits) -- NU = [Network Units](tfgrid3:cloudunits) +- CU = Compute Units +- SU = Storage Units +- NU = Network Units TF Explorer is the inventory of all IT capacity available for consumption on the ThreeFold_Grid. See http://explorer.grid.tf/ @@ -23,7 +23,7 @@ TFT received for people using capacity is disributed as follows: | 35% | needs to be burned | results in more TFT burned compared to generated once grid more mature. | | 10% | to TF Foundation | used to promote the manage the project. | | 5% | to Staking Pool for TF Validators | used to reward the people who run the TFChain 3.0 blockchain validators. | -| 50% | for solution providers & sales channel | managed by [ThreeFold DAO](/tfgrid/farming/tfdao). | +| 50% | for solution providers & sales channel | managed by [ThreeFold DAO](tfgrid3:tfdao.md). | the single source of truth for Utilization specifications is on https://library.threefold.me/info/threefold#/tfgrid/farming/proof_of_utilization diff --git a/collections/legal/terms_conditions_websites.md b/collections/legal/terms_conditions_websites.md index e2a81a3..c7a957d 100644 --- a/collections/legal/terms_conditions_websites.md +++ b/collections/legal/terms_conditions_websites.md @@ -1,7 +1,7 @@ +# TERMS OF USE - **TERMS OF USE** +**Last updated September 13, 2019** - **Last updated September 13, 2019** !!wiki.include page:part_0_agreement_terms !!wiki.include page:part_1_ip_rights !!wiki.include page:part_2_user_representations diff --git a/collections/legal/terms_conditions_websites/part_0_agreement_terms.md b/collections/legal/terms_conditions_websites/part_0_agreement_terms.md index 0711e09..ae4989d 100644 --- a/collections/legal/terms_conditions_websites/part_0_agreement_terms.md +++ b/collections/legal/terms_conditions_websites/part_0_agreement_terms.md @@ -1,8 +1,8 @@ -**AGREEMENT TO TERMS** +## AGREEMENT TO TERMS - These Terms of Use constitute a legally binding agreement made between you, whether personally or on behalf of an entity ("you") and ThreeFold, doing business as ThreeFold ("**ThreeFold**", "**we**", "**us**", or "**our**"), concerning your access to and use of the threefold related websites: +These Terms of Use constitute a legally binding agreement made between you, whether personally or on behalf of an entity ("you") and ThreeFold, doing business as ThreeFold ("**ThreeFold**", "**we**", "**us**", or "**our**"), concerning your access to and use of the threefold related websites: - !!wiki.include page:websites +!!wiki.include page:websites.md as well as any other media form, media channel, forum, mobile website or mobile application related, linked, or otherwise connected thereto (collectively, the "Site"). diff --git a/collections/legal/terms_conditions_websites/part_10_site_management.md b/collections/legal/terms_conditions_websites/part_10_site_management.md index 1b12bf6..c16cdc1 100644 --- a/collections/legal/terms_conditions_websites/part_10_site_management.md +++ b/collections/legal/terms_conditions_websites/part_10_site_management.md @@ -1,3 +1,4 @@ -**SITE MANAGEMENT** + +## SITE MANAGEMENT We reserve the right, but not the obligation, to: (1) monitor the Site for violations of these Terms of Use; (2) take appropriate legal action against anyone who, in our sole discretion, violates the law or these Terms of Use, including without limitation, reporting such user to law enforcement authorities; (3) in our sole discretion and without limitation, refuse, restrict access to, limit the availability of, or disable (to the extent technologically feasible) any of your Contributions or any portion thereof; (4) in our sole discretion and without limitation, notice, or liability, to remove from the Site or otherwise disable all files and content that are excessive in size or are in any way burdensome to our systems; and (5) otherwise manage the Site in a manner designed to protect our rights and property and to facilitate the proper functioning of the Site. \ No newline at end of file diff --git a/collections/legal/terms_conditions_websites/part_11_privacy_policy.md b/collections/legal/terms_conditions_websites/part_11_privacy_policy.md index 5db0439..92cb9e9 100644 --- a/collections/legal/terms_conditions_websites/part_11_privacy_policy.md +++ b/collections/legal/terms_conditions_websites/part_11_privacy_policy.md @@ -1,22 +1,23 @@ -**PRIVACY POLICY** + +## PRIVACY POLICY We care about data privacy and security. Please review our Privacy Policy: privacypolicy . By using the Site, you agree to be bound by our Privacy Policy, which is incorporated into these Terms of Use. Please be advised the Site is hosted in the United States. If you access the Site from the European Union, Asia, or any other region of the world with laws or other requirements governing personal data collection, use, or disclosure that differ from applicable laws in the United States, then through your continued use of the Site, you are transferring your data to the United States, and you expressly consent to have your data transferred to and processed in the United States. Further, we do not knowingly accept, request, or solicit information from children or knowingly market to children. Therefore, in accordance with the U.S. Children’s Online Privacy Protection Act, if we receive actual knowledge that anyone under the age of 13 has provided personal information to us without the requisite and verifiable parental consent, we will delete that information from the Site as quickly as is reasonably practical. -**TERM AND TERMINATION** +## TERM AND TERMINATION These Terms of Use shall remain in full force and effect while you use the Site. WITHOUT LIMITING ANY OTHER PROVISION OF THESE TERMS OF USE, WE RESERVE THE RIGHT TO, IN OUR SOLE DISCRETION AND WITHOUT NOTICE OR LIABILITY, DENY ACCESS TO AND USE OF THE SITE (INCLUDING BLOCKING CERTAIN IP ADDRESSES), TO ANY PERSON FOR ANY REASON OR FOR NO REASON, INCLUDING WITHOUT LIMITATION FOR BREACH OF ANY REPRESENTATION, WARRANTY, OR COVENANT CONTAINED IN THESE TERMS OF USE OR OF ANY APPLICABLE LAW OR REGULATION. WE MAY TERMINATE YOUR USE OR PARTICIPATION IN THE SITE OR DELETE YOUR ACCOUNT AND ANY CONTENT OR INFORMATION THAT YOU POSTED AT ANY TIME, WITHOUT WARNING, IN OUR SOLE DISCRETION. - If we terminate or suspend your account for any reason, you are prohibited from registering and creating a new account under your name, a fake or borrowed name, or the name of any third party, even if you may be acting on behalf of the third party. In addition to terminating or suspending your account, we reserve the right to take appropriate legal action, including without limitation pursuing civil, criminal, and injunctive redress. +If we terminate or suspend your account for any reason, you are prohibited from registering and creating a new account under your name, a fake or borrowed name, or the name of any third party, even if you may be acting on behalf of the third party. In addition to terminating or suspending your account, we reserve the right to take appropriate legal action, including without limitation pursuing civil, criminal, and injunctive redress. -**MODIFICATIONS AND INTERRUPTIONS** +## MODIFICATIONS AND INTERRUPTIONS - We reserve the right to change, modify, or remove the contents of the Site at any time or for any reason at our sole discretion without notice. However, we have no obligation to update any information on our Site. We also reserve the right to modify or discontinue all or part of the Site without notice at any time. We will not be liable to you or any third party for any modification, price change, suspension, or discontinuance of the Site. +We reserve the right to change, modify, or remove the contents of the Site at any time or for any reason at our sole discretion without notice. However, we have no obligation to update any information on our Site. We also reserve the right to modify or discontinue all or part of the Site without notice at any time. We will not be liable to you or any third party for any modification, price change, suspension, or discontinuance of the Site. We cannot guarantee the Site will be available at all times. We may experience hardware, software, or other problems or need to perform maintenance related to the Site, resulting in interruptions, delays, or errors. We reserve the right to change, revise, update, suspend, discontinue, or otherwise modify the Site at any time or for any reason without notice to you. You agree that we have no liability whatsoever for any loss, damage, or inconvenience caused by your inability to access or use the Site during any downtime or discontinuance of the Site. Nothing in these Terms of Use will be construed to obligate us to maintain and support the Site or to supply any corrections, updates, or releases in connection therewith. -**GOVERNING LAW** +## GOVERNING LAW These Terms of Use and your use of the Site are governed by and construed in accordance with the laws of Belgium, without regard to its conflict of law principles. \ No newline at end of file diff --git a/collections/legal/terms_conditions_websites/part_12_dispute_resolution.md b/collections/legal/terms_conditions_websites/part_12_dispute_resolution.md index 0d11d7d..fedf6ed 100644 --- a/collections/legal/terms_conditions_websites/part_12_dispute_resolution.md +++ b/collections/legal/terms_conditions_websites/part_12_dispute_resolution.md @@ -1,7 +1,8 @@ -**DISPUTE RESOLUTION** + +## DISPUTE RESOLUTION Any legal action of whatever nature brought by either you or us (collectively, the "Parties" and individually, a "Party") shall be commenced or prosecuted in courts located in Belgium, Ghent, and the Parties hereby consent to, and waive all defenses of lack of personal jurisdiction and forum non conveniens with respect to venue and jurisdiction in such state and federal courts. Application of the United Nations Convention on Contracts for the International Sale of Goods and the Uniform Computer Information Transaction Act (UCITA) are excluded from these Terms of Use. In no event shall any claim, action, or proceeding brought by either Party related in any way to the Site be commenced more than one (1) years after the cause of action arose. -**CORRECTIONS** +## CORRECTIONS There may be information on the Site that contains typographical errors, inaccuracies, or omissions, including descriptions, pricing, availability, and various other information. We reserve the right to correct any errors, inaccuracies, or omissions and to change or update the information on the Site at any time, without prior notice. \ No newline at end of file diff --git a/collections/legal/terms_conditions_websites/part_13_disclaimer.md b/collections/legal/terms_conditions_websites/part_13_disclaimer.md index 19472d0..dc76bba 100644 --- a/collections/legal/terms_conditions_websites/part_13_disclaimer.md +++ b/collections/legal/terms_conditions_websites/part_13_disclaimer.md @@ -1,3 +1,4 @@ -**DISCLAIMER** + +## DISCLAIMER THE SITE IS PROVIDED ON AN AS-IS AND AS-AVAILABLE BASIS. YOU AGREE THAT YOUR USE OF THE SITE AND OUR SERVICES WILL BE AT YOUR SOLE RISK. TO THE FULLEST EXTENT PERMITTED BY LAW, WE DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED, IN CONNECTION WITH THE SITE AND YOUR USE THEREOF, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. WE MAKE NO WARRANTIES OR REPRESENTATIONS ABOUT THE ACCURACY OR COMPLETENESS OF THE SITE’S CONTENT OR THE CONTENT OF ANY WEBSITES LINKED TO THE SITE AND WE WILL ASSUME NO LIABILITY OR RESPONSIBILITY FOR ANY (1) ERRORS, MISTAKES, OR INACCURACIES OF CONTENT AND MATERIALS, (2) PERSONAL INJURY OR PROPERTY DAMAGE, OF ANY NATURE WHATSOEVER, RESULTING FROM YOUR ACCESS TO AND USE OF THE SITE, (3) ANY UNAUTHORIZED ACCESS TO OR USE OF OUR SECURE SERVERS AND/OR ANY AND ALL PERSONAL INFORMATION AND/OR FINANCIAL INFORMATION STORED THEREIN, (4) ANY INTERRUPTION OR CESSATION OF TRANSMISSION TO OR FROM THE SITE, (5) ANY BUGS, VIRUSES, TROJAN HORSES, OR THE LIKE WHICH MAY BE TRANSMITTED TO OR THROUGH THE SITE BY ANY THIRD PARTY, AND/OR (6) ANY ERRORS OR OMISSIONS IN ANY CONTENT AND MATERIALS OR FOR ANY LOSS OR DAMAGE OF ANY KIND INCURRED AS A RESULT OF THE USE OF ANY CONTENT POSTED, TRANSMITTED, OR OTHERWISE MADE AVAILABLE VIA THE SITE. WE DO NOT WARRANT, ENDORSE, GUARANTEE, OR ASSUME RESPONSIBILITY FOR ANY PRODUCT OR SERVICE ADVERTISED OR OFFERED BY A THIRD PARTY THROUGH THE SITE, ANY HYPERLINKED WEBSITE, OR ANY WEBSITE OR MOBILE APPLICATION FEATURED IN ANY BANNER OR OTHER ADVERTISING, AND WE WILL NOT BE A PARTY TO OR IN ANY WAY BE RESPONSIBLE FOR MONITORING ANY TRANSACTION BETWEEN YOU AND ANY THIRD-PARTY PROVIDERS OF PRODUCTS OR SERVICES. AS WITH THE PURCHASE OF A PRODUCT OR SERVICE THROUGH ANY MEDIUM OR IN ANY ENVIRONMENT, YOU SHOULD USE YOUR BEST JUDGMENT AND EXERCISE CAUTION WHERE APPROPRIATE. \ No newline at end of file diff --git a/collections/legal/terms_conditions_websites/part_14_limitations_liability.md b/collections/legal/terms_conditions_websites/part_14_limitations_liability.md index 9adccbf..7e3519e 100644 --- a/collections/legal/terms_conditions_websites/part_14_limitations_liability.md +++ b/collections/legal/terms_conditions_websites/part_14_limitations_liability.md @@ -1,3 +1,4 @@ -**LIMITATIONS OF LIABILITY** - IN NO EVENT WILL WE OR OUR DIRECTORS, EMPLOYEES, OR AGENTS BE LIABLE TO YOU OR ANY THIRD PARTY FOR ANY DIRECT, INDIRECT, CONSEQUENTIAL, EXEMPLARY, INCIDENTAL, SPECIAL, OR PUNITIVE DAMAGES, INCLUDING LOST PROFIT, LOST REVENUE, LOSS OF DATA, OR OTHER DAMAGES ARISING FROM YOUR USE OF THE SITE, EVEN IF WE HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. NOTWITHSTANDING ANYTHING TO THE CONTRARY CONTAINED HEREIN, OUR LIABILITY TO YOU FOR ANY CAUSE WHATSOEVER AND REGARDLESS OF THE FORM OF THE ACTION, WILL AT ALL TIMES BE LIMITED TO $1.00 USD. CERTAIN STATE LAWS DO NOT ALLOW LIMITATIONS ON IMPLIED WARRANTIES OR THE EXCLUSION OR LIMITATION OF CERTAIN DAMAGES. IF THESE LAWS APPLY TO YOU, SOME OR ALL OF THE ABOVE DISCLAIMERS OR LIMITATIONS MAY NOT APPLY TO YOU, AND YOU MAY HAVE ADDITIONAL RIGHTS. \ No newline at end of file +## LIMITATIONS OF LIABILITY + +IN NO EVENT WILL WE OR OUR DIRECTORS, EMPLOYEES, OR AGENTS BE LIABLE TO YOU OR ANY THIRD PARTY FOR ANY DIRECT, INDIRECT, CONSEQUENTIAL, EXEMPLARY, INCIDENTAL, SPECIAL, OR PUNITIVE DAMAGES, INCLUDING LOST PROFIT, LOST REVENUE, LOSS OF DATA, OR OTHER DAMAGES ARISING FROM YOUR USE OF THE SITE, EVEN IF WE HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. NOTWITHSTANDING ANYTHING TO THE CONTRARY CONTAINED HEREIN, OUR LIABILITY TO YOU FOR ANY CAUSE WHATSOEVER AND REGARDLESS OF THE FORM OF THE ACTION, WILL AT ALL TIMES BE LIMITED TO $1.00 USD. CERTAIN STATE LAWS DO NOT ALLOW LIMITATIONS ON IMPLIED WARRANTIES OR THE EXCLUSION OR LIMITATION OF CERTAIN DAMAGES. IF THESE LAWS APPLY TO YOU, SOME OR ALL OF THE ABOVE DISCLAIMERS OR LIMITATIONS MAY NOT APPLY TO YOU, AND YOU MAY HAVE ADDITIONAL RIGHTS. \ No newline at end of file diff --git a/collections/legal/terms_conditions_websites/part_15_indemnification.md b/collections/legal/terms_conditions_websites/part_15_indemnification.md index 447c022..544d07f 100644 --- a/collections/legal/terms_conditions_websites/part_15_indemnification.md +++ b/collections/legal/terms_conditions_websites/part_15_indemnification.md @@ -1,3 +1,4 @@ -**INDEMNIFICATION** + +## INDEMNIFICATION You agree to defend, indemnify, and hold us harmless, including our subsidiaries, affiliates, and all of our respective officers, agents, partners, and employees, from and against any loss, damage, liability, claim, or demand, including reasonable attorneys’ fees and expenses, made by any third party due to or arising out of: (1) your Contributions; (2) use of the Site; (3) breach of these Terms of Use; (4) any breach of your representations and warranties set forth in these Terms of Use; (5) your violation of the rights of a third party, including but not limited to intellectual property rights; or (6) any overt harmful act toward any other user of the Site with whom you connected via the Site. Notwithstanding the foregoing, we reserve the right, at your expense, to assume the exclusive defense and control of any matter for which you are required to indemnify us, and you agree to cooperate, at your expense, with our defense of such claims. We will use reasonable efforts to notify you of any such claim, action, or proceeding which is subject to this indemnification upon becoming aware of it. \ No newline at end of file diff --git a/collections/legal/terms_conditions_websites/part_16_user_data.md b/collections/legal/terms_conditions_websites/part_16_user_data.md index 80ecde7..8862793 100644 --- a/collections/legal/terms_conditions_websites/part_16_user_data.md +++ b/collections/legal/terms_conditions_websites/part_16_user_data.md @@ -1,3 +1,4 @@ -**USER DATA** + +## USER DATA We will maintain certain data that you transmit to the Site for the purpose of managing the performance of the Site, as well as data relating to your use of the Site. Although we perform regular routine backups of data, you are solely responsible for all data that you transmit or that relates to any activity you have undertaken using the Site. You agree that we shall have no liability to you for any loss or corruption of any such data, and you hereby waive any right of action against us arising from any such loss or corruption of such data. diff --git a/collections/legal/terms_conditions_websites/part_17_electronic_comms_transactions_signatures.md b/collections/legal/terms_conditions_websites/part_17_electronic_comms_transactions_signatures.md index da54ef8..a6181b9 100644 --- a/collections/legal/terms_conditions_websites/part_17_electronic_comms_transactions_signatures.md +++ b/collections/legal/terms_conditions_websites/part_17_electronic_comms_transactions_signatures.md @@ -1,3 +1,4 @@ -**ELECTRONIC COMMUNICATIONS, TRANSACTIONS, AND SIGNATURES** + +## ELECTRONIC COMMUNICATIONS, TRANSACTIONS, AND SIGNATURES Visiting the Site, sending us emails, and completing online forms constitute electronic communications. You consent to receive electronic communications, and you agree that all agreements, notices, disclosures, and other communications we provide to you electronically, via email and on the Site, satisfy any legal requirement that such communication be in writing. YOU HEREBY AGREE TO THE USE OF ELECTRONIC SIGNATURES, CONTRACTS, ORDERS, AND OTHER RECORDS, AND TO ELECTRONIC DELIVERY OF NOTICES, POLICIES, AND RECORDS OF TRANSACTIONS INITIATED OR COMPLETED BY US OR VIA THE SITE. You hereby waive any rights or requirements under any statutes, regulations, rules, ordinances, or other laws in any jurisdiction which require an original signature or delivery or retention of non-electronic records, or to payments or the granting of credits by any means other than electronic means. \ No newline at end of file diff --git a/collections/legal/terms_conditions_websites/part_18_miscellaneous.md b/collections/legal/terms_conditions_websites/part_18_miscellaneous.md index 633bbe3..3a0c30d 100644 --- a/collections/legal/terms_conditions_websites/part_18_miscellaneous.md +++ b/collections/legal/terms_conditions_websites/part_18_miscellaneous.md @@ -1,3 +1,4 @@ -**MISCELLANEOUS** - These Terms of Use and any policies or operating rules posted by us on the Site or in respect to the Site constitute the entire agreement and understanding between you and us. Our failure to exercise or enforce any right or provision of these Terms of Use shall not operate as a waiver of such right or provision. These Terms of Use operate to the fullest extent permissible by law. We may assign any or all of our rights and obligations to others at any time. We shall not be responsible or liable for any loss, damage, delay, or failure to act caused by any cause beyond our reasonable control. If any provision or part of a provision of these Terms of Use is determined to be unlawful, void, or unenforceable, that provision or part of the provision is deemed severable from these Terms of Use and does not affect the validity and enforceability of any remaining provisions. There is no joint venture, partnership, employment or agency relationship created between you and us as a result of these Terms of Use or use of the Site. You agree that these Terms of Use will not be construed against us by virtue of having drafted them. You hereby waive any and all defenses you may have based on the electronic form of these Terms of Use and the lack of signing by the parties hereto to execute these Terms of Use. \ No newline at end of file +## MISCELLANEOUS + +These Terms of Use and any policies or operating rules posted by us on the Site or in respect to the Site constitute the entire agreement and understanding between you and us. Our failure to exercise or enforce any right or provision of these Terms of Use shall not operate as a waiver of such right or provision. These Terms of Use operate to the fullest extent permissible by law. We may assign any or all of our rights and obligations to others at any time. We shall not be responsible or liable for any loss, damage, delay, or failure to act caused by any cause beyond our reasonable control. If any provision or part of a provision of these Terms of Use is determined to be unlawful, void, or unenforceable, that provision or part of the provision is deemed severable from these Terms of Use and does not affect the validity and enforceability of any remaining provisions. There is no joint venture, partnership, employment or agency relationship created between you and us as a result of these Terms of Use or use of the Site. You agree that these Terms of Use will not be construed against us by virtue of having drafted them. You hereby waive any and all defenses you may have based on the electronic form of these Terms of Use and the lack of signing by the parties hereto to execute these Terms of Use. \ No newline at end of file diff --git a/collections/legal/terms_conditions_websites/part_19_contact_us.md b/collections/legal/terms_conditions_websites/part_19_contact_us.md index 82f7d36..002b6ca 100644 --- a/collections/legal/terms_conditions_websites/part_19_contact_us.md +++ b/collections/legal/terms_conditions_websites/part_19_contact_us.md @@ -1,8 +1,9 @@ -**CONTACT US** - In order to resolve a complaint regarding the Site or to receive further information regarding use of the Site, please contact us at: +## CONTACT US - **ThreeFold FCZ** +In order to resolve a complaint regarding the Site or to receive further information regarding use of the Site, please contact us at: + +### ThreeFold FCZ BA1120 DMCC BUSINESS CENTRE, LEVEL NO 1, JEWELLERY & GEMPLEX 3, DUBAI, UNITED EMIRATES ARAB diff --git a/collections/legal/terms_conditions_websites/part_1_ip_rights.md b/collections/legal/terms_conditions_websites/part_1_ip_rights.md index 7e1c522..4e7ac6f 100644 --- a/collections/legal/terms_conditions_websites/part_1_ip_rights.md +++ b/collections/legal/terms_conditions_websites/part_1_ip_rights.md @@ -1,5 +1,6 @@ -**INTELLECTUAL PROPERTY RIGHTS** - Unless otherwise indicated, the Site is our proprietary property and all source code, databases, functionality, software, website designs, audio, video, text, photographs, and graphics on the Site (collectively, the "Content") and the trademarks, service marks, and logos contained therein (the "Marks") are owned or controlled by us or licensed to us, and are protected by copyright and trademark laws and various other intellectual property rights and EU competition laws, foreign jurisdictions, and international conventions. The Content and the Marks are provided on the Site "AS IS" for your information and personal use only. Except as expressly provided in these Terms of Use, no part of the Site and no Content or Marks may be copied, reproduced, aggregated, republished, uploaded, posted, publicly displayed, encoded, translated, transmitted, distributed, sold, licensed, or otherwise exploited for any commercial purpose whatsoever, without our express prior written permission. +## INTELLECTUAL PROPERTY RIGHTS + +Unless otherwise indicated, the Site is our proprietary property and all source code, databases, functionality, software, website designs, audio, video, text, photographs, and graphics on the Site (collectively, the "Content") and the trademarks, service marks, and logos contained therein (the "Marks") are owned or controlled by us or licensed to us, and are protected by copyright and trademark laws and various other intellectual property rights and EU competition laws, foreign jurisdictions, and international conventions. The Content and the Marks are provided on the Site "AS IS" for your information and personal use only. Except as expressly provided in these Terms of Use, no part of the Site and no Content or Marks may be copied, reproduced, aggregated, republished, uploaded, posted, publicly displayed, encoded, translated, transmitted, distributed, sold, licensed, or otherwise exploited for any commercial purpose whatsoever, without our express prior written permission. Provided that you are eligible to use the Site, you are granted a limited license to access and use the Site and to download or print a copy of any portion of the Content to which you have properly gained access solely for your personal, non-commercial use. We reserve all rights not expressly granted to you in and to the Site, the Content and the Marks. \ No newline at end of file diff --git a/collections/legal/terms_conditions_websites/part_2_user_representations.md b/collections/legal/terms_conditions_websites/part_2_user_representations.md index 281bcc0..fd256ce 100644 --- a/collections/legal/terms_conditions_websites/part_2_user_representations.md +++ b/collections/legal/terms_conditions_websites/part_2_user_representations.md @@ -1,5 +1,6 @@ -**USER REPRESENTATIONS** - By using the Site, you represent and warrant that: (1) all registration information you submit will be true, accurate, current, and complete; (2) you will maintain the accuracy of such information and promptly update such registration information as necessary; (3) you have the legal capacity and you agree to comply with these Terms of Use; (4) you are not a minor in the jurisdiction in which you reside; (5) you will not access the Site through automated or non-human means, whether through a bot, script, or otherwise; (6) you will not use the Site for any illegal or unauthorized purpose; and (7) your use of the Site will not violate any applicable law or regulation. +## USER REPRESENTATIONS + +By using the Site, you represent and warrant that: (1) all registration information you submit will be true, accurate, current, and complete; (2) you will maintain the accuracy of such information and promptly update such registration information as necessary; (3) you have the legal capacity and you agree to comply with these Terms of Use; (4) you are not a minor in the jurisdiction in which you reside; (5) you will not access the Site through automated or non-human means, whether through a bot, script, or otherwise; (6) you will not use the Site for any illegal or unauthorized purpose; and (7) your use of the Site will not violate any applicable law or regulation. If you provide any information that is untrue, inaccurate, not current, or incomplete, we have the right to suspend or terminate your account and refuse any and all current or future use of the Site (or any portion thereof). \ No newline at end of file diff --git a/collections/legal/terms_conditions_websites/part_3_user_registration.md b/collections/legal/terms_conditions_websites/part_3_user_registration.md index 24f5115..a9fea55 100644 --- a/collections/legal/terms_conditions_websites/part_3_user_registration.md +++ b/collections/legal/terms_conditions_websites/part_3_user_registration.md @@ -1,3 +1,4 @@ -**USER REGISTRATION** -You may be required to register with the Site. You agree to keep your password confidential and will be responsible for all use of your account and password. We reserve the right to remove, reclaim, or change a username you select if we determine, in our sole discretion, that such username is inappropriate, obscene, or otherwise objectionable. +## USER REGISTRATION + +You may be required to register with the Site. You agree to keep your password confidential and will be responsible for all use of your account and password. We reserve the right to remove, reclaim, or change a username you select if we determine, in our sole discretion, that such username is inappropriate, obscene, or otherwise objectionable. \ No newline at end of file diff --git a/collections/legal/terms_conditions_websites/part_4_prohibited_activities.md b/collections/legal/terms_conditions_websites/part_4_prohibited_activities.md index 79eb1f9..d488310 100644 --- a/collections/legal/terms_conditions_websites/part_4_prohibited_activities.md +++ b/collections/legal/terms_conditions_websites/part_4_prohibited_activities.md @@ -1,8 +1,9 @@ -**PROHIBITED ACTIVITIES** + +## PROHIBITED ACTIVITIES You may not access or use the Site for any purpose other than that for which we make the Site available. The Site may not be used in connection with any commercial endeavors except those that are specifically endorsed or approved by us. - As a user of the Site, you agree not to: +As a user of the Site, you agree not to: 1. Systematically retrieve data or other content from the Site to create or compile, directly or indirectly, a collection, compilation, database, or directory without written permission from us. 2. Circumvent, disable, or otherwise interfere with security-related features of the Site, including features that prevent or restrict the use or copying of any Content or enforce limitations on the use of the Site and/or the Content contained therein. diff --git a/collections/legal/terms_conditions_websites/part_5_user_generated_contributions.md b/collections/legal/terms_conditions_websites/part_5_user_generated_contributions.md index 15b00c4..aca8557 100644 --- a/collections/legal/terms_conditions_websites/part_5_user_generated_contributions.md +++ b/collections/legal/terms_conditions_websites/part_5_user_generated_contributions.md @@ -1,8 +1,7 @@ -**USER GENERATED CONTRIBUTIONS** -The Site may invite you to chat, contribute to, or participate in blogs, message boards, online forums, and other functionality, and may provide you with the opportunity to create, submit, post, display, transmit, perform, publish, distribute, or broadcast content and materials to us or on the Site, including but not limited to text, writings, video, audio, photographs, graphics, comments, suggestions, or personal information or other material (collectively, "Contributions"). Contributions may be viewable by other users of the Site and through third-party websites. As such, any Contributions you transmit may be treated as non-confidential and non-proprietary. When you create or make available any Contributions, you thereby represent and warrant that: +## USER GENERATED CONTRIBUTIONS - +The Site may invite you to chat, contribute to, or participate in blogs, message boards, online forums, and other functionality, and may provide you with the opportunity to create, submit, post, display, transmit, perform, publish, distribute, or broadcast content and materials to us or on the Site, including but not limited to text, writings, video, audio, photographs, graphics, comments, suggestions, or personal information or other material (collectively, "Contributions"). Contributions may be viewable by other users of the Site and through third-party websites. As such, any Contributions you transmit may be treated as non-confidential and non-proprietary. When you create or make available any Contributions, you thereby represent and warrant that: 1. The creation, distribution, transmission, public display, or performance, and the accessing, downloading, or copying of your Contributions do not and will not infringe the proprietary rights, including but not limited to the copyright, patent, trademark, trade secret, or moral rights of any third party. 2. You are the creator and owner of or have the necessary licenses, rights, consents, releases, and permissions to use and to authorize us, the Site, and other users of the Site to use your Contributions in any manner contemplated by the Site and these Terms of Use. diff --git a/collections/legal/terms_conditions_websites/part_6_contribution_license.md b/collections/legal/terms_conditions_websites/part_6_contribution_license.md index 689ec3d..12b9c59 100644 --- a/collections/legal/terms_conditions_websites/part_6_contribution_license.md +++ b/collections/legal/terms_conditions_websites/part_6_contribution_license.md @@ -1,4 +1,5 @@ -**CONTRIBUTION LICENSE** + +## CONTRIBUTION LICENSE By posting your Contributions to any part of the Site or making Contributions accessible to the Site by linking your account from the Site to any of your social networking accounts, you automatically grant, and you represent and warrant that you have the right to grant, to us an unrestricted, unlimited, irrevocable, perpetual, non-exclusive, transferable, royalty-free, fully-paid, worldwide right, and license to host, use, copy, reproduce, disclose, sell, resell, publish, broadcast, retitle, archive, store, cache, publicly perform, publicly display, reformat, translate, transmit, excerpt (in whole or in part), and distribute such Contributions (including, without limitation, your image and voice) for any purpose, commercial, advertising, or otherwise, and to prepare derivative works of, or incorporate into other works, such Contributions, and grant and authorize sublicenses of the foregoing. The use and distribution may occur in any media formats and through any media channels. diff --git a/collections/legal/terms_conditions_websites/part_7_social_media.md b/collections/legal/terms_conditions_websites/part_7_social_media.md index ea7c25d..861494b 100644 --- a/collections/legal/terms_conditions_websites/part_7_social_media.md +++ b/collections/legal/terms_conditions_websites/part_7_social_media.md @@ -1,4 +1,5 @@ -**SOCIAL MEDIA** + +## SOCIAL MEDIA As part of the functionality of the Site, you may link your account with online accounts you have with third-party service providers (each such account, a "Third-Party Account") by either: (1) providing your Third-Party Account login information through the Site; or (2) allowing us to access your Third-Party Account, as is permitted under the applicable terms and conditions that govern your use of each Third-Party Account. You represent and warrant that you are entitled to disclose your Third-Party Account login information to us and/or grant us access to your Third-Party Account, without breach by you of any of the terms and conditions that govern your use of the applicable Third-Party Account, and without obligating us to pay any fees or making us subject to any usage limitations imposed by the third-party service provider of the Third-Party Account. By granting us access to any Third-Party Accounts, you understand that (1) we may access, make available, and store (if applicable) any content that you have provided to and stored in your Third-Party Account (the "Social Network Content") so that it is available on and through the Site via your account, including without limitation any friend lists and (2) we may submit to and receive from your Third-Party Account additional information to the extent you are notified when you link your account with the Third-Party Account. Depending on the Third-Party Accounts you choose and subject to the privacy settings that you have set in such Third-Party Accounts, personally identifiable information that you post to your Third-Party Accounts may be available on and through your account on the Site. Please note that if a Third-Party Account or associated service becomes unavailable or our access to such Third Party Account is terminated by the third-party service provider, then Social Network Content may no longer be available on and through the Site. You will have the ability to disable the connection between your account on the Site and your Third-Party Accounts at any time. PLEASE NOTE THAT YOUR RELATIONSHIP WITH THE THIRD- diff --git a/collections/legal/terms_conditions_websites/part_8_submission.md b/collections/legal/terms_conditions_websites/part_8_submission.md index d390911..f00bbc3 100644 --- a/collections/legal/terms_conditions_websites/part_8_submission.md +++ b/collections/legal/terms_conditions_websites/part_8_submission.md @@ -1,3 +1,4 @@ -**SUBMISSIONS** + +## SUBMISSIONS You acknowledge and agree that any questions, comments, suggestions, ideas, feedback, or other information regarding the Site ("Submissions") provided by you to us are non-confidential and shall become our sole property. We shall own exclusive rights, including all intellectual property rights, and shall be entitled to the unrestricted use and dissemination of these Submissions for any lawful purpose, commercial or otherwise, without acknowledgment or compensation to you. You hereby waive all moral rights to any such Submissions, and you hereby warrant that any such Submissions are original with you or that you have the right to submit such Submissions. You agree there shall be no recourse against us for any alleged or actual infringement or misappropriation of any proprietary right in your Submissions. \ No newline at end of file diff --git a/collections/legal/terms_conditions_websites/part_9_thirdparty_websites_content.md b/collections/legal/terms_conditions_websites/part_9_thirdparty_websites_content.md index 7f69b25..29b1251 100644 --- a/collections/legal/terms_conditions_websites/part_9_thirdparty_websites_content.md +++ b/collections/legal/terms_conditions_websites/part_9_thirdparty_websites_content.md @@ -1,3 +1,4 @@ -**THIRD-PARTY WEBSITES AND CONTENT** + +## THIRD-PARTY WEBSITES AND CONTENT The Site may contain (or you may be sent via the Site) links to other websites ("Third-Party Websites") as well as articles, photographs, text, graphics, pictures, designs, music, sound, video, information, applications, software, and other content or items belonging to or originating from third parties ("Third-Party Content"). Such Third-Party Websites and Third-Party Content are not investigated, monitored, or checked for accuracy, appropriateness, or completeness by us, and we are not responsible for any Third-Party Websites accessed through the Site or any Third-Party Content posted on, available through, or installed from the Site, including the content, accuracy, offensiveness, opinions, reliability, privacy practices, or other policies of or contained in the Third-Party Websites or the Third-Party Content. Inclusion of, linking to, or permitting the use or installation of any Third-Party Websites or any Third-Party Content does not imply approval or endorsement thereof by us. If you decide to leave the Site and access the Third-Party Websites or to use or install any Third-Party Content, you do so at your own risk, and you should be aware these Terms of Use no longer govern. You should review the applicable terms and policies, including privacy and data gathering practices, of any website to which you navigate from the Site or relating to any applications you use or install from the Site. Any purchases you make through Third-Party Websites will be through other websites and from other companies, and we take no responsibility whatsoever in relation to such purchases which are exclusively between you and the applicable third party. You agree and acknowledge that we do not endorse the products or services offered on Third-Party Websites and you shall hold us harmless from any harm caused by your purchase of such products or services. Additionally, you shall hold us harmless from any losses sustained by you or harm caused to you relating to or resulting in any way from any Third-Party Content or any contact with Third-Party Websites. \ No newline at end of file diff --git a/collections/legal/tfgrid/terms_conditions_tfgrid3.md b/collections/legal/tfgrid/terms_conditions_tfgrid3.md index 49e1d84..f274e0a 100644 --- a/collections/legal/tfgrid/terms_conditions_tfgrid3.md +++ b/collections/legal/tfgrid/terms_conditions_tfgrid3.md @@ -2,7 +2,7 @@ THESE TERMS AND CONDITIONS (THE "**AGREEMENTS**") CONSTITUTE A LEGAL AGREEMENT BETWEEN YOU ("TFGRID **USER**,""TFGRID **FARMER**," "**YOU**", OR "**YOURS**") AND [THREEFOLD COMPANIES](companies) or TFTECH ("**THREEFOLD**", "**COMPANY**," "**US**," "**WE**" OR "**OUR**"), GOVERNING THE TERMS OF YOUR PARTICIPATION AS A PARTNER, CUSTOMER, FARMER OR USER IN THE THREEFOLD GRID. YOU UNDERSTAND AND AGREE THAT BY ACCEPTING THE TERMS OF THIS AGREEMENT, EITHER BY CLICKING TO SIGNIFY ACCEPTANCE, OR BY TAKING ANY ONE OR MORE OF THE FOLLOWING ACTIONS DOWNLOADING, INSTALLING, RUNNING,/AND OR USING THE APPLICABLE SOFTWARE, YOU AGREE TO BE BOUND BY THE TERMS OF THIS AGREEMENT EFFECTIVE AS OF THE DATE THAT YOU TAKE THE EARLIEST OF ONE OF THE FOREGOING ACTIONS. YOU REPRESENT AND WARRANT THAT YOU ARE 18 YEARS OLD OR OLDER AND HAVE THE RIGHT AND AUTHORITY TO ENTER INTO AND COMPLY WITH THE TERMS OF THIS AGREEMENT. ->> BY USING THE [TFGRID](tfgrid3:threefold_grid) OR ANY OF THE THREEFOLD PROVIDED SOFTWARE OR SERVICES YOU ACCEPT FOLLOWING AGREEMENTS: +>> BY USING THE [TFGRID](threefold_grid) OR ANY OF THE THREEFOLD PROVIDED SOFTWARE OR SERVICES YOU ACCEPT FOLLOWING AGREEMENTS: - [X] [Terms & Conditions TFGrid Users TFGrid 3](terms_conditions_griduser) - [X] [Terms & Conditions TFGrid Farmers TFGrid 3](terms_conditions_farmer3) : relevant if you are a TFGrid Farmer diff --git a/collections/legal/threefold_grid.md b/collections/legal/threefold_grid.md new file mode 100644 index 0000000..0ebe6c4 --- /dev/null +++ b/collections/legal/threefold_grid.md @@ -0,0 +1,5 @@ +# ThreeFold_Grid + +ThreeFold_Grid is a global, neutral, and sustainable network of autonomous storage and compute Internet capacity created by ThreeFold Farmers, with more than 80,000,000 GB and 20,000 cores existing today. On this Grid, IT capacity is indexed / registered on the TFChain for easy discovery by purchasers. Any application which can run on Linux can run on the ThreeFold_Grid but with more privacy, security, closer to the end-user, and at a much lower cost. + +This Internet capacity is produced and allocated locally - similar to the way electricity and other utilities are purchased today. This allows any digital service or application provider to host their services and applications in proximity to the end user leading to significantly greater performance, a lower price point and better margins. This is both more cost effective and green. diff --git a/collections/mbweni/about/intro.md b/collections/mbweni/about/intro.md index e0e3881..59ac018 100644 --- a/collections/mbweni/about/intro.md +++ b/collections/mbweni/about/intro.md @@ -1,23 +1,9 @@ # Mbweni Ruins and Gardens Wiki +![mbweni_ruins_image](../img/mbweni_ruins_image.png) + ## Introduction Welcome to the Mbweni Ruins and Gardens Wiki, your ultimate guide to discovering the beauty, history, and community spirit of Mbweni. Previously known as Jungle Paradise, Mbweni Ruins and Gardens is a vibrant and experimental regeneration hub in the heart of Zanzibar, with the desire to inspire, nurture, and embrace sustainable tourism as a catalyst for transformation. More than just a resort, we are a diverse community of passionate individuals with exciting projects, dedicated to doing good and having a good time - -Nestled in a serene coastal area, Mbweni offers a unique blend of historical ruins, lush gardens, and vibrant community life. Whether you're a curious traveler, a history enthusiast, or someone seeking a peaceful retreat, Mbweni has something special to offer you. - -## Navigation - -Navigate easily through the different aspects of Mbweni: - -- [Introduction](mbweni/about/intro.md): Learn more about Mbweni, its location, and our story. -- [History](mbweni/history/history.md): Delve into the rich history of Mbweni, including its ruins, gardens, and cultural significance. -- [Community](mbweni/community/community.md): Discover the diverse people, projects, and partnerships that shape our vibrant community. -- [Initiatives](mbweni/initiatives/initiatives.md): Explore our commitment to sustainability and quality of life initiatives. -- [Facilities](mbweni/facilities/facilities.md): Find out about diverse work and leisure facilities at Mbweni. -- [Activities](mbweni/activities/activities.md): From water sports to yoga and community events, experience the fulfilling life at Mbweni. -- [Tours](mbweni/tours/tours.md): Embark on guided tours to explore the surrounding areas, from Mbweni to Kilimanjaro, and immerse yourself in the local culture. -- [Freeflow Nation](freeflow/freeflow_movement.md): Learn about the Freeflow Movement, the driving force behind our core principles and philosophy. - -Explore Mbweni Ruins and Gardens Wiki to uncover the treasures that await you in this enchanting corner of the world. +Nestled in a serene coastal area, Mbweni offers a unique blend of historical ruins, lush gardens, and vibrant community life. Whether you're a curious traveler, a history enthusiast, or someone seeking a peaceful retreat, Mbweni has something special to offer you. \ No newline at end of file diff --git a/collections/mbweni/about/mbweni.md b/collections/mbweni/about/mbweni.md index 66e1ee4..0141f59 100644 --- a/collections/mbweni/about/mbweni.md +++ b/collections/mbweni/about/mbweni.md @@ -16,6 +16,7 @@ Mbweni Ruins and Gardens is a coliving space consisting of 13 rooms and 3 apartm - **Address:** Mbweni Rd, Unguja Urban West. P.O BOX 3775, Zanzibar, Tanzania - **Contact:** +255 778 242 424 -**Website:** [mbweniruinsandgardens.com](https://mbweniruinsandgardens.com) +- **Website:** [mbweniruinsandgardens.com](https://mbweniruinsandgardens.com) +- **Email:** info@mbweniruinsandgardens.com Whether you're seeking a tranquil retreat, a cultural experience, or an opportunity to engage with like-minded individuals, Mbweni Ruins and Gardens offers a unique and fulfilling experience. Join us in our journey towards sustainability, community, and adventure. diff --git a/collections/mbweni/about/story.md b/collections/mbweni/about/story.md index dd10951..c91799b 100644 --- a/collections/mbweni/about/story.md +++ b/collections/mbweni/about/story.md @@ -17,9 +17,9 @@ We pledge to cultivate a harmonious community that fosters creating impact, pers ### Learn More About Our Manifesto and Philosophies: -- [Freeflow Nation](freeflow/freeflow_movement.md) - - [Manifesto](freeflow/manifesto/manifesto.md) - - [Digital Nation](freeflow/manifesto/digital_nation_info_laws.md) +- [Freeflow Nation](freeflow:freeflow_movement.md) + - [Manifesto](freeflow:manifesto/manifesto.md) + - [Digital Nation](freeflow:manifesto/digital_nation_info_laws.md) ### Learn More About Our Community: - [Community](mbweni/community/community.md) diff --git a/collections/mbweni/activities/activities.md b/collections/mbweni/activities/activities.md index ae5f6f5..23a7648 100644 --- a/collections/mbweni/activities/activities.md +++ b/collections/mbweni/activities/activities.md @@ -6,15 +6,15 @@ Welcome to Mbweni, where every day is filled with excitement, adventure, and pro Embark on a journey of exploration and discovery as you navigate through our diverse range of activities: -- [**Sailing:**](mbweni/activities/sailing.md) Set sail on the crystal-clear waters surrounding Mbweni and experience the thrill of navigating the waves. +- [**Sailing:**](sailing.md) Set sail on the crystal-clear waters surrounding Mbweni and experience the thrill of navigating the waves. -- [**Community Events:**](mbweni/activities/events.md) Immerse yourself in the vibrant community spirit of Mbweni by participating in our engaging and inclusive events. +- [**Community Events:**](events.md) Immerse yourself in the vibrant community spirit of Mbweni by participating in our engaging and inclusive events. -- [**Outdoor Sports:**](mbweni/activities/sports.md) Get your adrenaline pumping with a variety of outdoor sports activities, including beach volleyball, kayaking, and more. +- [**Outdoor Sports:**](sports.md) Get your adrenaline pumping with a variety of outdoor sports activities, including beach volleyball, kayaking, and more. -- [**Yoga:**](mbweni/activities/yoga.md) Find inner peace and balance with rejuvenating yoga sessions set against the backdrop of Mbweni's natural beauty. +- [**Yoga:**](yoga.md) Find inner peace and balance with rejuvenating yoga sessions set against the backdrop of Mbweni's natural beauty. -- [**Outdoor Cinema:**](mbweni/activities/cinema.md) Sit back, relax, and enjoy movie evenings with our outdoor cinema experience at Mbweni Ruins, perfect for cozy evenings with friends and family. +- [**Outdoor Cinema:**](cinema.md) Sit back, relax, and enjoy movie evenings with our outdoor cinema experience at Mbweni Ruins, perfect for cozy evenings with friends and family. ## Explore Enriching Tours diff --git a/collections/mbweni/activities/sailing.md b/collections/mbweni/activities/sailing.md index 9fbedd8..58e5942 100644 --- a/collections/mbweni/activities/sailing.md +++ b/collections/mbweni/activities/sailing.md @@ -18,4 +18,4 @@ Set sail on the crystal-clear waters surrounding Mbweni Ruins and Gardens aboard To book your sailing experience or inquire about our services, please contact us for reservations and more information. -Contact us: +255778242424 or email [info@mbweniruinsandgardens.com](mailto:info@mbweniruinsandgardens.com). +!!wiki.include page:'mbweni/contact_info.md' \ No newline at end of file diff --git a/collections/mbweni/facilities/sports.md b/collections/mbweni/activities/sports.md similarity index 92% rename from collections/mbweni/facilities/sports.md rename to collections/mbweni/activities/sports.md index 1109ce2..e88c8af 100644 --- a/collections/mbweni/facilities/sports.md +++ b/collections/mbweni/activities/sports.md @@ -18,6 +18,6 @@ Enhance your fitness journey with the assistance of our personal trainers, avail To rent sport equipment or inquire about personal trainers, please contact us for availability and pricing: -Contact us: +255778242424 or email [info@mbweniruinsandgardens.com](mailto:info@mbweniruinsandgardens.com). +!!wiki.include page:'mbweni/contact_info.md' Embrace an active lifestyle and make the most of your stay at Mbweni Ruins and Gardens with our sport equipment rental services. diff --git a/collections/mbweni/activities/yoga.md b/collections/mbweni/activities/yoga.md index e640c36..de1748e 100644 --- a/collections/mbweni/activities/yoga.md +++ b/collections/mbweni/activities/yoga.md @@ -18,4 +18,4 @@ Experience the tranquility and serenity of yoga amidst the lush surroundings of To join our yoga sessions or inquire about mentorship opportunities, please contact us for more information. -Contact us: +255778242424 or email [info@mbweniruinsandgardens.com](mailto:info@mbweniruinsandgardens.com). +!!wiki.include page:'mbweni/contact_info.md' \ No newline at end of file diff --git a/collections/mbweni/community/community.md b/collections/mbweni/community/community.md index 98718cd..e6b440c 100644 --- a/collections/mbweni/community/community.md +++ b/collections/mbweni/community/community.md @@ -2,15 +2,15 @@ Welcome to the community page of Mbweni Ruins and Gardens! Here, you'll discover the diverse and vibrant community that calls Mbweni home. Navigate easily through the different aspects of our community: -- [Mbweni Community](mbweni/community/mbweni_community.md): Learn about the residents and contributors who make up the Mbweni community. -- [ThreeFold](mbweni/community/threefold.md): Explore the ThreeFold community and their initiatives at Mbweni. -- [H.E.R DAO](mbweni/community/her_dao.md): Discover the projects and activities of H.E.R DAO within the Mbweni community. -- [LIOS Labs](mbweni/community/lios_labs.md): Find out about the innovative projects and collaborations taking place at LIOS Labs in Mbweni. -- [Dunia Yetu](mbweni/community/duniayetu.md): Learn about Dunia Yetu and their efforts to empower local communities in Mbweni and beyond. -- [Msonge Farm](mbweni/community/msonge.md): Explore the sustainable farming practices and agricultural projects at Msonge Farm. -- [Ootopia](mbweni/community/ootopia.md): Discover the vision and initiatives of Ootopia in creating sustainable communities at Mbweni. -- [Sikana](mbweni/community/sikana.md): Learn about Sikana's educational programs and community outreach efforts in Mbweni. -- [Sunzibar](mbweni/community/sunzibar.md): Explore Sunzibar's solar power initiatives and projects aimed at promoting sustainable tourism and environmental conservation in Mbweni. -- [VEDA Egypt](mbweni/community/veda_egypt.md): Discover the cultural exchange and collaboration projects between Mbweni and VEDA Egypt. +- [Mbweni Community](mbweni_community.md): Learn about the residents and contributors who make up the Mbweni community. +- [ThreeFold](threefold.md): Explore the ThreeFold community and their initiatives at Mbweni. +- [H.E.R DAO](her_dao.md): Discover the projects and activities of H.E.R DAO within the Mbweni community. +- [LIOS Labs](lios_labs.md): Find out about the innovative projects and collaborations taking place at LIOS Labs in Mbweni. +- [Dunia Yetu](duniayetu.md): Learn about Dunia Yetu and their efforts to empower local communities in Mbweni and beyond. +- [Msonge Farm](msonge.md): Explore the sustainable farming practices and agricultural projects at Msonge Farm. +- [Ootopia](ootopia.md): Discover the vision and initiatives of Ootopia in creating sustainable communities at Mbweni. +- [Sikana](sikana.md): Learn about Sikana's educational programs and community outreach efforts in Mbweni. +- [Sunzibar](sunzibar.md): Explore Sunzibar's solar power initiatives and projects aimed at promoting sustainable tourism and environmental conservation in Mbweni. +- [VEDA Egypt](veda_egypt.md): Discover the cultural exchange and collaboration projects between Mbweni and VEDA Egypt. Join us as we celebrate diversity, collaboration, and community spirit at Mbweni Ruins and Gardens! diff --git a/collections/mbweni/contact_info.md b/collections/mbweni/contact_info.md new file mode 100644 index 0000000..06a66d0 --- /dev/null +++ b/collections/mbweni/contact_info.md @@ -0,0 +1,4 @@ +- **Address:** Mbweni Rd, Unguja Urban West. P.O BOX 3775, Zanzibar, Tanzania +- **Contact:** +255 778 242 424 +- **Website:** [mbweniruinsandgardens.com](https://mbweniruinsandgardens.com) +- **Email:** info@mbweniruinsandgardens.com \ No newline at end of file diff --git a/collections/mbweni/facilities/beach.md b/collections/mbweni/facilities/beach.md index a39d715..269a54f 100644 --- a/collections/mbweni/facilities/beach.md +++ b/collections/mbweni/facilities/beach.md @@ -35,4 +35,4 @@ Elevate your leisure time to new heights with Mbweni Ruins & Gardens Beach Club Become a member of our Beach Club and experience seaside luxury like never before. Contact us to inquire about membership options and start enjoying the perks of beachfront bliss. -Contact us: +255778242424 or email [info@mbweniruinsandgardens.com](mailto:info@mbweniruinsandgardens.com). +!!wiki.include page:'mbweni/contact_info.md' \ No newline at end of file diff --git a/collections/mbweni/facilities/coworking.md b/collections/mbweni/facilities/coworking.md index c500042..8e90ee4 100644 --- a/collections/mbweni/facilities/coworking.md +++ b/collections/mbweni/facilities/coworking.md @@ -30,4 +30,4 @@ Discover a productive and collaborative environment at our coworking space, wher Experience the benefits of our coworking space and take your work to new heights in a supportive and inspiring environment. Contact us to learn more about membership options and start coworking with us today. -Contact us: +255778242424 or email [info@mbweniruinsandgardens.com](mailto:info@mbweniruinsandgardens.com). +!!wiki.include page:'mbweni/contact_info.md' \ No newline at end of file diff --git a/collections/mbweni/facilities/facilities.md b/collections/mbweni/facilities/facilities.md index b02f354..d091eb3 100644 --- a/collections/mbweni/facilities/facilities.md +++ b/collections/mbweni/facilities/facilities.md @@ -1,23 +1,15 @@ -# Fun and Productive Activities at Mbweni +# Available Facilities at Mbweni -Welcome to Mbweni, where every day is filled with excitement, adventure, and productivity. Whether you're seeking thrilling outdoor sports, peaceful yoga sessions, or engaging community events, there's something for everyone at Mbweni. Join us as we explore a variety of activities designed to enhance your experience and make your stay both enjoyable and fulfilling. +Welcome to Mbweni, where we provide facilities to suit your every needs. -## Navigate Through Exciting Activities +## Explore Our Facilities -Embark on a journey of exploration and discovery as you navigate through our diverse range of activities: +We propose relaxing and confortable facilities to make sure you have the most pleasant stay possible: -- [**Sailing:**](mbweni/activities/sailing.md) Set sail on the crystal-clear waters surrounding Mbweni and experience the thrill of navigating the waves. +- [**Restaurant & Bar:**](restaurant.md) Our restaurant at Mbweni Ruins and Gardens offers a rich fusion of Zanzibar local, Tanzanian, and worldwide cuisine. -- [**Community Events:**](mbweni/activities/events.md) Immerse yourself in the vibrant community spirit of Mbweni by participating in our engaging and inclusive events. +- [**Coworking Space:**](coworking.md) Discover a productive and collaborative environment at our coworking space, where creativity flourishes and ideas come to life. -- [**Outdoor Sports:**](mbweni/activities/sports.md) Get your adrenaline pumping with a variety of outdoor sports activities, including beach volleyball, kayaking, and more. +- [**Swimming Pool:**](swimmingpool.md) Dive into relaxation at our infinity pool, nestled by the beach and surrounded by lush botanical gardens. -- [**Yoga:**](mbweni/activities/yoga.md) Find inner peace and balance with rejuvenating yoga sessions set against the backdrop of Mbweni's natural beauty. - -- [**Outdoor Cinema:**](mbweni/activities/cinema.md) Sit back, relax, and enjoy movie nights under the stars with our outdoor cinema experience, perfect for cozy evenings with friends and family. - -## Explore Enriching Tours - -In addition to our on-site activities, Mbweni offers enriching tours that allow you to explore the surrounding area and immerse yourself in the local culture and heritage. Join us as we embark on guided tours to nearby attractions, cultural landmarks, and natural wonders, enriching your understanding of the region and creating lasting memories. - -Join us at Mbweni and experience the perfect blend of fun, relaxation, and productivity. Whether you're seeking adventure, wellness, or simply a sense of community, our diverse range of activities has something for everyone. Welcome to a world of endless possibilities at Mbweni. +- [**Private Beach:**](beach.md) Escape to our exclusive private beach area at Mbweni Ruins and Gardens, where tranquility meets luxury. \ No newline at end of file diff --git a/collections/mbweni/facilities/restaurant.md b/collections/mbweni/facilities/restaurant.md index 54c705e..50b5e89 100644 --- a/collections/mbweni/facilities/restaurant.md +++ b/collections/mbweni/facilities/restaurant.md @@ -14,7 +14,7 @@ Indulge in delectable flavors and breathtaking ocean views at our restaurant, wh Explore our menu offerings and tantalize your taste buds with our diverse selection of dishes: -[View Menu](https://www2.mbweniruinsandgardens.com/docs/menu.pdf) +[View Menu](https://www.mbweniruinsandgardens.com/docs/menu.pdf) ## Join Us @@ -22,4 +22,4 @@ We look forward to welcoming you to Mbweni Ruins and Gardens Restaurant, where c For reservations or inquiries, please contact us: -Contact us: +255778242424 or email [info@mbweniruinsandgardens.com](mailto:info@mbweniruinsandgardens.com). +!!wiki.include page:'mbweni/contact_info.md' \ No newline at end of file diff --git a/collections/mbweni/facilities/swimmingpool.md b/collections/mbweni/facilities/swimmingpool.md index 20f850b..b5474e8 100644 --- a/collections/mbweni/facilities/swimmingpool.md +++ b/collections/mbweni/facilities/swimmingpool.md @@ -24,4 +24,4 @@ Elevate your leisure time to new heights with a visit to our swimming pool at Mb For inquiries or to become a resident or Beach Club member, please contact us: -Contact us: +255778242424 or email [info@mbweniruinsandgardens.com](mailto:info@mbweniruinsandgardens.com). +!!wiki.include page:'mbweni/contact_info.md' \ No newline at end of file diff --git a/collections/mbweni/history/history.md b/collections/mbweni/history/history.md index 501604f..ec30b21 100644 --- a/collections/mbweni/history/history.md +++ b/collections/mbweni/history/history.md @@ -2,7 +2,7 @@ Here, you'll discover the fascinating stories behind the ruins and botanical gardens that make Mbweni a unique destination. Navigate easily through the different aspects of Mbweni's history: -- [Mbweni Ruins](mbweni/history/ruins.md): Learn about the ancient ruins that dot the landscape of Mbweni and their historical significance. -- [Botanical Gardens](mbweni/history/gardens.md): Explore the lush botanical gardens of Mbweni and their role in preserving the natural beauty of the area. +- [Mbweni Ruins](ruins.md): Learn about the ancient ruins that dot the landscape of Mbweni and their historical significance. +- [Botanical Gardens](gardens.md): Explore the lush botanical gardens of Mbweni and their role in preserving the natural beauty of the area. Embark on a journey through time as we uncover the rich heritage and cultural legacy of Mbweni Ruins and Gardens. diff --git a/collections/mbweni/img/mbweni_ruins_image.png b/collections/mbweni/img/mbweni_ruins_image.png new file mode 100644 index 0000000..4a5340b Binary files /dev/null and b/collections/mbweni/img/mbweni_ruins_image.png differ diff --git a/collections/mbweni/initiatives/harvest_gardens.md b/collections/mbweni/initiatives/harvest_gardens.md index 9509a38..c51f36b 100644 --- a/collections/mbweni/initiatives/harvest_gardens.md +++ b/collections/mbweni/initiatives/harvest_gardens.md @@ -26,4 +26,4 @@ Immerse yourself in the joy of growing your own food and connecting with the ear For more information or to join the Harvest Garden Project, please contact us: -Contact us: +255778242424 or email [info@mbweniruinsandgardens.com] +!!wiki.include page:'mbweni/contact_info.md' \ No newline at end of file diff --git a/collections/mbweni/initiatives/initiatives.md b/collections/mbweni/initiatives/initiatives.md index 48fbc60..73adeb9 100644 --- a/collections/mbweni/initiatives/initiatives.md +++ b/collections/mbweni/initiatives/initiatives.md @@ -4,17 +4,17 @@ Welcome to our Initiatives page, where we highlight the various projects and pro ## Navigation -- [Mbweni Clean Project](mbweni/initiatives/mbweni_clean.md) +- [Mbweni Clean Project](mbweni_clean.md) - Dive into environmental stewardship with our weekly beach clean up initiative dedicated to revitalize the pristine beauty of Mbweni Bay and neighboring surroundings. Our dedicated team, along with residents and guests, comes together every Saturday for a fun beach clean-up. This collaborative effort not only fosters a sense of community but also contributes to the conservation of our coastal ecosystem. -- [Harvest Garden Project](mbweni/initiatives/harvest_gardens.md) +- [Harvest Garden Project](harvest_gardens.md) - Harvest Garden is our farm-to-table community project where aromatic herbs and spices are locally cultivated within Mbweni Botanical Garden, educating members on sustainable agriculture practices. Immerse yourself in the joy of growing your own food and connecting with the earth, as we foster a deeper understanding of the journey from soil to plate. -- [Ecology Seminars](mbweni/initiatives/seminars.md) +- [Ecology Seminars](seminars.md) - Join us every month for our Ecology Seminars, where we delve into the fascinating world of ecology through thoughtfully crafted workshops led by passionate individuals. Set amidst the captivating ambiance of the historical Mbweni Ruins, our seminars provide an enriching experience that fosters both learning and connection. Join us as we strive to create a more sustainable and vibrant community at Mbweni Ruins and Gardens. For more information or to get involved, please contact us: -Contact us: +255778242424 or email [info@mbweniruinsandgardens.com](mailto:info@mbweniruinsandgardens.com). +!!wiki.include page:'mbweni/contact_info.md' \ No newline at end of file diff --git a/collections/mbweni/initiatives/mbweni_clean.md b/collections/mbweni/initiatives/mbweni_clean.md index 7251507..6428851 100644 --- a/collections/mbweni/initiatives/mbweni_clean.md +++ b/collections/mbweni/initiatives/mbweni_clean.md @@ -26,4 +26,4 @@ Become a part of our environmental conservation efforts and make a positive impa For more information or to get involved, please contact us: -Contact us: +255778242424 or email [info@mbweniruinsandgardens.com](mailto:info@mbweniruinsandgardens.com). +!!wiki.include page:'mbweni/contact_info.md' \ No newline at end of file diff --git a/collections/mbweni/initiatives/seminars.md b/collections/mbweni/initiatives/seminars.md index 475989b..fa97112 100644 --- a/collections/mbweni/initiatives/seminars.md +++ b/collections/mbweni/initiatives/seminars.md @@ -16,4 +16,4 @@ Whether you're a seasoned environmentalist or simply curious about the natural w For more information or to reserve your spot at our next seminar, please contact us: -Contact us: +255778242424 or email [info@mbweniruinsandgardens.com](mailto:info@mbweniruinsandgardens.com). +!!wiki.include page:'mbweni/contact_info.md' \ No newline at end of file diff --git a/collections/mbweni/tours/island_tours.md b/collections/mbweni/tours/island_tours.md index d0236e9..e4f71e2 100644 --- a/collections/mbweni/tours/island_tours.md +++ b/collections/mbweni/tours/island_tours.md @@ -18,4 +18,4 @@ Embark on unforgettable adventures and explore the stunning beauty of Zanzibar w For pricing information and to book your island tour, please contact us: -Contact us: +255778242424 or email [info@mbweniruinsandgardens.com](mailto:info@mbweniruinsandgardens.com). +!!wiki.include page:'mbweni/contact_info.md' \ No newline at end of file diff --git a/collections/mbweni/tours/kilimanjaro.md b/collections/mbweni/tours/kilimanjaro.md index 5b66460..d795bd6 100644 --- a/collections/mbweni/tours/kilimanjaro.md +++ b/collections/mbweni/tours/kilimanjaro.md @@ -26,4 +26,4 @@ We collaborate with trusted third-party tour operators who specialize in Kiliman For pricing information and to book your Kilimanjaro trekking adventure, please contact us: -Contact us: +255778242424 or email [info@mbweniruinsandgardens.com](mailto:info@mbweniruinsandgardens.com). +!!wiki.include page:'mbweni/contact_info.md' \ No newline at end of file diff --git a/collections/mbweni/tours/maasai.md b/collections/mbweni/tours/maasai.md index d6e360a..2caa280 100644 --- a/collections/mbweni/tours/maasai.md +++ b/collections/mbweni/tours/maasai.md @@ -22,4 +22,4 @@ At Mbweni Ruins & Gardens, we are committed to responsible and sustainable touri For pricing information and to book your Maasai Village Tour, please contact us: -Contact us: +255778242424 or email [info@mbweniruinsandgardens.com](mailto:info@mbweniruinsandgardens.com). +!!wiki.include page:'mbweni/contact_info.md' \ No newline at end of file diff --git a/collections/mbweni/tours/mangroves.md b/collections/mbweni/tours/mangroves.md index 9c4dc9e..49fcb3c 100644 --- a/collections/mbweni/tours/mangroves.md +++ b/collections/mbweni/tours/mangroves.md @@ -22,4 +22,4 @@ Our Mangroves Conservation Tours are led by experienced ecologists and conducted To book your Mangroves Conservation Tour and experience the wonders of Zanzibar's mangroves, please contact us: -Contact us: +255778242424 or email [info@mbweniruinsandgardens.com](mailto:info@mbweniruinsandgardens.com). +!!wiki.include page:'mbweni/contact_info.md' \ No newline at end of file diff --git a/collections/mbweni/tours/mbweni_tour.md b/collections/mbweni/tours/mbweni_tour.md index e604a26..bdc6a73 100644 --- a/collections/mbweni/tours/mbweni_tour.md +++ b/collections/mbweni/tours/mbweni_tour.md @@ -27,4 +27,4 @@ Gain insight into Mbweni's dedication to sustainability and environmental stewar Experience the beauty and heritage of Mbweni Ruins & Gardens with our Mbweni Tour. To book your tour and embark on a journey of discovery, please contact us: -Contact us: +255778242424 or email [info@mbweniruinsandgardens.com](mailto:info@mbweniruinsandgardens.com). +!!wiki.include page:'mbweni/contact_info.md' \ No newline at end of file diff --git a/collections/mbweni/tours/safari.md b/collections/mbweni/tours/safari.md index b5a7d29..57d2952 100644 --- a/collections/mbweni/tours/safari.md +++ b/collections/mbweni/tours/safari.md @@ -34,4 +34,4 @@ At Mbweni Ruins & Gardens, we are committed to responsible and ethical tourism p Ready to embark on a thrilling safari adventure in mainland Tanzania? Contact us to book your Safari Tour and create unforgettable memories amidst Africa's magnificent wilderness: -Contact us: +255778242424 or email [info@mbweniruinsandgardens.com](mailto:info@mbweniruinsandgardens.com). +!!wiki.include page:'mbweni/contact_info.md' \ No newline at end of file diff --git a/collections/mbweni/tours/spice_farm.md b/collections/mbweni/tours/spice_farm.md index c26a07d..1319bb5 100644 --- a/collections/mbweni/tours/spice_farm.md +++ b/collections/mbweni/tours/spice_farm.md @@ -43,4 +43,4 @@ Relish your meal in a scenic dining setting surrounded by the natural beauty of Ready to immerse yourself in the enchanting world of Zanzibar's spice farms and organic agriculture? Contact us to book your Spice Farm Tour with Farm-to-Table Lunch and embark on a journey of discovery: -Contact us: +255778242424 or email [info@mbweniruinsandgardens.com](mailto:info@mbweniruinsandgardens.com). +!!wiki.include page:'mbweni/contact_info.md' \ No newline at end of file diff --git a/collections/mbweni/tours/stone_town.md b/collections/mbweni/tours/stone_town.md index 6b4dc9c..395c85f 100644 --- a/collections/mbweni/tours/stone_town.md +++ b/collections/mbweni/tours/stone_town.md @@ -34,4 +34,4 @@ Immerse yourself in a learning experience that goes beyond sightseeing, with opp To embark on a journey through the enchanting streets of Stone Town and uncover its hidden treasures, contact us to book your tour: -Contact us: +255778242424 or email [info@mbweniruinsandgardens.com](mailto:info@mbweniruinsandgardens.com). +!!wiki.include page:'mbweni/contact_info.md' \ No newline at end of file diff --git a/collections/mbweni/tours/tours.md b/collections/mbweni/tours/tours.md index 2383511..24c3f15 100644 --- a/collections/mbweni/tours/tours.md +++ b/collections/mbweni/tours/tours.md @@ -6,26 +6,26 @@ Discover the diverse landscapes, rich cultural heritage, and natural wonders of ### Explore our Range of Tours -- [Mbweni Tour](mbweni/tours/mbweni_tour.md): Delve into the history and culture of Mbweni Ruins and Gardens, uncovering the secrets of this historic site and its lush botanical gardens. +- [Mbweni Tour](mbweni_tour.md): Delve into the history and culture of Mbweni Ruins and Gardens, uncovering the secrets of this historic site and its lush botanical gardens. -- [Stone Town](mbweni/tours/stone_town.md): Traverse the labyrinthine streets of Stone Town, a UNESCO World Heritage Site renowned for its architectural marvels, vibrant markets, and rich history. +- [Stone Town](stone_town.md): Traverse the labyrinthine streets of Stone Town, a UNESCO World Heritage Site renowned for its architectural marvels, vibrant markets, and rich history. -- [Island Tours](mbweni/tours/island_tours.md): Embark on island-hopping adventures to explore Zanzibar's pristine beaches, turquoise waters, and secluded islands, each offering its own unique charm and allure. +- [Island Tours](island_tours.md): Embark on island-hopping adventures to explore Zanzibar's pristine beaches, turquoise waters, and secluded islands, each offering its own unique charm and allure. -- [Spice Farm](mbweni/tours/spice_farm.md): Immerse yourself in the sights, scents, and flavors of Zanzibar's spice farms, where you'll learn about the cultivation of exotic spices and herbs that have shaped the island's culinary heritage. +- [Spice Farm](spice_farm.md): Immerse yourself in the sights, scents, and flavors of Zanzibar's spice farms, where you'll learn about the cultivation of exotic spices and herbs that have shaped the island's culinary heritage. -- [Mangroves Tours](mbweni/tours/mangroves.md): Paddle through the tranquil waters of Zanzibar's mangrove forests, discovering the unique ecosystem and biodiversity of these vital coastal habitats. +- [Mangroves Tours](mangroves.md): Paddle through the tranquil waters of Zanzibar's mangrove forests, discovering the unique ecosystem and biodiversity of these vital coastal habitats. -- [Wildlife Conservations](mbweni/tours/wildlife.md): Embark on wildlife conservation tours to encounter Zanzibar's rich biodiversity, from rare endemic species to majestic marine life, and learn about efforts to protect and preserve these natural treasures. +- [Wildlife Conservations](wildlife.md): Embark on wildlife conservation tours to encounter Zanzibar's rich biodiversity, from rare endemic species to majestic marine life, and learn about efforts to protect and preserve these natural treasures. -- [Kilimanjaro Tours](mbweni/tours/kilimanjaro.md): Embark on an epic journey to the roof of Africa with Kilimanjaro tours, where you'll trek through diverse ecosystems, witness breathtaking vistas, and conquer Africa's highest peak. +- [Kilimanjaro Tours](kilimanjaro.md): Embark on an epic journey to the roof of Africa with Kilimanjaro tours, where you'll trek through diverse ecosystems, witness breathtaking vistas, and conquer Africa's highest peak. -- [Safari Tours](mbweni/tours/safari.md): Experience the thrill of a safari adventure on the mainland of Tanzania, where you'll encounter iconic wildlife, explore vast savannahs, and immerse yourself in the wonders of Africa's untamed wilderness. +- [Safari Tours](safari.md): Experience the thrill of a safari adventure on the mainland of Tanzania, where you'll encounter iconic wildlife, explore vast savannahs, and immerse yourself in the wonders of Africa's untamed wilderness. -- [Maasai Village](mbweni/tours/maasai.md): Journey to the heart of Maasai culture with tours to traditional Maasai villages, where you'll learn about their rich heritage, customs, and way of life. +- [Maasai Village](maasai.md): Journey to the heart of Maasai culture with tours to traditional Maasai villages, where you'll learn about their rich heritage, customs, and way of life. ## Book Your Adventure To book any of our tours or learn more about our offerings, please contact us: -Contact us: +255778242424 or email [info@mbweniruinsandgardens.com](mailto:info@mbweniruinsandgardens.com). +!!wiki.include page:'mbweni/contact_info.md' \ No newline at end of file diff --git a/collections/mbweni/tours/wildlife.md b/collections/mbweni/tours/wildlife.md index daf60ee..c4cbaa1 100644 --- a/collections/mbweni/tours/wildlife.md +++ b/collections/mbweni/tours/wildlife.md @@ -22,4 +22,4 @@ Participate in hands-on conservation activities, such as beach clean-ups, reef m To book a wildlife conservation tour or learn more about our conservation initiatives, please contact us: -Contact us: +255778242424 or email [info@mbweniruinsandgardens.com](mailto:info@mbweniruinsandgardens.com). +!!wiki.include page:'mbweni/contact_info.md' \ No newline at end of file diff --git a/collections/p2p/poa/poa.md b/collections/p2p/poa/poa.md index 41d6790..0303348 100644 --- a/collections/p2p/poa/poa.md +++ b/collections/p2p/poa/poa.md @@ -20,13 +20,13 @@ what is the ability for the Author to act in line to - People First - is the author capable to give without expectations to the benefit of the community (people). -There are 3 ways how a vote can be done +There are 3 ways how a vote can be done: -- **positive** +- **Positive** - means we agree and want to give our support -- **neutral** +- **Neutral** - means we are not sure, we don't wanna say yes or no -- **negative** +- **Negative** - means we don't agree diff --git a/collections/partners_utilization/helium.md b/collections/partners_utilization/helium.md index 452cde5..b7bb65a 100644 --- a/collections/partners_utilization/helium.md +++ b/collections/partners_utilization/helium.md @@ -10,26 +10,26 @@ https://www.linxdot.com/shop/linxdot-indoor-helium-hotspot/ ## Future Partnership with Helium -### Introduction to Helium: +### Introduction to Helium [Helium](https://www.helium.com/) is a decentralized wireless network that enables low-power, long-range connectivity for Internet of Things (IoT) devices. By leveraging blockchain technology and a network of hotspots, Helium provides a cost-effective and scalable solution for IoT device connectivity, facilitating the growth of the Internet of Things ecosystem. -### Potential Partnership: +### Potential Partnership A future partnership between ThreeFold and Helium holds immense potential for advancing decentralized infrastructure and connectivity solutions. By combining ThreeFold's expertise in decentralized cloud computing with Helium's innovative wireless network, the two entities could collaborate to create a comprehensive ecosystem that offers decentralized hosting and connectivity services. -### How the Partnership Could Happen: +### How the Partnership Could Happen 1. **Integration of Services:** ThreeFold's TF Grid could integrate with Helium's network infrastructure, allowing TF Grid users to seamlessly access and utilize Helium's decentralized wireless connectivity for their IoT applications and devices. This integration could unlock new possibilities for IoT deployments, enabling efficient data transmission and communication over long distances. 2. **Enhanced IoT Solutions:** The partnership could lead to the development of integrated IoT solutions that leverage both ThreeFold's decentralized hosting capabilities and Helium's wireless network. This collaboration could enable the deployment of IoT applications in remote or underserved areas, where traditional connectivity infrastructure is limited or unavailable. 3. **Joint Innovation Initiatives:** ThreeFold and Helium could collaborate on joint innovation initiatives to explore new use cases and applications for decentralized cloud computing and wireless connectivity. By combining their expertise and resources, the two entities could drive innovation in areas such as smart cities, agriculture, environmental monitoring, and more. -## Benefits for Users:** +## Benefits for Users - **Seamless Integration:** Users of both ThreeFold and Helium will benefit from seamless integration between decentralized hosting and wireless connectivity, simplifying the deployment and management of IoT applications and devices. - **Improved Reliability:** By leveraging Helium's decentralized wireless network, users can achieve greater reliability and resilience for their IoT deployments, even in challenging environments or during network disruptions. - **Cost-Efficiency:** The combined offering of ThreeFold and Helium provides users with a cost-effective solution for hosting and connectivity, reducing operational expenses and enabling more efficient resource utilization. -## Conclusion: +## Conclusion A future partnership between ThreeFold and Helium represents a convergence of decentralized infrastructure and wireless connectivity, offering new opportunities for innovation and collaboration in the rapidly evolving IoT landscape. By leveraging each other's strengths and capabilities, the two entities could create a synergistic ecosystem that empowers developers, businesses, and communities to build scalable and resilient IoT solutions for the future. For more information about Helium, visit [helium.com](https://www.helium.com/). diff --git a/collections/partners_utilization/holochain.md b/collections/partners_utilization/holochain.md index db4ee15..0557568 100644 --- a/collections/partners_utilization/holochain.md +++ b/collections/partners_utilization/holochain.md @@ -19,10 +19,10 @@ Above info came from [https://www.coinbureau.com/review/holochain-rsm/](https:// ThreeFold and Holochain will together go to market, Holochain as application layer being hosted on the ThreeFold Grid. -### *Introduction to Holochain: +### Introduction to Holochain [Holochain](https://www.holochain.org/) is a framework for building decentralized applications (dApps) that is designed to be scalable, efficient, and adaptable. Unlike traditional blockchain architectures, Holochain uses a distributed hash table (DHT) to enable peer-to-peer communication and data storage, offering greater flexibility and performance for decentralized applications. -## Partnership with ThreeFold: +## Partnership with ThreeFold The partnership between ThreeFold and Holochain represents a convergence of decentralized infrastructure and application development frameworks. By leveraging the strengths of both platforms, the partnership aims to foster innovation and accelerate the adoption of decentralized technologies. ### How the Partnership Works diff --git a/collections/problems/painkiller/cd_issues_cloud_not_enough.md b/collections/problems/painkiller/cd_issues_cloud_not_enough.md index 2d2b4a8..2b0ce92 100644 --- a/collections/problems/painkiller/cd_issues_cloud_not_enough.md +++ b/collections/problems/painkiller/cd_issues_cloud_not_enough.md @@ -1,71 +1,80 @@ ![](img/cloudcomplex.png) -# Do current clouds resolve your problems? +# Do Current Clouds Resolve Your Problems? This page describe some of the issues you might encounter if your use clouds to fullfil your requirements for your solution. -## high CDN cost = Content Delivery +## High CDN Cost = Content Delivery - CDN's cost between 20 and 60 on major CDN's from Amazon, Google, ..., after negotiation and willingness to park lots of money and commit per month it mught be certain discount. - Other specialized CDN's can be around 10 per TB if services from e.g. Europe or US, smaller CDN's are much more expensive. -- Managing these CDN's is expensive and not easy job. +- Managing these CDN's is expensive and not an easy job. ->> this means to service 10m people it would cost about 1 to 2m USD per month just for CDN alone. +>> This means to service 10m people, it would cost about 1 to 2m USD per month just for CDN alone. -## High cost of operations +## High Cost of Operations -- cloud servers -- managing those servers, what if mistakes are made +There are high cost of operations attributed to this type of technology. -## Ability to be shut down on the public cloud +- Cloud servers + - Managing those servers + - What if mistakes are made -- its highly probable that within months there would be attempts to shut down the CDN's or often it happens more softly (give bad service and make your product look bad). +## Ability to Shut Down Servers -## apps typically not ready to scale +There is always the possibility to be shut down on the public cloud -- ... -- there are optimizations which can be done e.g. better indexing, better queries, more optimization strategies e.g. using redis -- more knowledge is required to optimize the app +It's highly probable that within months there would be attempts to shut down the CDN's or often it happens more softly (give bad service and make your product look bad). -## Ability to shutdown the mobile apps +## Can't Scale Apps -- google/apple might chose to shutdown apps -- not easy to know how fast this will go, it might just be overnight +Apps are typically not ready to scale. + +- There are optimizations which can be done e.g. better indexing, better queries, more optimization strategies e.g. using redis +- More knowledge is required to optimize the app + +## Ability to Shutdown the Mobile Apps + +- Google/Apple might chose to shutdown apps +- Not easy to know how fast this will go, it might just be overnight ## GDPR -- are very annoying constraints in e.g. Europe, need to be careful to comply +The GDPR constraints are to be taken into account. They are very annoying constraints in e.g. Europe, need to be careful to comply. -## Legal potential trouble +## Legal Potential Trouble -- its important to have good terms & conditions and think which legal entity will be the counterpart of the T&C -- there will be legal requirements like how to shutdown / recognize bad content +- It's important to have good *Terms & Conditions* (T&C) and think which legal entity will be the counterpart of the T&C +- There will be legal requirements, e.g. shutdown and/or recognize bad content -## Redundancy / Uptime +## Redundancy and Uptime -- is the site redundant, can data be lost? -- what happens if a datacenter goes down? -- or what happens if a DB server crashes? -- what happens if e.g. DB gets corrupted? -- how to make sure people always deserve the service they need -- if it kind of works now, will it work if 10x more people? -- is everything monitored? -- if an issue is detected are there people available 24h/day 7/7 to fix -- do the people who will fix have the right knowledge, where is that knowledge stored -- is the monitoring system itself monitored, very often monitoring by itself will stop working +There are a factor of parameters that need to be taken into account to provide a reliable service. + +- Is the site redundant, can data be lost? +- What happens if a datacenter goes down? + - Or what happens if a DB server crashes? +- What happens if e.g. DB gets corrupted? +- How to make sure people always deserve the service they need +- If it kind of works now, will it work if 10x more people? +- Is everything monitored? +- If an issue is detected are there people available 24h/day 7/7 to fix +- Do the people who will fix have the right knowledge, where is that knowledge stored +- Is the monitoring system itself monitored, very often monitoring by itself will stop working ## Performance -- how to see performance is not good enough for customers -- how to make sure we can easily fix it, can be region specific -- how to relocate services? +Performance affect user experience directly and must be dealt with care. -## protect against human error - -- mistakes are and will be made this might have huge impact on uptime and if not careful loose data -- truck factor: what happens if someone goes away? can org easily take over and continue -- level of automation & documentation? -- how is version control done +- How to see performance is not good enough for customers +- How to make sure we can easily fix it, can be region specific +- How to relocate services? +## Protect Against Human Error +The system in place must be able to protect against human error. This has to be considered. +- Mistakes are and will be made this might have huge impact on uptime and if not careful loose data +- Truck factor: what happens if someone goes away? Can org easily take over and continue +- Level of automation & documentation? +- How is version control done diff --git a/collections/problems/painkiller/cd_issues_cost.md b/collections/problems/painkiller/cd_issues_cost.md new file mode 100644 index 0000000..48001c2 --- /dev/null +++ b/collections/problems/painkiller/cd_issues_cost.md @@ -0,0 +1,51 @@ +![](img/cdn2.png) + +## High CDN Cost = Content Delivery + +- CDN's cost between 20 and 60 on major CDN's from Amazon, Google, ..., after negotiation and willingness to park lots of money and commit per month it might be certain discount. +- Other specialized CDN's can be around 10 per TB if services from e.g. Europe or US, smaller CDN's are much more expensive. +- Managing these CDN's is expensive and not easy job. + +> This means to service 10m people, it would cost about 1 to 2m USD per month just for CDN alone. + + +# CDN Pricing Amazon + +Remark no fees included for HTTPS requests, but should be ok for volume we are talking about, if app is made in right way. + +| Location | Price per TB (USD) | +| ----------- | ------------------ | +| US | 28 | +| Middle East | 56 | +| Africa | 56 | + +## CloudFront Price Amazon: Regional Data Transfer Out to Origin (per GB) + +| | United States, Mexico, and Canada | Europe, Israel, and Türkiye |  South Africa, Kenya, Nigeria,  and Middle East | South America | Japan | Australia and New Zealand | Hong Kong, Indonesia,  Philippines, Singapore, South Korea, Taiwan, Thailand, Malaysia, and Vietnam | India | +| ----------------- | --------------------------------- | --------------------------- | ----------------------------------------------- | ------------- | ------ | ------------------------- | --------------------------------------------------------------------------------------------------- | ------ | +| All Data Transfer | $0.020 | $0.020 | $0.060 | $0.125 | $0.060 | $0.080 | $0.060 | $0.160 | + +References: https://aws.amazon.com/cloudfront/pricing/ + +## Discounts + +- Discounts can be negotiated but required serious amounts of pre-financing + +# CDN Pricing Google + +Remark no fees included for HTTPS requests, but should be ok for volume we are talking about, if app is made in right way. + +| | **< 10 TiB** | **10 TiB-150 TiB** | **150 TiB-500 TiB** | **\> 500 TiB** | +| ------------------------------------------------------------------------------ | ----- | ------------ | ------------------ | ------------------- | +| Asia Pacific
(including Hong Kong) | $0.09 | $0.06 | $0.05 | On demand | +| China | $0.20 | $0.17 | $0.16 | On demand | +| Europe | $0.08 | $0.055 | $0.03 | On demand | +| North America
(including Hawaii) | $0.08 | $0.055 | $0.03 | On demand | +| Oceania | $0.11 | $0.09 | $0.08 | On demand | +| South America | $0.09 | $0.06 | $0.05 | On demand | +| All other destinations
(including Mexico, Central America, and Middle East) | $0.09 | $0.06 | $0.05 | On demand | + +References: https://cloud.google.com/cdn/pricing + + + diff --git a/collections/problems/painkiller/no_pain_killer.md b/collections/problems/painkiller/no_pain_killer.md index 94e6135..b0ae44e 100644 --- a/collections/problems/painkiller/no_pain_killer.md +++ b/collections/problems/painkiller/no_pain_killer.md @@ -1,12 +1,12 @@ ![](img/painkillers.png) -# Painkillers are not a solution. +# Painkillers Are Not a Solution -Currently, most develop their digital future by implementing many independent projects which all act as painkillers to their problems. While a painkiller might fix symptoms, it rarely solves the root issue. This happens for content providers, countries, enterprises. +Currently, most develop their digital future by implementing many independent projects which all act as painkillers to their problems. While a painkiller might fix symptoms, it rarely solves the root issue. This happens for content providers, countries, enterprises, etc. -We should stop treating the symptoms it becomes time to resolve the root cause. +We should stop treating the symptoms. It's time to resolve the root cause. -We believe you have the opportunity to leapfrog straight to a solution which is both easier to implement and solves most of its issues all at once. +We believe you have the opportunity to leapfrog straight to a solution which is both easier to implement and solves most of the issues all at once. This has huge benefits: @@ -16,7 +16,7 @@ This has huge benefits: * It is more prepared for the future * It's greener (such a system will use up to 100 times less energy) -## onion layers +## Onion Layers ![](img/onion_layers.png) @@ -38,5 +38,5 @@ Now, imagine when hundreds of such models are connectted to one another and exch The problem here is that individual systems are trying to redo things better, however they are using the same base infrastructure. They simply redefine that base towards a relevant issue. Ths cannot lead to optimal systems since solutions are managed around a single functiion. If multiiple people need to use that function it gets very complicated. -One way to go around this has been to use Enterprise Message Bus: Controlling how models talk to each other by pre-defining the messages exchanged. But this does not solve the problem at the root. +One way to go around this has been to use Enterprise Message Bus: controlling how models talk to each other by pre-defining the messages exchanged. But this does not solve the problem at the root. diff --git a/collections/problems/problems.md b/collections/problems/problems.md index e69de29..25e8ece 100644 --- a/collections/problems/problems.md +++ b/collections/problems/problems.md @@ -0,0 +1,5 @@ +# Problems + +We are facing problems that affect us all in direct and indirect ways. Thankfully, the ThreeFold Grid offers a myriad of solutions to those problems. + +Let's have a look at the problems at hands and the overall situation of cloud network, storage and compute. \ No newline at end of file diff --git a/collections/projectinca/collab.md b/collections/projectinca/collab.md index adb224d..065d5ca 100644 --- a/collections/projectinca/collab.md +++ b/collections/projectinca/collab.md @@ -4,5 +4,5 @@ Let's all together work together on this document as well as on the stories which make up our planning. -- [info_tfgrid = markdown docs for this wiki](https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections) -- [stories, contributors only, ask access](https://git.ourworld.tf/tfgrid/depin_circle/issues) \ No newline at end of file +- [Git repo for this manual](https://git.ourworld.tf/tfgrid/info_tfgrid) +- [Stories for contributors only (Ask access)](https://git.ourworld.tf/tfgrid/depin_circle/issues) \ No newline at end of file diff --git a/collections/projectinca/engineering/engineering.md b/collections/projectinca/engineering/engineering.md index 271cce1..c51f038 100644 --- a/collections/projectinca/engineering/engineering.md +++ b/collections/projectinca/engineering/engineering.md @@ -1,3 +1,3 @@ # Engineering -> TODO: specify more \ No newline at end of file +This section presents the engineering aspect of the project. \ No newline at end of file diff --git a/collections/projectinca/farming/inca_farming.md b/collections/projectinca/farming/inca_farming.md index cdda7db..2cf3458 100644 --- a/collections/projectinca/farming/inca_farming.md +++ b/collections/projectinca/farming/inca_farming.md @@ -2,14 +2,14 @@ ## INCA Farming = **Become a Cloud Service Provider** -Farming means a person or company offers compute, storage and network capacity to the network +The process of farming consists of a person or a company offering compute, storage and network capacity to the network. -- Farmers buy a INCA Node -- A farmer connects the INCA Node(s) to internet and get rewards for providing capacity -- A farmer earns rewards mainly for utilization but there are also lots of rewards available for providing capacity. -- A farmer is helping his/her community to get access to sovereign Internet & Cloud applications on an unbreakabale co-owned Internet/Cloud. +- Farmers buy INCA Nodes +- They connect the INCA Nodes to internet and get rewards for providing capacity +- Farmers earn rewards mainly for utilization, but there are also lots of rewards available for providing capacity. +- Farmers help their community to get access to sovereign Internet and cloud applications on an unbreakabale and co-owned Internet and cloud. -### Income for the Farmers: mainly based on Utilization +### Income for the Farmers: Mainly Based on Utilization The farmers make capacity available and specify their price. @@ -22,36 +22,37 @@ The recommended pricing is: - $0.005-4 for Cloud Block Capacity (VM, Containers, Kubernetes, ...) (per hour) - $0.2-2 for Storage Box (100 GB of storage) (per month) -- ** farmers can also make money with other services e.g. +- Farmers can also make money with other services e.g. - $0.01-0.2 for 1000 messages over LoraWAN (long range wifi) -> 80% of these fees goes to farmer, 20% to the *TFCOOP, exception for a twin which is 50-50% split. +> 80% of these fees goes to farmer, 20% to the *TFCOOP, exception for a twin which is split 50-50%. -### Farming Boosters = additional rewards for providing capacity +### Farming Boosters = Additional Rewards for Providing Capacity -Our aim is to have millions of nodes in the field to evingly create the biggest network of Cloud & Internet Capacity in the world. +Our aim is to have millions of nodes in the field to eventually create the biggest network of Cloud & Internet Capacity in the world. -There are Farming Boosters (additional rewards) available for supporting special locations, providing more uptime & SLA's, ... +There are Farming Boosters (additional rewards) available for supporting special locations, providing more uptime & SLA's, etc. -Cell's get colors in line to need of service: +Cells get colorized in line with the service needed: -- green (enough nodes, no rewards) -- yellow (can use some extra nodes) -- red (let's do it, this region needs help) +- Green (enough nodes, no rewards) +- Yellow (can use some extra nodes) +- Red (let's do it, this region needs help) -For red cells the additional farming booster reward is highest. +For red cells, the additional farming booster reward is the highest. -### How to become a farmer +### How to Become a Farmer -- buy a *INCA NODE (Compute/Storage/AI node) or *INCA ROUTER (Mycelium Network Node). -- or assemble your own Node, our software makes it easy to get started (see threefold.io for version 3). +- Buy a *INCA NODE (Compute/Storage/AI node) or *INCA ROUTER (Mycelium Network Node). +- Assemble your own node + - Our software makes it easy to get started. Check [ThreeFold](https://threefold.io/) v3 for more info. -### Rewards for being a Farmer +### Rewards for Being a Farmer -Typically a Farmer can earn the investment of their node back 2 to 10 times over 5 years if succesful. +Typically a Farmer can earn the investment of their node back 2 to 10 times over 5 years if successful. -> For a [simulation](https://docs.google.com/spreadsheets/d/1D6Q3Yav_SS356zAILwN4SrmqwYfLibT3E6oWrVPU4c8/edit#gid=170998100) +> For a simulation, [consult this document](https://docs.google.com/spreadsheets/d/1D6Q3Yav_SS356zAILwN4SrmqwYfLibT3E6oWrVPU4c8/edit#gid=170998100). ### Farming Pools @@ -59,22 +60,21 @@ Some farmers will chose not to manage, market or operate their 3node, in that ca A Farming pool takes care of -- marketing the capacity -- giving support to the userbase (developers) -- managing the best possible pricing -- monitor all nodes and optimize uptime -- monitor available bandwidth and make optimizations where possible. - -If a farmer uses a farming pool he/she will have to give a part of their reward to the farming pool, each farming pool can decide how much that needs to be. +- Marketing the capacity +- Giving support to the userbase (developers) +- Managing the best possible pricing +- Monitor all nodes and optimize uptime +- Monitor available bandwidth and make optimizations where possible +If a farmer uses a farming pool, they will have to give a part of their reward to the farming pool, each farming pool can decide how much that needs to be. ## Remarks ### Network Rewards requires Unblocked Incoming Internet. -"Incoming internet traffic should be enabled to earn rewards from network bandwidth. +Incoming Internet traffic should be enabled to earn rewards from network bandwidth. -If a farmer lacks this capability, their INCA Node will connect to a neighboring INCA Node with good internet connectivity and public incoming access. In this case, the neighbor farmer will earn money from the internet traffic, while the farmer will continue to earn rewards for compute and storage." +If a farmer lacks this capability, their INCA Node will connect to a neighboring INCA Node with good internet connectivity and public incoming access. In this case, the neighbor farmer will earn money from the Internet traffic, while the farmer will continue to earn rewards for compute and storage." All traffic is end2end encrypted over the Mycelium network = our P2P Network which lives on top of current Internet. diff --git a/collections/projectinca/farming/inca_farming_reward.md b/collections/projectinca/farming/inca_farming_reward.md index f7f30eb..f2bc1ac 100644 --- a/collections/projectinca/farming/inca_farming_reward.md +++ b/collections/projectinca/farming/inca_farming_reward.md @@ -1,8 +1,5 @@ # Farming Reward Calculation -We have created a simulation sheet which allows you to estimate farming rewards based on utilization: +We have created a [simulation sheet](https://docs.google.com/spreadsheets/d/1D6Q3Yav_SS356zAILwN4SrmqwYfLibT3E6oWrVPU4c8/edit#gid=170998100) which allows you to estimate farming rewards based on utilization. -For a [simulation](https://docs.google.com/spreadsheets/d/1D6Q3Yav_SS356zAILwN4SrmqwYfLibT3E6oWrVPU4c8/edit#gid=170998100) - - -> Do note, there are other rewards in relation to uptime, performance & location, you're reward might be much higher compared to utilization only. +> Note: There are other rewards in relation to uptime, performance and location. Your reward might be much higher compared to utilization only. \ No newline at end of file diff --git a/collections/projectinca/farming/inca_nodes.md b/collections/projectinca/farming/inca_nodes.md index a058b5b..7121ac7 100644 --- a/collections/projectinca/farming/inca_nodes.md +++ b/collections/projectinca/farming/inca_nodes.md @@ -9,7 +9,7 @@ - 512 GB SSD - min 4 logical CPU cores -Will cost less than 500 USD. +It will cost less than 500 USD. ### INCA Node Gold @@ -20,7 +20,7 @@ Will cost less than 500 USD. - min 8 logical CPU cores -Will cost less than 1000 USD. +It will cost less than 1000 USD. ### INCA Node Platinum @@ -32,7 +32,7 @@ Will cost less than 1000 USD. - min 16 logical CPU cores -Will cost less than 1800 USD. +It will cost less than 1800 USD. ### INCA Node Datacenter diff --git a/collections/projectinca/farming/inca_routers.md b/collections/projectinca/farming/inca_routers.md index 33fcfed..64aaa8c 100644 --- a/collections/projectinca/farming/inca_routers.md +++ b/collections/projectinca/farming/inca_routers.md @@ -1,7 +1,7 @@ ## INCA Routers -The INCA Routers allow everyone to connect the users of our network with the INCA Node +The INCA Routers allow everyone to connect the users of our network with the INCA Node. ### INCA Router Indoor @@ -30,7 +30,7 @@ This INCA Router is super fast and has lots of connectivity. ![](img/TFRouter_2b.png) -> This INCA Router can be bought right now. +> Purchasing this INCA router is currently possible. ### INCA Router Outdoor + Long Range @@ -40,14 +40,10 @@ Currently, we rely on fiber or existing internet connections to link between loc ![](img/TFRouter_lr.png) -> We are looking for volunteers who will be rewarded to do reasearch and experiment with chosen equipment to test performance in real life situations, let us know if interest to help. - - - +> We are looking for volunteers who will be rewarded to do reasearch and experiment with chosen equipment to test performance in real life situations, let us know if you want to collaborate. ## Lo-RAN ![](img/loran.png) - -!!task.add story:'TFRouter_selection' title:'describe loran on INCA Router' \ No newline at end of file + \ No newline at end of file diff --git a/collections/projectinca/farming/networkmap.md b/collections/projectinca/farming/networkmap.md index 8f572cd..3fa1b01 100644 --- a/collections/projectinca/farming/networkmap.md +++ b/collections/projectinca/farming/networkmap.md @@ -1,8 +1,8 @@ # Network Map +We are planning on creating a network map to visualize all INCA nodes, routers and also devices from partners. + ![](img/networkmap.png) -Above network map is from Helium see [the Helium Explorer](https://explorer.helium.com/) but we aim to have a similar map to visualize all INCA nodes and routers and also devices from partners. - - +The Aaove network map is from Helium. See [the Helium Explorer](https://explorer.helium.com/) for inspiration. diff --git a/collections/projectinca/funding.md b/collections/projectinca/funding.md index ccd8ce2..c6108d5 100644 --- a/collections/projectinca/funding.md +++ b/collections/projectinca/funding.md @@ -3,11 +3,11 @@ # Funding INCA-G -Funding INCA-G needs to be explored further. Selling INCA-G NFT tokens through entities such as SwissBorg might be good option. +Funding INCA-G needs to be explored further. Selling INCA-G NFT tokens through entities such as SwissBorg might be a good option. # Funding Through Project Mycelium (HERO) -There will be a new project called Project Mycelium. This project will be focused on the Hero super-tool. This will run on multiple clouds and we will also publish our own cloud versions. +There will be a new project called Project Mycelium. This project will be focused on the Hero AI assistant and tool. This will run on multiple clouds and we will also publish our own cloud versions. The first narrative version can be found [in this doc](https://docs.google.com/document/d/1H24yGqXi3pX9xljTviFPS9tI4hX1r6cSB3hBa0BTtCI). This project aims to fundraise +40m EUR and will also buy TFT. See the section about deploying 100,000 HERO's to have an overview of the demand for grid resources this project would generate. diff --git a/collections/projectinca/grants/grant_versions.md b/collections/projectinca/grants/grant_versions.md index 1aee5c5..f86cd3b 100644 --- a/collections/projectinca/grants/grant_versions.md +++ b/collections/projectinca/grants/grant_versions.md @@ -1,4 +1,6 @@ -We believe in the power of grants to together with the community build the necessary components or reward the community to further develop the project. +We believe in the power of grants to build together the necessary components or reward the community to further develop the project. -- 1,2,3.X series are called TFGrid and can be followed on www.threefold.io -- 4.x series called INCA (INternet CApacity), tbd website +- 1,2,3.X series are called TFGrid + - The website is www.threefold.io +- 4.x series called INCA (INternet CApacity) + - The website will be released soon diff --git a/collections/projectinca/grants/grant_voting_process.md b/collections/projectinca/grants/grant_voting_process.md index e6ea760..79fdec3 100644 --- a/collections/projectinca/grants/grant_voting_process.md +++ b/collections/projectinca/grants/grant_voting_process.md @@ -1,17 +1,24 @@ -## Voting Process +## Grant Voting Process The voting process is as follows: - Go to INCA Connect - See the projects -- Vote + or - +- Vote yes or no for a given project - Vote requests for projects need to be live for a minimum of 2 weeks -- Votes are not free min 5 USD, but preferred 10 or more, the proceeds of votes go back to treasury +- Votes are not free + - Minimum 5 USD, but preferred 10 or more + - The proceeds of votes go back to the treasury - Each project defines - - min nr of votes, voting fee, if dedicated account, proper description, vesting scheme -- Everyone can see the projects on https://projectinca.info/projects and comment if logged in and accepted as commenter or moderator -- We need simple majority to have positive vote -- Once positive vote the money goes in account created per project, there can be vesting on it, with acceleration + - Minimum number of votes + - Voting fee + - If dedicated account + - Proper description + - Vesting scheme +- Everyone can see the projects on the [Project INCA Projects website](https://projectinca.info/projects) and comment if logged in and accepted as commenter or moderator +- We need simple majority to have a positive vote +- Once we have a positive vote, the money goes in the account created for the project + - There can be vesting on it, with acceleration, etc. - Supported chains - We start by supporting Stellar - Then we will also support Solana diff --git a/collections/projectinca/grants/grants_inca.md b/collections/projectinca/grants/grants_inca.md index 474bf7d..cf66c88 100644 --- a/collections/projectinca/grants/grants_inca.md +++ b/collections/projectinca/grants/grants_inca.md @@ -43,6 +43,4 @@ option = { ## TFT Grants Treasury -- **660,000,000 INCA is available for Grants (over all releases)** - -!!wiki.include page:'projectinca:grant_voting_process.md' \ No newline at end of file +- **660,000,000 INCA is available for Grants (over all releases)** \ No newline at end of file diff --git a/collections/projectinca/grants/grants_tft.md b/collections/projectinca/grants/grants_tft.md index 0963c61..e6396c1 100644 --- a/collections/projectinca/grants/grants_tft.md +++ b/collections/projectinca/grants/grants_tft.md @@ -1,7 +1,5 @@ # TFGrid 3.x Grants -!!wiki.include page:'projectinca:grant_versions.md' - Below you can find the grants as are open and being executed on for the 3.x version of our project. ```echarts @@ -46,17 +44,17 @@ option = { ## TFT Grants Treasury -- At least 180,000,000 TFT (which si 360,000,000 INCA) is available for Grants - - projects defined below - - in future on https://projectinca.info/projects (To Be Done, link not working yet) - - voting through INCA Connect -- <10m in locked pool (dead wallets) +- At least 180,000,000 TFT (which could be converted to 360,000,000 INCA) is available for grants + - Projects defined below + - Will be available in the future on https://projectinca.info/projects + - Voting through INCA Connect +- <10m in locked pool (dead wallets) ## Reward Projects Initial projects are listed below. -> Remark: all TFT are with vesting and have min execution price 0.1 USD per TFT or higher ! +> Remark: all TFT are with vesting and have min execution price 0.1 USD per TFT or higher! - [Deploy AI Blocks](projectinca/grant_aiblock.md) : 10m TFT - [Deploy Cloud Blocks](projectinca/grant_cloudblock.md) : 15m TFT @@ -68,6 +66,4 @@ Initial projects are listed below. - [Biz dev rewards](projectinca/biz_dev_rewards.md) : 5% of raised token sales or other investments in TFT at 0.1 USD per TFT or higher. - [Code TFGrid 3.13](projectinca/grant_tf_3_13.md) : 10m TFT - [Code TFGrid 3.14](projectinca/grant_tf_3_14.md) : 5m TFT -- [Establish Thorchain DEX](projectinca/grant_thorchain.md) : 5m TFT - -!!wiki.include page:'projectinca:grant_voting_process.md' +- [Establish Thorchain DEX](projectinca/grant_thorchain.md) : 5m TFT \ No newline at end of file diff --git a/collections/projectinca/grants/tf3/biz_dev_rewards.md b/collections/projectinca/grants/tf3/biz_dev_rewards.md index 56763c9..ed55607 100644 --- a/collections/projectinca/grants/tf3/biz_dev_rewards.md +++ b/collections/projectinca/grants/tf3/biz_dev_rewards.md @@ -3,13 +3,13 @@ If TFCoop or TF DMCC receives funding they are able to reward the biz dev activity with tokens if following requirements are met. -## requirements +## Requirements - investment will be used for the benefit for the TFGrid or the community (e.g. tokenlaunch, marketing, ...) - investment can be as loan, equity or over the counter token sales (as IT capacity) - money is on the bank account -## terms +## Terms - 5% in TFT at 0.1 if price of TFT < 0.1, otherwise avg price of TFT over last 30 days. - the biz dev person needs agreement with TF DMCC or TF COOP \ No newline at end of file diff --git a/collections/projectinca/grants/tf3/box_vesting_include.md b/collections/projectinca/grants/tf3/box_vesting_include.md index 82c7249..876a2ac 100644 --- a/collections/projectinca/grants/tf3/box_vesting_include.md +++ b/collections/projectinca/grants/tf3/box_vesting_include.md @@ -1,4 +1,4 @@ -## The tokens are vested +## The Tokens Are Vested - TFT are only available once the cloud, storage or ai box is available and has been tested - the farmer receives the TFT in an account with vesting and can only sell once price is above certain value diff --git a/collections/projectinca/grants/tf3/chapter_include.md b/collections/projectinca/grants/tf3/chapter_include.md index bafe895..ae3af0e 100644 --- a/collections/projectinca/grants/tf3/chapter_include.md +++ b/collections/projectinca/grants/tf3/chapter_include.md @@ -1,7 +1,7 @@ - 3,000 TFT per deployed node of min 32 GB mem and min 2 TB SSD. - 1,000 TFT per Mycelium Router (connectivity to the TFGrid) -**hackathons** +**Hackathons** - We expect the Chapter to organize hackatons how to deploy and manage the nodes - We expect the Chapter to organize a farming pool to manage the nodes. @@ -12,7 +12,7 @@ For each hackathon organized there is a reward of 20,000 TFT if succefull. - at least 1000 nodes < 1 year of good quality over multiple countries -## requirements +## Requirements - news on TF / INCA ecosystem - report on the achievements, connect with community @@ -22,9 +22,9 @@ For each hackathon organized there is a reward of 20,000 TFT if succefull. - TF DMCC will validate the candidates and start the project - Project will be followed up by the OurWorld Team in Zanzibar -## The tokens are vested +## The Tokens Are Vested - TFT are only available per node or hackathon delivered. - min price to sell 0.1 USD per TFT (unvesting rule) -this makes sure we don't add to the price pressure. \ No newline at end of file +This makes sure we don't add to the price pressure. \ No newline at end of file diff --git a/collections/projectinca/grants/tf3/contributor_rewards.md b/collections/projectinca/grants/tf3/contributor_rewards.md index 3b90c85..7b1c763 100644 --- a/collections/projectinca/grants/tf3/contributor_rewards.md +++ b/collections/projectinca/grants/tf3/contributor_rewards.md @@ -2,7 +2,7 @@ The TF Team & community has not been properly rewarded, we suggest following reward scheme for activities as have been done over the last year. -## requirements +## Requirements - the activities rewarded were 100% to the benefit of TF - the impact was measurable and/or recognized @@ -12,7 +12,7 @@ The TF Team & community has not been properly rewarded, we suggest following rew Everyone should recommend candidates to TF DMCC, candidates will be put on this list, voting will be organized. -## The tokens are vested +## The Tokens Are Vested - the TFT are received in an account with vesting and can only sell once price is above certain value - min price to sell 0.1 USD per TFT (unvesting rule) diff --git a/collections/projectinca/grants/tf3/grant_aiblock.md b/collections/projectinca/grants/tf3/grant_aiblock.md index 80322db..e82b3fa 100644 --- a/collections/projectinca/grants/tf3/grant_aiblock.md +++ b/collections/projectinca/grants/tf3/grant_aiblock.md @@ -24,7 +24,7 @@ The total size of the grant is 10m TFT but can be expended later. !!wiki.include page:'projectinca:box_vesting_include.md' -## Grant calculation +## Grant Calculation We believe the current minimal real price of TFT is at least 0.1 or 0.2, not the current marketcap which has no liquidity diff --git a/collections/projectinca/grants/tf3/grant_cloudblock.md b/collections/projectinca/grants/tf3/grant_cloudblock.md index ec0e825..82f78eb 100644 --- a/collections/projectinca/grants/tf3/grant_cloudblock.md +++ b/collections/projectinca/grants/tf3/grant_cloudblock.md @@ -23,7 +23,7 @@ The aim is to reward the creation of capacity for 100,000 Storage Blocks, each a !!wiki.include page:'projectinca:box_vesting_include.md' -## Grant calculation +## Grant Calculation We believe the minimal real price of TFT is at least 0.1 or 0.2, not the current marketcap which has no liquidity diff --git a/collections/projectinca/grants/tf3/grant_storageblock.md b/collections/projectinca/grants/tf3/grant_storageblock.md index 4bfcb17..0a5b229 100644 --- a/collections/projectinca/grants/tf3/grant_storageblock.md +++ b/collections/projectinca/grants/tf3/grant_storageblock.md @@ -23,7 +23,7 @@ The aim is to reward the creation of capacity for 100,000 Storage Blocks, each a !!wiki.include page:'projectinca:box_vesting_include.md' -## Grant calculation +## Grant Calculation We believe the minimal real price of TFT is at least 0.1 or 0.2, not the current marketcap which has no liquidity diff --git a/collections/projectinca/grants/tf3/grant_tf_3_13.md b/collections/projectinca/grants/tf3/grant_tf_3_13.md index 508109c..f4370dc 100644 --- a/collections/projectinca/grants/tf3/grant_tf_3_13.md +++ b/collections/projectinca/grants/tf3/grant_tf_3_13.md @@ -7,16 +7,13 @@ There is a grant of 10m TFT foreseen for the work done by the codescalers & TF9 ## Requirements - The work has already been done - -## Requirements - - Project is delivered - opensource - customers operational - See: https://dashboard.grid.tf/ -## The tokens are vested +## The Tokens Are Vested - Min price to sell 0.1 USD per TFT for 50% (means the developer can only sell their tokens once this price achieved) - Min price to sell 0.15 USD per TFT for 50% diff --git a/collections/projectinca/grants/tf3/grant_tf_3_14.md b/collections/projectinca/grants/tf3/grant_tf_3_14.md index 207c218..d6f83ca 100644 --- a/collections/projectinca/grants/tf3/grant_tf_3_14.md +++ b/collections/projectinca/grants/tf3/grant_tf_3_14.md @@ -4,7 +4,7 @@ The teams are doing a lot of work on the next release which will give us much be There is a grant of 5m TFT foreseen for the work as will be done by the codescalers & TF9 teams. -## requirements +## Requirements - The work as defined on [project management tool](https://git.ourworld.tf/tfgrid/circle_engineering/projects/28) is executed and delivered - Project is delivered @@ -15,7 +15,7 @@ There is a grant of 5m TFT foreseen for the work as will be done by the codescal - Release is on mainnet -## The tokens are vested +## The Tokens Are Vested - Min price to sell 0.1 USD per TFT for 50% (means the developer can only sell their tokens once this price achieved) - Min price to sell 0.15 USD per TFT for 50% diff --git a/collections/projectinca/grants/tf3/marketplace_grant.md b/collections/projectinca/grants/tf3/marketplace_grant.md index a906f39..a4e3537 100644 --- a/collections/projectinca/grants/tf3/marketplace_grant.md +++ b/collections/projectinca/grants/tf3/marketplace_grant.md @@ -22,7 +22,7 @@ There is a grant of 5m TFT foreseen. - Development starts, tokens put on multisignature wallets - Once project delivered & vesting criteria achieved developers can optionally sell TFT -## The tokens are vested +## The Tokens Are Vested - Project is delivered - opensource diff --git a/collections/projectinca/grants/tf3/marketplace_requirements.md b/collections/projectinca/grants/tf3/marketplace_requirements.md index e94ed52..bbd3d76 100644 --- a/collections/projectinca/grants/tf3/marketplace_requirements.md +++ b/collections/projectinca/grants/tf3/marketplace_requirements.md @@ -1,5 +1,5 @@ -## requirements +## Requirements - The interface needs to be super simple and well documented over web - The interface needs to be usable on mobile diff --git a/collections/projectinca/liquidity/liquidity.md b/collections/projectinca/liquidity/liquidity.md index 9444e77..c70f2c7 100644 --- a/collections/projectinca/liquidity/liquidity.md +++ b/collections/projectinca/liquidity/liquidity.md @@ -1,7 +1,6 @@ ![](cloud_computing_with_liquidity_of_water_flow_aspect_19_12.png) - # Liquidity ## Solana @@ -14,15 +13,16 @@ We will partner with many DEX'es and make our token available where possible. ## THORChain -THORCHain is an amazing platform, with super nice DEX. We need to find some cash to launch us on this chain. +THORCHain is an amazing platform, with a super nice decentralized exchange (DEX). We need to find some cash to launch the project on this chain. ## LiquidCrypto -See [https://liquidcrypto.finance/](https://liquidcrypto.finance/) +See the [liquidCrypto](https://liquidcrypto.finance/) website. -- A very nice platform, we can even whitelabel if that would be required. +- A very nice platform + - We can even whitelabel if that would be required - Works on many blockchain platforms and is very well integrated with many DEXes -- There will be an INCA liquidity pool, which can have parameters as defined by us. +- There will be an INCA liquidity pool, which can have parameters as defined by us - This liquidity pool can be accessed from multiple blockchains e.g. Solana, Stellar, Ethereum-based chains ## Stellar (History) diff --git a/collections/projectinca/marketplace/marketplace.md b/collections/projectinca/marketplace/marketplace.md index d9e612a..d0e242b 100644 --- a/collections/projectinca/marketplace/marketplace.md +++ b/collections/projectinca/marketplace/marketplace.md @@ -2,9 +2,9 @@ We have reached a sizeable grid and want to promote commercialization. -- We are introducing a market place and our next generation grid v4.0 (INCA). -- This will make it a lot more easy for 3rd parties to use our infrastructure. -- The currency as used on the marketplace is INCA, there will be a bridge between TFT and INCA. +- We are introducing a market place and our next generation grid v4.0 (INCA) +- This will make it a lot more easy for 3rd parties to use our infrastructure +- The currency as used on the marketplace is INCA, there will be a bridge between TFT and INCA ## Benefits @@ -13,13 +13,11 @@ We have reached a sizeable grid and want to promote commercialization. - Easier for users to find right priced service - Easier to monitor and enforce SLA's - Easier to track utilization and expansion -- Can and will be extended to other Internet/Cloud Services +- Can and will be extended to other Internet/cloud Services -## More info about our cloud & Storage Blocks. +## More info about our cloud & storage blocks -- [Cloud Blocks](tfgrid4:cloudblock.md) -- [AI Blocks](tfgrid4:aiblock.md) -- [Storage Blocks](tfgrid4:storageblock.md) +Read the next sections for more information on the block concept. !!wiki.include page:'marketplace_pricing0.md' diff --git a/collections/projectinca/marketplace/marketplace_pricing0.md b/collections/projectinca/marketplace/marketplace_pricing0.md index 58cc4e0..611eb43 100644 --- a/collections/projectinca/marketplace/marketplace_pricing0.md +++ b/collections/projectinca/marketplace/marketplace_pricing0.md @@ -1,11 +1,8 @@ - ### Possible Marketplace Pricing Each farmer can decide on their own price but between the min and max as specified below. - ![](img/marketplace_pricing.png) -As a consumer you have the capability to look for the Blocks which are of interest to you in relation to its properties like SLA, location, price, reputation, ... - +As a consumer you have the capability to look for the blocks which are of interest to you in relation to its properties like SLA, location, price, reputation, etc. diff --git a/collections/projectinca/peer2peer_promotion.md b/collections/projectinca/peer2peer_promotion.md index 2f070cb..ab53b2d 100644 --- a/collections/projectinca/peer2peer_promotion.md +++ b/collections/projectinca/peer2peer_promotion.md @@ -8,9 +8,9 @@ We believe the rollout must be viral. Here's how to achieve this. ### Expansion Rewards our TF Scouts: -We expect the TF Scout to help newcomers to get onboarded. +We expect the TF Scouts to help newcomers to get onboarded. -We expect the TF Scout to do the following: +We expect the TF Scouts to do the following: - Make sure the person knows about TF and understands its purpose & goal - Instruct what INCA is and what we can do with it diff --git a/collections/projectinca/proj_info.md b/collections/projectinca/proj_info.md deleted file mode 100644 index 19cd2a1..0000000 --- a/collections/projectinca/proj_info.md +++ /dev/null @@ -1,5 +0,0 @@ -![alt text](theplan.png) - -# Project Info - -This section lists lots of info in relation to the why, what, etc. \ No newline at end of file diff --git a/collections/projectinca/project_info.md b/collections/projectinca/project_info.md new file mode 100644 index 0000000..61ca2f7 --- /dev/null +++ b/collections/projectinca/project_info.md @@ -0,0 +1,5 @@ +![alt text](theplan.png) + +# Project Info + +In this section, we provide general information on the project. \ No newline at end of file diff --git a/collections/projectinca/tokens/inca.md b/collections/projectinca/tokens/inca.md index 1b0d60a..0eb7330 100644 --- a/collections/projectinca/tokens/inca.md +++ b/collections/projectinca/tokens/inca.md @@ -6,7 +6,7 @@ There can never be more than 4 Billion INCA. - 50% of supply for Farming - People expanding the network with Router & Node capacity over the multiple releases - 16.5% Million for community grants - - we want to expand and build our project in first place together with the community + - We want to expand and build our project in first place together with the community - 1.3% Million for community expansion specifically for INCA - Promotion of the TFGrid - 3.3% For liquidity providing (DEX, marketmakers, ...) @@ -67,4 +67,4 @@ The following table shows planned release, some of the mechanisms and details ar -For more information about our gen3 token see [here called TFT](tft.md) \ No newline at end of file +For more information about our gen3 token see [here](tft.md). \ No newline at end of file diff --git a/collections/projectinca/tokens/tft.md b/collections/projectinca/tokens/tft.md index 30aa36e..c05096d 100644 --- a/collections/projectinca/tokens/tft.md +++ b/collections/projectinca/tokens/tft.md @@ -1,10 +1,10 @@ -## TFT main stats +## TFT Main Stats -TFT is the token on stellar as was used on our previous grids (v 1,2,3) +TFT is the token on Stellar as was used on our previous grids (v 1,2,3). - **The TFT is our Creator Token, it has established and proven the technology** -- Right now about 5 million TFT are farmed (mined) per month. -- About 294,000,000 TFT have been farmed so far. +- Right now about 5 million TFT are farmed (mined) per month +- About 294,000,000 TFT have been farmed so far - Farming of TFT will stop at 1 Billion TFT @@ -45,10 +45,10 @@ option = { - Rivine-minted TFT: 112,862,249 - Stellar-minted TFT: 181,262,054 -### On v3.x of our Grid TFT Farming limited to 1 Billion +### On v3.x of our Grid TFT Farming is limited to 1 Billion -- Farming on TFGrid (our v3 release), stops at 1 Billion. -- Farming continues (over v4 release), total will be 50% of the total supply (1,2,3 and 4 release) +- Farming on TFGrid (our v3 release) stops at 1 Billion. +- Farming continues (over v4 release) total will be 50% of the total supply (1,2,3 and 4 release) *The values above are estimate in some cases as we don't have full visibility and details for all wallets, but of course the totals are correct.* diff --git a/collections/projectmycelium/farming/farming.md b/collections/projectmycelium/farming/farming.md index 1ddbd3b..3ec9427 100644 --- a/collections/projectmycelium/farming/farming.md +++ b/collections/projectmycelium/farming/farming.md @@ -1,48 +1,46 @@ +# Become a Hero Host +You can become a Hero host by deploying Mycelium nodes and/or routers. -## Become a Hero Host +- As a host, you connect the router(s) and/or node(s) to internet and get rewards for providing compute, AI and network capacity. By doing this, you are helping your community to provide capacity to the network. -> Deploy Mycelium Nodes or Routers +## Income for the Hosts -- as host you connect the router(s) and/or node(s) to internet and get rewards for providing compute, AI and network capacity -- as host you earn rewards. -- as host you are helping your community to provide capacity +Our aim is to have millions of routers and nodes in the field. Via our Network Map, we will map where cells displaying information on the the necessity to deploy more routers and/or nodes. -### Income for the Hosts +The cells will show urgency via its colorzied code. -Our aim is to have millions of routers and nodes in the field, we will have a map where cells will show the necessety to deploy more routers and/or nodes. +- Green (enough nodes, no rewards) +- Yellow (can use some extra nodes) +- Red (let's do it, this region needs help) -The collors will show urgency. +For red cells the reward is the highest. -- green (enough nodes, no rewards) -- yellow (can use some extra nodes) -- red (let's do it, this region needs help) +## A Whole Ecosystem -For red cells the reward is highest. +We are also hosting on other networks like ThreeFold which is using the same underlying tech. This means that the ThreeFold Grid and the Mycelium network can co-exist and build on each other. -We are also hosting on other networks like ThreeFold which is using the same underlying tech. +## How to Become a Host +Becoming a Mycelium host is highly accessible. -### How to become a Host +- Buy a *NODE (Compute/Storage node) or a *ROUTER (Mycelium Network Node). +- Connect it to the Internet +- Become part of a Hosting Pool -- buy a *NODE (Compute/Storage node) or *ROUTER (Mycelium Network Node). -- connect to the internet -- become part of a Hosting Pool +## Hosting Rewards -### Rewards for being a Host +Typically a host can earn the investment of their node back 2 to 5 times over 5 years if successful. This is not a financial advice and we recommend anyone to do their own research before proceeding in any project of the sort. -Typically a Host can earn the investment of their node back 2 to 5 times over 5 years if succesful. +## Hosting Pool -### Hosting Pool +A Hosting pool takes care of many things. -A Hosting pool takes care of - -- marketing the capacity and capabilities -- giving support to the userbase (developers) -- managing the best possible pricing -- monitor all nodes, routers and optimize uptime -- monitor available bandwidth and make optimizations where possible. - -If a Host uses a Hosting Pool he/she will have to give a part of their reward to the hosting pool, each hosting pool can decide how much that needs to be. +- Marketing the capacity and capabilities +- Giving support to the userbase (developers) +- Managing the best possible pricing +- Monitor all nodes, routers and optimize uptime +- Monitor available bandwidth and make optimizations where possible. +If a host uses a Hosting Pool, they will have to give a part of their reward to the hosting pool. Each hosting pool can decide how much that needs to be and hosts will be invited to select the hosting pool that most fits their needs. diff --git a/collections/projectmycelium/farming/mycelium_nodes.md b/collections/projectmycelium/farming/mycelium_nodes.md index 85c623a..9163bb0 100644 --- a/collections/projectmycelium/farming/mycelium_nodes.md +++ b/collections/projectmycelium/farming/mycelium_nodes.md @@ -9,7 +9,7 @@ - 512 GB SSD - min 4 logical CPU cores -Will cost less than 500 USD. +It will cost less than 500 USD. ## Gold @@ -19,7 +19,7 @@ Will cost less than 500 USD. - 1000 GB SSD - min 8 logical CPU cores -Will cost less than 1000 USD. +It will cost less than 1000 USD. ## Platinum @@ -30,7 +30,7 @@ Will cost less than 1000 USD. - 4000 GB HDD - min 16 logical CPU cores -Will cost less than 1800 USD. +It will cost less than 1800 USD. ## Remarks diff --git a/collections/projectmycelium/farming/mycelium_routers.md b/collections/projectmycelium/farming/mycelium_routers.md index 26f3a71..ffc4dd3 100644 --- a/collections/projectmycelium/farming/mycelium_routers.md +++ b/collections/projectmycelium/farming/mycelium_routers.md @@ -7,20 +7,20 @@ The Mycelium Routers allow everyone to connect the users of our network with eac We are partnering with WiFi device vendors to extend the Mycelium Network in a full peer-to-peer fashion. -WiFi 6 is now a reality and a native capacity from our first chosen node. The TFRouter Indoor can be purchased starting now. +WiFi 6 is now a reality and a native capacity from our first chosen node. The Mycelium Router Indoor can be purchased starting now. It's an exciting node with a reasonable price point and enough CPU capacity to run the Mycelium Network stack within the node itself. -More than 1 node can be installed in a larger office, hotel, home, etc., and they will automatically mesh together. +More than one node can be installed in a larger office, hotel, home, etc., and they will automatically mesh together. ![](tfrouter_physical.png) ### Mycelium Router Edge -The TFRouter Edge is a powerhouse, equipped with a strong CPU and lots of memory to run edge network functions. This router can be connected to multiple uplinks (satellite, cable, fiber, 5G), ... +The Mycelium Router Edge is a powerhouse, equipped with a strong CPU and lots of memory to run edge network functions. This router can be connected to multiple uplinks (satellite, cable, fiber, 5G, etc.). -Mycelium ensures that the shortest and fastest path is always used, and all communication is end-to-end encrypted between an TFRouter or even your mobile or computer if you have the Mycelium agent installed. +Mycelium ensures that the shortest and fastest path is always used, and all communication is end-to-end encrypted between an Mycelium Router or even your mobile or computer if you have the Mycelium agent installed. ![](img/TFRouter_2.png) @@ -30,7 +30,7 @@ This Router is super fast and has lots of connectivity. > This Router can be bought right now. -### TFRouter Outdoor + Long Range +### Mycelium Router Outdoor + Long Range We are in the process of selecting the appropriate network equipment to bridge between two locations and enable the creation of meshed wireless networks at the lowest cost. diff --git a/collections/projectmycelium/governance.md b/collections/projectmycelium/governance.md index 3703a35..4ebc9ff 100644 --- a/collections/projectmycelium/governance.md +++ b/collections/projectmycelium/governance.md @@ -1,4 +1,3 @@ # Governance -> to be completed - +This section provides the essential information concerning the Project Mycelium governance. \ No newline at end of file diff --git a/collections/projectmycelium/intro.md b/collections/projectmycelium/intro.md index d31df7a..dbe82cf 100644 --- a/collections/projectmycelium/intro.md +++ b/collections/projectmycelium/intro.md @@ -2,8 +2,14 @@ # Project Mycelium -> TODO: intro text +The Project Mycelium aims at building a conscious collective intelligence by enabling everyone to become the center of their own digital world. + +We want to redefine how to create and deploy on the Internet by means of a personal intelligent digital alter ego which allows us to create a collective intelligence. + +This project will supercharge our digital life, where we all have the opportunity to learn, partake and succeed with unlimited access to all digital tools required. ## Why -> [Toward a Collective Conscious Intelligence](https://info.ourworld.tf/hero4d) \ No newline at end of file +There is an urgent need for a cloud and AI infrastructure upgrade. + +We need local infrastructure that ensures data locality and security. We need to have complete control over our own data. This data also needs to be close to us and unbreakable. There is a need to decentralize the data. Our system allows to disperse the data and workloads to avoid centralization and increase security. We need further security in the IT world. Our project proposes multi-layered security architectures to keep communication, data and compute safe. \ No newline at end of file diff --git a/collections/projectmycelium/participants.md b/collections/projectmycelium/participants.md index 484d474..66d7c2e 100644 --- a/collections/projectmycelium/participants.md +++ b/collections/projectmycelium/participants.md @@ -1,21 +1,22 @@ -# Ecosystem +# An Ecosystem to Thrive ![alt text](participants.png) -The following parties or solutions make up our ecosystem +The following parties or solutions make up our ecosystem: - Hero (our own product) - Digital FreeZone - - possibility to attach a sovereign personal company to our hero + - Possibility to attach a sovereign personal company to our hero - Mycelium Routers & Nodes (our own way how to provide capacity) -- ThreeFold - - a decentralized grid we want to work with to have access to more capacity - - uses simular tech as Mycelium Routers & Nodes +- [ThreeFold](https://threefold.io/) + - A decentralized grid we want to work with to have access to more capacity + - Uses simular tech as Mycelium Routers & Nodes - HoloChain - - very close partner we are working with for a future of mutual credit currencies + - Very close partner we are working with for a future of mutual credit currencies - RainLanguage - - an amazing language for doing decentralized DEX orders, and provide liquidity + - An amazing language for doing decentralized DEX orders, and provide liquidity - Solana - - the most scalable blockchain today, the std for the DePIN world + - The most scalable blockchain today + - The standard for the DePIN world diff --git a/collections/projectmycelium/participants/digital_freezone_layer.md b/collections/projectmycelium/participants/digital_freezone_layer.md new file mode 100644 index 0000000..af0b50f --- /dev/null +++ b/collections/projectmycelium/participants/digital_freezone_layer.md @@ -0,0 +1,3 @@ +# Digital Freezone Layer + +The Digital Freezone layer of the Project Mycelium will provide many possibilities for its users, e.g. the possibility to attach a sovereign personal company to a Hero key. \ No newline at end of file diff --git a/collections/projectmycelium/participants/hero_layer.md b/collections/projectmycelium/participants/hero_layer.md new file mode 100644 index 0000000..5b7a11d --- /dev/null +++ b/collections/projectmycelium/participants/hero_layer.md @@ -0,0 +1,3 @@ +# Hero Layer + +The Hero layer of the Project Mycelium consists of a highly versatile and secure AI assistant and much more. \ No newline at end of file diff --git a/collections/projectmycelium/participants/mycelium_layer.md b/collections/projectmycelium/participants/mycelium_layer.md new file mode 100644 index 0000000..0083bf3 --- /dev/null +++ b/collections/projectmycelium/participants/mycelium_layer.md @@ -0,0 +1,3 @@ +# Mycelium Layer + +The Mycelium layer of the Project Mycelium consists of the innovative Mycelium Network, an end-to-end encrypted IPv6 overlay network. \ No newline at end of file diff --git a/collections/projectmycelium/participants/transactional_layer.md b/collections/projectmycelium/participants/transactional_layer.md new file mode 100644 index 0000000..2d795af --- /dev/null +++ b/collections/projectmycelium/participants/transactional_layer.md @@ -0,0 +1,3 @@ +# Transactional Layer + +The Transactional layer of the Project Mycelium will provide the needed layer to do transactions within the whole Project Mycelium ecosystem. \ No newline at end of file diff --git a/collections/projectmycelium/presentations/product_slides.md b/collections/projectmycelium/presentations/product_slides.md index 3738b5a..524271c 100644 --- a/collections/projectmycelium/presentations/product_slides.md +++ b/collections/projectmycelium/presentations/product_slides.md @@ -1,6 +1,8 @@ ![](img/prodslides.png) -# Hero +# Our Hero Journey -The [Following Slides](https://docs.google.com/presentation/d/1pB1ILqKnLMsjpkYRjIdAWY3mxgO6qJiExavNbAf6DWw/edit#slide=id.g2cfd347b7cd_0_994) present the product vision of our hero on top of the Mycelium Network. \ No newline at end of file +We prepared the following presentation to provide an overview of the [Project Mycelium](https://docs.google.com/presentation/d/1pB1ILqKnLMsjpkYRjIdAWY3mxgO6qJiExavNbAf6DWw/edit#slide=id.g2cfd347b7cd_0_994). + +In this presentation, we present the Hero personal AI assistant. Hero is possible thanks to the network Mycelium we built. \ No newline at end of file diff --git a/collections/projectmycelium/solana.md b/collections/projectmycelium/solana.md index 0df8827..ec2f897 100644 --- a/collections/projectmycelium/solana.md +++ b/collections/projectmycelium/solana.md @@ -2,6 +2,8 @@ ## Solana -Is a very scalable blockchain in the DePIN space, Project Mycelium will launch its tokens in this ecosystem. +Solana is a very scalable and important blockchain in the DePIN space. Project Mycelium will launch its tokens in this ecosystem to allow for a large audience to learn about Project Mycelium and participate within the ecosystem. + +We will provide more information on the project launch. diff --git a/collections/projectmycelium/tokens/tokenomics.md b/collections/projectmycelium/tokens/tokenomics.md index aeb9a15..ae1c467 100644 --- a/collections/projectmycelium/tokens/tokenomics.md +++ b/collections/projectmycelium/tokens/tokenomics.md @@ -1,3 +1,9 @@ -> TODO +# Tokenomics -we love how https://flare.network/tokenomics-flr-updated/ did it \ No newline at end of file +This section will be expanded as we develop the Project Mycelium tokenomics. + +For now, we provide the template for the Hero tokens and keys. + +## Inspiration + +We love how [Flare Network](https://flare.network/tokenomics-flr-updated/) developed a tokenomics aimed at the community and collaboration. We will draw inspiration from their work. \ No newline at end of file diff --git a/collections/projectmycelium/tokens/tokens.md b/collections/projectmycelium/tokens/tokens.md index 8fa8063..3281559 100644 --- a/collections/projectmycelium/tokens/tokens.md +++ b/collections/projectmycelium/tokens/tokens.md @@ -1,14 +1,20 @@ -# Tokens +# Hero Tokens and Keys -- HERO TOKEN = - - our digital currency - - there will be X,000,000,000 HERO - - the large majority of the HERO will be to reward community expansion (technology and reach) -- HERO KEY = - - your autonomous sovereign digital self, with a slot for a unique name - - can be connected to a legal entity (company) in a digital freezone. - - Your HERO KEY is unique and has unique properties like nr of names slots linked to it, capacity of storage, bandwidth, ..., possible locations for hosting, capabilities, ... - - We can buy and re-sell our key, the KEY once deployed is always personal and linked to our Identity, if we sell the KEY, then our personallity gets disconnected. +## Hero Token + +The HERO token is our digital currency. There will be a given amount of Hero tokens (X,000,000,000 HERO tokens). This will be determined in the near future. + +The large majority of HERO tokens will be to reward community expansion (technology and reach). + +## Hero Key + +The Hero key is a crucial part of the Hero journey. + +The Hero key is your autonomous sovereign digital self, with a slot for a unique name. It can be connected to a legal entity (i.e. a company) in a digital freezone. + +Your Hero key is unique and has unique properties like the numbers of names slots linked to it, the capacity of storage, compute, bandwidth, possible locations for hosting, capabilities, and much more. + +We can buy and re-sell our key, the Hero key, once deployed, is always personal and linked to our Identity. If we sell the Hero key, then our personallity gets disconnected. diff --git a/collections/social_media_protocols/activitypub.md b/collections/social_media_protocols/activitypub.md index 9d85eb3..ee3f4ef 100644 --- a/collections/social_media_protocols/activitypub.md +++ b/collections/social_media_protocols/activitypub.md @@ -1,10 +1,12 @@ -![](img/activitypub.png) +![](img/activitypub_logo.png) # ActivityPub ActivityPub is the most well established protocol for a decentralized social networking: -Some of its limitations +## Important Limitations + +ActivityPub has many benefits, but it has also some limitations: - **User Experience** - The user experience on ActivityPub platforms can vary significantly and may not always match the polish and consistency of centralized social networks, potentially hindering wider adoption. @@ -25,7 +27,7 @@ Some of its limitations - **Security** - Ensuring security across decentralized instances is complex. Each instance is responsible for its own security, leading to potential vulnerabilities if not managed correctly. -less important +## Lesser Limitations - **Fragmentation and Interoperability** - There can be fragmentation within the ActivityPub ecosystem, with different instances implementing the protocol in slightly different ways. This can lead to interoperability issues and a fragmented user experience. diff --git a/collections/social_media_protocols/img/activitypub.png b/collections/social_media_protocols/img/activitypub.png deleted file mode 100644 index e4a667b..0000000 Binary files a/collections/social_media_protocols/img/activitypub.png and /dev/null differ diff --git a/collections/social_media_protocols/img/activitypub_logo.png b/collections/social_media_protocols/img/activitypub_logo.png new file mode 100644 index 0000000..29494c1 Binary files /dev/null and b/collections/social_media_protocols/img/activitypub_logo.png differ diff --git a/collections/social_media_protocols/img/matrix.png b/collections/social_media_protocols/img/matrix_logo.png similarity index 100% rename from collections/social_media_protocols/img/matrix.png rename to collections/social_media_protocols/img/matrix_logo.png diff --git a/collections/social_media_protocols/img/nostr.png b/collections/social_media_protocols/img/nostr.png deleted file mode 100644 index d2f088b..0000000 Binary files a/collections/social_media_protocols/img/nostr.png and /dev/null differ diff --git a/collections/social_media_protocols/img/nostr_logo.png b/collections/social_media_protocols/img/nostr_logo.png new file mode 100644 index 0000000..587cd61 Binary files /dev/null and b/collections/social_media_protocols/img/nostr_logo.png differ diff --git a/collections/social_media_protocols/matrix.md b/collections/social_media_protocols/matrix.md index fb78816..4181779 100644 --- a/collections/social_media_protocols/matrix.md +++ b/collections/social_media_protocols/matrix.md @@ -1,8 +1,8 @@ -![](matrix.png) +![](matrix_logo.png) # Matrix -Matrix is a rapidly growing chat protocol known for its open-source nature, decentralization, interoperability, and strong emphasis on security and privacy. These features combine to make Matrix not just a robust choice for messaging and VoIP (Voice over Internet Protocol) services but arguably one of the best in the field for certain applications. +Matrix is a rapidly growing chat protocol known for its open-source nature, decentralization, interoperability, and strong emphasis on security and privacy. These features combine to make Matrix not just a robust choice for messaging and VoIP (Voice over Internet Protocol) services, but arguably one of the best in the field for certain applications. ## Matrix Manifesto @@ -13,9 +13,9 @@ We believe: - The ability to converse securely and privately is a basic human right. - Communication should be available to everyone as a free and open, unencumbered, standard and global network. -see [https://matrix.org/about/](https://matrix.org/about/) +Read more [here](https://matrix.org/about/). -## Why +## Matrix Features ### 1. **Open Standard and Open Source** - Matrix is an open standard, meaning its specifications are publicly available for review and use. This promotes transparency and allows for independent verification of its security and functionality. @@ -44,6 +44,7 @@ see [https://matrix.org/about/](https://matrix.org/about/) ### 7. **Future-Proof Technology** - Matrix is designed to be future-proof, with continuous updates and improvements to its protocol and infrastructure. Its commitment to decentralization, privacy, and interoperability positions it well in the evolving digital landscape. -### Challenges +## Challenges + While Matrix offers numerous advantages, it’s important to acknowledge challenges such as the complexity of setting up and managing a personal server, the ongoing process to improve user experience across different clients, and ensuring consistent performance at scale. diff --git a/collections/social_media_protocols/nostr.md b/collections/social_media_protocols/nostr.md index b1f3b01..510eec8 100644 --- a/collections/social_media_protocols/nostr.md +++ b/collections/social_media_protocols/nostr.md @@ -1,11 +1,15 @@ -![](img/nostr.png) +![](img/nostr_logo.png) # Nostr The Nostr protocol is a decentralized and open protocol designed for social networking and communication. +## Nostr Limitations + Despite its innovative approach, it has several limitations: +### Important Limitations + - **User Experience** - The user experience with Nostr-based applications can be less polished compared to centralized networks, which might deter mainstream adoption. - **Scalability** @@ -21,15 +25,11 @@ Despite its innovative approach, it has several limitations: - **Network Effect** - Nostr's value increases with its user base. However, building a large user base is challenging, especially against established social media platforms. -less important +### Lesser Limitations - **Security and Privacy Risks** - While Nostr offers more privacy than traditional networks, its openness can lead to security risks. Continual evolution of the protocol is needed to address potential vulnerabilities. - **Resource Constraints** - Running a relay requires resources, and smaller entities or individuals may struggle to participate as relay operators due to these constraints. - **Interoperability and Standards** - - As Nostr is an evolving protocol, maintaining interoperability between different clients and adherence to standards is challenging, which could lead to fragmentation. - -## Our Technical Remarks - -- ... \ No newline at end of file + - As Nostr is an evolving protocol, maintaining interoperability between different clients and adherence to standards is challenging, which could lead to fragmentation. \ No newline at end of file diff --git a/collections/social_media_protocols/protocols.md b/collections/social_media_protocols/protocols.md index 4f636ce..57bd104 100644 --- a/collections/social_media_protocols/protocols.md +++ b/collections/social_media_protocols/protocols.md @@ -3,7 +3,7 @@ # Social Media App Protocols - [**Activitypub**](activitypub.md) -- [**nostr**](nostr.md) +- [**Nostr**](nostr.md) - **Diaspora** - An early decentralized social network. - Uses the "Diaspora federation protocol" for connecting different instances (pods). @@ -11,7 +11,7 @@ - **OStatus** - An older federation protocol used by platforms like GNU social. - Includes technologies like WebSub and Salmon for federated communication. - - Predates ActivityPub but is still in use in some networks. + - Predates ActivityPub, but is still in use in some networks. - **Matrix** - Designed for secure, decentralized communication (instant messaging, VoIP, video calls). - Uses an open standard for real-time communication. @@ -20,7 +20,7 @@ - A protocol primarily for instant messaging and presence information. - Extended for social networking through various extensions. - Known for its flexibility and adoption in various messaging services. - - Rather complicated and somewhat outdated + - Rather complicated and somewhat outdated. - **Secure Scuttlebutt (SSB)** - A decentralized communication platform for social networking. - Uses a peer-to-peer network, connecting users directly with friends. @@ -31,6 +31,10 @@ Each protocol presents unique features and focuses, from privacy-centric networks to broader social communication platforms. They share the common goal of offering alternatives to centralized social media, emphasizing user control, privacy, and choice. +## Comparing Nostr and ActivityPub + +We proceed to compare Nostr and Activity by stating the advantages of both protocols. + ### Advantages of Nostr over ActivityPub - **Simplicity and Lightweight Protocol** @@ -43,6 +47,7 @@ Each protocol presents unique features and focuses, from privacy-centric network - Operating a Nostr relay is potentially less resource-intensive than running an ActivityPub server, allowing more users to participate as relay operators. ### Advantages of ActivityPub over Nostr + - **Established Ecosystem and Adoption** - ActivityPub has a more established ecosystem with platforms like Mastodon and PeerTube, leading to a larger community and developed features. - **Federation Model** @@ -54,7 +59,7 @@ Each protocol presents unique features and focuses, from privacy-centric network - **Stronger Identity Management** - ActivityPub provides clearer mechanisms for identity and account management, which is vital for trust and reputation in the network. -### Conclusion +# Conclusion Nostr is well-suited for users and developers prioritizing simplicity, privacy, and flexible data hosting. In contrast, ActivityPub is more appropriate for those seeking a feature-rich, interconnected social networking experience with established community support and structured content moderation. The choice between the two depends on individual needs and priorities related to privacy, social interaction, and resource availability for hosting and development. diff --git a/collections/solutions/content_providers/cdn_cost.md b/collections/solutions/content_providers/cdn_cost.md deleted file mode 100644 index e9729da..0000000 --- a/collections/solutions/content_providers/cdn_cost.md +++ /dev/null @@ -1,53 +0,0 @@ -![](img/cdn2.png) - -## high CDN cost = Content Delivery - -- CDN's cost between 20 and 60 on major CDN's from Amazon, Google, ..., after negotiation and willingness to park lots of money and commit per month it mught be certain discount. -- Other specialized CDN's can be around 10 per TB if services from e.g. Europe or US, smaller CDN's are much more expensive. -- Managing these CDN's is expensive and not easy job. - ->> this means to service 10m people it would cost about 1 to 2m USD per month just for CDN alone. - - -# CDN pricing Amazon - -Remark no fees included for HTTPS requests, but should be ok for volume we are talking about, if app is made in right way. - -## US - -![](img/amz_us.png) - -= 28 USD per TB in US - -## EUR - -![](img/amz_eur.png) - -## MIDDLE EAST - -![](img/amz_middleeast.png) - -= 56 USD per TB - -## AFRICA - -![](img/amz_sa.png) - -= 56 USD per TB - -## Discounts - -- discounts can be negotiated but required serious amounts of pre-financing - -# CDN pricing Google - -Remark no fees included for HTTPS requests, but should be ok for volume we are talking about, if app is made in right way. - -![](img/google_1.png) - -![](img/google2.png) - -https://cloud.google.com/cdn/pricing - - - diff --git a/collections/solutions/content_providers/content_providers.md b/collections/solutions/content_providers/content_providers.md index c1116b2..0fc54ad 100644 --- a/collections/solutions/content_providers/content_providers.md +++ b/collections/solutions/content_providers/content_providers.md @@ -6,11 +6,11 @@ Content providers have quite some issues in supporting their user base, our appr Below you can find how we can help you to resolve some of your possible issues. -## lower your CDN cost = Content Delivery +## Lower your CDN cost = Content Delivery - costs typically are +50 USD per TB, our solution goes below 10 USD. - cost goes to 10 USD at start, from v2.0 can be even lower. -- see [Costs of CDN's](cdn_cost.md) +- see [Costs of CDN's](problems:cd_issues_cost.md) ## Lower your cost of operations diff --git a/collections/solutions/solutions.md b/collections/solutions/solutions.md index e69de29..9fc8f39 100644 --- a/collections/solutions/solutions.md +++ b/collections/solutions/solutions.md @@ -0,0 +1,6 @@ +# Solutions + +- [Content Providers](solutions:content_providers.md) +- [FreeFlow Self](web4:freeflowself.md) +- [Actor Based Development](web4:actor_based_approach.md) +- [Vlang](web4:vlang.md) \ No newline at end of file diff --git a/collections/tech/architecture/architecture.md b/collections/tech/architecture/architecture.md index d1dac89..e7444de 100644 --- a/collections/tech/architecture/architecture.md +++ b/collections/tech/architecture/architecture.md @@ -1,10 +1,11 @@ ## Architecture +The ThreeFold Grid architecture provides a myriad of cloud possibilities thanks to its interrelated layers. ![](img/architecture.png) -### 3nodes +### 3Nodes The network of nodes which make up the cloud. Each node provides compute, storage and network capacity. @@ -43,7 +44,7 @@ Mycelium Routers seamlessly integrate with our Mycelium network technology, effi These Mycelium Routers are not only compatible with Wi-Fi but also with 4G and 5G networks, ensuring versatile connectivity options. -## 3Bots = autonomous layer +## 3Bots: The Autonomous Layer ![](img/autonous3bots.png) @@ -74,5 +75,4 @@ Our Decentralized Cloud Technology the ideal platform for hosting any web3 and A Our Zero-OS operating system already supports integrated GPUs, ensuring optimal performance for decentralized AI applications. - > Any workload (web2/3 and AI) can run on on our Decentralized Cloud. \ No newline at end of file diff --git a/collections/tech/features.md b/collections/tech/features.md index 1e00f77..9668776 100644 --- a/collections/tech/features.md +++ b/collections/tech/features.md @@ -1,5 +1,7 @@ # Decentralized Cloud Technology Features +We present the highlights of our decentralized cloud technology that solves many of the current IT and cloud challenges. + ![](img/cloud_features.png) !!wiki.include page:'tech:zos_toc.md' \ No newline at end of file diff --git a/collections/tech/innovations/fungistor_innovation.md b/collections/tech/innovations/fungistor_innovation.md index 5d2697b..29e4fb9 100644 --- a/collections/tech/innovations/fungistor_innovation.md +++ b/collections/tech/innovations/fungistor_innovation.md @@ -1,4 +1,4 @@ -## FungiStor (end 2024) +## FungiStor (End 2024) !!wiki.include page:'fungistor_innovation_short' \ No newline at end of file diff --git a/collections/tech/innovations/fungistor_innovation_short.md b/collections/tech/innovations/fungistor_innovation_short.md index 9327d69..abb376a 100644 --- a/collections/tech/innovations/fungistor_innovation_short.md +++ b/collections/tech/innovations/fungistor_innovation_short.md @@ -1,25 +1,9 @@ -### The Problem - -Existing blockchain, internet, and P2P content delivery and storage systems suffer from sluggish performance and are too expensive. Content retrieval is often slow, and the overhead for ensuring redundancy is excessive. We require innovative approaches to facilitate efficient information sharing among users. - -Content delivery frequently represents the most significant expense for social networks. Running a basic social video network for 10 million users currently costs approximately $2 million per month using traditional cloud providers. We have the potential to reduce this cost by several orders of magnitude. - - -### Introducing FungiStor - -FungiStor is a peer-to-peer (P2P) content delivery layer designed to store and distribute an extensive range of objects, including images, videos, files, and more. It has the capability to handle trillions of objects and files efficiently. FungiStor serves as an excellent solution for content delivery networks (CDNs), significantly reducing costs for organizations seeking to stream or deliver substantial data volumes to their user base. - -Furthermore, FungiStor will act as the backend infrastructure for the Flists within our own system. It is versatile and can be utilized by anyone in need of a global-level content delivery system for files, objects, and images. - -### The Benefits - -- **Global scalability, sub-50ms lookups:** FungiStor scales worldwide with ultra-fast data retrieval under 50 milliseconds. -- **Localized content delivery:** prioritizes local data access for optimized speed and efficiency. -- **Quantum-Safe security:** incorporates robust quantum security measures. -- **Interoperability:** works seamlessly with IPFS, Torrent, and more. -- **Cost efficiency:** offers significant cost savings, potentially 10 to 100 times less than conventional solutions. +!!wiki.include page:'tech:fungistor_innovation_short0.md' ### Status -Planned for the end of 2024 \ No newline at end of file + +Planned for the end of 2024 + +Remark, FungiStor will act as the backend infrastructure for the Flists within our own system. It is versatile and can be utilized by anyone in need of a global-level content delivery system for files, objects, and images. diff --git a/collections/tech/innovations/fungistor_innovation_short0.md b/collections/tech/innovations/fungistor_innovation_short0.md new file mode 100644 index 0000000..e3fb0ec --- /dev/null +++ b/collections/tech/innovations/fungistor_innovation_short0.md @@ -0,0 +1,22 @@ + + +### The Problem + +Existing blockchain, internet, and P2P content delivery and storage systems suffer from sluggish performance and are too expensive. Content retrieval is often slow, and the overhead for ensuring redundancy is excessive. We require innovative approaches to facilitate efficient information sharing among users. + +Content delivery frequently represents the most significant expense for social networks. Running a basic social video network for 10 million users currently costs approximately $2 million per month using traditional cloud providers. We have the potential to reduce this cost by several orders of magnitude. + + +### Introducing FungiStor + +FungiStor is a peer-to-peer (P2P) content delivery layer designed to store and distribute an extensive range of objects, including images, videos, files, and more. It has the capability to handle trillions of objects and files efficiently. FungiStor serves as an excellent solution for content delivery networks (CDNs), significantly reducing costs for organizations seeking to stream or deliver substantial data volumes to their user base. + + +### The Benefits + +- **Global scalability, sub-50ms lookups:** FungiStor scales worldwide with ultra-fast data retrieval under 50 milliseconds. +- **Localized content delivery:** prioritizes local data access for optimized speed and efficiency. +- **Quantum-Safe security:** incorporates robust quantum security measures. +- **Interoperability:** works seamlessly with IPFS, Torrent, and more. +- **Cost efficiency:** offers significant cost savings, potentially 10 to 100 times less than conventional solutions. + diff --git a/collections/tech/innovations/key_innovations_overview.md b/collections/tech/innovations/key_innovations_overview.md index b8793d7..20c07b3 100644 --- a/collections/tech/innovations/key_innovations_overview.md +++ b/collections/tech/innovations/key_innovations_overview.md @@ -1,8 +1,10 @@ +

Key Innovations

+ +Throughout the years, we've built innovative products that are now part of a whole ecosystem. ![](dream_comes_true.png) -# Key Innovations - +

Table of Contents

- [Mycelium: a new network layer for the internet](mycelium_innovation.md) - [Zero-OS: a minimalistic and more efficient server operating system](zos_innovation) diff --git a/collections/tech/innovations/mycelium_innovation.md b/collections/tech/innovations/mycelium_innovation.md index 07b5d5e..0f4cc37 100644 --- a/collections/tech/innovations/mycelium_innovation.md +++ b/collections/tech/innovations/mycelium_innovation.md @@ -1,4 +1,4 @@ -## Mycelium: a new network layer for the internet +## Mycelium: A New Network Layer for the Internet !!wiki.include page:mycelium_innovation_short.md \ No newline at end of file diff --git a/collections/tech/innovations/network_wall_innovation.md b/collections/tech/innovations/network_wall_innovation.md index 49f8233..e782b2c 100644 --- a/collections/tech/innovations/network_wall_innovation.md +++ b/collections/tech/innovations/network_wall_innovation.md @@ -1,5 +1,7 @@ -## NetworkWall +## Network Wall + +The Network Wall offers 100% separation between where compute workloads are and where services are exposed, proving an extremely high level of security. ![](network_wall.png) diff --git a/collections/tech/innovations/network_wall_innovation_short.md b/collections/tech/innovations/network_wall_innovation_short.md index a8991d2..1aaa2da 100644 --- a/collections/tech/innovations/network_wall_innovation_short.md +++ b/collections/tech/innovations/network_wall_innovation_short.md @@ -4,7 +4,7 @@ Traditional firewalls are increasingly ineffective at addressing modern security challenges. They struggle to mitigate emerging threats, particularly against backdoors and man-in-the-middle attacks. Backdoors can render firewalls obsolete as attackers find ways to bypass them. New and innovative approaches to cybersecurity are necessary to address these evolving security problems. -## Introducing NetworkWall +## Introducing Network Wall Imagine a scenario where you deploy applications within secure, liquid-cooled physical containers or smaller POD's that operate without relying on traditional TCP/IP or Ethernet protocols. By avoiding the use of standard low-level protocols, the existing backdoors are unable to communicate with the external world. diff --git a/collections/tech/innovations/world_records.md b/collections/tech/innovations/world_records.md index cbf71a5..dadbe11 100644 --- a/collections/tech/innovations/world_records.md +++ b/collections/tech/innovations/world_records.md @@ -1,8 +1,9 @@ ## World Records +Our team is working on re-inventing layers of the Internet for more than 30 years. While we were doing so this has resulted in some world records and innovative products. + +Here is an overview of those achievements: + ![](img/world_records.png) -Our team is working on re-inventing layers of the Internet for more than 30 years. - -While we were doing so this has resulted in some world records and innovative products. diff --git a/collections/tech/innovations/zos_innovation.md b/collections/tech/innovations/zos_innovation.md index af7b825..1e55529 100644 --- a/collections/tech/innovations/zos_innovation.md +++ b/collections/tech/innovations/zos_innovation.md @@ -1,4 +1,6 @@ -## Zero-OS: a minimalistic more efficient server operating system +## Zero-OS: A Minimalistic More Efficient Server Operating System + +Zero-OS is our innovative operating system built from the Linux kernel. ![](img/zos_innovation.png) diff --git a/collections/tech/innovations/zstor_innovation.md b/collections/tech/innovations/zstor_innovation.md index 89b01a8..ecbf12b 100644 --- a/collections/tech/innovations/zstor_innovation.md +++ b/collections/tech/innovations/zstor_innovation.md @@ -1,6 +1,8 @@ ## Zero-Stor : A Quantum Safe Backend Storage System +Zeros-Stor is a quantum safe backend storage system that use efficient algorithms to ensure maximal use of storage. + ![](qsss.png) !!wiki.include page:zstor_innovation_short \ No newline at end of file diff --git a/collections/tech/innovations/zstor_innovation_short.md b/collections/tech/innovations/zstor_innovation_short.md index 08677d0..6940fac 100644 --- a/collections/tech/innovations/zstor_innovation_short.md +++ b/collections/tech/innovations/zstor_innovation_short.md @@ -1,6 +1,3 @@ - -## Zero-Stor : A Quantum Safe Backend Storage System. - ### The Problem Traditional backend storage systems have their roots in centralized environments, focusing on low-latency and closed security setups. However, these characteristics make them less suitable for use in decentralized cloud contexts. @@ -9,12 +6,12 @@ Newer generation storage systems such as protocol-driven or blockchain-based sol ### Introducing Zero-Stor -A redesigned storage system which can scale to planet level. It is super secure, private and fast enough for more use cases. It is designed to operate in a decentralized context and data can never be lost or corrupted. +A redesigned storage system which can scale to a planetary level. It is super secure, private and fast enough for more use cases. It is designed to operate in a decentralized context and data can never be lost or corrupted. This storage system is: - A backend storage system - It cannot be used by end users -- It's meant to be integrated with a front end storage system like e.g. S3 or a filesystem (see next section). +- It's meant to be integrated with a front end storage system like e.g. S3 or a filesystem ### The Benefits diff --git a/collections/tech/natural_progression/how_does_it_work.md b/collections/tech/natural_progression/how_does_it_work.md index 03d1f16..7b6c9dd 100644 --- a/collections/tech/natural_progression/how_does_it_work.md +++ b/collections/tech/natural_progression/how_does_it_work.md @@ -1,27 +1,23 @@ - - # The Internet’s Natural Progression The Internet was always meant to be a peer-to-peer infrastructure. As large companies became profit and data centric, centralization quickly became the norm. -> We have a vision of the Internet which is much more close to how the Internet was intended to be. +***We have a vision of the Internet which is much more close to how the Internet was intended to be.*** ![alt text](natural_progression.png) -We believe in a world where every person is the center of his/her digital life. In this new Internet each person has his/her own digital avatar which we call a hero. +We believe in a world where every person is the center of their digital life. In this new Internet each person has their own digital avatar which we call a ***Hero***. -The technical component which makes hero possible is a compoment called 3bot. This 3Bot server is only owned and managed by you lives on top of the Decentralized Cloud. - -All the 3Bots communicate to each other over the shortest possible path, this path is end2end encrypted. +The technical component which makes Hero possible is a compoment called 3Bot. This 3Bot server. only owned and managed by you, lives on top of the cecentralized cloud. +All the 3Bots communicate to each other over the shortest possible path. This path is end-to-end encrypted. ![alt text](arch_minimal.png) -The underlying network of capacity is the Decentralized Cloud which is the IT Energy which makes all possible. - -The Decentralized Cloud is the result of more than 10 years of development and now active on more than 2000 nodes. +The underlying network of capacity is the decentralized cloud which is like the basic IT energy which makes all of this possible. +The cecentralized cloud is the result of more than 10 years of development and it is now active on more than 2000 nodes. ## Requirements For A New Internet @@ -33,11 +29,12 @@ The Decentralized Cloud is the result of more than 10 years of development and n - Private - More Secure - Storage needs to be - - More reliable with less overhead (only 20% overhead needed) - - Capable to be global and be used as CDN (Content Delivery Network) - - Fast enough for the Use Case at hand + - More reliable with less overhead + - Our technology has only 20% overhead needed + - Capable to be global and be used as Content Delivery Network (CDN) + - Fast enough for the use case at hand - Network needs to be - - Working no matter what happens with existing network, route around issues. + - Working no matter what happens with existing network, route around issues - Local sensitive (chose shortest path) - End2End Encrypted - Capable to really know where information goes to or comes from (authenticity) \ No newline at end of file diff --git a/collections/tech/nature/nature.md b/collections/tech/nature/nature.md index 0219496..14b0e51 100644 --- a/collections/tech/nature/nature.md +++ b/collections/tech/nature/nature.md @@ -3,17 +3,17 @@ ![](nature.png) -- Just like we have trillions of cells in our body, so can billions of 3bots live next to each other -- Each 3bot has memory, knows how to communicate, has knowledge, history, ... -- 3Botss like cells cannot live without a body = which is the network of the 3Nodes. +- Just like we have trillions of cells in our body, so can billions of hero's live next to each other +- Each Hero (3bot) has memory, knows how to communicate, has knowledge, history, ... +- Heroes like cells cannot live without a body = which is the network of the Heroes. ## This approach scales for ever ![](scaleout.png) -- There can be unlimited amounts 3Nodes and 3Bots +- There can be unlimited amounts Nodes and Heroes - There are no bottlenecks nor centralization points -- Our peer2peer network technology takes care of routing and security issues between the Twins and the 3Nodes. The shortest paths is always looked for. +- Our peer2peer mycelium network technology takes care of routing and security issues between the Twins and the Nodes. The shortest paths is always looked for. diff --git a/collections/tech/nature/nature.png b/collections/tech/nature/nature.png index 5d1d080..54862e8 100644 Binary files a/collections/tech/nature/nature.png and b/collections/tech/nature/nature.png differ diff --git a/collections/tech/nature/scaleout.png b/collections/tech/nature/scaleout.png index 4e3d678..74f7534 100644 Binary files a/collections/tech/nature/scaleout.png and b/collections/tech/nature/scaleout.png differ diff --git a/collections/tech/primitives/network/img/.done b/collections/tech/primitives/network/img/.done new file mode 100644 index 0000000..8e80bf2 --- /dev/null +++ b/collections/tech/primitives/network/img/.done @@ -0,0 +1 @@ +mycelium.png diff --git a/collections/tech/primitives/network/img/mycelium.png b/collections/tech/primitives/network/img/mycelium.png new file mode 100644 index 0000000..f9b1959 Binary files /dev/null and b/collections/tech/primitives/network/img/mycelium.png differ diff --git a/collections/tech/primitives/network/mycelium.md b/collections/tech/primitives/network/mycelium.md index 14849fd..86ca200 100644 --- a/collections/tech/primitives/network/mycelium.md +++ b/collections/tech/primitives/network/mycelium.md @@ -1,46 +1,18 @@ +<<<<<<< HEAD +# Mycelium: Our Planetary Network as used in the TFGrid + + +![alt text](img/mycelium.png) +======= # Mycelium: Our Planetary Network +The planetary network called Mycelium is an overlay network which lives on top of the existing Internet or other peer-to-peer networks created. + ![](img/planet_net_.jpg) +In the Mycelium network, everyone is connected to everyone. End-to-end encryption between users of an app and the app runs behind the network wall. +>>>>>>> ba303b6e3eb8220bf2851a949db109e68ccd1f8c -The planetary network called Mycelium is an overlay network which lives on top of the existing Internet or other peer-to-peer networks created. In this network, everyone is connected to everyone. End-to-end encryption between users of an app and the app runs behind the network wall. - -Each user end network point is strongly authenticated and uniquely identified, independent of the network carrier used. There is no need for a centralized firewall or VPN solutions, as there is a circle-based networking security in place. - -### Key Benefits - -- It finds shortest possible paths between peers -- There is full security through end-to-end encrypted messaging -- It allows for peer-to-peer links, like meshed wireless -- It can survive broken Internet links and re-route when needed -- It resolves the shortage of IPV4 addresses - -Whereas current computer networks depend heavily on very centralized design and configuration, this networking concept breaks this mold by making use of a global-spanning tree to form a scalable IPv6 encrypted mesh network. This is a peer-to-peer implementation of a networking protocol. - -The following table illustrates the high-level differences between traditional networks like today's Internet, and the Planetary Network created by ThreeFold: - -| Characteristic | Traditional | Mycelium | -| --------------------------------------------------------------- | ----------- | ----------------- | -| End-to-end encryption for all traffic across the network | No | Yes | -| Decentralized routing information shared using a DHT | No | Yes | -| Cryptographically-bound IPv6 addresses | No | Yes | -| Node is aware of its relative location to other nodes | No | Yes | -| IPv6 address remains with the device even if moved | No | Yes | -| Topology extends gracefully across different mediums, i.e. mesh | No | Yes | - -## What are the problems solved here? - -The Internet as we know it today doesn’t conform to a well-defined topology. This has largely happened over time - as the Internet has grown, more and more networks have been “bolted together." The lack of defined topology gives us some unavoidable problems: - -- The routing tables that hold a “map” of the Internet are huge and inefficient -- There isn’t really any way for a computer to know where it is located on the Internet relative to anything else -- It is difficult to examine where a packet will go on its journey, from source to destination, without actually sending it -- It is very difficult to install reliable networks into locations that change often or are non-static, i.e. wireless mesh networks - -These problems have been partially mitigated (but not really solved) through centralization - rather than your computers at home holding a copy of the global routing table, your ISP does it for you. Your computers and network devices are configured just to “send it upstream” and to let your ISP decide where it goes from there, but this does leave you entirely at the mercy of your ISP, who can redirect your traffic anywhere they like and to inspect, manipulate, or intercept it. - -In addition, wireless meshing requires you to know a lot about the network around you, which would not typically be the case when you have outsourced this knowledge to your ISP. Many existing wireless mesh routing schemes are not scalable or efficient, and do not bridge well with existing networks. - -![](img/planetary_net.jpg) +!!wiki.include page:'tech:mycelium_incl.md' \ No newline at end of file diff --git a/collections/tech/primitives/network/mycelium_incl.md b/collections/tech/primitives/network/mycelium_incl.md new file mode 100644 index 0000000..03505b8 --- /dev/null +++ b/collections/tech/primitives/network/mycelium_incl.md @@ -0,0 +1,42 @@ + +Mycelium is an overlay network which lives on top of the existing Internet or other peer-to-peer networks created. In this network, everyone is connected to everyone. End-to-end encryption between users of an app and the app runs behind the network wall. + +Each user end network point is strongly authenticated and uniquely identified, independent of the network carrier used. There is no need for a centralized firewall or VPN solutions, as there is a circle-based networking security in place. + +### Key Benefits + +- It finds shortest possible paths between peers +- There is full security through end-to-end encrypted messaging +- It allows for peer-to-peer links, like meshed wireless +- It can survive broken Internet links and re-route when needed +- It resolves the shortage of IPV4 addresses + +Whereas current computer networks depend heavily on very centralized design and configuration, this networking concept breaks this mold by making use of a global-spanning tree to form a scalable IPv6 encrypted mesh network. This is a peer-to-peer implementation of a networking protocol. + +The following table illustrates the high-level differences between traditional networks like today's Internet, and the Planetary Network created by ThreeFold: + +| Characteristic | Traditional | Mycelium | +| --------------------------------------------------------------- | ----------- | -------- | +| End-to-end encryption for all traffic across the network | No | Yes | +| Decentralized routing information shared using a DHT | No | Yes | +| Cryptographically-bound IPv6 addresses | No | Yes | +| Node is aware of its relative location to other nodes | No | Yes | +| IPv6 address remains with the device even if moved | No | Yes | +| Topology extends gracefully across different mediums, i.e. mesh | No | Yes | +| Post Quantum Safe | No | Yes | + +## What are the problems solved here? + +The Internet as we know it today doesn’t conform to a well-defined topology. This has largely happened over time - as the Internet has grown, more and more networks have been “bolted together." The lack of defined topology gives us some unavoidable problems: + +- The routing tables that hold a “map” of the Internet are huge and inefficient +- There isn’t really any way for a computer to know where it is located on the Internet relative to anything else +- It is difficult to examine where a packet will go on its journey, from source to destination, without actually sending it +- It is very difficult to install reliable networks into locations that change often or are non-static, i.e. wireless mesh networks + +These problems have been partially mitigated (but not really solved) through centralization - rather than your computers at home holding a copy of the global routing table, your ISP does it for you. Your computers and network devices are configured just to “send it upstream” and to let your ISP decide where it goes from there, but this does leave you entirely at the mercy of your ISP, who can redirect your traffic anywhere they like and to inspect, manipulate, or intercept it. + +In addition, wireless meshing requires you to know a lot about the network around you, which would not typically be the case when you have outsourced this knowledge to your ISP. Many existing wireless mesh routing schemes are not scalable or efficient, and do not bridge well with existing networks. + +![](img/planetary_net.jpg) + diff --git a/collections/tech/primitives/network/networking.md b/collections/tech/primitives/network/networking.md index 4e7a35a..331e151 100644 --- a/collections/tech/primitives/network/networking.md +++ b/collections/tech/primitives/network/networking.md @@ -13,7 +13,7 @@ No connection is made with the Internet. The ZNet is a single tenant network and ### Redundancy -As integrated with [Web Gateway (WebGW)](webgw): +As integrated with [Web Gateway](webgw.md) ![alt text](net2.png) diff --git a/collections/tech/qsss/img/create_png.sh b/collections/tech/qsss/img/create_png.sh deleted file mode 100644 index b232adf..0000000 --- a/collections/tech/qsss/img/create_png.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -for name in ./*.mmd -do - output=$(basename $name mmd)png - echo $output - mmdc -i $name -o $output -w 4096 -H 2160 -b transparant - echo $name -done diff --git a/collections/tech/qsss/img/filesystem_abstract.jpg b/collections/tech/qsss/img/filesystem_abstract.jpg new file mode 100644 index 0000000..b366139 Binary files /dev/null and b/collections/tech/qsss/img/filesystem_abstract.jpg differ diff --git a/collections/tech/qsss/img/nft_architecture_updated.png b/collections/tech/qsss/img/nft_architecture_updated.png index eba9f1f..4ad2363 100644 Binary files a/collections/tech/qsss/img/nft_architecture_updated.png and b/collections/tech/qsss/img/nft_architecture_updated.png differ diff --git a/collections/tech/qsss/img/nft_storage_updated.png b/collections/tech/qsss/img/nft_storage_updated.png deleted file mode 100644 index f695d64..0000000 Binary files a/collections/tech/qsss/img/nft_storage_updated.png and /dev/null differ diff --git a/collections/tech/qsss/nft_storage.md b/collections/tech/qsss/nft_storage.md index 01f860d..97130f2 100644 --- a/collections/tech/qsss/nft_storage.md +++ b/collections/tech/qsss/nft_storage.md @@ -1,5 +1,7 @@ # Quantum Safe Storage System for NFT +Our technology enables quantum safe storage for NFT. + ![](img/nft_architecture_updated.png) The owner of the NFT can upload the data using one of our supported interfaces: @@ -16,7 +18,6 @@ The NFT system operates on top of a very reliable storage system which is sustai #### Persistence = Owned by the data user, as represented by their associated 3Bot -![](img/nft_storage_updated.png) The system is not based on a shared-all architecture. diff --git a/collections/tech/qsss/qss_benefits.md b/collections/tech/qsss/qss_benefits.md new file mode 100644 index 0000000..ce31e06 --- /dev/null +++ b/collections/tech/qsss/qss_benefits.md @@ -0,0 +1,7 @@ +![](img/qsss_intro2.png.jpg) + +# Quantum Safe Storage System benefits + +!!wiki.include page:'technology:qss_benefits0.md' + +!!wiki.include page:'technology:qsss_toc.md' \ No newline at end of file diff --git a/collections/tech/qsss/qss_benefits_.md b/collections/tech/qsss/qss_benefits_.md new file mode 100644 index 0000000..bb27444 --- /dev/null +++ b/collections/tech/qsss/qss_benefits_.md @@ -0,0 +1,6 @@ +- Up to 10x more efficient (power and usage of hardware) +- Ultra reliable, data can not be lost +- Ultra safe & private +- Ultra scalable +- Sovereign, data is close to you in the country of your choice +- Truly peer-to-peer, by everyone for everyone diff --git a/collections/tech/qsss/qss_filesystem.md b/collections/tech/qsss/qss_filesystem.md index 9203756..4e0068b 100644 --- a/collections/tech/qsss/qss_filesystem.md +++ b/collections/tech/qsss/qss_filesystem.md @@ -1,5 +1,7 @@ # Quantum Safe Filesystem +Our quantum safe filesystem technology has unique features. + ![](qss_fs_arch.png) A redundant filesystem, can store PB's (millions of gigabytes) of information. diff --git a/collections/tech/qsss/qsss2_home.md b/collections/tech/qsss/qsss2_home.md new file mode 100644 index 0000000..d62400a --- /dev/null +++ b/collections/tech/qsss/qsss2_home.md @@ -0,0 +1,21 @@ +![](img/qsstorage_architecture.jpg) + +# Quantum Safe Storage System + +Imagine a storage system with the following benefits + +!!!include:qss_benefits_ + +> This is not a dream but does exist and is the underpinning of the TFGrid. + +Our storage architecture follows the true peer-to-peer design of the TF grid. Any participating node only stores small incomplete parts of objects (files, photos, movies, databases...) by offering a slice of the present (local) storage devices. Managing the storage and retrieval of all of these distributed fragments is done by a software that creates development or end-user interfaces for this storage algorithm. We call this '**dispersed storage**'. + +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 + +!!!def alias:qsss,quantum_safe_storage_system + + + diff --git a/collections/tech/qsss/qsss_home.md b/collections/tech/qsss/qsss_home.md index 079f131..d2955a3 100644 --- a/collections/tech/qsss/qsss_home.md +++ b/collections/tech/qsss/qsss_home.md @@ -2,9 +2,11 @@ # Quantum Safe Storage System +Our storage architecture follows the true peer2peer design of the cecentralized cloud system. + ![](img/qsss_intro2.png) -Our storage architecture follows the true peer2peer design of the Decentralized Cloud System. Any participating node only stores small incomplete parts of objects (files, photos, movies, databases etc.) by offering a slice of the present (local) storage devices. Managing the storage and retrieval of all of these distributed fragments is done by a software that creates development or end-user interfaces for this storage algorithm. We call this '**dispersed storage**'. +Any participating node only stores small incomplete parts of objects (files, photos, movies, databases etc.) by offering a slice of the present (local) storage devices. Managing the storage and retrieval of all of these distributed fragments is done by a software that creates development or end-user interfaces for this storage algorithm. We call this '**dispersed storage**'. ## Benefits diff --git a/collections/tech/qsss/qsss_toc.md b/collections/tech/qsss/qsss_toc.md new file mode 100644 index 0000000..0798a25 --- /dev/null +++ b/collections/tech/qsss/qsss_toc.md @@ -0,0 +1,6 @@ +

Quantum Safe Storage More Info

+ +

Table of Contents

+ +- [Quantum Safe Storage Overview](qsss_home.md) +- [Quantum Safe Filesystem](qss_filesystem) \ No newline at end of file diff --git a/collections/tech/technology.md b/collections/tech/technology.md index f88c156..d29aac7 100644 --- a/collections/tech/technology.md +++ b/collections/tech/technology.md @@ -1,21 +1,19 @@ # ThreeFold Grid Technology +ThreeFold has developed a highly efficient infrastructure layer for a new Internet. -ThreeFold has developed a highly efficient infrastructure layer for a new internet. - -Providing Internet & Cloud capacity is as easy as buying or building a node and connecting it to the internet. +Providing Internet & cloud capacity is as easy as getting a node and connecting it to the Internet. ![](3node_simple.png) -A lot of capacity has been deployed in the world, ThreeFold farmers buy a computer and they connect it to the internet, as such they use our operating system to provide Internet capacity to the world. +A lot of capacity has been deployed in the world, hundreds of ThreeFold farmers acquired a computer and connected it to the Internet, as such they use our operating system to provide Internet capacity to the world. Farmers can buy pre-built node or build their own via our DIY guides. - -There are multiple ways in which people can interact with our platform (as a developer or IT an expert: sysadmin): +There are multiple ways in which people can interact with our platform, as a developer, a sysadmin, IT expert, etc. ![](img/architecture_usage.png) -All technology is developed by ThreeFold and is opensource, this technology is being used for the ThreeFold grid (see https://www.threefold.io) which is the deployment of a new internet which is green, safe and owned by all of us. +All technology is developed by ThreeFold and is opensource, this technology is being used for the ThreeFold grid (see the [ThreeFold Website](https://www.threefold.io)) which is the deployment of a new Internet which is green, safe and owned by all of us. This document explains how ThreeFold is the missing layer for the full web2, web3 and blockchain world. diff --git a/collections/tech/zos/zos_toc.md b/collections/tech/zos/zos_toc.md index 7cb0662..c50fbb9 100644 --- a/collections/tech/zos/zos_toc.md +++ b/collections/tech/zos/zos_toc.md @@ -1,34 +1,34 @@ -## Zero OS as generator for Compute, Storage, Network capacity. +## Zero OS as a generator for Compute, Storage, Network capacity ### Compute (uses CU) -- [ZKube](tech:zkube.md) +- [ZKube](zkube.md) - kubernetes deployment -- [ZMachine](tech:zmachine.md) +- [ZMachine](zmachine.md) - the container or virtual machine running inside ZOS -- [CoreX](tech:corex.md) +- [CoreX](corex.md) - process manager (optional), can be used to get remote access to your zmachine A 3Node is a Zero-OS enabled computer which is hosted with any of the Cloud Providers. ### There are 4 storage mechanisms which can be used to store your data: -- [ZOS FS](tech:zos_fs.md) +- [ZOS FS](zos_fs.md) - is our dedupe unique filesystem, replaces docker images. -- [ZOS Mount](tech:zmount.md) +- [ZOS Mount](zmount.md) - is a mounted disk location on SSD, this can be used as faster storage location. -- [Quamtum Safe Filesystem](tech:qss_filesystem.md) +- [Quantum Safe Filesystem](qss_filesystem.md) - this is a super unique storage system, data can never be lost or corrupted. Please be reminded that this storage layer is only meant to be used for secondary storage applications. -- [ZOS Disk](tech:zdisk.md) +- [ZOS Disk](zdisk.md) - a virtual disk technology, only for TFTech OEM partners. ### There are 4 ways how networks can be connected to a Z-Machine. -- [Mycelium = Planetary network](tech:mycelium.md): +- [Mycelium = Planetary network](mycelium.md) - is a planetary scalable network, we have clients for windows, osx, android and iphone. -- [ZOS NIC](tech:znic.md): +- [ZOS NIC](znic.md) - connection to a public ipaddress -- [WEB GW](tech:webgw.md): +- [WEB GW](webgw.md) - web gateway, a secure way to allow internet traffic reach your secure Z-Machine. diff --git a/collections/technology/architecture/img/quantum_safe_storage.jpg b/collections/technology/architecture/img/quantum_safe_storage.jpg deleted file mode 100644 index 4d99c48..0000000 Binary files a/collections/technology/architecture/img/quantum_safe_storage.jpg and /dev/null differ diff --git a/collections/technology/primitives/network/img/planet_net_.jpg b/collections/technology/primitives/network/img/planet_net_.jpg deleted file mode 100644 index afba046..0000000 Binary files a/collections/technology/primitives/network/img/planet_net_.jpg and /dev/null differ diff --git a/collections/technology/qsss/interfaces_usecases/img/nft_architecture.jpg b/collections/technology/qsss/interfaces_usecases/img/nft_architecture.jpg deleted file mode 100644 index 0c09946..0000000 Binary files a/collections/technology/qsss/interfaces_usecases/img/nft_architecture.jpg and /dev/null differ diff --git a/collections/technology/qsss/interfaces_usecases/img/nft_storage.jpg b/collections/technology/qsss/interfaces_usecases/img/nft_storage.jpg deleted file mode 100644 index 5f758d0..0000000 Binary files a/collections/technology/qsss/interfaces_usecases/img/nft_storage.jpg and /dev/null differ diff --git a/collections/technology/qsss/interfaces_usecases/img/storage_architecture_1.jpg b/collections/technology/qsss/interfaces_usecases/img/storage_architecture_1.jpg deleted file mode 100644 index 3a0d3fe..0000000 Binary files a/collections/technology/qsss/interfaces_usecases/img/storage_architecture_1.jpg and /dev/null differ diff --git a/collections/technology/qsss/product/img/quantumsafe_storage_algo.jpg b/collections/technology/qsss/product/img/quantumsafe_storage_algo.jpg deleted file mode 100644 index 448c7a7..0000000 Binary files a/collections/technology/qsss/product/img/quantumsafe_storage_algo.jpg and /dev/null differ diff --git a/collections/test/.collection b/collections/test/.collection new file mode 100644 index 0000000..e69de29 diff --git a/collections/test/test.md b/collections/test/test.md new file mode 100644 index 0000000..bb8e902 --- /dev/null +++ b/collections/test/test.md @@ -0,0 +1,7 @@ +# Mdbook Test + +If you can build and see this mdbook, Hero Mdbook is properly configured! + +You can now work on the library and improve the books. + +Thanks for your contribution to the TFGrid! \ No newline at end of file diff --git a/collections/tfgrid3/dao/tfdao.md b/collections/tfgrid3/dao/tfdao.md index 2b3ec3a..79cddd8 100644 --- a/collections/tfgrid3/dao/tfdao.md +++ b/collections/tfgrid3/dao/tfdao.md @@ -17,5 +17,5 @@ As well as ### More info about DAO's -- see [what is a DAO](dao_info.md) -- see [why a DAO](dao_why.md) \ No newline at end of file +- see [what is a DAO](tfgrid3:dao_info.md) +- see [why a DAO](tfgrid3:dao_why.md) \ No newline at end of file diff --git a/collections/tfgrid3/governance/gep_comm_brainstorm.md b/collections/tfgrid3/governance/gep_comm_brainstorm.md index 1c3c69b..4dbed4e 100644 --- a/collections/tfgrid3/governance/gep_comm_brainstorm.md +++ b/collections/tfgrid3/governance/gep_comm_brainstorm.md @@ -108,4 +108,4 @@ Here are the details of this proposition: 3. Note: the current option to add an additional contract on top of the current one means unequal competition. So not ideal. 5. Adjust 30-min wakeup rule slashing: adjust slashing up until the day of violation instead of for the whole minting period -Note: This is based on community feedback over many discussions. Ideally, we can integrate those points here with the ongoing 3.14 plan as shared by Kristof at the top of this page. [Link to 3.14 ebook](https://threefold.info/tfgrid3/tfgrid3/intro.html) \ No newline at end of file +Note: This is based on community feedback over many discussions. Ideally, we can integrate those points here with the ongoing 3.14 and 3.15 plans. \ No newline at end of file diff --git a/collections/tfgrid3/governance/guardians.md b/collections/tfgrid3/governance/guardians.md index 16226c9..cc043fc 100644 --- a/collections/tfgrid3/governance/guardians.md +++ b/collections/tfgrid3/governance/guardians.md @@ -19,10 +19,10 @@ Requirements: What you will get in return: * Eternal recognition from your Regional Internet community (-: -* TBDk USD per month in TFT as provided by the *TFCOOP - * The TFT will come from the *TFCOOP Treasury +* TBDk USD per month in TFT as provided by the [TFCOOP](tfcoop_intro.md) + * The TFT will come from the TFCOOP Treasury ## Guardians will host a validator -See documentation on [validators](validator.md) for more information. +See documentation on [validators](validators.md) for more information. diff --git a/collections/tfgrid3/intro.md b/collections/tfgrid3/intro.md index 7058e23..3db8e8a 100644 --- a/collections/tfgrid3/intro.md +++ b/collections/tfgrid3/intro.md @@ -10,54 +10,4 @@ We highly encourage feedback and discussions around the next grid release.

Contribute

-Use the [ThreeFold forum](https://forum.threefold.io/c/dao/rfc/81) to discuss the content or edit directly in [our Git system](https://git.ourworld.tf/tfgrid/info_tfgrid). - ---- - -

Table of Contents

- -- [Introduction](tfgrid3/intro.md) - - [Who We Are](tfgrid3/who_are_we.md) - - [Values](values/planet_people_first.md) - - [Ecosystem](tfgrid3/ecosystem.md) - - [The Internet today](tech/internet_today.md) - - [Inefficient Hardware](tech/history/c64.md) - - [Too Many Layers](tech/history/layers.md) -- [Promotion](tfgrid3/promotion.md) - - [Messaging](tfgrid3/messaging.md) - - [Chapters](tfgrid3/chapters.md) -- [ThreeFold Cooperative](tfgrid3/tfcoop_intro.md) - - [Governance](tfgrid3/governance.md) - - [Guardians](tfgrid3/guardians.md) - - [Grid Enhancement Proposals](tfgrid3/gep.md) - - [GEP Community Brainstorm](tfgrid3/gep_comm_brainstorm.md) - - [Farming GEP 3.14](tfgrid3/farming_update_3_14.md) -- [Tokenomics](tfgrid3/tokenomics.md) - - [Farming Rewards](tfgrid3/farming_reward.md) - - [Token Overview](tfgrid3/tokens_overview.md) - - [Validators](tfgrid3/validators.md) -- [Technology](tech/technology.md) - - [TFGrid Core Capabilities](tech/features.md) - - [Compute](tech/compute.md) - - [Zero-OS](tech/zos.md) - - [Infrastructure As Code](tech/smartcontract_iac.md) - - [CoreX](tech/corex.md) - - [Storage](tech/qsss_home.md) - - [Quantum Safe Storage Algo](tech/qss_algorithm.md) - - [Zero Knowledge proof](tech/qss_zero_knowledge_proof.md) - - [NFT Storage](tech/nft_storage.md) - - [S3 Storage](tech/s3_interface) - - [File System](tech/qss_filesystem.md) - - [Network](tech/networking.md) - - [Mycelium](tech/mycelium.md) - - [Web Gateway](tech/webgw.md) - - [Key Innovations](tech/key_innovations_overview.md) - - [Mycelium Network](tech/mycelium_innovation.md) - - [Zero-OS](tech/zos_innovation.md) - - [Quantum Safe Storage](tech/zstor_innovation.md) - - [Quantum Safe Filesystem](tech/qsfs_innovation.md) - - [FList: better OS Images](tech/flist_innovation.md) - - [FungiStor](tech/fungistor_innovation.md) - - [Network Wall](tech/network_wall_innovation.md) - - [Architecture](tech/architecture.md) - - [Energy Efficient](tech/energy_efficient.md) \ No newline at end of file +Use the [ThreeFold forum](https://forum.threefold.io/c/dao/rfc/81) to discuss the content or edit directly in [our Git system](https://git.ourworld.tf/tfgrid/info_tfgrid). \ No newline at end of file diff --git a/collections/tfgrid3/promotion/promotion.md b/collections/tfgrid3/promotion/promotion.md index 245fb66..764edd3 100644 --- a/collections/tfgrid3/promotion/promotion.md +++ b/collections/tfgrid3/promotion/promotion.md @@ -17,7 +17,7 @@ The ThreeFold Cooperative will organize promotional activities in the future, bu > Note: This team does not do promotion or communicaton directly in relation to blockchain, DePIN, tokens, ... -## We are looking for +## We Are Looking For - Promotion team (hands on) for DePIN launch - Community Management & Outreach diff --git a/collections/tfgrid3/threefold_grid.md b/collections/tfgrid3/threefold_grid.md new file mode 100644 index 0000000..5268715 --- /dev/null +++ b/collections/tfgrid3/threefold_grid.md @@ -0,0 +1,7 @@ +# ThreeFold_Grid + +ThreeFold_Grid is a global, neutral, and sustainable network of autonomous storage and compute Internet capacity created by ThreeFold Farmers, with more than 80,000,000 GB and 20,000 cores existing today. On this Grid, IT capacity is indexed / registered on the TFChain for easy discovery by purchasers. Any application which can run on Linux can run on the ThreeFold_Grid but with more privacy, security, closer to the end-user, and at a much lower cost. + +This Internet capacity is produced and allocated locally - similar to the way electricity and other utilities are purchased today. This allows any digital service or application provider to host their services and applications in proximity to the end user leading to significantly greater performance, a lower price point and better margins. This is both more cost effective and green. + +!!!def alias:Threefold_Grid,tf_grid diff --git a/collections/tfgrid3/tokenomics/farming_reward.md b/collections/tfgrid3/tokenomics/farming_reward.md index 8e8fcc1..99bf889 100644 --- a/collections/tfgrid3/tokenomics/farming_reward.md +++ b/collections/tfgrid3/tokenomics/farming_reward.md @@ -25,8 +25,8 @@ More information [in our manual](https://manual.grid.tf/knowledge_base/farming/f ### 2. Proof Of Utilization -- 50% of utilized capacity which comes over the portal from *TFCOOP will be given to the farmer -- 40% of utilized capacity goes to *TFCOOP +- 50% of utilized capacity which comes over the portal from the TFCOOP will be given to the farmer +- 40% of utilized capacity goes to the TFCOOP - 10% of utilized capacity goes to Stakers on the Validators
diff --git a/collections/tfgrid3/tokenomics/tokenomics.md b/collections/tfgrid3/tokenomics/tokenomics.md index 31e98f9..6959a08 100644 --- a/collections/tfgrid3/tokenomics/tokenomics.md +++ b/collections/tfgrid3/tokenomics/tokenomics.md @@ -8,4 +8,4 @@ ## More info - [Farming rewards](farming_reward.md) -- [Token overview](token_overview.md) \ No newline at end of file +- [Token overview](tokens_overview.md) \ No newline at end of file diff --git a/collections/tfgrid3/who_are_we.md b/collections/tfgrid3/who_are_we.md index 0f39ae3..33a9c87 100644 --- a/collections/tfgrid3/who_are_we.md +++ b/collections/tfgrid3/who_are_we.md @@ -17,7 +17,7 @@ ThreeFold Grid (TFGrid) is a foundational layer which can be used by any web2/3 ## The Project Purpose The purpose is to deliver a new infrastructure layer to build a new internet on top of. This layer is sovereign, more scalable, peer-to-peer and co-owned. The project delivers network, compute and storage to anyone who needs it for their own usecases. -[See the high level tech description.](key_innovations.md) +[See the high level tech description.](tech:key_innovations.md) ## Who Benefits The Most From The TFGrid's Capabilities? diff --git a/collections/tfgrid4/boxes/aiblock.md b/collections/tfgrid4/boxes/aiblock.md index bf5c669..f9e303c 100644 --- a/collections/tfgrid4/boxes/aiblock.md +++ b/collections/tfgrid4/boxes/aiblock.md @@ -1,6 +1,6 @@ # AI Block (AB) -!!wiki.include page:'box_intro.md' +!!wiki.include page:'block_intro.md' An AI box is a unit of AI capacity (GPU or future TPU driven). diff --git a/collections/tfgrid4/boxes/cloudblock.md b/collections/tfgrid4/boxes/cloudblock.md index 1b30e21..78a08c4 100644 --- a/collections/tfgrid4/boxes/cloudblock.md +++ b/collections/tfgrid4/boxes/cloudblock.md @@ -1,14 +1,6 @@ -# CloudBlock Concepts +

CloudBlock Concepts

-

Table of Contents

- -- [CloudBlock Concepts](#cloudblock-concepts) - - [CloudBlock (CB)](#cloudblock-cb) - - [Cloud Hour (CH)](#cloud-hour-ch) - - [CloudBlock Properties](#cloudblock-properties) - - -!!wiki.include page:'box_intro.md' +!!wiki.include page:'block_intro.md' ## CloudBlock (CB) @@ -17,14 +9,14 @@ There are unlimited different configurations of cloudblock. A configuration of a machine defines the cloudblock which can be made. -cloudblock can be aggregated to make a bigger cloudblock. +A cloudblock can be aggregated to make a bigger cloudblock. The default cloudblock has - 4GB memory - 2 virtual cores of CPU -- minimal 50 GB of fast storage (can be more, as to be defined by provider) -- minimal availability of 1 mbit/s bandwidth at all times +- Minimal 50 GB of fast storage (can be more, as to be defined by provider) +- Minimal availability of 1 mbit/s bandwidth at all times Terms @@ -39,11 +31,11 @@ Terms - 120 GB of SSD capacity - 6.4 logical CPU core (oversubscription of 4, which means user can max use 4x CPU capacity if system allows) - when a user choses the full machine, then he/she will have reserved all Storage Blocks capacity which means the machine is now dedicated reserved for the user, the hoster specifies the discount for this typically 50%. On a dedicated machine the user has full access to the GPU. -- min 2GB always needs to be left as buffer for memory and 10% of SSD capacity +- Min 2GB always needs to be left as buffer for memory and 10% of SSD capacity How does it work: -- When a developer wants to deploy a virtual machine, he/she needs to define the required capacity and will be able to make a choice based on these CloudBlocks, each CloudBlock has different base specs (mem, ssd, gpu, cpu) and reputation, the developer can now make a selection of how many of these Storage Blocks need to be given to the virtual machine. This defines the monthly price which will have to be paid as well as capacity available to the VM. +- When a developer wants to deploy a virtual machine, they need to define the required capacity and will be able to make a choice based on these CloudBlocks, each CloudBlock has different base specs (mem, ssd, gpu, cpu) and reputation, the developer can now make a selection of how many of these Storage Blocks need to be given to the virtual machine. This defines the monthly price which will have to be paid as well as capacity available to the VM. ## Cloud Hour (CH) diff --git a/collections/tfgrid4/boxes/storageblock.md b/collections/tfgrid4/boxes/storageblock.md index c1fb8c8..a5a12ce 100644 --- a/collections/tfgrid4/boxes/storageblock.md +++ b/collections/tfgrid4/boxes/storageblock.md @@ -1,6 +1,6 @@ # StorageBlock -!!wiki.include page:'box_intro.md' +!!wiki.include page:'block_intro.md' ## StorageBlock (SB) diff --git a/collections/tfgrid4/roadmap_tfgrid.md b/collections/tfgrid4/roadmap_tfgrid.md index 5e652a6..e34195b 100644 --- a/collections/tfgrid4/roadmap_tfgrid.md +++ b/collections/tfgrid4/roadmap_tfgrid.md @@ -10,7 +10,7 @@ This section covers the TFGrid 4.0 roadmap. Stay tuned for more information on t - No more TFChain - Many peer-to-peer features -- Features as descrived in [v4.0](v40/40.md) -- Concepts as described in [all trust document](v40/alltrust.md). +- Features as descrived in [v4.0](v40:40.md) +- Concepts as described in [all trust document](v40:alltrust.md). > Note: More information will follow, TODO link to right sections \ No newline at end of file diff --git a/collections/values/values.md b/collections/values/values.md new file mode 100644 index 0000000..db54a9c --- /dev/null +++ b/collections/values/values.md @@ -0,0 +1,5 @@ +# Values + +We always have the planet and people first in mind. + +Anything we do needs to improve our planet's situation and help the people around us. \ No newline at end of file diff --git a/collections/web4/actor_based/actor_based_approach.md b/collections/web4/actor_based/actor_based_approach.md index bb0e994..74f0451 100644 --- a/collections/web4/actor_based/actor_based_approach.md +++ b/collections/web4/actor_based/actor_based_approach.md @@ -2,12 +2,8 @@ ![](img/twin_model.png) -'actor' driven pattern instead of a model first pattern. +We use an 'actor' driven pattern instead of a model first pattern. In such a pattern, the root model only holds essentials in its database, hence any necessary changes can be applied at the root. -The model can tap direct into knowledge (how to do certain things) by accessing the 'recipes'. 'Recipes' are the source code that can easily be adapted to any task. By using Domain Specific Language (DSL) it is easy to reuse recipes. - -> TODO: too dense, need more explanation - - +The model can tap direct into knowledge (how to do certain things) by accessing the 'recipes'. 'Recipes' are the source code that can easily be adapted to any task. By using Domain Specific Language (DSL) it is easy to reuse recipes. \ No newline at end of file diff --git a/collections/web4/architecture_highlevel/img/.done b/collections/web4/architecture_highlevel/img/.done index f964d6f..d42b5d9 100644 --- a/collections/web4/architecture_highlevel/img/.done +++ b/collections/web4/architecture_highlevel/img/.done @@ -4,3 +4,4 @@ web2_integration_w4.png web4_architecture_intro.png web4_bc_link.png web_intro_0.png +path_to_web4.png diff --git a/collections/web4/architecture_highlevel/img/path_to_web4.png b/collections/web4/architecture_highlevel/img/path_to_web4.png index 5c1de2c..c45a0ad 100644 Binary files a/collections/web4/architecture_highlevel/img/path_to_web4.png and b/collections/web4/architecture_highlevel/img/path_to_web4.png differ diff --git a/collections/web4/architecture_highlevel/internet_evolution.md b/collections/web4/architecture_highlevel/internet_evolution.md index 152eadd..2f39f7e 100644 --- a/collections/web4/architecture_highlevel/internet_evolution.md +++ b/collections/web4/architecture_highlevel/internet_evolution.md @@ -1,4 +1,4 @@ -# Internet Evolution to Web 4.0 +# Internet r(E)volution ### Classic Internet @@ -35,6 +35,7 @@ In the Web 4.0 vision, the user has been put in the center. ![](img/path_to_web4.png) + - you in the center of your digital life (hero) - blockchain only needed for functions like money, identity, smart contracts, ... - internet 10x more efficient diff --git a/collections/web4/freeflowself/freeflowself.md b/collections/web4/freeflowself/freeflowself.md index 21b7a79..3dd8db2 100644 --- a/collections/web4/freeflowself/freeflowself.md +++ b/collections/web4/freeflowself/freeflowself.md @@ -9,8 +9,6 @@ FreeFlow Self is your unique digital "self" - in other worlds, it is you in this FreeFlow Self guarantees that only you have access to your data - no one else. It encourages a trustful environment without any manipulation attempt from third parties. -> TODO: need more complete and easy to understand explanation, more practical - ## Link to 3Bot 3Bot is a first implementation of the FreeFlow Self, its rather technical and in heavy development at this stage. diff --git a/collections/why/countries_no_internet.md b/collections/why/countries_no_internet.md index 59f2da6..6dc569a 100644 --- a/collections/why/countries_no_internet.md +++ b/collections/why/countries_no_internet.md @@ -1,21 +1,15 @@ ![](fortune_no_internet.png) - # Many Countries Do Not Have Their Own Internet ![alt text](nointernet.png) - -The issue extends beyond countries lacking their own Internet infrastructure; a significant portion of the global population still lacks access to the Internet. +The issue extends beyond countries lacking their own Internet infrastructure: a significant portion of the global population still lacks access to the Internet. It is a must to democratize the Internet. -## IMMENSE LOSSES - -**BECAUSE OF THE CENTRALIZED MODEL** - -some companies have access to the data of hundreds -of millions of citizens, this makes us a product. +## The Centralized Model Leads to Immense Losses +Some companies have access to the data of hundreds of millions of citizens, this makes us a product. ![alt text](not_internet_losses.png) \ No newline at end of file diff --git a/collections/why/internet_human_right/internet_human_right.md b/collections/why/internet_human_right/internet_human_right.md index 3f6e35c..a202272 100644 --- a/collections/why/internet_human_right/internet_human_right.md +++ b/collections/why/internet_human_right/internet_human_right.md @@ -1,7 +1,7 @@ ![](img/humanityplanet.jpg) -# Why we do what we do +# Why We Do What We Do ## Internet Access is a Human Right diff --git a/collections/why/social_warming/social_warming.md b/collections/why/social_warming/social_warming.md index 7f8785c..ce90459 100644 --- a/collections/why/social_warming/social_warming.md +++ b/collections/why/social_warming/social_warming.md @@ -1,18 +1,17 @@ ![](img/social_warming.png) -## +5 billion people in survival mode +## +5 Billion People in Survival Mode ![](img/toabondance.png) -## Our Kids define our Future World +## Our Kids Define our Future World ![](img/world_behind.png) We are maybe too much focussed on what kind of world we will leave behind, rather than thinking about how we need to raise our kids so that they will treat our world differently. - -## Education is everything +## Education is Everything ![](img/africa_young.png) diff --git a/collections/why/why.md b/collections/why/why.md index 32bbaa8..d8de3df 100644 --- a/collections/why/why.md +++ b/collections/why/why.md @@ -3,6 +3,6 @@ # Why - [Cloud Too Centralized](why/current_cloud_too_centralized.md) -- [Countries don't have their Internet](why/countries_no_internet.md) +- [Countries Don't Have Their Own Internet](why/countries_no_internet.md) - [Human Right](why/internet_human_right.md) - [Social Warming](why/social_warming.md) diff --git a/collections_beta/inca_fuel/economy.md b/collections_beta/inca_fuel/economy.md index dc478b8..d23f823 100644 --- a/collections_beta/inca_fuel/economy.md +++ b/collections_beta/inca_fuel/economy.md @@ -1,2 +1,3 @@ # Economy +We present the overall economy of the grid and the interactions between the different tokens that are part of the ecosystem. \ No newline at end of file diff --git a/heroscript/duniayetu/book_collections.md b/heroscript/duniayetu/book_collections.md index a77e8e6..2381a8a 100644 --- a/heroscript/duniayetu/book_collections.md +++ b/heroscript/duniayetu/book_collections.md @@ -2,7 +2,7 @@ ```js -!!book.generate name:'duniayetu' title:'TFGrid Internet 4.0' +!!book.generate name:'duniayetu' title:'Dunia Yetu' url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/books/duniayetu_dar' diff --git a/heroscript/new_mdbook/book_collections.md b/heroscript/new_mdbook/book_collections.md deleted file mode 100644 index 203a937..0000000 --- a/heroscript/new_mdbook/book_collections.md +++ /dev/null @@ -1,9 +0,0 @@ -```js - -!!book.generate name:'new_mdbook' title:'New mdBook' - url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/books/new_mdbook' - -!!doctree.add - url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/new_mdbook' - -``` \ No newline at end of file diff --git a/heroscript/new_mdbook/context.md b/heroscript/new_mdbook/context.md deleted file mode 100644 index a8f5892..0000000 --- a/heroscript/new_mdbook/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/new_mdbook/sshkey.md b/heroscript/new_mdbook/sshkey.md deleted file mode 100644 index 85acfe6..0000000 --- a/heroscript/new_mdbook/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/tech/book_collections.md b/heroscript/tech/book_collections.md index f62e116..85b5a9e 100644 --- a/heroscript/tech/book_collections.md +++ b/heroscript/tech/book_collections.md @@ -2,7 +2,7 @@ ```js -!!book.generate name:'tech' title:'Tech' +!!book.generate name:'tech' title:'ThreeFold Technology' url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/books/tech' diff --git a/heroscript/test/book_collections.md b/heroscript/test/book_collections.md index 0ffe780..125bd84 100644 --- a/heroscript/test/book_collections.md +++ b/heroscript/test/book_collections.md @@ -2,23 +2,12 @@ ```js -!!book.generate name:'tfgrid' title:'TFGrid Internet 4.0' +!!book.generate name:'test' title:'Mdbook Test' url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/books/test' !!doctree.add - url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/tfgrid_org' - -!!doctree.add - url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/values' - -!!doctree.add - url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/p2p' - -!!doctree.add - url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/why' + url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/test' - -``` - +``` \ No newline at end of file diff --git a/heroscript/tfgrid4/book_collections.md b/heroscript/tfgrid4/book_collections.md index 3d063e6..f26c301 100644 --- a/heroscript/tfgrid4/book_collections.md +++ b/heroscript/tfgrid4/book_collections.md @@ -2,14 +2,45 @@ ```js -!!book.generate name:'tfgrid' title:'TFGrid Internet 4.0' - url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/books/tfgrid' +!!book.generate name:'tfgrid4' title:'TFGrid Internet 4.0' + url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/books/tfgrid4' !!doctree.add - url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections' + url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/bestkeptsecret' +!!doctree.add + url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/why' +!!doctree.add + url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/farming_v4' + +!!doctree.add + url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/economy' + +!!doctree.add + url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/p2p' + +!!doctree.add + url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/partners_utilization' + +!!doctree.add + url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/solutions' + +!!doctree.add + url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/web4' + +!!doctree.add + url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/tech' + +!!doctree.add + url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/values' + +!!doctree.add + url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/problems' + +!!doctree.add + url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/dy_intro' ```