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

[7.9] Clean up the developer guide (#71631) #76983

Merged
merged 2 commits into from
Sep 9, 2020

Conversation

jportner
Copy link
Contributor

@jportner jportner commented Sep 8, 2020

Backports the following commits to 7.9:

Note: ran into a couple of conflicts, incorporated some changes from #75814 which was merged more recently than the backport target (development-security-rbac redirect)

Docs preview: https://kibana_76983.docs-preview.app.elstc.co/diff

* rename float to discrete

* use same section title level on all source files

* Elasticsearch => {es}

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
# Conflicts:
#	docs/developer/architecture/index.asciidoc
#	docs/developer/architecture/security/index.asciidoc
#	docs/developer/architecture/security/rbac.asciidoc
Comment on lines -12 to +14
include::rbac.asciidoc[]
include::rbac.asciidoc[leveloffset=+1]

include::feature-registration.asciidoc[leveloffset=+1]
Copy link
Contributor Author

@jportner jportner Sep 8, 2020

Choose a reason for hiding this comment

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

feature-registration.asciidoc was unintentionally removed in #67764 (backported to 7.9) and re-added in #71631 (backported to 7.10). That's the primary reason I decided to backport this PR to 7.9 as well.

This was a conflict with the backport that I think I resolved incorrectly
Copy link
Contributor

@stacey-gammon stacey-gammon left a comment

Choose a reason for hiding this comment

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

Thanks for cleaning this up!

@jportner jportner merged commit abacbcd into elastic:7.9 Sep 9, 2020
@jportner jportner deleted the backport/7.9/pr-71631 branch September 9, 2020 19:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants