Merge branch 'main' of git.ourworld.tf:tfgrid/info_tfgrid
# Conflicts: # books/projectinca/SUMMARY.md # collections/tech/primitives/network/mycelium.md
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
- [Intro](earthhub/intro.md)
|
||||
- [Introduction](earthhub/intro.md)
|
||||
- [Faq](earthhub/faq.md)
|
||||
- [Roadmap](earthhub/roadmap.md)
|
||||
- [Federated Protocols](social_media_protocols/protocols.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)
|
||||
|
||||
@@ -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)
|
||||
- [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)
|
||||
@@ -1,2 +0,0 @@
|
||||
- [Example 1](new_mdbook/new_mdbook_example1.md)
|
||||
- [Example 2](new_mdbook/new_mdbook_example2.md)
|
||||
@@ -1,20 +1,70 @@
|
||||
|
||||
- [Intro](projectinca/intro.md)
|
||||
- [Introduction](projectinca/intro.md)
|
||||
- [The Plan](projectinca/theplan_c.md)
|
||||
- [Funding](projectinca/funding.md)
|
||||
- [P2P Promotion](projectinca/peer2peer_promotion.md)fl
|
||||
- [Liquidity](projectinca/liquidity.md)
|
||||
<<<<<<< HEAD
|
||||
- [Collaboration INCA Launch](projectinca/collab.md)
|
||||
=======
|
||||
- [INCA Tokenomics](projectinca/tokens.md)
|
||||
- [INCA](projectinca/inca.md)
|
||||
- [INCA Grants](projectinca/grants.md)
|
||||
- [v3.x Grants](projectinca/grants_tft.md)
|
||||
- [Deploy AI Blocks](projectinca/grant_aiblock.md)
|
||||
- [Deploy Cloud Blocks](projectinca/grant_cloudblock.md)
|
||||
- [Deploy Storage Blocks](projectinca/grant_storageblock.md)
|
||||
- [Develop INCA Marketplace](projectinca/marketplace_grant.md)
|
||||
- [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)
|
||||
- [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)
|
||||
- [Pricing](projectinca/marketplace_pricing.md)
|
||||
- [AI Blocks](tfgrid4/aiblock.md)
|
||||
- [Cloud Blocks](tfgrid4/cloudblock.md)
|
||||
- [Storage Blocks](tfgrid4/storageblock.md)
|
||||
- [INCA Farming](projectinca/inca_farming.md)
|
||||
- [INCA Hosts](projectinca/inca_nodes.md)
|
||||
- [INCA Routers](projectinca/inca_routers.md)
|
||||
- [INCA Network Map](projectinca/networkmap.md)
|
||||
- [Reward Simulation](projectinca/inca_farming_reward.md)
|
||||
- [INCA Launch Collaboration](projectinca/collab.md)
|
||||
>>>>>>> ba303b6e3eb8220bf2851a949db109e68ccd1f8c
|
||||
- [Remuneration](projectinca/remuneration.md)
|
||||
- [Promotion Effort](tfgrid3/promotion.md)
|
||||
- [Messaging](tfgrid3/messaging.md)
|
||||
- [Teams](projectinca/teams.md)
|
||||
<<<<<<< HEAD
|
||||
- [Hero - Project Mycelium](projectinca/hero.md)
|
||||
=======
|
||||
- [INCA Grid Utilization](partners_utilization/partners.md)
|
||||
- [Hero - Project Mycelium](projectinca/hero.md)
|
||||
- [Digital Freezone](partners_utilization/freezone.md)
|
||||
- [Tanzania Internet](partners_utilization/tanzania.md)
|
||||
- [Elestio](partners_utilization/elestio.md)
|
||||
- [Earth Wallet](partners_utilization/earth_wallet.md)
|
||||
- [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)
|
||||
- [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)
|
||||
>>>>>>> ba303b6e3eb8220bf2851a949db109e68ccd1f8c
|
||||
- [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)
|
||||
- [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)
|
||||
- [Values](values/planet_people_first.md)
|
||||
- [TFGrid Utilization](partners_utilization/partners.md)
|
||||
- [Digital Freezone](partners_utilization/freezone.md)
|
||||
@@ -31,7 +81,7 @@
|
||||
- [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)
|
||||
@@ -39,7 +89,7 @@
|
||||
- [Energy Efficient](tech/energy_efficient.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)
|
||||
- [Appendix](projectinca/appendix.md)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
|
||||
- [Intro](projectmycelium/intro.md)
|
||||
- [Introduction](projectmycelium/intro.md)
|
||||
- [Product Vision](projectmycelium/product_slides.md)
|
||||
- [Tokenomics](projectmycelium/tokenomics.md)
|
||||
- [Tokens](projectmycelium/tokens.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)
|
||||
|
||||
@@ -1,3 +1 @@
|
||||
|
||||
- [Why](why/why.md)
|
||||
- [org](tfgrid_org/cf.md)
|
||||
- [Test Page](test/test.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)
|
||||
Reference in New Issue
Block a user