From 418e64f8b2f3f07f7339daf61402c63e71071d05 Mon Sep 17 00:00:00 2001 From: Ville Skyttä Date: Mar 07 2017 13:07:09 +0000 Subject: Spelling fixes --- diff --git a/bin/clean-binary-files b/bin/clean-binary-files index b0197f2..6e2b9e2 100755 --- a/bin/clean-binary-files +++ b/bin/clean-binary-files @@ -261,7 +261,7 @@ execute_bjr_command() { return 0 fi - # Strip version and extention. e.g. abc-2.1-api-1.0.4.jar -> abc-2.1-api + # Strip version and extension. e.g. abc-2.1-api-1.0.4.jar -> abc-2.1-api _jar_filename=`basename $1` _search_name=`basename $1` _search_name=`echo $_search_name | sed -r -e s/-[[:digit:].]*\\\.jar//g | sed -r -e s/\\\.jar$//g` diff --git a/bin/create-jar-links b/bin/create-jar-links index 5a2118a..d062a07 100755 --- a/bin/create-jar-links +++ b/bin/create-jar-links @@ -61,7 +61,7 @@ create_jar_links () { continue fi - # Strip version and extention. e.g. abc-2.1-api-1.0.4.jar -> abc-2.1-api + # Strip version and extension. e.g. abc-2.1-api-1.0.4.jar -> abc-2.1-api _jar_filename=`basename $file` _search_name=`basename $file` _search_name=`echo $_search_name | sed -r -e s/-[[:digit:].]*\\\.jar//g | sed -r -e s/\\\.jar$//g` diff --git a/doc/ant.txt b/doc/ant.txt index fc500c3..2a0637f 100644 --- a/doc/ant.txt +++ b/doc/ant.txt @@ -7,7 +7,7 @@ ______ Apache Ant is probably second most used Java build tool right after Apache Maven. The main difference between these two tools is that Ant is procedural and -Maven is declarative. When using Ant, it is neccessary to exactly describe the +Maven is declarative. When using Ant, it is necessary to exactly describe the processes which lead to the result. It means that one needs to specify where the source files are, what needs to be done and when it needs to be done. On the other hand, Maven relies on conventions and doesn't require specifying most @@ -155,5 +155,5 @@ ant -Divy.mode=local test publish-local Details: - The publish target may be named differently. Search the `build.xml` - for occurences of `ivy:publish`. + for occurrences of `ivy:publish`. - `%mvn_install` will install all the published artifacts. diff --git a/doc/dependency_handling.txt b/doc/dependency_handling.txt index e353547..019d181 100644 --- a/doc/dependency_handling.txt +++ b/doc/dependency_handling.txt @@ -24,7 +24,7 @@ information from the built binaries or package source. The Java packaging tooling on Fedora provides automatic Requires and Provides generation for packages built using XMvn. The Provides are based on Maven artifact coordinates of artifacts that were installed by the -currenlty being built. They are generated for each subpackage +currently being built. They are generated for each subpackage separately. They follow a general format `mvn(groupId:artifactId:extension:classifier:version)`, where the extension is omitted if it's `jar` and classifier is omitted if empty. diff --git a/doc/fedora_java_specifics.txt b/doc/fedora_java_specifics.txt index 45f125a..d73b29b 100644 --- a/doc/fedora_java_specifics.txt +++ b/doc/fedora_java_specifics.txt @@ -82,7 +82,7 @@ $ build-classpath log4j junit org.ow2.asm:asm -------- `log4j` corresponds to `log4j.jar` stored in `%{_javadir}`. If the JAR -file is stored in subdirectory under `%{_javadir}`, it's neccessary to +file is stored in subdirectory under `%{_javadir}`, it's necessary to pass `subdirectory/jarname` as an argument to `build-classpath`. Example: diff --git a/doc/introduction_for_packagers.txt b/doc/introduction_for_packagers.txt index 5c416a1..73a192e 100644 --- a/doc/introduction_for_packagers.txt +++ b/doc/introduction_for_packagers.txt @@ -281,7 +281,7 @@ task customJar(type: Jar) { .Make While unlikely, it's still possible that you encounter a project whose build is managed by plain old Makefiles. They contain a list of targets -which consist of commands (marked with tab at the begining of line) and +which consist of commands (marked with tab at the beginning of line) and are invoked by `make` _target_ or simply `make` to run the default target. diff --git a/doc/jar_file_id_aliases.txt b/doc/jar_file_id_aliases.txt index 26f84ed..f72dab5 100644 --- a/doc/jar_file_id_aliases.txt +++ b/doc/jar_file_id_aliases.txt @@ -8,7 +8,7 @@ msimacek, 31 March 2015 In the real world the same project can appear under different names as it was evolving or released differently. Therefore other projects may refer to those -alternative names instead of using the name currently prefered by upstream. +alternative names instead of using the name currently preferred by upstream. ===== Artifact aliases XMvn provides a way to attach multiple artifact coordinates to a single diff --git a/doc/jar_file_id_compat.txt b/doc/jar_file_id_compat.txt index cd20759..1772f09 100644 --- a/doc/jar_file_id_compat.txt +++ b/doc/jar_file_id_compat.txt @@ -12,7 +12,7 @@ provides would clash. The recommended practice is to update the current package to the new version and create new package representing the old version (called compat package). The compat package needs to have the version number (usually only the major number, unless further -distinction is necessary) appended to the name, thus effectivelly having +distinction is necessary) appended to the name, thus effectively having different name from RPM's point of view. Such compat package needs to perform some additional steps to ensure that it can be installed and used along the non-compat one. diff --git a/doc/migration.txt b/doc/migration.txt index 3335770..192821a 100644 --- a/doc/migration.txt +++ b/doc/migration.txt @@ -64,7 +64,7 @@ BuildRequires: javapackages-local %prep # The default location for installing JAR files is %{_javadir}/%{name}/ # Because our original specfile put the JAR directly to %{_javadir}, we -# want to override this behavior. The folowing call tells XMvn to +# want to override this behavior. The following call tells XMvn to # install the groupId:artifactId artifact as %{_javadir}/%{name}.jar %mvn_file groupId:artifactId %{name} diff --git a/doc/packaging_maven_project.txt b/doc/packaging_maven_project.txt index 0eb4bfd..07a1737 100644 --- a/doc/packaging_maven_project.txt +++ b/doc/packaging_maven_project.txt @@ -140,7 +140,7 @@ Maven artifact. See <> for more information on `%mvn_alias`. -Rebuild the pacakge and check `rpm -qp --provides` output again: +Rebuild the package and check `rpm -qp --provides` output again: [source,shell] ------ diff --git a/java-utils/java-functions b/java-utils/java-functions index 0758a18..6f93aa6 100644 --- a/java-utils/java-functions +++ b/java-utils/java-functions @@ -177,7 +177,7 @@ set_jvm() # try to find it from java command # try javac first, or we might get the location of the jre instead - djw - # if JRE is prefered then don't try javac - mizdebsk + # if JRE is preferred then don't try javac - mizdebsk case "${_prefer_jre}" in 1|[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]) cmds=java @@ -384,7 +384,7 @@ link_jar_repository() { } -# Finds a specific extention (jar or directory) +# Finds a specific extension (jar or directory) find_jar() { local IFS=: diff --git a/macros.d/macros.fjava b/macros.d/macros.fjava index 75969b1..ec57d8c 100644 --- a/macros.d/macros.fjava +++ b/macros.d/macros.fjava @@ -38,7 +38,7 @@ # This macro causes given artifact(s) to be installed in given subpackage. # # GId, aId and ver can contain wildcards and alternatives, which allows -# multiple artifacts to be matched. If any of gId, aId or ver is omited +# multiple artifacts to be matched. If any of gId, aId or ver is omitted # then any value will match the respective part. In particular a bare : # symbol will match any artifact. # @@ -57,7 +57,7 @@ # resolve any of aliases will result in resolving the original artifact. # # GId, aId and ver can contain wildcards and alternatives, which allows -# multiple artifacts to be matched. If any of gId, aId or ver is omited +# multiple artifacts to be matched. If any of gId, aId or ver is omitted # then any value will match the respective part. In particular a bare : # symbol will match any artifact. # @@ -72,7 +72,7 @@ # Usage: %mvn_file [gId]:[aId[:ver]] [file2 ...] # # GId, aId and ver can contain wildcards and alternatives, which allows -# multiple artifacts to be matched. If any of gId, aId or ver is omited +# multiple artifacts to be matched. If any of gId, aId or ver is omitted # then any value will match the respective part. In particular a bare : # symbol will match any artifact. # @@ -87,7 +87,7 @@ # Usage: %mvn_compat_version [gId]:[aId[:ver]] [version2 ...] # # GId, aId and ver can contain wildcards and alternatives, which allows -# multiple artifacts to be matched. If any of gId, aId or ver is omited +# multiple artifacts to be matched. If any of gId, aId or ver is omitted # then any value will match the respective part. In particular a bare : # symbol will match any artifact. # @@ -247,7 +247,7 @@ sort -u -o ${_filelist} ${_filelist} \ # Maven artifact. # # groupId and artifactId are identifiers of Maven group and artifact of the -# module on which dependency is to be removed. If they are ommited then all +# module on which dependency is to be removed. If they are omitted then all # identifiers are matched. # # POM location can be either a full path to the POM file, or a path to the @@ -266,7 +266,7 @@ sort -u -o ${_filelist} ${_filelist} \ # Maven plugin. # # groupId and artifactId are identifiers of Maven group and artifact of the -# plugin which invocation is to be removed. If they are ommited then all +# plugin which invocation is to be removed. If they are omitted then all # identifiers are matched. # # POM location can be either a full path to the POM file, or a path to the @@ -285,7 +285,7 @@ sort -u -o ${_filelist} ${_filelist} \ # project module. # # Module name is the exact name of the module to be disabled. It must not be -# ommited. +# omitted. # # POM location can be either a full path to the POM file, or a path to the # directory containing pom.xml. If POM location is not given then pom.xml from @@ -450,7 +450,7 @@ sort -u -o ${_filelist} ${_filelist} \ # current working directory is used. # # Extra XML is additional XML code to be added into the node. This -# parameter can be ommited, in which case no extra XML is appended. +# parameter can be omitted, in which case no extra XML is appended. # %pom_add_dep() %{expand: %{__pom_call}add_dep %* } @@ -467,7 +467,7 @@ sort -u -o ${_filelist} ${_filelist} \ # groupId and artifactId. # # groupId and artifactId are identifiers of Maven plugin artifact of which -# invocation is to be added. groupId may be ommited, in which case value of +# invocation is to be added. groupId may be omitted, in which case value of # "org.apache.maven.plugins" is used as default. artifactId must be # specified. If version is not specified then default value of "any" is used. # @@ -476,7 +476,7 @@ sort -u -o ${_filelist} ${_filelist} \ # current working directory is used. # # Extra XML is additional XML code to be added into the node. This -# parameter can be ommited, in which case no extra XML is appended. +# parameter can be omitted, in which case no extra XML is appended. # %pom_add_plugin() %{expand: %{__pom_call}add_plugin %* } diff --git a/man/pom_add_dep.txt b/man/pom_add_dep.txt index f1643aa..d00b5ca 100644 --- a/man/pom_add_dep.txt +++ b/man/pom_add_dep.txt @@ -47,7 +47,7 @@ used. When both *pom.xml* and *ivy.xml* are present, *pom.xml* is processed. You can specify more file locations which will be processed. Extra XML is additional XML code to be added into the ** -node. This parameter can be ommited, in which case no extra XML is +node. This parameter can be omitted, in which case no extra XML is appended. EXAMPLES diff --git a/man/pom_add_plugin.txt b/man/pom_add_plugin.txt index 1b32f96..d2e0c9d 100644 --- a/man/pom_add_plugin.txt +++ b/man/pom_add_plugin.txt @@ -19,7 +19,7 @@ This macro patches specified POM file adding plugin invocation of given groupId and artifactId. groupId and artifactId are identifiers of Maven plugin artifact of -which invocation is to be added. groupId may be ommited, in which +which invocation is to be added. groupId may be omitted, in which case value of "org.apache.maven.plugins" is used as default. artifactId must be specified. If version is not specified then default value of "any" is used. @@ -30,7 +30,7 @@ the directory containing *pom.xml*. If POM location is not given then file locations which will be processed. Extra XML is additional XML code to be added into the ** node. -This parameter can be ommited, in which case no extra XML is appended. +This parameter can be omitted, in which case no extra XML is appended. EXAMPLES -------- diff --git a/man/pom_change_dep.txt b/man/pom_change_dep.txt index 3871641..1f88aaf 100644 --- a/man/pom_change_dep.txt +++ b/man/pom_change_dep.txt @@ -45,7 +45,7 @@ used. When both *pom.xml* and *ivy.xml* are present, *pom.xml* is processed. You can specify more file locations which will be processed. Extra XML is additional XML code to be added into the ** -node. This parameter can be ommited, in which case no extra XML is +node. This parameter can be omitted, in which case no extra XML is appended. EXAMPLES diff --git a/man/pom_disable_module.txt b/man/pom_disable_module.txt index dbbad1b..0c980f3 100644 --- a/man/pom_disable_module.txt +++ b/man/pom_disable_module.txt @@ -18,7 +18,7 @@ This macro patches specified POM file not to contain reference to given project module. Module name is the exact name of the module to be disabled. It must -not be ommited. +not be omitted. POM location can be either a full path to the POM file, or a path to the directory containing *pom.xml*. If POM location is not given then diff --git a/man/pom_remove_dep.txt b/man/pom_remove_dep.txt index 142d8cf..5ce676e 100644 --- a/man/pom_remove_dep.txt +++ b/man/pom_remove_dep.txt @@ -35,7 +35,7 @@ This macro patches specified POM file not to contain dependencies on given Maven artifact. groupId and artifactId are identifiers of Maven group and artifact of -the module on which dependency is to be removed. If they are ommited +the module on which dependency is to be removed. If they are omitted then all identifiers are matched. When modifying Ivy modules, the org and name correspond to the Maven @@ -47,7 +47,7 @@ not given then *pom.xml* or *ivy.xml* from current working directory is used. When both *pom.xml* and *ivy.xml* are present, *pom.xml* is processed. You can specify more file locations. If the dependency is not found in all of given files, the command raises an error. This can be -overriden with the `-f` option. +overridden with the `-f` option. EXAMPLES diff --git a/man/pom_remove_plugin.txt b/man/pom_remove_plugin.txt index 246e50d..fa8b392 100644 --- a/man/pom_remove_plugin.txt +++ b/man/pom_remove_plugin.txt @@ -30,7 +30,7 @@ This macro patches specified POM file not to contain invocations of given Maven plugin. groupId and artifactId are identifiers of Maven group and artifact of -the plugin which invocation is to be removed. If they are ommited +the plugin which invocation is to be removed. If they are omitted then all identifiers are matched. POM location can be either a full path to the POM file, or a path to diff --git a/man/shade-jar.txt b/man/shade-jar.txt index 9502283..b515ece 100644 --- a/man/shade-jar.txt +++ b/man/shade-jar.txt @@ -16,7 +16,7 @@ DESCRIPTION ----------- *shade-jar* utility is means for changing JAR file namespaces. -Basically it replaces all occurences of given pattern with a given +Basically it replaces all occurrences of given pattern with a given replacement. The replacament is performed on class file names and inside the class files themselves. This is commonly known as _shading_. @@ -25,7 +25,7 @@ EXAMPLES -------- *shade-jar org.apache.log4j com.example.shaded.log4j /usr/share/java/log4j.jar lib/shaded-log4j.jar* will replace all -occurences of *org.apache.log4j* in JAR file +occurrences of *org.apache.log4j* in JAR file */usr/share/java/log4j.jar* with *com.example.shaded.log4j* and store the resulting JAR in *lib/shaded-log4j.jar*.