development to main #47

Merged
mik-tf merged 47 commits from development into main 2024-05-03 12:30:46 +00:00
2 changed files with 8 additions and 8 deletions
Showing only changes of commit 2165ebdad8 - Show all commits

View File

@ -9,7 +9,7 @@ This manual is organized in two main sections:
The *ThreeFold Knowledge Base* section contains all information needed to understand how the whole ThreeFold ecosystem works.
The *ThreeFold Documentation* section contains all the practical information of the ThreeFold Grid, from general information covering the multi-functional [Dashboard](dashboard/dashboard.md), [TFT](threefold_token/threefold_token.md) and our community-based [FAQ](faq/faq.md), to specific tutorials for [developers](developers/developers.md), [farmers](farmers/farmers.md) and [system administrators](system_administrators/system_administrators.md).
The *ThreeFold Documentation* section contains all the practical information of the ThreeFold Grid, from general information covering the multi-functional [Dashboard](dashboard:dashboard.md), [TFT](threefold_token:threefold_token.md) and our community-based [FAQ](faq:faq.md), to specific tutorials for [developers](developers:developers.md), [farmers](farmers:farmers.md) and [system administrators](system_administrators:system_administrators.md).
> Explore the TFGrid status page for live updates on Threefold services!
>

View File

@ -2,13 +2,13 @@
The section contains information about the ThreeFold ecosystem, its technology and its history.
For practical information for farmers, developers and system administrators, refer to the [ThreeFold Documentation](./documentation.md).
For practical information for farmers, developers and system administrators, refer to the [ThreeFold Documentation](documentation.md).
<h2>Table of Contents</h2>
- [About](./about/about.md)
- [Technology](./technology/technology_toc.md)
- [Farming](./farming/farming_toc.md)
- [Cloud](./cloud/cloud_toc.md)
- [Collaboration](./collaboration/collaboration_toc.md)
- [Legal](./legal/terms_conditions_all3.md)
- [About](about:about.md)
- [Technology](technology:technology_toc.md)
- [Farming](farming:farming_toc.md)
- [Cloud](cloud:cloud_toc.md)
- [Collaboration](collaboration:collaboration_toc.md)
- [Legal](legal:terms_conditions_all3.md)