fix develoment conflict

content/build/index.md

@@ -8,18 +8,14 @@ insert_anchor_links: "left"
 
 {% row(style="center margin narrow") %}
 
-![](developet_tft.jpg#medium)
+## **Build** the Future
 
-
+Deploy and administer on a decentralized autonomous edge infrastructure. Experience true ownership of your deployments with a decentralized framework. Evolve the way you create and deploy innovative solutions, with greater scalability, efficiency, privacy, and security.
-## The Next Generation of <br> **Cloud Computing**
-
-Deploy any workload with unprecedented security, scalability, and efficiency, on a fully comprehensive peer-to-peer digital infrastructure. Discover a cloud like no other.
 
 <br>
 
-<button>[Dashboard](https://dashboard.grid.tf)</button>
+<button>[Developer Manual](https://manual.grid.tf/developers/developers.html)</button>
-<button>[Playground](https://play.grid.tf)</button>
+<button>[Sysadmin Manual](https://manual.grid.tf/system_administrators/system_administrators.html)</button>
-<button>[Manual](https://manual.grid.tf/)
 <button>[Grid Chat](https://t.me/threefoldtesting)</button>
 
 {% end %}
@@ -34,8 +30,6 @@ Deploy any workload with unprecedented security, scalability, and efficiency, on
 
 Plug in standard tools and protocols to the most resilient and versatile storage system ever created, or access raw disk on the location of your choice.
 
-<button> [Learn More](https://library.threefold.me/info/threefold#/technology/qsss/threefold__qsss_home) </button>
-
 |||
 
 ![compute](compute.jpg#medium)
@@ -44,8 +38,6 @@ Plug in standard tools and protocols to the most resilient and versatile storage
 
 Native support for containers and virtual machines. Migrate existing applications effortlessly or build from scratch in a cutting-edge computing environment.
 
-<button>[Learn More](https://manual.grid.tf/weblets/weblets_home.html)</button>
-
 |||
 
 ![network](network.jpg#medium)
@@ -54,47 +46,6 @@ Native support for containers and virtual machines. Migrate existing application
 
 Private overlay networks and global end-to-end encryption minimize attack surface. Handle inbound traffic with uniquely secure web gateways.
 
-
-<button>[Learn More](https://library.threefold.me/info/manual/#/cloud/threefold__planetary_network)</button>
-
-{% end %}
-
-<!-- section 3  -->
-
-{% row(style="center mtop narrow") %}
-
-## Explore **What's Possible**
-
-Build in a truly decentralized environment on the ThreeFold Grid. A sandbox of limitless possibilities awaits for the open source builders of a decentralized tomorrow.
-
-{% end %}
-
-{% row(style="center mtop between") %}
-
-[![virtual machine](virtual_machine.png#medium)](https://library.threefold.me/info/manual/#/manual__weblets_vm)
-
-|||
-
-[![kubernetes](kubernetes.png#medium)](https://library.threefold.me/info/manual/#/manual__weblets_k8s)
-
-|||
-
-[![terraform](terraform.png#medium)](https://library.threefold.me/info/manual/#/manual__manual3_iac_home)
-
-{% end %}
-
-{% row(style="center mbottom between") %}
-
-[![weblets](weblets.png#medium)](https://library.threefold.me/info/manual/#/manual__weblets_home)
-
-|||
-
-[![quantum safe storage](qss.png#medium)](https://library.threefold.me/info/manual/#/technology/qsss/threefold__qsss_home)
-
-|||
-
-[![planetary network](planetary_network.png#medium)](https://library.threefold.me/info/manual/#/cloud/threefold__planetary_network)
-
 {% end %}
 
 <!-- section 5 -->
@@ -115,8 +66,8 @@ Dive into more resources and join the open-source movement building a better dig
 
 <br>
 
-<button>[Developer Resources](/developer)</button>
+<button>[For Developers](https://manual.grid.tf/developers/developers.html)</button>
-<button>[Manual](https://manual.grid.tf)</button>
+<button>[For Sysadmins](https://manual.grid.tf/system_administrators/system_administrators.html)</button>
 <button>[Grid Chat](https://t.me/threefoldtesting)</button>
 
 {% end %}

content/community/index.md

@@ -35,7 +35,7 @@ We're a 100% open-source and community-driven project that builds the critical i
 
 |||
 
-[![yahoo_news](documentation.png)](https://library.threefold.me/info/threefold#/)
+[![yahoo_news](documentation.png)](https://manual.grid.tf)
 
 {% end %}
 
@@ -81,38 +81,6 @@ We're a 100% open-source and community-driven project that builds the critical i
 
 {% end %}
 
-<br>
-
-
-<!-- section 4 (DEVELOPER COMMUNITY) -->
-
-{% row(style="margin" bgColor="#f2f2f2") %}
-
-![Image](community_developers.png#medium)
-
-|||
-
-## Join the ThreeFold <br> **Developer Community**
-
-From testing our latest releases to joining our development teams or applying for a ThreeFold Foundation grant – there are many ways to engage with ThreeFold’s technology.
-
-<button>[Developer Resources](/developer)</button>
-
-{% end %}
-
-<!-- section 6 (QUESTIONS) -->
-
-{% row(style="center between margin") %}
-
-## Frequently Asked <br> **Questions**
-
-Check out the FAQs or ask a question on the ThreeFold Forum.
-
-<button>[ThreeFold FAQ](/faq)</button>
-<button>[TFT FAQ](/tftfaq)</button>
-
-{% end %}
-
 
 {% community_banner() %}
 

content/farm/index.md

@@ -10,13 +10,13 @@ insert_anchor_links: "left"
 
 ## Be the **Internet**
 
-Become a ThreeFold Farmer. Provide Internet capacity to the people around you, and earn for it.
+By connecting a modern computer at your home or office to the ThreeFold Grid, you can provide Internet capacity to communities and builders, and be rewarded for doing this. Support a decentralized future. Take part in shaping a new Internet era governed by all of us.
 
 <br>
 
 <button>[Buy](https://marketplace.3node.global/index.php)</button>
-<button>[Build](https://library.threefold.me/info/threefold#/tfgrid/farming/threefold__diy_guide)</button>
+<button>[Build](https://manual.grid.tf/farmers/3node_building/3node_building.html)</button>
-<button>[Learn](https://library.threefold.me/info/threefold#/tfgrid/farming/threefold__farming_intro)</button>
+<button>[Learn](https://manual.grid.tf/intro/grid3_howitworks.html)</button>
 <button>[Farmers Chat](https://t.me/threefoldfarmers)</button>
 
 {% end %}

content/footer/_index.md

@@ -10,21 +10,25 @@ extra:
 
 {% row(style="lean") %}
 
-##### PARTICIPATE
+##### TAKE ACTION
 
 <br>
 
+<<<<<<< HEAD
 ###### [Talk to ThreeFolders](https://t.me/threefold)
 
 ###### [Buy the Token](https://manual.grid.tf/threefold_token/buy_sell_tft/buy_sell_tft.html)
 
 ###### [Start Farming](https://manual.grid.tf/farmers/farmers.html)
+=======
+###### [Manuals](https://manual.grid.tf/)
+>>>>>>> master
 
-###### [Farming Community](https://t.me/threefoldfarmers)
+###### [Buy the Token](https://manual.grid.tf/threefold_token/buy_sell_tft/buy_sell_tft.html)
 
-###### [Use the Grid](https://dashboard.grid.tf/)
+###### [Start Farming](https://manual.grid.tf/farmers/farmers.html)
 
-###### [Testing Community](https://t.me/threefoldtesting)
+###### [Use the Dashboard](https://dashboard.grid.tf/)
 
 ###### [ThreeFold Connect: iOS](https://apps.apple.com/us/app/3bot-login/id1459845885)
 
@@ -32,21 +36,19 @@ extra:
 
 |||
 
-##### KNOWLEDGEBASE
+##### TALK TO HUMANS
 
 <br>
 
-###### [ThreeFold Grid](https://manual.grid.tf/intro/grid3_howitworks.html)
+###### [Main Community](https://t.me/threefold)
 
-###### [ThreeFold Technology](https://manual.grid.tf/concepts/concepts_readme.html)
+###### [Farming Community](https://t.me/threefoldfarmers)
 
-###### [ThreeFold Farming](https://manual.grid.tf/farmers/farmers.html)
+###### [Grid User Community](https://t.me/threefoldtesting)
 
-###### [ThreeFold Token](https://manual.grid.tf/threefold_token/threefold_token.html)
+###### [Forum](https://forum.threefold.io/)
 
-###### [Manuals](https://manual.grid.tf/)
+<h6><a target="_self" onclick="window.location.href='/support'">Support</a></h6>
-
-###### [FAQ](https://manual.grid.tf/faq/faq.html)
 
 |||
 
@@ -58,12 +60,10 @@ extra:
 
 <h6><a target="_self" onclick="window.location.href='/partners'">Partners</a></h6>
 
+<h6><a target="_self" onclick="window.location.href='/people'">People</a></h6>
+
 <h6><a target="_self" onclick="window.location.href='/blog'">Blog</a></h6>
 
 <h6><a target="_self" onclick="window.location.href='/newsroom'">NewsRoom</a></h6>
 
-###### [Forum](https://forum.threefold.io/)
-
-<h6><a target="_self" onclick="window.location.href='/support'">Support</a></h6>
-
 {% end %}

content/grid/index.md

@@ -15,8 +15,7 @@ The Internet was meant to be a peer-to-peer infrastructure with us in the center
 
 <br>
 
-<button>[Discover the Grid](https://library.threefold.me/info/threefold#/tfgrid/threefold__grid_intro)</button>
+<button>[Discover the Grid](https://manual.grid.tf/intro/grid3_howitworks.html)</button>
-<button>[The Magic of the Tech](https://library.threefold.me/info/threefold#/technology/threefold__technology)</button>
 
 {% end %}
 
@@ -32,8 +31,8 @@ The Internet was meant to be a peer-to-peer infrastructure with us in the center
 
 Any current or future technology, including blockchain, metaverses and web 3.0, can be hosted natively on the ThreeFold Grid via smart contracts with minimum migration. The grid is compatible with most open source tools and protocols.
 
-<button>[Build on the Grid](https://manual.grid.tf/getstarted/tfgrid3_getstarted.html)</button>
+<button>[Developer Manual](https://manual.grid.tf/developers/developers.html)</button>
-<button>[Expand The Grid](/farm)</button>
+<button>[Sysadmin Manual](https://manual.grid.tf/system_administrators/system_administrators.html)</button>
 
 {% end %}
 
@@ -45,7 +44,7 @@ Any current or future technology, including blockchain, metaverses and web 3.0,
 
 The ThreeFold Grid is formed by Farmers, independent people who connect 3Nodes (decentralized Internet capacity) anywhere electricity and network are present. Together, they form a globally distributed Internet infrastructure and earn income in the form of TFT.
 
-<button>[Learn About TFT](/tft)</button>
+<button>[Expand The Grid](/farm)</button>
 
 |||
 
@@ -80,7 +79,7 @@ All our code is made open source to energize open collaboration and promote univ
 A decentralized autonomous operating system designed to dedicate hardware capacity to the People’s Internet via the ThreeFold Blockchain. Zero-OS can be booted on most modern computers to host anything that runs on Linux in a decentralized way.
 
 
-<button>[Learn More](https://library.threefold.me/info/threefold#/technology/threefold__zos)</button>
+<button>[Learn More](https://manual.grid.tf/concepts/grid3_components.html#0-os-or-zos)</button>
 
 {% end %}
 
@@ -93,7 +92,6 @@ A decentralized autonomous operating system designed to dedicate hardware capaci
 TFT is the official medium of exchange for Internet capacity on the ThreeFold Grid. The utility token allows users to reserve Internet capacity via the ThreeFold Blockchain and rewards farmers for their contribution to the network.
 
 <button>[About TFT](/tft)</button>
-<button>[Expand The Grid](/farm)</button>
 
 |||
 

content/header/index.md

@@ -43,16 +43,6 @@ extra:
 
 </button>
 
-|||
-
-<button onclick="window.location.href='/developer'">
-
-[Developer Resources](/developer)
-<br>
-<p class="text-sm">Join The Developer Community</p>
-
-</button>
-
 {% end %}
 
 - More
@@ -62,9 +52,9 @@ extra:
 
 #### Tools
 
-<button onclick="openInNewTab('https&#58;//library.threefold.me/info/threefold#/tokens/threefold__threefold_connect')">
+<button onclick="openInNewTab('https&#58;//manual.grid.tf/getstarted/TF_Connect/TF_Connect.html')">
 
-[ThreeFold Connect](https://library.threefold.me/info/threefold#/tokens/threefold__threefold_connect)
+[ThreeFold Connect](https://manual.grid.tf/getstarted/TF_Connect/TF_Connect.html)
 <br>
 <p class="text-sm">TFT Wallet, 2FA, & More</p>
 
@@ -88,14 +78,6 @@ extra:
 
 #### Resources
 
-<button onclick="openInNewTab('https&#58;//library.threefold.me/info/threefold#/')">
-
-[Library](https://library.threefold.me/info/threefold#/)
-<br>
-<p class="text-sm">Explore the Documentation</p>
-
-</button>
-
 <button onclick="openInNewTab('https&#58;//manual.grid.tf')">
 
 [Manual](https://manual.grid.tf)
@@ -106,9 +88,19 @@ extra:
 
 <button onclick="openInNewTab('https&#58;//github.com/threefoldtech/')">
 
-[GitHub](https://github.com/threefoldtech/)
+[GitHub | TF Tech](https://github.com/threefoldtech/)
 <br>
-<p class="text-sm">Code & Documentation</p>
+<p class="text-sm">Code Library & Documentation</p>
+
+</button>
+
+<button onclick="openInNewTab('https&#58;//github.com/threefoldtech/')">
+
+[GitHub | TF Foundation](https://github.com/threefoldfoundation/)
+<br>
+<p class="text-sm">Websites & Manuals</p>
+
+</button>
 
 |||
 

content/home/index.md

@@ -20,9 +20,9 @@ extra:
 
 <br/>
 
-## A Co-Owned Global Sovereign **Internet**
+## Decentralized. Autonomous.<br>Internet Infrastructure.
 
-ThreeFold is **a peer-to-peer open-source Internet platform that connects users directly with local Internet capacity** (storage, compute, and network) provided by farmers. A decentralized sovereign alternative to today's centralized Internet model.
+ThreeFold is a globally-distributed grid of storage, compute, and network capacity, acting as “no middleman” Internet resources between independent capacity providers and users.
 
 <br>
 <br>
@@ -202,7 +202,7 @@ By connecting hardware at your home or office – or anywhere you'd like – you
 
 <button>[Buy a 3Node](http://marketplace.3node.global/)</button>
 <button>[Build a 3Node](https://manual.grid.tf/farmers/3node_building/3node_building.html)</button>
-<button>[Learn](https://manual.grid.tf/farmers/farmers.html)</button>
+<button>[Learn](https://manual.grid.tf/intro/grid3_howitworks.html)</button>
 <button>[Farmers Chat](https://t.me/threefoldfarmers)</button>
 
 {% end %}

content/tft/index.md

@@ -9,7 +9,14 @@ insert_anchor_links: "left"
 
 {% row(style="center mtop narrow") %}
 
-![](tft_header1.png#medium)
+## TFT **Powers** the Decentralized Internet
+
+Join the Internet revolution with the ThreeFold Token (TFT), an innovative utility token used to build, store and exchange on the ThreeFold Grid. Through many of its unique properties, TFT opens a whole new world of possibilities that was previously unimaginable with centralized infrastructures.
+
+<br>
+
+<button>[Learn About TFT](https://manual.grid.tf/threefold_token/threefold_token.html)</button>
+<button>[Get TFT](https://manual.grid.tf/threefold_token/buy_sell_tft/buy_sell_tft.html)</button>
 
 {% end %}
 
@@ -51,7 +58,16 @@ With a limited supply of 4 billion TFT and a burning mechanism, the token is bac
 ### **Secured by Cryptography**
 TFT transactions and smart contracts on the ThreeFold Grid are secured by advanced cryptography.
 
-|||
+<br>
+<br>
+
+![Image](tft_table.png#mx-auto)
+
+
+{% end %}
+
+
+<!-- section 4 (THE CURRENCY) -->
 
 
 ### **Ultra-Scalable**
@@ -60,8 +76,7 @@ ThreeFold is made to handle thousands of transactions and smart contracts per se
 |||
 
 
-### **Energy-efficient**
+<button>[Learn About TFT](https://manual.grid.tf/threefold_token/threefold_token.html)</button>
-ThreeFold’s innovative infrastructure is incredibly sustainable, ensuring the tokens sustainability and longevity.
 
 {% end %}
 

content/tftfaq/q3/index.md

@@ -11,8 +11,6 @@ The most used platforms are:
 
 1. [Pancake Swap](https://library.threefold.me/info/threefold#/tokens/threefold__tft_binance_defi) to exchange any Binance Smart Chain token to TFT.
 
-2. [Liquid Exchange](https://library.threefold.me/info/threefold#/tokens/threefold__tft_liquid) and [Liquid Quick Exchange](https://library.threefold.me/info/threefold#/tokens/threefold__tft_liquid_quick_exchange) support bank deposits, visa credit cards and most used cryptocurrencies.
+3. [Stellar DEX](https://manual.grid.tf/threefold_token/buy_sell_tft/tft_lobstr/tft_lobstr.html) to exchange XLM or other stellar based tokens to TFT (multiple wallets and DEX UI supported).
-
-3. [Stellar DEX](https://library.threefold.me/info/threefold#/tokens/threefold__tft_stellar_dex) to exchange XLM or other stellar based tokens to TFT (multiple wallets and DEX UI supported).
 
 Learn more about the other buying options [here](https://library.threefold.me/info/threefold#/tokens/threefold__how_to_buy)

templates/shortcodes/tft_links.html

@@ -6,7 +6,7 @@
         <img class="py-2 mr-2 my-2 px-5 border-2 border-black" src="{{link}}" alt="gettft">
     </a>
     <a class="center"
-    href="https://library.threefold.me/info/threefold#/tokens/threefold__tft_stellar_dex"
+    href="https://manual.grid.tf/threefold_token/buy_sell_tft/tft_lobstr/tft_lobstr.html"
     target="_blank">
     {% set link = page.permalink ~ "stellar_logo.png"%}
     <img class="py-2 mr-2 my-2 px-5 border-2 border-black" src="{{link}}" alt="stellar">