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

docs: updated Stream Proxy doc #9367

Merged
merged 7 commits into from
May 6, 2023
Merged

docs: updated Stream Proxy doc #9367

merged 7 commits into from
May 6, 2023

Conversation

kayx23
Copy link
Member

@kayx23 kayx23 commented Apr 25, 2023

Description

Improved the part of doc before the MySQL example in Stream Proxy doc

Checklist

  • I have explained the need for this PR and the problem it solves
  • I have explained the changes or the new features added to this PR
  • I have added tests corresponding to this change
  • I have updated the documentation to reflect this change
  • I have verified that this change is backward compatible (If not, please discuss on the APISIX mailing list first)

@kayx23
Copy link
Member Author

kayx23 commented Apr 25, 2023

@navendu-pottekkat @Neilblaze @moonming can any mod help with approval? Small change. Easy to review. Thanks!

pottekkat
pottekkat previously approved these changes Apr 25, 2023
@pottekkat
Copy link
Member

@kayx23 Could you check the failing lint check? Ready to merge after that.

@kayx23
Copy link
Member Author

kayx23 commented Apr 25, 2023

@navendu-pottekkat sigh, my favourite thing to do, adding trailing spaces and failing CI checks! Should be good now.

btw, I've noticed quite a few times that people are merging doc improvements PR into version specific branches which aren't carried over to the main branch. This was resulted from directly using the "edit this page" button on the front end which automatically propose PR changes into a specific version (though you can select which branch to merge into but people dont usually notice).

For my first doc PR I had to open a new PR to merge into the master branch. I subsequently discovered if you JUST merge the doc change into the master branch, the change isn't reflected in the most current version of doc (say 3.2). This might result in people thinking the latest doc is still outdated and waste time fixing docs that are already fixed?

Had a quick discussion w @Neilblaze not long while ago.

Wonder what the suggested practice/workflow is here?

@pottekkat
Copy link
Member

@kayx23 I guess it could be the delay between running updates to the apisix-website repo and updating this repo. Changes made here are only updated on the site when the apisix-website repo is built and published. The most recent changes are shown in the "next" version and not on the latest available version. When a new version of APISIX is released, the docs for it are also updated.

Does merging to version specific branches update the doc for that specific version? If yes, that might be the desired way it should work.

@kayx23
Copy link
Member Author

kayx23 commented Apr 25, 2023

Does merging to version specific branches update the doc for that specific version? If yes, that might be the desired way it should work.

It does, but some of these changes are meant to be effective for subsequent releases and therefore, better be in master branch. I have left comments under all doc PRs merged into release 3.2 last time I noticed that look like they should be in master branch. Nobody seems to reply so far.

next

ok understood

@kayx23
Copy link
Member Author

kayx23 commented Apr 26, 2023

work in progress

@kayx23 kayx23 marked this pull request as draft April 26, 2023 06:48
@kayx23 kayx23 changed the title docs: updated description for Stream Proxy docs: updated Stream Proxy doc Apr 26, 2023
@kayx23 kayx23 marked this pull request as ready for review April 27, 2023 21:22
@kayx23
Copy link
Member Author

kayx23 commented Apr 27, 2023

changing this much for now. ready for review

Copy link
Contributor

@Neilblaze Neilblaze left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! 😃

Copy link
Member

@juzhiyuan juzhiyuan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@juzhiyuan juzhiyuan merged commit fd24f3c into apache:master May 6, 2023
@kayx23 kayx23 deleted the patch-3 branch May 6, 2023 08:27
hongbinhsu added a commit to fitphp/apix that referenced this pull request May 13, 2023
* upstream/master: (42 commits)
  fix: add `rust-check` target to the makefile for deps pre-checking (apache#9453)
  test: remove duplicate `proto` unit test file and tweak test case title (apache#9445)
  feat: proxy-mirror add grpc and grpcs support (apache#9388)
  test: replace all httpbin upstream (apache#9452)
  fix: 404 error in ci test (apache#9447)
  fix: body-transformer plugin return raw body anytime (apache#9446)
  fix(ci): fips: ensure apisix compiles with openssl3 (apache#9427)
  chore(deps): bump actions/stale from 7 to 8 (apache#9159)
  chore(deps): bump actions/setup-node from 3.5.1 to 3.6.0 (apache#8625)
  chore(test): split the access log of apisix and test server (apache#8819)
  docs: fix grammar (apache#9395)
  fix(wolf-rbac): other plugin in consumer not effective when consumer used wolf-rbac plugin (apache#9287) (apache#9298)
  docs: use shell instead of Python to configure protos resources (apache#9414)
  docs: add guide to authenticate websocket connections (apache#9369)
  docs: updated Stream Proxy doc (apache#9367)
  feat: proxy_rewrite support miltiple regex pattern matching (apache#9194)
  feat: route-level MTLS (apache#9322)
  ci: tcp logger with real logger server (apache#9392)
  fix: always parse domain when host is domain name (apache#9332)
  docs: CHANGELOG.md Chinese docs lint (apache#9411)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants