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

rewrote Markers #2584

Merged
merged 24 commits into from
May 22, 2024
Merged

rewrote Markers #2584

merged 24 commits into from
May 22, 2024

Conversation

grobmeier
Copy link
Member

@grobmeier grobmeier commented May 15, 2024 •
edited

Rewrite of the Markers description, adding more information but also making the code example smaller

#2535

Ported to 3.x with: 891c08e

@grobmeier grobmeier requested a review from ppkarwasz May 15, 2024 22:09
@grobmeier grobmeier self-assigned this May 15, 2024
@grobmeier grobmeier mentioned this pull request May 15, 2024
Closed
5 tasks
vy
vy requested changes May 16, 2024
View reviewed changes
src/site/antora/modules/ROOT/pages/manual/markers.adoc Outdated Show resolved Hide resolved
src/site/antora/modules/ROOT/pages/manual/markers.adoc Outdated Show resolved Hide resolved
src/site/antora/modules/ROOT/pages/manual/markers.adoc Outdated Show resolved Hide resolved
src/site/antora/modules/ROOT/pages/manual/markers.adoc Outdated Show resolved Hide resolved
src/site/antora/modules/ROOT/pages/manual/markers.adoc Outdated Show resolved Hide resolved
src/site/antora/modules/ROOT/pages/manual/markers.adoc Show resolved Hide resolved
src/site/antora/modules/ROOT/pages/manual/markers.adoc Outdated Show resolved Hide resolved
src/site/antora/modules/ROOT/pages/manual/markers.adoc Outdated Show resolved Hide resolved
src/site/antora/modules/ROOT/pages/manual/markers.adoc Show resolved Hide resolved
src/site/antora/modules/ROOT/pages/manual/markers.adoc Outdated Show resolved Hide resolved
grobmeier and others added 10 commits May 16, 2024 19:59
@grobmeier @vy
wording
fbc06fa 
Co-authored-by: Volkan Yazıcı <volkan@yazi.ci>
@grobmeier @vy
improved syntax
6d0146b 
Co-authored-by: Volkan Yazıcı <volkan@yazi.ci>
@grobmeier @vy
uppercase letters for constants
75a915f 
Co-authored-by: Volkan Yazıcı <volkan@yazi.ci>
@grobmeier @vy
wording
f940fec 
Co-authored-by: Volkan Yazıcı <volkan@yazi.ci>
@grobmeier @vy
uppercase constants
45d7088 
Co-authored-by: Volkan Yazıcı <volkan@yazi.ci>
@grobmeier @vy
link
a7a89ad 
Co-authored-by: Volkan Yazıcı <volkan@yazi.ci>
@grobmeier @vy
link
9c57434 
Co-authored-by: Volkan Yazıcı <volkan@yazi.ci>
@grobmeier @vy
link
710eafc 
Co-authored-by: Volkan Yazıcı <volkan@yazi.ci>
@grobmeier
corrected capitalization and code highlighting
fb3ff23
@grobmeier
imrpoved some wording
9d1dbad
grobmeier and others added 6 commits May 20, 2024 17:59
@grobmeier @vy
used proper formatting
ac18c9e 
Co-authored-by: Volkan Yazıcı <volkan@yazi.ci>
@grobmeier @vy
added comments for better copy / pasting
49701cb 
Co-authored-by: Volkan Yazıcı <volkan@yazi.ci>
@grobmeier @vy
improved example
77ded9c 
Co-authored-by: Volkan Yazıcı <volkan@yazi.ci>
@grobmeier @ppkarwasz
better linking to source
d4b2bbf 
Co-authored-by: Piotr P. Karwasz <piotr.github@karwasz.org>
@grobmeier
remaining feedback, improved wording (active voice)
5ef18e6
@grobmeier
some more activating voice, formatting
2159c0e
@ppkarwasz ppkarwasz requested a review from vy May 22, 2024 10:14
ppkarwasz
ppkarwasz requested changes May 22, 2024
View reviewed changes
src/site/antora/modules/ROOT/examples/manual/markers/log4j2.xml
<!-- tag::logger[] -->
<Logger name="example" level="ALL"><!--1-->
<logger name="example" level="ALL"><!--1-->
Copy link
Contributor

Choose a reason for hiding this comment

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

The correct capitalization is Logger:

logging-log4j2/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java

Line 62 in 2e17be4

@Plugin(name = "Logger", category = Node.CATEGORY, printObject = true)

I did republish the XSD a couple of weeks ago, but apparently something is wrong with it (not the examples).

@grobmeier grobmeier merged commit 57c98de into 2.x May 22, 2024
6 checks passed
@grobmeier grobmeier deleted the doc/2.x/manual-markers-2535 branch May 22, 2024 17:13
grobmeier added a commit that referenced this pull request May 22, 2024
@grobmeier
ported markers rewrite to 3.x (#2584)
891c08e
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ppkarwasz ppkarwasz ppkarwasz requested changes

@vy vy Awaiting requested review from vy

Assignees

@grobmeier grobmeier

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@grobmeier @vy @ppkarwasz