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

Update Docker docs for v6 #8587

Merged
2 commits merged into from Nov 8, 2017
Merged

Update Docker docs for v6 #8587

2 commits merged into from Nov 8, 2017

Conversation

ghost
Copy link

@ghost ghost commented Nov 6, 2017

  • Document Docker image "flavours"
  • Fix up section hierarchy
  • Capture Docker config default
  • Warn about default "masking" when replacing logstash.yml

@ghost ghost requested a review from dliappis November 6, 2017 02:21
Copy link
Contributor

@dliappis dliappis left a comment

Choose a reason for hiding this comment

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

LGTM!

The images are available in two different configurations or "flavors". The
`x-pack` flavor, which is the default, ships with X-Pack features
pre-installed. The `oss` flavor does not include X-Pack, and contains only
open-source Logstash.

Choose a reason for hiding this comment

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

Super nitpicky, but the internal style guide says not to hyphenate "open source."

Copy link
Author

Choose a reason for hiding this comment

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

Thanks. Super nitpicky is what we do!

@ghost ghost merged commit 2a9e11a into elastic:master Nov 8, 2017
@ghost
Copy link
Author

ghost commented Nov 8, 2017

What is the correct way to get this docs patch into 6.x/6.0?

git cherry-pick or something more sophisticated?

@lcawl
Copy link
Contributor

lcawl commented Nov 8, 2017

There was a broken link in this update, so I've put a fix in commit 9ef86d0

ghost pushed a commit that referenced this pull request Nov 8, 2017
* Update Docker docs for v6

* De-hyphenate "open source" in Docker docs
ghost pushed a commit that referenced this pull request Nov 8, 2017
* Update Docker docs for v6

* De-hyphenate "open source" in Docker docs
@ghost
Copy link
Author

ghost commented Nov 8, 2017

6.0 -> 712acbf
6.x -> a7bb930

@ghost ghost deleted the docker-docs-v6 branch November 8, 2017 03:09
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants