Merge branch 'main' of git.ourworld.tf:tfgrid/info_tfgrid

# Conflicts:
#	collections/def/3node.md

collections/cloudbox/cloudbox_concepts.md

@@ -0,0 +1,25 @@
+# CloudBox Concepts
+
+## CloudBox (CB)
+
+Is a unit of compute, fast storage and memory.
+There are unlimited different configurations of cloudboxes.
+
+A configuration of a machine defines the cloudboxes which can be made.
+
+Cloudboxes can be aggregated to make a bigger cloudbox.
+
+The default cloudbox has 4GB memory, 2 virtual cores of CPU and 100 GB of fast storage.
+
+
+## CloudHour (CH)
+
+Is like a kwatth unit for electricty, it represents a cloudbox being used for 1h and billed as such.
+
+INCA Hosts (our cloud providers) can price the CloudHour themselves in a chosen currency.s
+
+
+## CloudBox Option (CBO)
+
+Each cloudbox can be billed for storage and network utilization, which are billed as this capacity is being used.
+

collections/def/cloud_provider.md

@@ -1,7 +0,0 @@
-# Cloud 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_fuel.md

@@ -0,0 +1,12 @@
+# IncaFuel
+
+INCA Fuel is our peer2peer mutual credit currency which is the result of people buying/selling Services (cloud, internet bandwidth, energy, …) on the @TFGRID. 
+The only way INCA Fuel can be bought is through @INCA. 
+
+TF has partnered with Holochain to realize this capability. 
+
+INCA Fuel will make us unlimitedly scalable and will work even when connections to the main global Internet are not too slow or not available e.g. in a remote area.
+
+IncaFuel at start corresponds with the price of 1 INCA.
+
+!!wiki.def alias:'inca_fuel,i_fuel' 

collections/def/inca_generator.md

@@ -0,0 +1,5 @@
+## INCA Generator
+
+An INCA Generator provides Cloud, Internet and Electricity to the people around and is the combination of one or more TF Routers, TF Nodes, and optional solar electricity production. 
+
+An INCA Generator provides a passive income in INCA for the owner.

collections/def/inca_host.md

@@ -0,0 +1,7 @@
+# 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/inca_marketplace

@@ -0,0 +1,9 @@
+# INCA Marketplace
+
+> planned for TFGrid 4.0
+
+To INCA Marketplace allows people to buy our TF Grid products and services using credit cards, digital currencies, … 
+
+Underneath of course everything goes back to INCA as the reserve currency. 
+
+The INCA Marketplace will have a simplified API which allows our partners to buy and sell services more easily and of course in line with all required regulations.

collections/def/tf_node.md

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

collections/def/tfcoop.md

@@ -5,3 +5,5 @@
 
 
 !!wiki.todo title:'content for ${dockey}'
+
+!!wiki.def alias:'tf_grid'

collections/def/tfgrid.md

@@ -4,4 +4,4 @@ Our ThreeFold grid which is the interconnected network of all Zero-OS powered 3N
 
 !!wiki.include doc:'tech/tfgrid_architecture'
 
-!!wiki.def alias:'tf-grid'
+!!wiki.def alias:'tf_grid'

collections/def/tfrouter.md

@@ -0,0 +1,4 @@
+# TF Router
+
+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.
+

collections/tfgrid_org/positioning/project_messaging.md

@@ -1,7 +1,25 @@
 
 
-- its all THE project
-- we no-where boost about how far we got
+## principles
+
+- we don't sell anything, just show what you can do with it and where we are going
 - we are just clear about status
 - we are ofcourse clear about size & features
 
+
+## possible narative
+
+### Home
+
+> Decentralized Autonomous Cloud
+
+- Cloud means, any service 
+- Decentralized means, everyone is a participant. Everyone can deliver and/or use cloud services, everyone can use.
+- Autonomous means, cloud service providers don't need to be experts, the software is capable to run 100% autonomous.
+ 
+
+
+
+
+
+

collections/tfideas/validators.md

@@ -0,0 +1,13 @@
+# Validators
+
+Validators & staking are not dead in TFGrid 4.0, it will be as we have announced it.
+
+- 9 guardians are needed
+- they run a full TF Validator Stack (technically)
+- anyone can stake TFT on that stack
+
+reward
+
+- X percent of revenue over TFGrid in TFT (or whatever future currency)
+- a validator gets a monthly income to support his/her work as well in e.g. INCA or TFT
+