Skip to content

Asciidoctor support - #688

Merged
nik9000 merged 1 commit into
versioned_plugin_docsfrom
asciidoctorify2
Apr 30, 2019
Merged

Asciidoctor support#688
nik9000 merged 1 commit into
versioned_plugin_docsfrom
asciidoctorify2

Conversation

@nik9000

@nik9000 nik9000 commented Apr 17, 2019

Copy link
Copy Markdown
Member

This fixes a few Asciidoctor specific issues with the docs, specifically
removing an and from an ifeval which is not supported by AsciiDoc
and adding some substitutions that are not the default for Asciidoctor.

This fixes a few Asciidoctor specific issues with the docs, specifically
removing an `and` from an `ifeval` which is not supported by AsciiDoc
and adding some substitutions that are not the default for Asciidoctor.
@nik9000
nik9000 requested a review from karenzone April 17, 2019 20:48
@karenzone

karenzone commented Apr 18, 2019

Copy link
Copy Markdown
Contributor

@nik9000 I can get this to build successfully with both docker/asciidoc and docker/asciidoctor! Fantastic progress.

I noticed that with --asciidoctor, all of the versions of a single plugin appear on one page. Is that something we should address now or resolve in a later iteration?

@jsvd FYI
@dedemorton The code changes look straightforward, but I'd appreciate your taking a look since this magic of the VPR is your creation.

@nik9000

nik9000 commented Apr 19, 2019

Copy link
Copy Markdown
Member Author

I noticed that with --asciidoctor, all of the versions of a single plugin appear on one page. Is that something we should address now or resolve in a later iteration?

Hmmmm. I think we should grab it in a follow up change. This is progress and progress is good.

@karenzone karenzone left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I can get this to build successfully with both docker/asciidoc and docker/asciidoctor! I/we can further investigate the pagination issue (mentioned in earlier comments) as a separate PR.

Update: Pagination works as expected with: ./build_docs --doc ../logstash-docs/docs/versioned-plugins/index.asciidoc --asciidoctor --chunk 1 --open

@karenzone
karenzone requested a review from dedemorton April 25, 2019 21:21

@dedemorton dedemorton left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM. Just a couple of comment about updates required in logstash, too (which you're probably doing anyhow, but wanted to raise awareness).

I do not see the problem with the chunk level that Karen describes when --chunk 1 is specified.

[id="{type}-{plugin}-index"]

== Versioned {plugin} {type} plugin docs
[subs="attributes"]

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Same comment as before. This file also exists here: https://github.com/elastic/logstash/blob/master/docs/include/version-list-intro.asciidoc manually.

@@ -1,6 +1,7 @@
[id="{type}-{plugin}-index"]

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

ditto. this is copied from the logstash repo. Make sure you also apply the changes to the file in the logstash repo, too.

@@ -1,9 +1,11 @@
ifeval::["{versioned_docs}"!="true"]
[subs="attributes"]

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Note that this file is a manual copy of https://github.com/elastic/logstash/blob/master/docs/include/plugin_header.asciidoc. Make sure you also apply the changes to the file in the logstash repo. Someday the plugin script will copy the file automatically (gotta dream big), but for now, we have to keep the file in sync manually.

@nik9000

nik9000 commented Apr 30, 2019

Copy link
Copy Markdown
Member Author

Awesome! I'll merge this today and see about opening the changes to the logstash repo too!

@nik9000
nik9000 merged commit 3743373 into versioned_plugin_docs Apr 30, 2019
@nik9000
nik9000 deleted the asciidoctorify2 branch April 30, 2019 13:48
nik9000 added a commit to elastic/logstash that referenced this pull request Apr 30, 2019
Ports elastic/logstash-docs#688 to this repo. Asciidoctor doesn't quite
work on this repo, but it comes closer with these changes.
@nik9000

nik9000 commented Apr 30, 2019

Copy link
Copy Markdown
Member Author

I've opened elastic/logstash#10730 .

nik9000 added a commit to elastic/logstash that referenced this pull request May 1, 2019
Ports elastic/logstash-docs#688 to this repo. Asciidoctor doesn't quite
work on this repo, but it comes closer with these changes.
nik9000 added a commit to elastic/logstash that referenced this pull request May 1, 2019
Ports elastic/logstash-docs#688 to this repo. Asciidoctor doesn't quite
work on this repo, but it comes closer with these changes.
nik9000 added a commit to elastic/logstash that referenced this pull request May 1, 2019
Ports elastic/logstash-docs#688 to this repo. Asciidoctor doesn't quite
work on this repo, but it comes closer with these changes.
nik9000 added a commit to elastic/logstash that referenced this pull request May 1, 2019
Ports elastic/logstash-docs#688 to this repo. Asciidoctor doesn't quite
work on this repo, but it comes closer with these changes.
nik9000 added a commit to elastic/logstash that referenced this pull request May 1, 2019
Ports elastic/logstash-docs#688 to this repo. Asciidoctor doesn't quite
work on this repo, but it comes closer with these changes.
nik9000 added a commit to elastic/logstash that referenced this pull request May 1, 2019
Ports elastic/logstash-docs#688 to this repo. Asciidoctor doesn't quite
work on this repo, but it comes closer with these changes.
nik9000 added a commit to elastic/logstash that referenced this pull request May 1, 2019
Ports elastic/logstash-docs#688 to this repo. Asciidoctor doesn't quite
work on this repo, but it comes closer with these changes.
nik9000 added a commit to elastic/logstash that referenced this pull request May 1, 2019
Ports elastic/logstash-docs#688 to this repo. Asciidoctor doesn't quite
work on this repo, but it comes closer with these changes.
nik9000 added a commit to elastic/logstash that referenced this pull request May 1, 2019
Ports elastic/logstash-docs#688 to this repo. Asciidoctor doesn't quite
work on this repo, but it comes closer with these changes.
nik9000 added a commit to elastic/logstash that referenced this pull request May 1, 2019
Ports elastic/logstash-docs#688 to this repo. Asciidoctor doesn't quite
work on this repo, but it comes closer with these changes.
nik9000 added a commit to elastic/logstash that referenced this pull request May 1, 2019
Ports elastic/logstash-docs#688 to this repo. Asciidoctor doesn't quite
work on this repo, but it comes closer with these changes.
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.

3 participants