Skip to content

Commit 2ed487b

Browse files
Clarify XML 1.1 content and attribute TLD wording
Replace "Control characters are encoded as for forXml11" with "Encodes control characters the same way as forXml11" in the forXml11Content and forXml11Attribute tag and function descriptions, as noted in triage.
1 parent 806d000 commit 2ed487b

2 files changed

Lines changed: 16 additions & 16 deletions

File tree

‎jakarta/src/main/resources/META-INF/java-encoder-advanced.tld‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
</tag>
5959
<tag>
6060
<description>
61-
Encodes for XML 1.1 attribute content. Control characters are encoded as for
62-
forXml11. Use only in XML 1.1 documents.
61+
Encodes for XML 1.1 attribute content. Encodes control characters the same way
62+
as forXml11. Use only in XML 1.1 documents.
6363
</description>
6464
<display-name>forXml11Attribute</display-name>
6565
<name>forXml11Attribute</name>
@@ -391,8 +391,8 @@
391391
<tag>
392392
<description>
393393
Encodes XML 1.1 text content. Does not escape quotes and is unsafe for attribute
394-
values; use forXml11 or forXml11Attribute for those contexts. Control characters are
395-
encoded as for forXml11. Use only in XML 1.1 documents.
394+
values; use forXml11 or forXml11Attribute for those contexts. Encodes control
395+
characters the same way as forXml11. Use only in XML 1.1 documents.
396396
</description>
397397
<display-name>forXml11Content</display-name>
398398
<name>forXml11Content</name>
@@ -582,8 +582,8 @@
582582
<function>
583583
<description>
584584
Encodes XML 1.1 text content. Does not escape quotes and is unsafe for attribute
585-
values; use forXml11 or forXml11Attribute for those contexts. Control characters are
586-
encoded as for forXml11. Use only in XML 1.1 documents.
585+
values; use forXml11 or forXml11Attribute for those contexts. Encodes control
586+
characters the same way as forXml11. Use only in XML 1.1 documents.
587587
</description>
588588
<display-name>forXml11Content</display-name>
589589
<name>forXml11Content</name>
@@ -601,8 +601,8 @@
601601
</function>
602602
<function>
603603
<description>
604-
Encodes for XML 1.1 attribute content. Control characters are encoded as for
605-
forXml11. Use only in XML 1.1 documents.
604+
Encodes for XML 1.1 attribute content. Encodes control characters the same way
605+
as forXml11. Use only in XML 1.1 documents.
606606
</description>
607607
<display-name>forXml11Attribute</display-name>
608608
<name>forXml11Attribute</name>

‎jsp/src/main/resources/META-INF/java-encoder-advanced.tld‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
</tag>
5959
<tag>
6060
<description>
61-
Encodes for XML 1.1 attribute content. Control characters are encoded as for
62-
forXml11. Use only in XML 1.1 documents.
61+
Encodes for XML 1.1 attribute content. Encodes control characters the same way
62+
as forXml11. Use only in XML 1.1 documents.
6363
</description>
6464
<display-name>forXml11Attribute</display-name>
6565
<name>forXml11Attribute</name>
@@ -391,8 +391,8 @@
391391
<tag>
392392
<description>
393393
Encodes XML 1.1 text content. Does not escape quotes and is unsafe for attribute
394-
values; use forXml11 or forXml11Attribute for those contexts. Control characters are
395-
encoded as for forXml11. Use only in XML 1.1 documents.
394+
values; use forXml11 or forXml11Attribute for those contexts. Encodes control
395+
characters the same way as forXml11. Use only in XML 1.1 documents.
396396
</description>
397397
<display-name>forXml11Content</display-name>
398398
<name>forXml11Content</name>
@@ -582,8 +582,8 @@
582582
<function>
583583
<description>
584584
Encodes XML 1.1 text content. Does not escape quotes and is unsafe for attribute
585-
values; use forXml11 or forXml11Attribute for those contexts. Control characters are
586-
encoded as for forXml11. Use only in XML 1.1 documents.
585+
values; use forXml11 or forXml11Attribute for those contexts. Encodes control
586+
characters the same way as forXml11. Use only in XML 1.1 documents.
587587
</description>
588588
<display-name>forXml11Content</display-name>
589589
<name>forXml11Content</name>
@@ -601,8 +601,8 @@
601601
</function>
602602
<function>
603603
<description>
604-
Encodes for XML 1.1 attribute content. Control characters are encoded as for
605-
forXml11. Use only in XML 1.1 documents.
604+
Encodes for XML 1.1 attribute content. Encodes control characters the same way
605+
as forXml11. Use only in XML 1.1 documents.
606606
</description>
607607
<display-name>forXml11Attribute</display-name>
608608
<name>forXml11Attribute</name>

0 commit comments

Comments
 (0)