commit b1a026cb086ad977a18b077558d4d60fc122b733
Author: Michael Simacek <msimacek(a)redhat.com>
Date: Mon Nov 25 00:26:15 2013 +0100
[doc] fix typos, missing quotes, etc.
Please note that RPM macros with braces that are not enclosed in
backticks cause whole line of text to be entirely skipped.
doc/core_java_packages.txt | 2 +-
doc/directory_layout.txt | 8 ++++----
doc/fedora_java_specifics.txt | 7 +++----
doc/jar_file_id.txt | 4 ++--
doc/jar_file_id_relative.txt | 2 +-
5 files changed, 11 insertions(+), 12 deletions(-)
---
diff --git a/doc/core_java_packages.txt b/doc/core_java_packages.txt
index 7e0c266..34e0728 100644
--- a/doc/core_java_packages.txt
+++ b/doc/core_java_packages.txt
@@ -11,7 +11,7 @@ depending of what Java funtionality is required.
*`java-headless`*::
This package provides a working Java Runtime Environment (JRE)
- with some functionality didabled. Graphics and audio support may
+ with some functionality disabled. Graphics and audio support may
be unavailable in this case. `java-headless` provides
functionality that is enough for most of packages and avoids
pulling in a number of graphics and audio libraries as
diff --git a/doc/directory_layout.txt b/doc/directory_layout.txt
index ca78cb1..140a83a 100644
--- a/doc/directory_layout.txt
+++ b/doc/directory_layout.txt
@@ -44,7 +44,7 @@ short description.
native code and do not depend on a particular Java standard
version. JAR files can either be placed directly in this
directory or one of its subdirectories. Often packages create
- their own subdirectories here, in this case subdirectory name
+ their own subdirectories there, in this case subdirectory name
should match package name.
*`%{_jnidir}`* -- `/usr/lib/java`::
@@ -61,8 +61,8 @@ short description.
These directories are rarely used and are retained mostly for
compatibility with JPackage project. They are meant to contain
JAR files that depend on particular Java standard version. Note
- that such JARs can (and usually are) placed in %{_javadir} or
- %{_jnidir}.
+ that such JARs can (and usually are) placed in `%{_javadir}` or
+ `%{_jnidir}`.
*`%{_javadocdir}`* -- `/usr/share/javadoc`::
@@ -80,6 +80,6 @@ short description.
*`%{_mavendepmapfragdir}`* -- `/usr/share/maven-fragments`::
Directory containing package metadata in XML format. Typically
- each binary package installs here a single XML file containing
+ each binary package installs there a single XML file containing
various information (metadata) about artifacts associated with
that package.
diff --git a/doc/fedora_java_specifics.txt b/doc/fedora_java_specifics.txt
index 89a5e5a..916783c 100644
--- a/doc/fedora_java_specifics.txt
+++ b/doc/fedora_java_specifics.txt
@@ -15,7 +15,7 @@ It's a Java application launcher which spawns Java Virtual Machine
Here is an example how to run sample Java project from section 1.1.1:
-[source,java]
+[source,shell]
--------
$ java org/fedoraproject/helloworld/HelloWorld.class
--------
@@ -38,7 +38,6 @@ installed at the same time. It is possible in Fedora, but only one of
them can be default Java environment in system. Fedora uses
`alternatives` for switching between different installed JREs/JDKs.
-[source,shell]
--------
# alternatives --config java
@@ -82,7 +81,7 @@ $ build-classpath log4j junit org.ow2.asm:asm
/usr/share/java/log4j.jar:/usr/share/java/junit.jar:/usr/share/java/objectweb-asm4/asm.jar
--------
-`log4j` corresponds to `log4j.jar` stored in %{_javadir}. If the JAR
+`log4j` corresponds to `log4j.jar` stored in `%{_javadir}`. If the JAR
file is stored in subdirectory under `%{_javadir}`, it's neccessary to
pass `subdirectory/jarname` as an argument to `build-classpath`.
Example:
@@ -114,7 +113,7 @@ Similar command `rebuild-jar-repository` can be used to rebuild JAR
repository previously built by `build-jar-repository`. See `man
rebuild-jar-repository` for more information.
-build-classpath-directory is a small tool which can be used to build
+`build-classpath-directory` is a small tool which can be used to build
classpath string from specified directory.
[source,shell]
diff --git a/doc/jar_file_id.txt b/doc/jar_file_id.txt
index 4f1e4a6..88ebe87 100644
--- a/doc/jar_file_id.txt
+++ b/doc/jar_file_id.txt
@@ -1,9 +1,9 @@
Complex Java applications usually consist of multiple components.
Each component can have multiple implementations, called _artifacts_.
-Artifacts in java context are _usually_ JAR files, but can also be WAR
+Artifacts in Java context are _usually_ JAR files, but can also be WAR
files or any other kind of file.
-There exist multiple incompatible ways of identifying (naming) Java
+There are multiple incompatible ways of identifying (naming) Java
artifacts and each build system often encourages usage of specific
naming scheme. This means that Linux distributions also need to allow
each artifact to be located using several different identifiers,
diff --git a/doc/jar_file_id_relative.txt b/doc/jar_file_id_relative.txt
index feb9b81..1eedeae 100644
--- a/doc/jar_file_id_relative.txt
+++ b/doc/jar_file_id_relative.txt
@@ -1,4 +1,4 @@
-As described in [link], JAR artifacts are installed in one of standard
+JAR artifacts are installed in one of standard
directory trees. Usually this is either `%{_javadir}`
(`/usr/share/java`) or `%{_jnidir}` (`/usr/lib/java`).
Show replies by date