Skip to content

[DOCS] More fixes for asciidoctor migration#12434

Merged
dedemorton merged 3 commits intoelastic:masterfrom
dedemorton:dita_migration_round_2
Jun 25, 2019
Merged

[DOCS] More fixes for asciidoctor migration#12434
dedemorton merged 3 commits intoelastic:masterfrom
dedemorton:dita_migration_round_2

Conversation

@dedemorton
Copy link
Copy Markdown
Contributor

@dedemorton dedemorton commented Jun 5, 2019

Fixes asciidoc coding issues that break the asciidoctor build.

Remaining to do:

  • Make sure asciidoc builds continue to work (will be tested by CI on this PR)
  • Compare asciidoc build output to asciidoctor build output to see what's different and make changes, as required. removed because this testing needs to happen after all the changes are merged and backported.

@dedemorton dedemorton added docs in progress Pull request is currently in progress. review needs_backport PR is waiting to be backported to other branches. labels Jun 5, 2019
@dedemorton dedemorton requested a review from nik9000 June 5, 2019 01:43
@dedemorton dedemorton requested a review from a team as a code owner June 5, 2019 01:43
Copy link
Copy Markdown
Member

@nik9000 nik9000 left a comment

Choose a reason for hiding this comment

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

The asciidoc changes make sense to me!

@dedemorton dedemorton removed the in progress Pull request is currently in progress. label Jun 5, 2019
@dedemorton
Copy link
Copy Markdown
Contributor Author

I think this is ready to merge. I don't think there is an easy way to test the asciidoctor builds without backporting to all branches first, but I did compare the HTML before/after to make sure the output is correct in the asciidoc build.

Copy link
Copy Markdown
Member

@nik9000 nik9000 left a comment

Choose a reason for hiding this comment

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

LGTM

@dedemorton
Copy link
Copy Markdown
Contributor Author

jenkins test this again please

@dedemorton dedemorton force-pushed the dita_migration_round_2 branch from 52828bd to 4a4a8f2 Compare June 7, 2019 00:24
@dedemorton dedemorton requested review from a team as code owners June 10, 2019 22:31
@dedemorton dedemorton force-pushed the dita_migration_round_2 branch from afd35ab to 5d6562a Compare June 11, 2019 14:01
@dedemorton dedemorton force-pushed the dita_migration_round_2 branch from 5d6562a to 054b799 Compare June 25, 2019 01:07
@dedemorton dedemorton merged commit d44d967 into elastic:master Jun 25, 2019
@dedemorton dedemorton deleted the dita_migration_round_2 branch June 25, 2019 17:39
DStape pushed a commit to DStape/beats that referenced this pull request Aug 20, 2019
* [DOCS] More fixes for asciidoctor migration

* Simplify logic for adding delimiter blocks

* Rebase and run make update
dedemorton added a commit to dedemorton/beats that referenced this pull request Aug 31, 2019
* [DOCS] More fixes for asciidoctor migration

* Simplify logic for adding delimiter blocks

* Rebase and run make update
dedemorton added a commit that referenced this pull request Sep 4, 2019
* Asciidoctor migration (#12006)

* Change tagging to work with asciidoctor

* Fix formatting issues

* Changes from review

* [DOCS] More fixes for asciidoctor migration (#12434)

* [DOCS] More fixes for asciidoctor migration

* Simplify logic for adding delimiter blocks

* Rebase and run make update

* Revert incorrect fix

* Update script to fix broken list format

* Fix script to pass autopep8 test
dedemorton added a commit to dedemorton/beats that referenced this pull request Sep 5, 2019
* Asciidoctor migration (elastic#12006)

* Change tagging to work with asciidoctor

* Fix formatting issues

* Changes from review

* [DOCS] More fixes for asciidoctor migration (elastic#12434)

* [DOCS] More fixes for asciidoctor migration

* Simplify logic for adding delimiter blocks

* Rebase and run make update

* Revert incorrect fix

* Update script to fix broken list format

* Fix script to pass autopep8 test
dedemorton added a commit that referenced this pull request Sep 5, 2019
* [7.1][DOCS] Backport: Fix asciidoctor build (#13460)

* Asciidoctor migration (#12006)

* Change tagging to work with asciidoctor

* Fix formatting issues

* Changes from review

* [DOCS] More fixes for asciidoctor migration (#12434)

* [DOCS] More fixes for asciidoctor migration

* Simplify logic for adding delimiter blocks

* Rebase and run make update

* Revert incorrect fix

* Update script to fix broken list format

* Fix script to pass autopep8 test

* Run make update

* Fix code formatting

* Remove attributes not used in this branch

* Remove unwanted section added during backport

* Revert to 6.8 version of journalbeat example
@dedemorton dedemorton removed the needs_backport PR is waiting to be backported to other branches. label Sep 11, 2019
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
* Asciidoctor migration (elastic#12006)

* Change tagging to work with asciidoctor

* Fix formatting issues

* Changes from review

* [DOCS] More fixes for asciidoctor migration (elastic#12434)

* [DOCS] More fixes for asciidoctor migration

* Simplify logic for adding delimiter blocks

* Rebase and run make update

* Revert incorrect fix

* Update script to fix broken list format

* Fix script to pass autopep8 test
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.

4 participants