From f0d384d5ad87aa180ec430a9206c18f017e2aa35 Mon Sep 17 00:00:00 2001
From: ♪ I'm a bot, bot, bot ♪ <_update_docs_trans@sundries01.phx2.fedoraproject.org>
Date: Jul 01 2022 22:04:36 +0000
Subject: automatic update of pot/po files


---

diff --git a/pot/master/pages/DistTag.pot b/pot/master/pages/DistTag.pot
index 8cb2fe0..035e42c 100644
--- a/pot/master/pages/DistTag.pot
+++ b/pot/master/pages/DistTag.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-12-15 22:30+0000\n"
+"POT-Creation-Date: 2022-07-01 21:58+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -114,12 +114,13 @@ msgid ""
 msgstr ""
 
 #. type: Table
-#: ./pages/DistTag.adoc:40
+#: ./pages/DistTag.adoc:41
 #, no-wrap
 msgid ""
 "|OS |+%{?dist}+ tag\n"
-"|RHEL 6 (all variants) |`.el6`\n"
 "|RHEL 7 (all variants) |`.el7`\n"
+"|RHEL 8 (all variants) |`.el8`\n"
+"|RHEL 9 (all variants) |`.el9`\n"
 "|Fedora {PREVVER} |`.fc{PREVVER}`\n"
 "|Fedora {CURRENTVER} |`.fc{CURRENTVER}`\n"
 "|Fedora {NEXTVER} |`.fc{NEXTVER}`\n"
@@ -127,19 +128,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./pages/DistTag.adoc:43
+#: ./pages/DistTag.adoc:44
 msgid "Development:"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/DistTag.adoc:45
+#: ./pages/DistTag.adoc:46
 msgid ""
 "The development branch takes the disttag of the next major unreleased "
 "version of Fedora."
 msgstr ""
 
 #. type: Plain text
-#: ./pages/DistTag.adoc:48
+#: ./pages/DistTag.adoc:49
 msgid ""
 "Note the leading period in the definition of `+%{?dist}+`. This is present "
 "so that it can easily be used in the release field.  These definitions can "
@@ -147,45 +148,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./pages/DistTag.adoc:50
+#: ./pages/DistTag.adoc:51
 msgid "Note that RHEL dist tags are only defined for EPEL packages."
 msgstr ""
 
 #. type: Title ===
-#: ./pages/DistTag.adoc:51
+#: ./pages/DistTag.adoc:52
 #, no-wrap
 msgid "+%{?dist}+ in the Release: field"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/DistTag.adoc:54
+#: ./pages/DistTag.adoc:55
 msgid "The `+%{?dist}+` tag is included in the Release field as follows:"
 msgstr ""
 
 #. type: delimited block .
-#: ./pages/DistTag.adoc:57
+#: ./pages/DistTag.adoc:58
 #, no-wrap
 msgid "Release: 1%{?dist}\n"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/DistTag.adoc:60
+#: ./pages/DistTag.adoc:61
 msgid "This translates into:"
 msgstr ""
 
 #. type: delimited block .
-#: ./pages/DistTag.adoc:63
+#: ./pages/DistTag.adoc:64
 #, no-wrap
 msgid "If %{dist} is defined, insert its value here. If not, do nothing.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/DistTag.adoc:66
+#: ./pages/DistTag.adoc:67
 msgid "So, if we have the following in a spec file:"
 msgstr ""
 
 #. type: delimited block .
-#: ./pages/DistTag.adoc:71
+#: ./pages/DistTag.adoc:72
 #, no-wrap
 msgid ""
 "Name: logjam\n"
@@ -194,34 +195,34 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./pages/DistTag.adoc:74
+#: ./pages/DistTag.adoc:75
 msgid ""
 "When this package is built in an i386 FC20 buildroot, it generates an rpm "
 "named: `+logjam-1.4-2.fc20.i386.rpm+`."
 msgstr ""
 
 #. type: Plain text
