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.

Sign up for GitHub

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

Jump to bottom

Backport #334 to 1.0: Phase 2 in conversion to asciidoc (#334) #371

Merged
merged 1 commit into from
Mar 5, 2019
Merged

Backport #334 to 1.0: Phase 2 in conversion to asciidoc (#334) #371

merged 1 commit into from
Mar 5, 2019
+253 −77

Conversation

webmat
Copy link
Contributor

@webmat webmat commented Mar 5, 2019

Backport of PR #334 to 1.0 branch. Original message:

More work toward the move to asciidoc:

  • Added new files and content.
  • Played with the content of Base Fields to demonstrate a three-column format.
  • Watch for possible terminology change from "core and extended" to "core and custom" for fields.

Want to see this rendered? https://ecs-docs.firebaseapp.com/ecs2/

@webmat webmat self-assigned this Mar 5, 2019
@webmat
Copy link
Contributor Author

webmat commented Mar 5, 2019

@ruflin This backport is currently built on top of backport #370, since it contains only changes to files that were added in #370.

@webmat webmat mentioned this pull request Mar 5, 2019
Merged
@karenzone
Phase 2 in conversion to asciidoc (elastic#334)
15c0c84 
* Phase 2 in conversion to asciidoc

* Update docs/convert.asciidoc

Trying the new suggest feature for changing v7.1 to v7.0.

Co-Authored-By: karenzone <[email protected]>

* Start incorporating review comments

* Update faq.asciidoc

Fix typo in anchor
@webmat webmat force-pushed the backport_334_1.0 branch from 1fbb02d to 15c0c84 Compare March 5, 2019 19:39
ruflin
ruflin approved these changes Mar 5, 2019
View reviewed changes
Copy link
Contributor

@ruflin ruflin left a comment

Choose a reason for hiding this comment

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

LGTM. On this one I would wait for it to go green TBH.

@webmat
Copy link
Contributor Author

webmat commented Mar 5, 2019

Well that's why I initially built it on top of the other PR: so we would see it go green with everything in it.

This is only changes to the asciidoc, so I'm not sure what could cause it to break, actually

@webmat webmat merged commit 3f21273 into elastic:1.0 Mar 5, 2019
@webmat webmat deleted the backport_334_1.0 branch March 7, 2019 12:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ruflin ruflin ruflin approved these changes

Assignees

@webmat webmat

Labels
1.0.0-ga backport
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@webmat @ruflin @karenzone