...

collections/def/3node.md

@@ -1,5 +0,0 @@
-# 3Node
-
-!!wiki.def alias:'3_node'
-
-

collections/def/csp.md

@@ -0,0 +1,7 @@
+# Cloud Service Provider
+
+A CSP (**Cloud Service Provider**) is a person or a company that provides scalable computing resources that developers can access on demand over a network, including cloud-based compute, storage, platform, and application services.
+
+!!wiki.todo assign:despiegk title:'content for ${dockey}'
+
+!!wiki.def alias:'tf-provider,cloud-provider,csp' 

collections/def/inca_host.md

@@ -1,7 +0,0 @@
-# INCA Host
-
-This might also be named as Cloud Service Provider. A CSP (**Cloud Service Provider**) is a person or a company that provides scalable computing resources that developers can access on demand over a network, including cloud-based compute, storage, platform, and application services.
-
-!!wiki.todo assign:despiegk title:'content for ${dockey}'
-
-!!wiki.def alias:'tf-provider,cloud-provider,csp,inca_hoster,inca_host' 

collections/def/tf_node.md

@@ -1,7 +0,0 @@
-# TFNode
-
-A ThreeFold Node (was originally called 3Node).
-
-> TODO:
-
-!!wiki.def alias:'3_node,tf_node'

collections/def/tfgrid.md

@@ -1,6 +1,6 @@
 # TFGrid
 
-Our ThreeFold grid which is the interconnected network of all Zero-OS powered 3Nodes which deliver compute, storage, network, gpu, loadbalancing, dns, ... services.
+Our ThreeFold grid which is the interconnected network of all Zero-OS powered TFNodes which deliver compute, storage, network, gpu, loadbalancing, dns, ... services.
 
 !!wiki.include doc:'tech/tfgrid_architecture'
 

collections/def/tfnode.md

@@ -0,0 +1,7 @@
+# TF Node (TFNode)
+
+!!wiki.include page:'farming:tf_nodes'
+
+!!wiki.def alias:'3_node,tf_node'
+
+

collections/def/tfrouter.md

@@ -2,3 +2,7 @@
 
 A new capability is being introduced called the TF Router, which is a 5G, Meshed Wireless and Satellite Router which allows everyone to become a Network Service Provider. The TF Router will always look for the shortest path between all our participants and has the capability to use any of the physical internet connections to provide best performance and uptime. The INCA Routers can even build a meshed wireless network which means we can bring the internet to the most remote areas in the world.
 
+
+!!wiki.include page:'farming:tf_routers'
+
+!!wiki.def alias:'tf_router'

collections/def/znet.md

@@ -0,0 +1,7 @@
+# ZeroNet
+
+Is network version of our Zero-OS based on OpenWRT, Myceliym and some Zero-OS components.
+
+This operating system allows to create distributed networking on a planetary scale and allows our farmers to provide network capacity to the TF Grid Ecosystem.
+
+!!wiki.def alias:'znet,zeronet'

collections/def/zos.md

@@ -1,3 +1,5 @@
-# 3Node
+# Zero-OS
+
+
 
 !!wiki.def alias:'zos,zero-os,z-os'