-#: ./pages/DistTag.adoc:76
+#: ./pages/DistTag.adoc:77
 msgid ""
 "Keep in mind that `+%{?dist}+` should *never* be used in the Name or Version "
 "fields, nor in %changelog entries."
 msgstr ""
 
 #. type: Title ===
-#: ./pages/DistTag.adoc:77
+#: ./pages/DistTag.adoc:78
 #, no-wrap
 msgid "Conditionals"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/DistTag.adoc:80
+#: ./pages/DistTag.adoc:81
 msgid ""
 "Along with `+%{?dist}+`, there are several \"helper\" variables defined by "
 "the buildsystem. These variables are:"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/DistTag.adoc:82
+#: ./pages/DistTag.adoc:83
 msgid ""
 "`+%{rhel}+`: This variable is only defined on Red Hat Enterprise Linux "
 "builds. If defined, it is set to the release number of Red Hat Enterprise "
@@ -229,14 +230,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./pages/DistTag.adoc:84
+#: ./pages/DistTag.adoc:85
 msgid ""
 "`+%{fedora}+`: This variable is only defined on Fedora builds. If defined, "
 "it is set to the release number of Fedora present at build time."
 msgstr ""
 
 #. type: Plain text
-#: ./pages/DistTag.adoc:86
+#: ./pages/DistTag.adoc:87
 msgid ""
 "`+%{rhl}+`: This variable is only defined on Red Hat Linux builds. If "
 "defined, it is set to the release number of Red Hat Linux present at build "
@@ -244,21 +245,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./pages/DistTag.adoc:88
+#: ./pages/DistTag.adoc:89
 msgid ""
 "`+%{fc#}+`: This variable is only defined on Fedora builds. For example, on "
 "Fedora {CURRENTVER} builds, `%{fc{CURRENTVER}}` is defined to 1."
 msgstr ""
 
 #. type: Plain text
-#: ./pages/DistTag.adoc:90
+#: ./pages/DistTag.adoc:91
 msgid ""
 "`+%{el#}+`: This variable is only defined on Red Hat Enterprise Linux "
 "builds. For example, on RHEL 7 builds, `+%{el7}+` is defined to 1."
 msgstr ""
 
 #. type: Plain text
-#: ./pages/DistTag.adoc:93
+#: ./pages/DistTag.adoc:94
 msgid ""
 "All of these variables, if defined, will have a purely numeric value.  With "
 "`+%{dist}+` and these additional variables, you can create conditionals in a "
@@ -266,12 +267,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./pages/DistTag.adoc:95
+#: ./pages/DistTag.adoc:96
 msgid "Here are some examples of how to use these variables in conditionals:"
 msgstr ""
 
 #. type: delimited block .
-#: ./pages/DistTag.adoc:99
+#: ./pages/DistTag.adoc:100
 #, no-wrap
 msgid ""
 "%if 0%{?rhel}\n"
@@ -279,7 +280,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: ./pages/DistTag.adoc:102
+#: ./pages/DistTag.adoc:103
 #, no-wrap
 msgid ""
 "%if 0%{?fedora} >= 21\n"
@@ -287,13 +288,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: ./pages/DistTag.adoc:104
+#: ./pages/DistTag.adoc:105
 #, no-wrap
 msgid "%{?fedora:%global _with_xfce --with-xfce}\n"
 msgstr ""
 
 #. type: delimited block .
-#: ./pages/DistTag.adoc:109
+#: ./pages/DistTag.adoc:110
 #, no-wrap
 msgid ""
 "%if 0%{?rhel}\n"
@@ -303,7 +304,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: ./pages/DistTag.adoc:112
+#: ./pages/DistTag.adoc:113
 #, no-wrap
 msgid ""
 "%if 0%{?rhl}%{?fedora}\n"
@@ -311,7 +312,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: ./pages/DistTag.adoc:116
+#: ./pages/DistTag.adoc:117
 #, no-wrap
 msgid ""
 "%{?fc20:Requires: foo}\n"
@@ -320,65 +321,65 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./pages/DistTag.adoc:119
+#: ./pages/DistTag.adoc:120
 msgid ""
 "Keep in mind that if you are checking for a specific family of "
 "distributions, that you need to use:"
 msgstr ""
 
 #. type: delimited block .
-#: ./pages/DistTag.adoc:122
+#: ./pages/DistTag.adoc:123
 #, no-wrap
 msgid "%if 0%{?rhel}\n"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/DistTag.adoc:125
+#: ./pages/DistTag.adoc:126
 msgid "and *NOT*"
 msgstr ""
 
 #. type: delimited block .
-#: ./pages/DistTag.adoc:128
+#: ./pages/DistTag.adoc:129
 #, no-wrap
 msgid "%if %{?rhel}\n"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/DistTag.adoc:131
+#: ./pages/DistTag.adoc:132
 msgid ""
 "Without the extra 0, if `+%{rhel}+` is undefined, the `+%if+` conditional "
 "will cease to exist, and the rpm will fail to build."
 msgstr ""
 
 #. type: Title ===
-#: ./pages/DistTag.adoc:132
+#: ./pages/DistTag.adoc:133
 #, no-wrap
 msgid "Things that you cannot use +%{?dist}+ for"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/DistTag.adoc:135
+#: ./pages/DistTag.adoc:136
 msgid ""
 "You must not override the variables for `+%{dist}+` (or any of the related "
 "variables)."
 msgstr ""
 
 #. type: Plain text
-#: ./pages/DistTag.adoc:136
+#: ./pages/DistTag.adoc:137
 msgid ""
 "You must not hardcode a value for `+%{dist}+` (or any of the related "
 "variables) in your spec."
 msgstr ""
 
 #. type: Plain text
-#: ./pages/DistTag.adoc:137
+#: ./pages/DistTag.adoc:138
 msgid ""
 "You must not hardcode a dist tag in the spec: *BAD:* Release: "
 "1.fc{CURRENTVER} *GOOD:* Release: 1%{?dist}"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/DistTag.adoc:138
+#: ./pages/DistTag.adoc:139
 msgid ""
 "You cannot put any sort of \"tagging\" in `+%{dist}+` (or any of the related "
 "variables). `+%{dist}+` (and its related variables) exist ONLY to define the "
@@ -386,27 +387,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./pages/DistTag.adoc:139
+#: ./pages/DistTag.adoc:140
 msgid ""
 "`+%{?dist}+` must never be used in the Name or Version fields, only Release, "
 "and only as documented above."
 msgstr ""
 
 #. type: Plain text
-#: ./pages/DistTag.adoc:140
+#: ./pages/DistTag.adoc:141
 msgid ""
 "`+%{fedora}+`, `+%{rhel}+`, `+%{rhl}+`, `+%{fc#}+`, `+%{el#}+` must never be "
 "used in the Name, Version, or Release fields."
 msgstr ""
 
 #. type: Title ==
-#: ./pages/DistTag.adoc:141
+#: ./pages/DistTag.adoc:142
 #, no-wrap
 msgid "Common questions"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/DistTag.adoc:145
+#: ./pages/DistTag.adoc:146
 msgid ""
 "Q: Why don't you just let the buildsystem (or packager) pass the value for "
 "dist to rpm, e.g. `+rpm --with dist el7+`? + A: Actually, we do. The Fedora "
@@ -414,7 +415,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./pages/DistTag.adoc:147
+#: ./pages/DistTag.adoc:148
 msgid ""
 "Q: Why is use of `+%{?dist}+` mandatory? + A: There are very few packages "
 "which didn't use it, the primary very old reason for not using it (sharing "
diff --git a/pot/master/pages/Java.pot b/pot/master/pages/Java.pot
index 6de2ca6..3993623 100644
--- a/pot/master/pages/Java.pot
+++ b/pot/master/pages/Java.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-12-15 22:30+0000\n"
+"POT-Creation-Date: 2022-07-01 21:58+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,70 +23,114 @@ msgid "Java Packaging Guidelines"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:5
+#: ./pages/Java.adoc:9
 msgid ""
 "This page represents Fedora guidelines for packaging libraries and "
-"applications written in Java and related languages using Java Virtual "
-"Machine as bytecode interpreter. It does not aim to extensively describe "
-"packaging techniques and tips. RPM macros and commands used here are "
-"documented in man pages. Furthermore a separate "
-"https://fedora-java.github.io/howto/latest/[Java Packaging HOWTO] describes "
-"Java packaging techniques in detail and includes examples, templates and "
-"documentation aimed at packagers and Java developers who are taking their "
-"first steps in Java RPM packaging."
+"applications written in Java and related languages that use the Java Virtual "
+"Machine as a bytecode interpreter."
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:7
+#: ./pages/Java.adoc:16
 msgid ""
-"Fedora Java packaging is originally based on "
+"It does not aim to extensively describe packaging techniques and tips.  RPM "
+"macros and commands used here are documented in man pages.  Furthermore, a "
+"separate https://fedora-java.github.io/howto/latest/[Java Packaging HOWTO] "
+"describes Java packaging techniques in detail and includes examples, "
+"templates and documentation aimed at packagers and Java developers who are "
+"taking their first steps in Java RPM packaging."
+msgstr ""
+
+#. type: Plain text
+#: ./pages/Java.adoc:21
+msgid ""
+"Fedora Java packaging is originally based on the "
 "https://web.archive.org/web/20191223234327/http://www.jpackage.org/[JPackage "
-"Project] standards. Over time we have diverged in packaging tools in most "
+"Project] standards.  Over time, we have diverged in packaging tools in most "
 "areas but we mostly keep backward compatibility with older packages that "
 "make use of JPackage standards."
 msgstr ""
 
 #. type: Title ==
-#: ./pages/Java.adoc:8
+#: ./pages/Java.adoc:22
 #, no-wrap
 msgid "Package naming"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:11
+#: ./pages/Java.adoc:25
 msgid ""
 "Packages MUST follow the standard Fedora xref:Naming.adoc[package naming "
 "guidelines]."
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:13
+#: ./pages/Java.adoc:27
 msgid ""
 "Java API documentation MUST be placed into a sub-package called "
 "`+%{name}-javadoc+`."
 msgstr ""
 
 #. type: Title ==
-#: ./pages/Java.adoc:14
+#: ./pages/Java.adoc:28
 #, no-wrap
 msgid "Release tags"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:17
+#: ./pages/Java.adoc:31
 msgid ""
 "Packages MUST follow the standard Fedora xref:Versioning.adoc[package "
 "versioning guidelines]."
 msgstr ""
 
 #. type: Title ==
-#: ./pages/Java.adoc:18
+#: ./pages/Java.adoc:32
+#, no-wrap
+msgid "Architecture support"
+msgstr ""
+
+#. type: Plain text
+#: ./pages/Java.adoc:36
+msgid ""
+"The system JDK / JRE might not be available on all architectures that are "
+"supported by any given Fedora release."
+msgstr ""
+
+#. type: Plain text
+#: ./pages/Java.adoc:38
+msgid "For this reason, all Java packages MUST contain an `+ExclusiveArch+` tag:"
+msgstr ""
+
+#. type: Plain text
+#: ./pages/Java.adoc:41
+msgid ""
+"Packages that build only `+noarch+` sub-packages MUST use `+ExclusiveArch: "
+"%{java_arches} noarch+`."
+msgstr ""
+
+#. type: Plain text
+#: ./pages/Java.adoc:43
+msgid ""
+"Packages that include architecture-dependent build artifacts (i.e. <<JNI>> "
+"modules)  MUST use `+ExclusiveArch: %{java_arches}+`."
+msgstr ""
+
+#. type: Plain text
+#: ./pages/Java.adoc:46
+msgid ""
+"The `+%{java_arches}+` macro contains a list of all the architectures where "
+"the system JRE / JDK is available and is defined on all Fedora releases."
+msgstr ""
+
+#. type: Title ==
+#: ./pages/Java.adoc:47
 #, no-wrap
 msgid "Pre-built dependencies"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:21
+#: ./pages/Java.adoc:50
 msgid ""
 "Packages MUST follow the standard Fedora "
 "xref:what-can-be-packaged.adoc#prebuilt-binaries-or-libraries[dependency "
@@ -94,21 +138,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:23
+#: ./pages/Java.adoc:54
 msgid ""
-"In particular `+*.class+` and `+*.jar+` files from upstream releases MUST "
+"In particular, `+*.class+` and `+*.jar+` files from upstream releases MUST "
 "NOT be used during build of Fedora packages and they MUST NOT be included in "
 "binary RPM."
 msgstr ""
 
 #. type: Title ==
-#: ./pages/Java.adoc:24
+#: ./pages/Java.adoc:55
 #, no-wrap
 msgid "JAR file installation"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:27
+#: ./pages/Java.adoc:61
 msgid ""
 "The following applies to all JAR files except <<JNI,JNI-using JAR files>> "
 "and application-specific JAR files (i.e., JAR files that can only reasonably "
@@ -117,289 +161,294 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./pages/Java.adoc:28
+#: ./pages/Java.adoc:62
 #, no-wrap
 msgid "Split JAR files"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:31
+#: ./pages/Java.adoc:67
 msgid ""
 "If a project offers the choice of packaging it as a single monolithic JAR or "
-"several ones, the split packaging SHOULD be preferred."
+"as several separate JARs, the split packaging SHOULD be preferred."
 msgstr ""
 
 #. type: Title ===
-#: ./pages/Java.adoc:32
+#: ./pages/Java.adoc:68
 #, no-wrap
 msgid "Installation directory"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:35
+#: ./pages/Java.adoc:71
 msgid ""
 "All architecture-independent JAR files MUST go into `+%{_javadir}+` or its "
 "subdirectory."
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:37
+#: ./pages/Java.adoc:72
 msgid "For installation of architecture dependent JAR files, see <<JNI>>."
 msgstr ""
 
 #. type: Title ===
-#: ./pages/Java.adoc:38
+#: ./pages/Java.adoc:73
 #, no-wrap
 msgid "Filenames"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:41
+#: ./pages/Java.adoc:76
 msgid ""
 "If the package provides a *single* JAR file installed filename SHOULD be "
 "`+%{name}.jar+`."
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:42
+#: ./pages/Java.adoc:77
 msgid ""
 "If the package provides *multiple* JAR files, they SHOULD be installed in a "
-"`+%{name}+` subdirectory"
+"`+%{name}+` subdirectory."
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:43
+#: ./pages/Java.adoc:78
 msgid ""
 "Versioned JAR files (`+*-%{version}.jar+`) MUST NOT be installed unless the "
-"package is a compatibility package"
+"package is a compatibility package."
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:44
+#: ./pages/Java.adoc:79
 msgid ""
-"Packages MAY provide alternative filenames as long as they do not conflict "
-"with other packages"
+"Packages MAY provide alternative filenames, as long as they do not conflict "
+"with other packages."
 msgstr ""
 
 #. type: Title ==
-#: ./pages/Java.adoc:45
+#: ./pages/Java.adoc:80
 #, no-wrap
 msgid "BuildRequires and Requires"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:48
+#: ./pages/Java.adoc:83
 msgid "Java packages MUST BuildRequire their respective build system:"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:50
+#: ./pages/Java.adoc:85
 msgid "`+BuildRequires: maven-local+` for packages built with Maven"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:51
+#: ./pages/Java.adoc:86
 msgid "`+BuildRequires: ant+` for packages built with ant"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:52
+#: ./pages/Java.adoc:87
 msgid "`+BuildRequires: java-devel+` for packages built with javac"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:54
+#: ./pages/Java.adoc:89
 msgid ""
-"Java binary packages or their dependencies MUST have Requires (generated by "
-"RPM or manual) on:"
+"Java binary packages or their dependencies MUST have `+Requires+` (generated "
+"by RPM or manual) on:"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:56
+#: ./pages/Java.adoc:91
 msgid "`+java-headless+` or `+java-headless >= 1:minimal_required_version+`"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:57
+#: ./pages/Java.adoc:92
 msgid "`+javapackages-filesystem+`"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:59
-msgid "If java-headless requirement is insufficient package MUST have Requires:"
-msgstr ""
-
-#. type: Plain text
-#: ./pages/Java.adoc:61
-msgid "`+java+` or `+java >= 1:minimal_required_version+`"
+#: ./pages/Java.adoc:96
+msgid ""
+"If a `+java-headless+` requirement is insufficient, then the package MUST "
+"have `+Requires+` for `+java+` or `+java >= 1:minimal_required_version+`."
 msgstr ""
 
 #. type: Title ==
-#: ./pages/Java.adoc:62
+#: ./pages/Java.adoc:97
 #, no-wrap
 msgid "Javadoc installation"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:65
-msgid "javadoc documentation MAY be generated"
+#: ./pages/Java.adoc:100
+msgid "JavaDoc documentation MAY be generated."
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:66
+#: ./pages/Java.adoc:103
 msgid ""
-"If javadoc documentation is generated it MUST be installed into a directory "
-"of `+%{_javadocdir}/%{name}+` as part of javadoc subpackage"
+"If javadoc documentation is generated, it MUST be installed into a directory "
+"of `+%{_javadocdir}/%{name}+` as part of the `+-javadoc+` subpackage."
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:67
+#: ./pages/Java.adoc:104
 msgid "Directory or symlink `+%{_javadocdir}/%{name}-%{version}+` SHOULD NOT exist."
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:68
+#: ./pages/Java.adoc:105
 msgid ""
-"The javadoc subpackage MUST be declared `+noarch+` even if main package is "
+"The javadoc subpackage MUST be declared `+noarch+`, even if main package is "
 "architecture specific."
 msgstr ""
 
 #. type: Title ==
-#: ./pages/Java.adoc:69
+#: ./pages/Java.adoc:106
 #, no-wrap
 msgid "No class-path in MANIFEST.MF"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:72
-msgid "JAR files MUST NOT include `+class-path+` entry inside META-INF/MANIFEST.MF"
+#: ./pages/Java.adoc:110
+msgid ""
+"JAR files MUST NOT include a `+class-path+` entry in their "
+"`+META-INF/MANIFEST.MF+` file."
 msgstr ""
 
 #. type: Title ==
-#: ./pages/Java.adoc:73
+#: ./pages/Java.adoc:111
 #, no-wrap
 msgid "Hardcoded paths"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:76
+#: ./pages/Java.adoc:117
 msgid ""
-"Packages MUST NOT hardcode paths to JAR files they use. When package needs "
-"to reference a JAR file, packager SHOULD use one of tools designed to "
-"locating JAR files in the system."
+"Packages MUST NOT hardcode paths to JAR files they use.  When a package "
+"needs to reference a JAR file, the packager SHOULD use one of tools that are "
+"designed for locating JAR files in the system."
 msgstr ""
 
 #. type: Title ==
-#: ./pages/Java.adoc:77
+#: ./pages/Java.adoc:118
 #, no-wrap
 msgid "Maven pom.xml files"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:80
+#: ./pages/Java.adoc:124
 msgid ""
 "If upstream project is shipping Maven `+pom.xml+` files, these MUST be "
-"installed. Additionally package MUST install mapping between upstream "
-"artifact and filesystem by using the `+%mvn_install+` macro."
+"installed.  Additionally, the package MUST install a mapping between the "
+"upstream artifact and the filesystem by using the `+%mvn_install+` macro."
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:82
+#: ./pages/Java.adoc:129
 msgid ""
-"If upstream project does not ship Maven `+pom.xml+` file, official "
-"https://mvnrepository.com/[maven repository] should be searched and if there "
-"are `+pom.xml+` files they SHOULD be installed."
+"If upstream project does not ship Maven `+pom.xml+` file, the official "
+"https://mvnrepository.com/[maven repository] should be consulted and if the "
+"project publishes `+pom.xml+` files there, they SHOULD be included."
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:84
+#: ./pages/Java.adoc:132
 msgid ""
-"If modifications to Maven pom.xml files are needed `+%pom_*+` family of "
-"macros SHOULD be used"
+"If modifications to Maven pom.xml files are needed, the `+%pom_*+` family of "
+"macros SHOULD be used."
 msgstr ""
 
 #. type: Title ==
-#: ./pages/Java.adoc:85
+#: ./pages/Java.adoc:133
 #, no-wrap
 msgid "Wrapper Scripts"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:88
+#: ./pages/Java.adoc:138
 msgid ""
 "Applications wishing to provide a convenient method of execution SHOULD "
-"provide a wrapper script in `+%{_bindir}+`. Packages SHOULD use "
+"provide a wrapper script in `+%{_bindir}+`.  Packages SHOULD use "
 "`+%jpackage_script+` to create these wrapper scripts."
 msgstr ""
 
 #. type: Title ==
-#: ./pages/Java.adoc:89
+#: ./pages/Java.adoc:139
 #, no-wrap
 msgid "Compatibility packages"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:92
+#: ./pages/Java.adoc:144
 msgid ""
 "In certain cases it might be necessary to create compatibility packages that "
-"provide older API/ABI level of the same library. However creating these "
-"compatibility packages is strongly discouraged. To standardize and simplify "
-"packaging of such compatibility packages following rules apply:"
+"provide older API/ABI level of the same library.  However, creating these "
+"compatibility packages is strongly discouraged."
+msgstr ""
+
+#. type: Plain text
+#: ./pages/Java.adoc:147
+msgid ""
+"To standardize and simplify packaging of such compatibility packages, the "
+"following rules apply:"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:94
+#: ./pages/Java.adoc:150
 msgid ""
-"Compatibility packages MUST be named in the same way as original except "
-"addition of version to package name,"
+"Compatibility packages MUST be named in the same way as the original package "
+"except the addition of the version to the package's name."
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:95
-msgid "Any JAR and POM files MUST be versioned."
+#: ./pages/Java.adoc:151
+msgid "Any JAR and POM files MUST be versioned, as well."
 msgstr ""
 
 #. type: Title ==
-#: ./pages/Java.adoc:97
+#: ./pages/Java.adoc:153
 #, no-wrap
 msgid "Packaging JAR files that use JNI"
 msgstr ""
 
 #. type: Title ===
-#: ./pages/Java.adoc:99
+#: ./pages/Java.adoc:155
 #, no-wrap
 msgid "Applicability"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:102
+#: ./pages/Java.adoc:161
 msgid ""
 "Java programs that wish to make calls into native libraries do so via the "
-"Java Native Interface (JNI). A Java package uses JNI if it contains a .so "
-"file. Note that this file can be embedded within JAR files themselves."
+"Java Native Interface (JNI).  A Java package uses JNI if it contains a .so "
+"file.  Note that this file can be embedded within JAR files themselves."
 msgstr ""
 
 #. type: Title ===
-#: ./pages/Java.adoc:103
+#: ./pages/Java.adoc:162
 #, no-wrap
 msgid "Guideline"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:106
+#: ./pages/Java.adoc:166
 msgid ""
-"JNI packages MUST follow guidelines of ordinary Java packages with "
-"exceptions listed here"
+"JNI packages MUST follow guidelines of ordinary Java packages, with these "
+"exceptions:"
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:107
+#: ./pages/Java.adoc:170
 msgid ""
 "JAR files using JNI or containing JNI shared objects themselves MUST be "
-"placed in `+%{_jnidir}+` and MAY be symlinked to `+%{_libdir}/%{name}+`."
+"placed in `+%{_jnidir}+`, but MAY be symlinked to `+%{_libdir}/%{name}+`."
 msgstr ""
 
 #. type: Plain text
-#: ./pages/Java.adoc:107
-msgid "JNI shared objects MUST be placed in `+%{_libdir}/%{name}+`"
+#: ./pages/Java.adoc:171
+msgid "JNI shared objects MUST be placed in `+%{_libdir}/%{name}+`."
 msgstr ""