tfgrid/info_docs_tfgrid4_tech
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'update breaking changes' (!9) from main_update_breaking into main

Browse Source 
Reviewed-on: #9
This commit is contained in:
mik-tf 2025-02-02 15:40:57 +00:00
commit a070bc7df5
3 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/main/internet_reinvented/internet_reinvented.md
View File

@ -18,11 +18,7 @@ All of above is in line with [First Principle Thinking](../first_principle_think
![](img/natural_progression.png) ![](img/natural_progression.png)
<<<<<<< HEAD
> We believe ACI is the implementation of Augmented Collective Intelligence.
=======
> We believe Web 4 is the implementation of Augmented Collective Intelligence. > We believe Web 4 is the implementation of Augmented Collective Intelligence.
>>>>>>> 26c95c2b7a975fc983fdaa81afd5edb27999afe3

4
docs/main/team/ourstory.md
View File

@ -28,8 +28,4 @@ The Web 4 ecosystem continues to expand with groundbreaking innovations:
- **3Router**: Encrypted network connectivity. - **3Router**: Encrypted network connectivity.
- **3Bot**: Self-healing applications that reduce downtime and improve reliability. - **3Bot**: Self-healing applications that reduce downtime and improve reliability.
<<<<<<< HEAD
With $65 million in investments and years of development, ACI has transitioned from a groundbreaking idea to a proven, operational reality. It offers a future where the internet is decentralized, resilient, and truly empowering for people and nations alike.
=======
With $65 million in investments and years of development, Web 4 has transitioned from a groundbreaking idea to a proven, operational reality. It offers a future where the internet is decentralized, resilient, and truly empowering for people and nations alike. With $65 million in investments and years of development, Web 4 has transitioned from a groundbreaking idea to a proven, operational reality. It offers a future where the internet is decentralized, resilient, and truly empowering for people and nations alike.
>>>>>>> 26c95c2b7a975fc983fdaa81afd5edb27999afe3

8
docs/main/team/ourworld.md
View File

@ -18,11 +18,7 @@ OurWorld envisions a transformative future built on the principles of autonomy a
By uniting these three pillars of autonomy, OurWorld is building a comprehensive system that empowers individuals and organizations to thrive. This vision seeks to foster a more equitable, resilient, and innovative global society, unlocking the potential for a truly decentralized future. By uniting these three pillars of autonomy, OurWorld is building a comprehensive system that empowers individuals and organizations to thrive. This vision seeks to foster a more equitable, resilient, and innovative global society, unlocking the potential for a truly decentralized future.
### **1. TF9** ### **1. TF9**
<<<<<<< HEAD
- **Description**: Next-generation ACI software company.
=======
- **Description**: Next-generation Web 4 software company. - **Description**: Next-generation Web 4 software company.
>>>>>>> 26c95c2b7a975fc983fdaa81afd5edb27999afe3
- **Key Features**: - **Key Features**:
- First platform capable of providing unmatched privacy, security, and unlimited scale. - First platform capable of providing unmatched privacy, security, and unlimited scale.
- Lowest possible cost and energy usage for Web 2, 3, and 4. - Lowest possible cost and energy usage for Web 2, 3, and 4.
@ -33,11 +29,7 @@ By uniting these three pillars of autonomy, OurWorld is building a comprehensive
--- ---
### **2. ThreeFold** ### **2. ThreeFold**
<<<<<<< HEAD
- **Description**: Decentralized ACI platform for the world.
=======
- **Description**: Decentralized Web 4 platform for the world. - **Description**: Decentralized Web 4 platform for the world.
>>>>>>> 26c95c2b7a975fc983fdaa81afd5edb27999afe3
- **Key Features**: - **Key Features**:
- Enables a decentralized platform for co-creating the future of the internet. - Enables a decentralized platform for co-creating the future of the internet.
- Incorporates ACI and Augmented Collective Intelligence. - Incorporates ACI and Augmented Collective Intelligence.