This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 3fe3a11547 fix some typos (#9292)
3fe3a11547 is described below
commit 3fe3a11547d1d084ec8a87989f01cdee02ec776e
Author: cui fliter <[email protected]>
AuthorDate: Thu Jun 30 23:30:08 2022 +0800
fix some typos (#9292)
Signed-off-by: cui fliter <[email protected]>
---
docs/en/FAQ/install_agent_on_websphere.md | 2 +-
docs/en/changes/changes-8.6.0.md | 2 +-
docs/en/setup/backend/on-demand-pod-log.md | 2 +-
.../java/org/apache/skywalking/oap/server/core/query/input/Entity.java | 2 +-
test/e2e-v2/cases/storage/tidb/tidbconfig/tidb.toml | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/docs/en/FAQ/install_agent_on_websphere.md
b/docs/en/FAQ/install_agent_on_websphere.md
index daddc750a1..cc7831248b 100644
--- a/docs/en/FAQ/install_agent_on_websphere.md
+++ b/docs/en/FAQ/install_agent_on_websphere.md
@@ -22,7 +22,7 @@ at
org.apache.skywalking.apm.dependencies.net.bytebuddy.matcher.ElementMatcher$J
...
```
-The exception occured because access grant was required in WebSphere.
+The exception occurred because access grant was required in WebSphere.
Simply follow these steps:
1. Set the agent's owner to the owner of WebSphere.
diff --git a/docs/en/changes/changes-8.6.0.md b/docs/en/changes/changes-8.6.0.md
index f3b9ecf0ce..eb6f75818c 100644
--- a/docs/en/changes/changes-8.6.0.md
+++ b/docs/en/changes/changes-8.6.0.md
@@ -73,7 +73,7 @@
* remove the no use maxItemNum for labeled-value metric, etc.
* Add Azure Functions logo.
* Support search Endpoint use keyword params in trace view.
-* Add a function which show the statistics infomation during the trace query.
+* Add a function which show the statistics information during the trace query.
* Remove the sort button at the column of Type in the trace statistics page.
* Optimize the APISIX icon in the topology.
* Implement metrics templates in the topology.
diff --git a/docs/en/setup/backend/on-demand-pod-log.md
b/docs/en/setup/backend/on-demand-pod-log.md
index c8c32ff9f6..0b6b745ec8 100644
--- a/docs/en/setup/backend/on-demand-pod-log.md
+++ b/docs/en/setup/backend/on-demand-pod-log.md
@@ -11,7 +11,7 @@ feature is disabled by default, please read the configuration
documentation to e
As the name indicates, this feature only works for Kubernetes Pods.
-SkyWalking OAP collects and saves the service instance's namespace and Pod
name in ther serivce instance's
+SkyWalking OAP collects and saves the service instance's namespace and Pod
name in the service instance's
properties, named `namespace` and `pod`, users can select the same and UI
should fetch the logs by service
instance in a given interval and display the logs in UI, OAP receives the
query and checks the instance's
properties and use the `namespace` and `pod` to locate the Pod and query the
logs.
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/Entity.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/Entity.java
index b8fb5d518f..9ec2aa7c1b 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/Entity.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/Entity.java
@@ -36,7 +36,7 @@ public class Entity {
/**
* <pre>
* 1. scope=All, no name is required.
- * 2. scope=Service, ServiceInstance and Endpoint, set neccessary
serviceName/serviceInstanceName/endpointName
+ * 2. scope=Service, ServiceInstance and Endpoint, set necessary
serviceName/serviceInstanceName/endpointName
* 3. Scope=ServiceRelation, ServiceInstanceRelation and EndpointRelation
* serviceName/serviceInstanceName/endpointName is/are the source(s)
* estServiceName/destServiceInstanceName/destEndpointName is/are
destination(s)
diff --git a/test/e2e-v2/cases/storage/tidb/tidbconfig/tidb.toml
b/test/e2e-v2/cases/storage/tidb/tidbconfig/tidb.toml
index 693ba1f91a..acfadaef34 100644
--- a/test/e2e-v2/cases/storage/tidb/tidbconfig/tidb.toml
+++ b/test/e2e-v2/cases/storage/tidb/tidbconfig/tidb.toml
@@ -249,6 +249,6 @@ binlog-socket = ""
# WriteTimeout specifies how long it will wait for writing binlog to pump.
write-timeout = "15s"
-# If IgnoreError is true, when writting binlog meets error, TiDB would stop
writting binlog,
+# If IgnoreError is true, when writing binlog meets error, TiDB would stop
writing binlog,
# but still provide service.
ignore-error = false
