Skip to content
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.

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

doc: Fixed some typoes. #972

Merged
merged 2 commits into from
Dec 13, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion doc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Reference Documentation
* [radixtree](router-radixtree.md)
* [Stand Alone Model](stand-alone.md): Supports to load route rules from local yaml file, it is more friendly such as under the kubernetes(k8s).
* [Stream Proxy](stream-proxy.md)
* [Admin API](admin-api-cn.md)
* [Admin API](admin-api.md)
* [Changelog](../CHANGELOG.md)
* [Code Style](../CODE_STYLE.md)
* [FAQ](../FAQ.md)
Expand Down
8 changes: 5 additions & 3 deletions doc/architecture-design.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
#
-->

[Chinese](architecture-design-cn.md)

## Table of Contents
- [**APISIX**](#apisix)
- [**APISIX Config**](#apisix-config)
Expand Down Expand Up @@ -187,7 +189,7 @@ The configuration of the plugin can be directly bound to the specified Route, or

A plugin will only be executed once in a single request, even if it is bound to multiple different objects (such as Route or Service).

The order in which plugins are run is determined by the priority of the plugin itself, for example: [example-plugin](../doc/plugins/example-plugin.lua#L16)。
The order in which plugins are run is determined by the priority of the plugin itself, for example: [example-plugin](../lua/apisix/plugins/example-plugin.lua#L37).

The plugin configuration is submitted as part of Route or Service and placed under `plugins`. It internally uses the plugin name as the hash's key to hold configuration items for different plugins.

Expand All @@ -208,7 +210,7 @@ The plugin configuration is submitted as part of Route or Service and placed und

Not all plugins have specific configuration items. For example, there is no specific configuration item under `prometheus`. In this case, an empty object identifier can be used.

[APISIX supported plugin list](plugins-cn.md)
[APISIX supported plugin list](README.md#plugins)

[Back to top](#Table-of-contents)

Expand Down Expand Up @@ -370,7 +372,7 @@ In APISIX, the process of identifying a Consumer is as follows:

<img src="./images/consumer-internal.png" width="50%" height="50%">

1. Authorization certification: e.g [key-auth](./plugins/key-auth.md), [JWT](./plugins/jwt-auth-cn.md), etc.
1. Authorization certification: e.g [key-auth](./plugins/key-auth.md), [JWT](./plugins/jwt-auth.md), etc.
2. Get consumer_id: By authorization, you can naturally get the corresponding Consumer `id`, which is the unique identifier of the Consumer object.
3. Get the Plugin or Upstream information bound to the Consumer: Complete the different configurations for different Consumers.

Expand Down
2 changes: 1 addition & 1 deletion lua/apisix/plugin.lua
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ local function load()
local_conf = core.config.local_conf(true)
local plugin_names = local_conf.plugins
if not plugin_names then
return nil, "failed to read plugin list form local file"
return nil, "failed to read plugin list from local file"
end

if local_conf.apisix and local_conf.apisix.enable_heartbeat then
Expand Down