diff --git a/README.md b/README.md index 7841ff3..49def3b 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,31 @@ Last Updated: March 2023 - For any suggestions or improvement ideas please Create an issue on: https://github.com/threefoldfoundation/www_ourworld_tf/issues +## Administrators +[ThreeFold's Web Admins](https://github.com/orgs/threefoldfoundation/teams/team_web_admin) + +## Contribution Procedure + +![readme](https://user-images.githubusercontent.com/43240801/236867088-56c95abd-510c-4202-b0c5-317cdfb75cb3.png) + +It is highly important to follow this procedure to contribute to the website content.
+__WARNING__: DO NOT commit straight into __master__ / __development__ branch. + +1. Create an Issue +Feel free to [create a new issue](https://github.com/threefoldfoundation/www_threefold_io/issues/new) to report an error on the website, or if you have any suggestions on website improvements. + +2. Make your own branch from __'development'__ branch. +by creating a new branch from 'Master' you will be provided with the latest copy of the live website content. + +3. Add your edits into your own branch via code editor locally, and push your local changes online. WARNING: DO NOT add your edits straight into __master__ / __development__ branch. + +5. Create a PR to merge your own branch into '**development**', and assign one of [ThreeFold's Web Admins](https://github.com/orgs/threefoldfoundation/teams/team_web_admin) on your PR as reviewer, or assign @sasha-astiadi as reviewer. + +7. When PR is approved, you can see your changes on staging env on www2.threefold.io (development branch) + +8. Admin will then create a PR to merge 'development' into into '**maste**r' (production branch) + +10. When PR is approved, you can see your changes live on production (master branch). diff --git a/content/creator-zones/index.md b/content/creator-zones/index.md index bb83c95..b74c66d 100644 --- a/content/creator-zones/index.md +++ b/content/creator-zones/index.md @@ -27,7 +27,7 @@ extra: Creator Zones are set up to allow aspiring entrepreneurs, business people and digital nomads to work together on projects and experiences that bring a positive impact to the society. - + ||| @@ -111,7 +111,7 @@ We work with the local population to allow them to help and earn from the Creato All Creator Zone experiences and technologies are built on top of the world’s largest decentralized and peer-to-peer network, the ThreeFold Grid. This allows endless security and scalability for all projects whilst offering limitless opportunities. - + ||| diff --git a/content/platform/index.md b/content/platform/index.md index ee28298..0bd8e37 100644 --- a/content/platform/index.md +++ b/content/platform/index.md @@ -28,7 +28,7 @@ extra: Explore the four layers of a decentalized and peer-to-peer future where no one is left behind. - + {% end %} @@ -40,9 +40,9 @@ Explore the four layers of a decentalized and peer-to-peer future where no one i
-Creator Zones are dedicated to building super-sustainable coworking and co-living communities where entrepreneurs, digital nomads and residents collaborate to build beautiful experiences that positively impact the lives of millions. +OurWorld is backed by the world's biggest decentralized internet network called The Threefold Grid. It is an open-source Internet infrastructure that leverages autonomous cloud and high-performance, permissionless blockchain technology. Learn about the grid and what makes it revolutionary. - + ||| @@ -82,7 +82,7 @@ Creator Zones are dedicated to building super-sustainable coworking and co-livin OurWorld consists of a decentralized internet network as the foundation. This base enables life-changing experiences and capabilties to be openly and freely available to everyone. - + |||