Skip to content

Update README.md #4175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wu-sheng merged 7 commits into from
Jan 5, 2020
Merged

Update README.md #4175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
933ebd2
update doc version
rainbend Jan 5, 2020
0cb6451
ref 6.x branch
rainbend Jan 5, 2020
bb6ec6f
ref 6.x branch
rainbend Jan 5, 2020
fb0cda2
update doc/README.md
rainbend Jan 5, 2020
b7d4052
Merge branch 'master' into batch/doc
rainbend Jan 5, 2020
083e57f
remove 5.x ...
rainbend Jan 5, 2020
d311dfc
Merge remote-tracking branch 'origin/batch/doc' into batch/doc
rainbend Jan 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ including


# Document
- [6.x Documents](docs/README.md).
- [7.x Documents](docs/README.md).
Comment thread
rainbend marked this conversation as resolved.
- [6.x Documents](https://github.com/apache/skywalking/blob/6.x/docs/README.md).



# Downloads
Expand Down
13 changes: 1 addition & 12 deletions docs/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Welcome
**Here are SkyWalking 6 official documents. You're welcome to join us.**
**Here are SkyWalking 7 official documents. You're welcome to join us.**

From here you can learn all about **SkyWalking**’s architecture, how to deploy and use SkyWalking, and develop based on SkyWalking contributions guidelines.

Expand Down Expand Up @@ -91,14 +91,3 @@ If you are already familiar with SkyWalking, you could use this catalog to find
* [FAQs](en/FAQ/README.md). A manifest of already known setup problems, secondary developments experiments. When you are facing a problem, check here first.


___
### Users from 5.x

SkyWalking 5.x is still supported by the community. For the users planning to upgrade from 5.x to 6.x, you should know some definitions of concepts changed.

The most important two changed concepts are:

1. Application (in 5.x) is changed to **Service** (in 6.x), also Application Instance is changed to **Service Instance**.
2. Service (in 5.x) is changed to **Endpoint** (in 6.x).