Merge pull request #474 from half-yutou/main

modify some docs
This commit is contained in:
qiaofeng1227 2024-04-24 14:07:11 +08:00 committed by GitHub
commit 92af2a1768
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 8 deletions

View file

@ -18,7 +18,7 @@ This project use [Code of Conduct](https://code.fb.com/codeofconduct), you shoul
In the process of your participation, we hope that everyone has a good habit of abiding by the agreement, including:
- Create Issue based on template
- Select tags not create tags
- Select tags instead of creating tags
- Complete the smallest unit independent task at one time
- Meaningful remarks when commit your code, you should select from: docs, test, fix, install, misc and so on
- Although the project has automated tests, I still hope that you can test without problems before submitting
@ -30,10 +30,10 @@ Contributor only allow to fork [main branch](https://github.com/Websoft9/websoft
## Branch
This repository have these branchs:
This repository have these branches:
* **Contributor's branch**: Develpoer can fork main branch as their delelopment branch anytime
* **main branch**: The only branch that accepts PR from Contributors's branch
* **Contributor's branch**: Developer can fork main branch as their development branch anytime
* **main branch**: The only branch that accepts PR from Contributors' branch
* **production branch**: For version release and don't permit modify directly, only merge PR from **main branch**
Flow: Contributor's branch → main branch → production branch
@ -72,7 +72,7 @@ Websoft9 use below [Artifact](https://jfrog.com/devops-tools/article/what-is-a-s
### Tags
- Type tags: Bug, enhancement, Documetation
- Type tags: Bug, enhancement, Documentation
- Stages Tags: PRD, Dev, QA(include deployment), Documentation
### WorkFlow

View file

@ -7,7 +7,7 @@
[Websoft9](https://github.com/Websoft9/websoft9) is web-based PaaS/Linux Panel for running 200+ hot [open source application](https://github.com/Websoft9/docker-library/tree/main/apps) on your own server.
Websoft9 help you running multiple applications in a single server, that means we believe Microservices on single machine is reasonable. On the contrary, it becomes more and more valuable as computing power increases
Websoft9 help you to run multiple applications in a single server, that means we believe Microservices on single machine is reasonable. On the contrary, it becomes more and more valuable as computing power increases
Although the Cloud Native emphasizes high availability and clustering, but most of the time, applications do not need to implement complex clusters or K8S.
@ -15,7 +15,7 @@ Websoft9's [architecture](https://github.com/Websoft9/websoft9/blob/main/docs/ar
## Demos
You can see the sceenshoots below:
You can see the screenshots below:
| ![image](https://github.com/Websoft9/websoft9/assets/16741975/8321780c-4824-4e40-997d-676a31534063) | ![image](https://github.com/Websoft9/websoft9/assets/16741975/e842575b-60bc-4b0d-a57b-28c26b16196a) | ![image](https://github.com/Websoft9/websoft9/assets/16741975/c598412a-9529-4286-ba03-6234d6da99b9) |
| --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- |
@ -79,4 +79,4 @@ Follow the [contributing guidelines](CONTRIBUTING.md) if you want to propose a c
# License
Websoft9 is licensed under the [LGPL-3.0](/License.md), and additional Terms: It is not allowed to publish free or paid image based on this repository in any Cloud platform's Marketplace without authorization
Websoft9 is licensed under the [LGPL-3.0](/LICENSE.md), and additional Terms: It is not allowed to publish free or paid image based on this repository in any Cloud platform's Marketplace without authorization