Merge pull request 'development_inca' (#46) from development_inca into development

Reviewed-on: #46

books/projectinca/SUMMARY.md

@@ -42,6 +42,7 @@
   - [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)
@@ -53,7 +54,6 @@
   - [Storage Blocks](tfgrid4/storageblock.md)
 - [Project Info](projectinca/proj_info.md)
   - [About us](tfgrid3/who_are_we.md)
-  - [Utilization](partners_utilization/)
   - [The Internet today](tech/internet_today.md)
     - [history c64](tech/history/c64.md)
     - [too many layers](tech/history/layers.md)
@@ -76,7 +76,7 @@
     - [Social Warming](why/social_warming.md)
 - [INCA Cloud Core Capabilities](tech/features.md)
   - [Compute](tech/compute.md)
-    - [Zero-OS](tech/zos.md)
+    - [Zero-OS](tech/zero_os.md)
     - [Infrastructure As Code](tech/smartcontract_iac.md)
     - [CoreX](tech/corex.md)
   - [Storage](tech/qsss_home.md)

books/tfgrid4/SUMMARY.md

@@ -23,7 +23,7 @@
   - [Elestio](partners_utilization/elestio.md)
   - [OW Freezone](partners_utilization/freezone.md)
   - [Helium](partners_utilization/helium.md)
-  - [Holochain](partners_utilization/helium.md)
+  - [Holochain](partners_utilization/holochain.md)
   - [TZG](partners_utilization/tanzania.md)
   - [Tier-S DC](partners_utilization/tier_s_datacenter.md)
 - [Solutions](solutions/solutions.md)

collections/def/zos.md

@@ -1,5 +1,5 @@
 # Zero-OS
 
+Zero-OS is a stateless and lightweight operating system designed to host anything that runs on Linux.
 
-
+!!wiki.def alias:'zos,zero-os'
-!!wiki.def alias:'zos,zero-os,z-os'

collections/partners_utilization/elestio.md

@@ -3,7 +3,7 @@
 ## Elestio
 
 **Introduction:**
-[Elestio](https://www.elestio.com/) is an innovative platform dedicated to providing cutting-edge decentralized applications (dApps) and services to users worldwide. With a focus on accessibility, security, and user empowerment, Elestio aims to revolutionize the way individuals interact with decentralized technologies.
+[Elestio](https://www.elest.io) is an innovative platform dedicated to providing cutting-edge decentralized applications (dApps) and services to users worldwide. With a focus on accessibility, security, and user empowerment, Elestio aims to revolutionize the way individuals interact with decentralized technologies.
 
 **Soon: Apps Hosted on the Grid:**
  ThreeFold's TF Grid is able to host a diverse range of decentralized applications. These applications span various categories, including finance, social networking, gaming, and more. By hosting Elestio on the TF Grid, we would provide a high availability, security, and scalability for Elestio's users, offering a seamless and reliable experience across all its offerings.

collections/partners_utilization/helium.md

@@ -1,10 +1,13 @@
 
 
 
-!!story.todo name:'mnode_selection' title:'select best helium node, can be as small as USB version' description:'see ${dockey}'
+<!-- !!story.todo name:'mnode_selection' title:'select best helium node, can be as small as USB version' description:'see ${dockey}' 
 
 https://www.linxdot.com/shop/linxdot-indoor-helium-hotspot/
 
+-->
+
+
 ## Future Partnership with Helium
 
 ### Introduction to Helium:

collections/partners_utilization/partners.md

@@ -5,7 +5,7 @@
 The following partners all have the potential to utilize a lot of our capacity and will drive the growth of our grid.
 
 - [Holochain](holochain.md) holochain, peer2peer transaction layer and dapp layer on top of TFGrid
-- [Earth Wallet]() alternative to BTC Lightening (cheap transactions, scale)
+- [Earth Wallet](earth_wallet.md) alternative to BTC Lightening (cheap transactions, scale)
 - [Digital Freezone](freezone.md) a digital freezone made for hundreds of millions of people.
 - [Tanzania Sovereign Internet](tanzania.md) a sovereign Internet for a country
 - [Elestio](elestio.md) +300 opensource apps on top of TFGrid (managed, supported)
@@ -13,5 +13,5 @@ The following partners all have the potential to utilize a lot of our capacity a
 - [Vindo](vindo.md) collaborative metaverse, best quality at low bandwidth
 - [Vverse](vverse.md) virtual reality museum
 - [Tier S Datacenter](tier_s_datacenter.md) more secure and efficient datacenter approach
-- [Helium](Helium.md) Decentralized IoT Network
+- [Helium](helium.md) Decentralized IoT Network
-- [Sikana](Sikana.md) Virtual Learning Platfrom
+- [Sikana](sikana.md) Virtual Learning Platfrom

collections/partners_utilization/tier_s_datacenter.md

@@ -22,6 +22,4 @@ These racks are used as is or put in a container.
 
 ![alt text](tiers_container.png)
 
-
+These containers can be used in a datacenter building to make it all fancy.
-
-These containers can be used in a datacenter building to make it all fancy.

collections/partners_utilization/vverse.md

@@ -2,7 +2,7 @@
 
 ## Vverse: Virtual Universe Explained
 
-[Vverse](https://www.vverse.io/) is an innovative platform that aims to create a virtual universe where users can explore, interact, and create in immersive virtual environments. It leverages cutting-edge technologies such as virtual reality (VR), augmented reality (AR), and blockchain to provide users with a seamless and engaging experience.
+[Vverse](https://veverse.com) is an innovative platform that aims to create a virtual universe where users can explore, interact, and create in immersive virtual environments. It leverages cutting-edge technologies such as virtual reality (VR), augmented reality (AR), and blockchain to provide users with a seamless and engaging experience.
 
 **Key Features of Vverse:**
 - **Immersive Environments:** Vverse offers a variety of immersive virtual environments for users to explore, ranging from futuristic cities to fantastical landscapes.
@@ -22,7 +22,7 @@ In the future, Vverse aims to partner with ThreeFold to leverage its decentraliz
 **Conclusion:**
 Vverse represents the future of immersive virtual experiences, and partnering with ThreeFold for hosting services aligns with its commitment to providing users with a secure, scalable, and decentralized platform. Together, Vverse and ThreeFold can create a virtual universe that pushes the boundaries of innovation and fosters creativity and collaboration on a global scale.
 
-For more information about Vverse, visit [vverse.io](https://www.vverse.io/).
+For more information about Vverse, visit [vverse](https://veverse.com).
 
 
 > [Example of a VVerse Museum](https://youtu.be/FCjofnZnTDk)

collections/projectinca/grants/tf3/marketplace_grant.md

@@ -6,8 +6,8 @@ ThreeFold DMCC and TF COOP will host such a market place.
 
 The marketplace will intitially be used to sell
 
-- [CloudBlocks](cloudblock.md)
+- [CloudBlocks](tfgrid4:cloudblock.md)
-- [StorageBlocks](storageblock.md)
+- [StorageBlocks](tfgrid4:storageblock.md)
 
 But many more services will be added.
 

collections/projectinca/marketplace/marketplace.md

@@ -27,5 +27,4 @@ We have reached a sizeable grid and want to promote commercialization.
 
 - [Development Cloud Blocks](grant_cloudblock.md)
 - [Development Storage Blocks](grant_storageblock.md)
-- [Development AI Blocks](grant_aiblock.md)
+- [Development AI Blocks](grant_aiblock.md)
-- [Development Marketplace](marketplace.md)

collections/tech/primitives/compute/compute.md

@@ -20,4 +20,4 @@ We have the following unique advantages:
 - Can use core-x to manage the workload
 
 
-For more information see [ZeroOS](zos.md)
+For more information see [ZeroOS](zero_os.md)

collections/web4/architecture_highlevel/web4_intro.md

@@ -1,4 +1,4 @@
 
 # Web 4 Intro
 
-{{#include web4_intro_.md}}
+{{#include web4_intro_0.md}}

collections/why/internet_human_right/internet_human_right.md

@@ -7,7 +7,7 @@
 
 In 2016, [the United Nations officially declared Internet access to be a human right](https://www2.ohchr.org/english/bodies/hrcouncil/docs/17session/A.HRC.17.27_en.pdf). The right to Internet access aims to protect people’s freedom of expression and opinion, as well as other fundamentals such as access to knowledge and information. 
 
-Yet as of 2019, [about 43% of humanity remains unconnected to the Internet](https://wearesocial.com/blog/2019/01/digital-2019-global-internet-use-accelerates), creating huge inequalities in the access to information and knowledge. It is important that the right steps are taken to improve the relationship between governments and citizens and to uphold all human rights.
+Yet as of 2019, [about 43% of humanity remains unconnected to the Internet](https://wearesocial.com/uk/blog/2019/01/digital-in-2019-global-internet-use-accelerates/), creating huge inequalities in the access to information and knowledge. It is important that the right steps are taken to improve the relationship between governments and citizens and to uphold all human rights.
  
 To make the new Internet accessible and equal to all, ThreeFold built an infrastructure that is widely affordable and collectively-owned by the network peers. To ensure a fair and equal distribution of the Internet to everyone, the expansion and reach to regions that need Internet capacity the most will be incentivized and/or sponsored by the Foundation.
 
@@ -25,4 +25,4 @@ The current Internet [consumes about 10% of global energy production](https://ww
 
 The current industry's solutions focus on increasing the use of renewable energies to power data centers. However this is not a viable solution as data centers consume enormous amounts of energy. Therefore, a new solution that can drastically reduce the global Internet’s energy consumption is needed. 
   
-ThreeFold today brings the largest peer-to-peer Internet grid on the planet. It uses pioneering technologies that remove the need for centralized and power-hungry data centers, consumes up to 90% less energy, and uses up to 90% less international fiber network capacity. (To learn about ThreeFold power savings, read [here](https://farming.threefold.io/blog/post/for_our_planet/).)
+ThreeFold today brings the largest peer-to-peer Internet grid on the planet. It uses pioneering technologies that remove the need for centralized and power-hungry data centers, consumes up to 90% less energy, and uses up to 90% less international fiber network capacity. (To learn about ThreeFold power savings, read [here](https://www.threefold.io/blog/for-our-planet/).)

heroscript/projectinca/book_collections.md

@@ -41,6 +41,9 @@
 !!doctree.add
     url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/tfgrid3'
 
+!!doctree.add
+    url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/p2p'
+
 
 ```