This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git
The following commit(s) were added to refs/heads/master by this push:
new 22d87d3 (doc) Fix typos in project documentations (#50)
22d87d3 is described below
commit 22d87d384627533d777b1ba3912807472589b244
Author: Marc Wrobel <[email protected]>
AuthorDate: Sat Jul 16 02:08:14 2022 +0200
(doc) Fix typos in project documentations (#50)
Fix typos in changelog, site and project guides.
---
HOWTO-RELEASE.txt | 2 +-
PROPOSAL.html | 12 ++++++------
pom.xml | 2 +-
src/changes/changes.xml | 12 ++++++------
src/docs/daemon.html | 20 ++++++++++----------
src/samples/README.txt | 8 ++++----
src/site/xdoc/faq.xml | 2 +-
src/site/xdoc/index.xml | 4 ++--
src/site/xdoc/mail-lists.xml | 2 +-
src/site/xdoc/procrun.xml | 6 +++---
10 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/HOWTO-RELEASE.txt b/HOWTO-RELEASE.txt
index 37d284a..98f5a9e 100644
--- a/HOWTO-RELEASE.txt
+++ b/HOWTO-RELEASE.txt
@@ -57,7 +57,7 @@ Before tagging:
- /src/site/xdoc/binaries.xml (version)
Only in tag:
- /pom.xml (remove -SNAPSHOT)
- - /src/native/unix/native/version.h (JSVC_IS_DEV_VERION 0)
+ - /src/native/unix/native/version.h (JSVC_IS_DEV_VERSION 0)
Search for the text "THIS FILE IS GENERATED BY" and regenerate the generated
files.
diff --git a/PROPOSAL.html b/PROPOSAL.html
index 7a9c82c..6cd6beb 100644
--- a/PROPOSAL.html
+++ b/PROPOSAL.html
@@ -31,7 +31,7 @@
valid tool to develop, other than applets and client applications,
reliable and performant server applications. The major disadvantage of
the Java™ platform is that still today the only portable way to
- start a Java™ applcation relies on a single point of entry: the
+ start a Java™ application relies on a single point of entry: the
<CODE><EM CLASS="key">public static void</EM> main(<EM
CLASS="ref">String</EM>[])</CODE>
method.
</P>
@@ -46,7 +46,7 @@
</P>
<P>
A server application written in Java might have to perform several tasks
- before being able to shutdown the Virtual Machine process. For example
+ before being able to shut down the Virtual Machine process. For example
in the case of a Servlet container, before the VM process is shut down,
sessions might need to be serialized to disk, and web applications need
to be destroyed.
@@ -70,7 +70,7 @@
<P>
Most multi-user operating systems already have a way in which server
applications are started and stopped, under Unix based operating systems
- non interactive server applications are called <em>daemons</em> and are
+ non-interactive server applications are called <em>daemons</em> and are
controlled by the operating system with a set of specified
<em>signals</em>. Under Windows such programs are called
<em>services</em>
and are controlled by appropriate calls to specific functions defined in
@@ -90,20 +90,20 @@
<CODE><EM CLASS="key">public static void</EM> main(<EM
CLASS="ref">String</EM>[])</CODE>
method. This specification cover the behavior and life cycle of what
we define as "Java ™ daemons", or, in other words,
- non interactive Java™ applications.
+ non-interactive Java™ applications.
</P>
<P>
This specification does not cover how the container of a Java™
daemon must be implemented, or how to build a native liaison between
the operating system and the <CODE><EM CLASS="ref">Daemon</EM></CODE>
- interface, but defines the relation between the an operating system
+ interface, but defines the relation between the operating system
process and the <CODE><EM CLASS="ref">Daemon</EM></CODE> implementation
life cycle. It should be trivial for implementors to build a native
liaison and container for Java™ daemons.
</P>
<P>
This specification, together with the related API documentation, can be
- used by software deveopers to build portable non interactive applications
+ used by software developers to build portable non-interactive
applications
based on the Java™ platform.
</P>
diff --git a/pom.xml b/pom.xml
index 38bb2c5..3d59242 100644
--- a/pom.xml
+++ b/pom.xml
@@ -194,7 +194,7 @@
<artifactId>commons-release-plugin</artifactId>
<executions>
<execution>
- <id>detatch-distributions</id>
+ <id>detach-distributions</id>
<phase>deploy</phase>
<goals>
<goal>detach-distributions</goal>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2933b98..c88f2a7 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -42,7 +42,7 @@
<!-- Fix -->
<action type="fix" dev="markt">
Procrun. Remove noisy INFO log message that triggered logging once per
- minute while the service was ruinning.
+ minute while the service was running.
</action>
<action type="fix" dev="ggregory" due-to="Marc Wrobel">
Fix typos in Javadoc and comments #51
@@ -63,7 +63,7 @@
to prevent the expected errors from polluting subsequent log messages.
</action>
<action issue="DAEMON-441" type="fix" dev="markt">
- Procrun. Only configure the logging to to be written to a file when
+ Procrun. Only configure the logging to be written to a file when
running as a service.
</action>
<action issue="DAEMON-441" type="fix" dev="markt">
@@ -142,7 +142,7 @@
GUI.
</action>
<action issue="DAEMON-439" type="fix" dev="markt">
- Procrun. Support --Startup=delayed for service installaion as well as
+ Procrun. Support --Startup=delayed for service installation as well as
service update.
</action>
<!-- ADD -->
@@ -282,7 +282,7 @@
</action>
<action issue="DAEMON-407" type="fix" dev="markt">
Procrun. Correct a regression in the fix for DAEMON-391 that caused the
- GUI to mix-up the WARN and INFO logging levels.
+ GUI to mix up the WARN and INFO logging levels.
</action>
<action issue="DAEMON-404" type="fix" dev="markt">
Procrun. Expand the search for a valid Java runtime library to include
@@ -387,11 +387,11 @@
jsvc. Include the full path to the jsvc executable in the debug log.
</action>
<action issue="DAEMON-397" type="add" dev="markt" due-to="Petr Hadraba">
- jsvc. Improve search for libjli.dylib on MacOS when using custom built
+ jsvc. Improve search for libjli.dylib on macOS when using custom-built
OpenJDK binaries.
</action>
<action type="fix" dev="markt" due-to="ggregory">
- Procun. Improve log messages for interactions with the Windows service.
+ Procrun. Improve log messages for interactions with the Windows
service.
</action>
<action type="fix" dev="markt" due-to="YunQiang Su">
jsvc. Improve mips detection.
diff --git a/src/docs/daemon.html b/src/docs/daemon.html
index 02d7d63..1ce7177 100644
--- a/src/docs/daemon.html
+++ b/src/docs/daemon.html
@@ -31,7 +31,7 @@
This document specifies the behavior and life cycle of an abstract
Java™ daemon, in relation to its native container. In addition
it defines a mechanism for controlling a daemon, and its interaction
- with the native OS process in which its existance is confined.
+ with the native OS process in which its existence is confined.
</P>
<H2>Index</H2>
@@ -54,7 +54,7 @@
valid tool to develop, other than applets and client applications,
reliable and performant server applications. The major disadvantage of
the Java™ platform is that still today the only portable way to
- start a Java™ applcation relies on a single point of entry: the
+ start a Java™ application relies on a single point of entry: the
<CODE><EM CLASS="key">public static void</EM> main(<EM
CLASS="ref">String</EM>[])</CODE>
method.
</P>
@@ -69,7 +69,7 @@
</P>
<P>
A server application written in Java might have to perform several tasks
- before being able to shutdown the Virtual Machine process. For example
+ before being able to shut down the Virtual Machine process. For example
in the case of a Servlet container, before the VM process is shut down,
sessions might need to be serialized to disk, and web applications need
to be destroyed.
@@ -93,7 +93,7 @@
<P>
Most multi-user operating systems already have a way in which server
applications are started and stopped, under Unix based operating systems
- non interactive server applications are called <em>daemons</em> and are
+ non-interactive server applications are called <em>daemons</em> and are
controlled by the operating system with a set of specified
<em>signals</em>. Under Windows such programs are called <em>daemons</em>
and are controlled by appropriate calls to specific functions defined in
@@ -112,20 +112,20 @@
<CODE><EM CLASS="key">public static void</EM> main(<EM
CLASS="ref">String</EM>[])</CODE>
method. This specification cover the behavior and life cycle of what
we define as "Java ™ daemons", or, in other words,
- non interactive Java™ applications.
+ non-interactive Java™ applications.
</P>
<P>
This specification does not cover how the container of a Java™
daemon must be implemented, or how to build a native liaison between
the operating system and the <CODE><EM CLASS="ref">Daemon</EM></CODE>
- interface, but defines the relation between the an operating system
+ interface, but defines the relation between the operating system
process and the <CODE><EM CLASS="ref">Daemon</EM></CODE> implementation
life cycle. It should be trivial for implementors to build a native
liaison and container for Java™ daemons.
</P>
<P>
This specification, together with the related API documentation, can be
- used by software deveopers to build portable non interactive applications
+ used by software developers to build portable non-interactive
applications
based on the Java™ platform.
</P>
@@ -150,7 +150,7 @@
<EM CLASS="key">public void</EM> destroy();
}</PRE>
<P>
- A daemon is managed through a well defined life cycle that defines how
+ A daemon is managed through a well-defined life cycle that defines how
it is loaded, initialized, started, stopped and destroyed. This life
cycle is expressed in the API by the <CODE>init(...)</CODE>,
<CODE>run()</CODE>, <CODE>die()</CODE> and <CODE>destroy()</CODE> methods
@@ -204,7 +204,7 @@
<P>
After the daemon instance has been constructed, the container must
initialize it before it can be started. Initialization is provided so
- that a daemon can read persisten configuration data, access native
+ that a daemon can read persistent configuration data, access native
resources, and perform other one-time activities.
</P>
<P>
@@ -231,7 +231,7 @@
</P>
<P>
During initialization, the daemon instance can throw any
- <CODE><EM CLASS="ref">Exception</EM></CODE> preventing a the successful
+ <CODE><EM CLASS="ref">Exception</EM></CODE> preventing the successful
completion of the <CODE>init(...)</CODE> method. In this case the daemon
instance must not be started, and the <CODE>destroy()</CODE> method must
not be called before the instance is released by the container to allow
diff --git a/src/samples/README.txt b/src/samples/README.txt
index 84ace65..ed1e521 100644
--- a/src/samples/README.txt
+++ b/src/samples/README.txt
@@ -7,7 +7,7 @@ SimpleDaemon
SimpleDaemon demonstrates the feature of the daemon offered by
Apache Commons Daemon.
-To run it adapt the SimpleDaemon.sh file and connect to it using:
+To run it, adapt the SimpleDaemon.sh file and connect to it using:
telnet localhost 1200
Additional information in ../native/unix/INSTALL.txt
@@ -23,7 +23,7 @@ services support under Win NT/2000/XP.
It uses Apache Commons Collections:
https://commons.apache.org/collections/
To use it you need at least commons-collections-1.0
-Check in build.xml that the property commons-collections.jar correspond to thei
+Check in build.xml that the property commons-collections.jar correspond to the
location of your commons-collections.jar file.
You have to create a file named startfile that uses a property format:
@@ -35,7 +35,7 @@ router1=/home/Standard/router/router pop3 pop3.example.net
router2=/home/Standard/router/smtp smtp.example.net
socks5=/usr/local/bin/socks5 -f
-To run it adapt the ServiceDaemon.sh file.
+To run it, adapt the ServiceDaemon.sh file.
AloneService
------------
@@ -46,4 +46,4 @@ ProcrunService
--------------
This is a simple Windows Service application.
It can be run either in Jvm or Java modes.
-See ProcrunServiceInstall.cmd for a sample installation script.
\ No newline at end of file
+See ProcrunServiceInstall.cmd for a sample installation script.
diff --git a/src/site/xdoc/faq.xml b/src/site/xdoc/faq.xml
index 9583d3e..de9547b 100644
--- a/src/site/xdoc/faq.xml
+++ b/src/site/xdoc/faq.xml
@@ -33,7 +33,7 @@ autoconf: Undefined macros:
***BUG in Autoconf--please report*** AC_PATH
***BUG in Autoconf--please report*** AC_PATH
</source>
-Your version of autoconf is to old, upgrade your autoconf and retry.
+Your version of autoconf is too old, upgrade your autoconf and retry.
Or run support/buildconf.sh in another machine and copy the daemon tree in
the machine where you want to compile jsvc.
</p>
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index a0884af..c118985 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -45,7 +45,7 @@
</p>
<p>
A server application written in Java might have to perform several tasks
- before being able to shutdown the Virtual Machine process. For example
+ before being able to shut down the Virtual Machine process. For example
in the case of a Servlet container, before the VM process is shut down,
sessions might need to be serialized to disk, and web applications need
to be destroyed.
@@ -75,7 +75,7 @@
<p>
Most multi-user operating systems already have a way in which server
applications are started and stopped. Under Unix based operating systems
- non interactive server applications are called <em>daemons</em> and are
+ non-interactive server applications are called <em>daemons</em> and are
controlled by the operating system with a set of specified
<em>signals</em>. Under Windows such programs are called
<em>services</em>
and are controlled by appropriate calls to specific functions defined in
diff --git a/src/site/xdoc/mail-lists.xml b/src/site/xdoc/mail-lists.xml
index 552e9e2..a6b6101 100644
--- a/src/site/xdoc/mail-lists.xml
+++ b/src/site/xdoc/mail-lists.xml
@@ -158,7 +158,7 @@ limitations under the License.
<td>
<strong>Commons Commits List</strong>
<br /><br />
- Only for e-mails automatically generated by the <a
href="scm.html">source control</a> sytem.
+ Only for e-mails automatically generated by the <a
href="scm.html">source control</a> system.
<br /><br />
</td>
<td><a
href="mailto:[email protected]";>Subscribe</a></td>
diff --git a/src/site/xdoc/procrun.xml b/src/site/xdoc/procrun.xml
index e126241..b259e70 100644
--- a/src/site/xdoc/procrun.xml
+++ b/src/site/xdoc/procrun.xml
@@ -237,7 +237,7 @@ JvmOptions:
-Dtwo=2
</source>
<br/>
-Only multi-valued parameters support this; they are indicated in the table
below by <b><code>++</code></b>.
+Only multivalued parameters support this; they are indicated in the table
below by <b><code>++</code></b>.
<br></br>
If <b><code>++</code></b> is used for a parameter that does not support
multiple values,
then it is treated the same as <b><code>--</code></b>. No error is reported.
@@ -292,7 +292,7 @@ JvmOptions:
When updating a service (//US or update command), using <b><code>--</code></b>
will replace any existing parameter with the new setting.
<br/>
-For multi-valued parameters, using the <b><code>++</code></b> option qualifier
+For multivalued parameters, using the <b><code>++</code></b> option qualifier
will add the new value(s) to any existing value(s).
</p>
<p>
@@ -547,7 +547,7 @@ will add the new value(s) to any existing value(s).
<td>Info</td>
<td>Defines the logging level and can be either <b>Error</b>, <b>Warn</b>
<b>Info</b>, <b>Debug</b>, or <b>Trace</b>. (Case insensitive). Note
- that for all log entires, the maximum length of the message component
of
+ that for all log entries, the maximum length of the message component
of
the log entry is 4096 characters.
</td>
</tr>
