You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by rc...@apache.org on 2023/03/22 02:52:32 UTC
[james-project] 01/03: [CLEAN CODE] Fix typo AsciiDoc document
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 4a492e64bd45eeefa72e9883eb25ac1d21f78847
Author: Tung Van TRAN <vt...@linagora.com>
AuthorDate: Tue Mar 21 16:26:24 2023 +0700
[CLEAN CODE] Fix typo AsciiDoc document
---
docs/modules/community/pages/contributing.adoc | 6 +++---
docs/modules/community/pages/guidelines.adoc | 18 +++++++++---------
docs/modules/community/pages/index.adoc | 2 +-
docs/modules/community/pages/mailing-lists.adoc | 2 +-
docs/modules/community/pages/support.adoc | 4 ++--
docs/modules/concepts/pages/glossary.adoc | 2 +-
docs/modules/concepts/pages/index.adoc | 2 +-
docs/modules/concepts/pages/messages/imf.adoc | 2 +-
docs/modules/concepts/pages/messages/index.adoc | 2 +-
docs/modules/concepts/pages/protocols/imap.adoc | 10 +++++-----
docs/modules/concepts/pages/storage/index.adoc | 6 +++---
docs/modules/concepts/pages/storage/mailbox.adoc | 4 ++--
docs/modules/concepts/pages/storage/users.adoc | 4 ++--
docs/modules/servers/pages/15-minute-demo.adoc | 4 ++--
docs/modules/servers/pages/5-minute-demo.adoc | 4 ++--
docs/modules/servers/pages/basic/self-hosting.notes | 2 +-
.../docs/modules/ROOT/pages/architecture/index.adoc | 14 +++++++-------
.../docs/modules/ROOT/pages/configure/blobstore.adoc | 2 +-
.../docs/modules/ROOT/pages/configure/imap.adoc | 2 +-
.../docs/modules/ROOT/pages/configure/index.adoc | 4 ++--
.../modules/ROOT/pages/configure/mailetcontainer.adoc | 2 +-
.../ROOT/pages/configure/recipientrewritetable.adoc | 2 +-
.../docs/modules/ROOT/pages/configure/sieve.adoc | 2 +-
.../docs/modules/ROOT/pages/configure/smtp-hooks.adoc | 6 +++---
.../docs/modules/ROOT/pages/configure/smtp.adoc | 14 +++++++-------
.../docs/modules/ROOT/pages/extending/index.adoc | 4 ++--
.../docs/modules/ROOT/pages/extending/smtp-hooks.adoc | 2 +-
.../docs/modules/ROOT/pages/operate/guide.adoc | 4 ++--
.../docs/modules/ROOT/pages/operate/webadmin.adoc | 18 +++++++++---------
.../docs/modules/ROOT/pages/run/k8s-logsMetrics.adoc | 2 +-
.../docs/modules/ROOT/pages/run/k8s-values.adoc | 2 +-
.../docs/modules/ROOT/pages/run/run-kubernetes.adoc | 6 +++---
.../docs/modules/ROOT/partials/HasException.adoc | 2 +-
.../modules/ROOT/partials/HasHabeasWarrantMark.adoc | 2 +-
.../modules/ROOT/partials/RecipientRewriteTable.adoc | 2 +-
.../modules/ROOT/partials/RemoteAddrInNetwork.adoc | 2 +-
.../modules/ROOT/partials/RemoteAddrNotInNetwork.adoc | 2 +-
.../modules/ROOT/partials/SMIMECheckSignature.adoc | 2 +-
.../docs/modules/ROOT/partials/SMTPIsAuthNetwork.adoc | 2 +-
src/homepage/index.html | 2 +-
src/site/xdoc/contribute.xml | 4 ++--
src/site/xdoc/guidelines.xml | 8 ++++----
42 files changed, 94 insertions(+), 94 deletions(-)
diff --git a/docs/modules/community/pages/contributing.adoc b/docs/modules/community/pages/contributing.adoc
index a0c442f14a..3c43430430 100644
--- a/docs/modules/community/pages/contributing.adoc
+++ b/docs/modules/community/pages/contributing.adoc
@@ -92,9 +92,9 @@ changes the writing of xref:#_idea_or_design_proposals[ADRs] is encouraged.
Your code contribution *must* be backed by a xref:_reporting_bugs[JIRA ticket].
* Clone the source code of the project from its link:git://git.apache.org/james-project.git[apache git repository] or its
-https://github.com/apache/james-project[Github]
+https://github.com/apache/james-project[GitHub]
* Create your branch and name it with the JIRA ticket number.
-* Create a Pull Request on Github with your branch name and prefix its different commits with the same name.
+* Create a Pull Request on GitHub with your branch name and prefix its different commits with the same name.
* A build will be started for your work on the link:https://ci-builds.apache.org/job/james/job/ApacheJames/[Apache CI].
* Active contributors will review your work, and merge it.
@@ -170,7 +170,7 @@ sometimes remove whitespaces which may not be desirable.
=== Code patches
-While we definitely prefer receiving contributions under the form of xref:#_how_to_contribute_some_code[Github pull requests],
+While we definitely prefer receiving contributions under the form of xref:#_how_to_contribute_some_code[GitHub pull requests],
in order to still be vendor neutral on the contribution process, we do accept submission of patches, in a process described
below.
diff --git a/docs/modules/community/pages/guidelines.adoc b/docs/modules/community/pages/guidelines.adoc
index c9dc17cdac..5e06234e55 100644
--- a/docs/modules/community/pages/guidelines.adoc
+++ b/docs/modules/community/pages/guidelines.adoc
@@ -47,7 +47,7 @@ James PMC members and Apache Software Foundation Members.
Topics to be discussed on the private mailing list:
- - Discussion of board reports. PMC members need to report quaterly project activity to the Apache board of directors,
+ - Discussion of board reports. PMC members need to report quarterly project activity to the Apache board of directors,
which is done through link:https://reporter.apache.org[reporter.apache.org]. Prior report submission, the draft should
be discussed on the private mailing list.
- Discussions of link:https://community.apache.org/newcommitter.html[new committers, new PMCs], including proposition discussions, votes and process follow up.
@@ -69,7 +69,7 @@ We actively rely on link:https://community.apache.org/committers/lazyConsensus.h
decisions, be them validating xref:contributing.adoc#_how_to_contribute_some_code[code changes], enacting
xref:contributing.adoc#_idea_or_design_proposals[design decisions].
-All code modifications should achieve lazy consensus under the form of github pull requests.
+All code modifications should achieve lazy consensus under the form of GitHub pull requests.
=== Voting
@@ -104,12 +104,12 @@ Abstain, no opinion, or I am happy to let the other group members decide this is
effects if too many people abstain.
*-1*
-No. On issues where consensus is required, this vote counts as a veto. All vetos must include an explanation of why the
+No. On issues where consensus is required, this vote counts as a veto. All vetoes must include an explanation of why the
veto is appropriate. A veto with no explanation is void. No veto can be overruled. If you disagree with the veto, you
should lobby the person who casts the veto. Voters intending to veto an action item should make their opinions known to
the group immediately, so that the problem can be remedied as early as possible.
-An action item requiring consensus approval must receive at least 3 binding +1 votes and no vetos. An action item
+An action item requiring consensus approval must receive at least 3 binding +1 votes and no vetoes. An action item
requiring majority approval must receive at least 3 binding +1 votes and more +1 votes than -1 votes (i.e., a majority
with a minimum quorum of three positive votes). All other action items are considered to have lazy approval until
someone votes -1, after which point they are decided by either consensus or a majority vote, depending upon the type
@@ -130,17 +130,17 @@ As part of the link:https://community.apache.org/newcommitter.html[process to be
- Establishing an Apache profile with the Apache secretary.
- Access will directly be granted on the link:https://issues.apache.org/jira/projects/JAMES[JIRA],
the ASF Git repository and the link:https://ci-builds.apache.org/job/james/job/ApacheJames/[ci].
- - Extra steps should be taken for xref:#_accessing_apache_github_as_a_committer[Github access].
+ - Extra steps should be taken for xref:#_accessing_apache_github_as_a_committer[GitHub access].
- A PMC should have had announced your nomination. If you have not already been doing it, we strongly
encourage you to write an email on public mailing list, presenting you, and your motivations toward
-contributing on Apache James. A reply to the announce would do the trick!
+contributing on Apache James. A reply to the announcement would do the trick!
=== Accessing Apache GitHub as a Committer
-- Verify you have a Github ID enabled with link:https://help.github.com/articles/securing-your-account-with-two-factor-authentication-2fa/[2FA]
-- Enter your Github ID into your link:https://id.apache.org/[Apache ID profile]
+- Verify you have a GitHub ID enabled with link:https://help.github.com/articles/securing-your-account-with-two-factor-authentication-2fa/[2FA]
+- Enter your GitHub ID into your link:https://id.apache.org/[Apache ID profile]
- Merge your Apache and GitHub accounts using link:https://gitbox.apache.org/setup/[GitBox] (Apache Account Linking utility). You should see 3 green checks in GitBox.
Wait at least 30 minutes for an email inviting you to Apache GitHub Organization and accept invitation.
-- After accepting the Github Invitation verify that you are a member of the link:https://github.com/orgs/apache/teams/james-committers[GitHub Apache James team].
+- After accepting the GitHub Invitation verify that you are a member of the link:https://github.com/orgs/apache/teams/james-committers[GitHub Apache James team].
diff --git a/docs/modules/community/pages/index.adoc b/docs/modules/community/pages/index.adoc
index 1213740b65..7b7bcee872 100644
--- a/docs/modules/community/pages/index.adoc
+++ b/docs/modules/community/pages/index.adoc
@@ -12,7 +12,7 @@ There are many ways for Users, Developers, Curious and Fans to join and be part
* xref:mailing-lists.adoc[Mailing lists]: Subscribe to the appropriate Mailing Lists according to your interests and profile.
* https://gitter.im/apache/james-project[Gitter chat room]: Chat in live with the community on Gitter.
* https://twitter.com/ApacheJames[Twitter]: Express yourself and follow us @ApacheJames.
- * https://github.com/apache/james-project[Github]: Read and contribute to the source code of the project.
+ * https://github.com/apache/james-project[GitHub]: Read and contribute to the source code of the project.
* https://issues.apache.org/jira/projects/JAMES[JIRA]: Report issues or make suggestions for the project on our bug tracker.
* https://builds.apache.org/job/ApacheJames/[CI]: Check the status of James builds on our Jenkins CI.
* xref:download.adoc[Download releases]: Download artifacts and sources your need for the James Server and James libraries.
diff --git a/docs/modules/community/pages/mailing-lists.adoc b/docs/modules/community/pages/mailing-lists.adoc
index 9c4590176b..5c80196f62 100644
--- a/docs/modules/community/pages/mailing-lists.adoc
+++ b/docs/modules/community/pages/mailing-lists.adoc
@@ -65,7 +65,7 @@ dedicated to that already.
== How to unsubscribe your old email address
-First, find out the particular email adress to which ezmlm is sending. The email headers are visible in Microsoft Outlook
+First, find out the particular email address to which ezmlm is sending. The email headers are visible in Microsoft Outlook
via the messages menu "View | Options".
Microsoft Mail Internet Headers Version 2.0
diff --git a/docs/modules/community/pages/support.adoc b/docs/modules/community/pages/support.adoc
index 30d96753b8..b9bfae9941 100644
--- a/docs/modules/community/pages/support.adoc
+++ b/docs/modules/community/pages/support.adoc
@@ -8,7 +8,7 @@ mailto:matthieu@baechler-craftsmanship.fr[*Baechler Craftsmanship*] has a very s
run by a long-time contributor and PMC of James which contributed significant enhancements
over the years.
-The company is commited to contribute to James and offers consultancy for companies willing
+The company is committed to contribute to James and offers consultancy for companies willing
to use James on their own infrastructure and/or need enhancements to fit their own needs.
Free Software is a core value of the company and it can also help customers to work with
@@ -20,7 +20,7 @@ image::linagora.png[link=https://linagora.com]
*Linagora* is an Open Source Software Company.
-Their mission is to bring digital independency to their customers.
+Their mission is to bring digital independence to their customers.
They are focused on large organizations both from private and public sector. They have set themselves the goal of
helping Governments to achieve their digital sovereignty.
diff --git a/docs/modules/concepts/pages/glossary.adoc b/docs/modules/concepts/pages/glossary.adoc
index edd9e76039..bd25369c6e 100644
--- a/docs/modules/concepts/pages/glossary.adoc
+++ b/docs/modules/concepts/pages/glossary.adoc
@@ -10,7 +10,7 @@ syntax of an email message.
[[email_server]]
Email Server (or Mail Server)::
-Any host that contains a sofware application that acts as a POP Server, an
+Any host that contains a software application that acts as a POP Server, an
IMAP Server, or an MTA.
IMAP::
diff --git a/docs/modules/concepts/pages/index.adoc b/docs/modules/concepts/pages/index.adoc
index aa019f3d39..d2100d52f6 100644
--- a/docs/modules/concepts/pages/index.adoc
+++ b/docs/modules/concepts/pages/index.adoc
@@ -1,7 +1,7 @@
= Apache James Core Concepts
:navtitle: Concepts
-The core domain of Apache James is intimitely related to email communications.
+The core domain of Apache James is intimately related to email communications.
Therefore this section is divided into topics that deal with the various
aspect of email systems.
diff --git a/docs/modules/concepts/pages/messages/imf.adoc b/docs/modules/concepts/pages/messages/imf.adoc
index 886c5f0f69..e355257d8c 100644
--- a/docs/modules/concepts/pages/messages/imf.adoc
+++ b/docs/modules/concepts/pages/messages/imf.adoc
@@ -36,7 +36,7 @@ Electronic mail messages are defined as having contents and an envelope. The con
consist of header fields and, optionally, a body. The body is nothing more than
a (potentially empty) sequence of lines of text.
-Although this sounds like a an extremely simple concept, to get two completely separate systems
+Although this sounds like an extremely simple concept, to get two completely separate systems
to agree and understand each other is a surprisingly complex problem that most people
today take for granted. Most of RFC822 deals with the nitty-gritty of formatting and parsing
this type of text message.
diff --git a/docs/modules/concepts/pages/messages/index.adoc b/docs/modules/concepts/pages/messages/index.adoc
index cc95cc4dce..9c723d415d 100644
--- a/docs/modules/concepts/pages/messages/index.adoc
+++ b/docs/modules/concepts/pages/messages/index.adoc
@@ -3,7 +3,7 @@
An email message is essentially a simple text message that is communicated
from one party to another. It is no miracle that two unknown parties are
-able to communicate; rather rather we can thank a set of standards that
+able to communicate; rather we can thank a set of standards that
allow any two unrelated systems to process an email even if the system owners
do not know each other.
diff --git a/docs/modules/concepts/pages/protocols/imap.adoc b/docs/modules/concepts/pages/protocols/imap.adoc
index 31601a3dd1..9d8251f27c 100644
--- a/docs/modules/concepts/pages/protocols/imap.adoc
+++ b/docs/modules/concepts/pages/protocols/imap.adoc
@@ -8,7 +8,7 @@ or IMAP, is a protocol used by email clients to retrieve
xref:messages/index.adoc[email messages] from a xref:glossary.adoc#email_server[mail server].
One could say that it is effectively in competition with xref:protocols/pop.adoc[POP]
because it accomplishes a function similar in nature, and most clients will force you
-to choose one or the other..
+to choose one or the other.
These days, the natural choice of protocol tends to be IMAP rather than POP.
The main difference between IMAP and POP is that messages are kept on the server, which
@@ -42,7 +42,7 @@ by <<RFC1176>>.
==== RFC1176
https://tools.ietf.org/html/rfc1176[RFC1176] ("Interactive Mail Access Protocol - Version 2")
-provides various, somewhat minor updates to <<RFC1064>>. This specification was supseded by
+provides various, somewhat minor updates to <<RFC1064>>. This specification was superseded by
the first IMAP3 specification, <<RFC1203>>.
=== IMAP3
@@ -50,7 +50,7 @@ the first IMAP3 specification, <<RFC1203>>.
==== RFC1203
https://tools.ietf.org/html/rfc1203[RFC1203] ("Interactive Mail Access Protocol - Version 3")
-obsoletes <<RFC1064>>, and presumedly also <<RFC1176>>.
+obsoletes <<RFC1064>>, and presumably also <<RFC1176>>.
It appears to be the only version of IMAP3 that was published. Apparently, IMAP3 is a rare
version, and was never really adopted by the marketplace.
@@ -80,7 +80,7 @@ Extensions to IMAP have been published as recently as in 2018.
==== Extensions to RFC3501
-For brevity, we simply refence a number of extentions to RFC3501:
+For brevity, we simply reference a number of extensions to RFC3501:
* https://tools.ietf.org/html/rfc4466[RFC4466] ("Collected Extensions to IMAP4 ABNF")
* https://tools.ietf.org/html/rfc4469[RFC4469] ("Internet Message Access Protocol (IMAP) CATENATE Extension")
@@ -179,6 +179,6 @@ l logout <7>
<3> Select `INBOX` as the current folder
<4> Fetch the contents of the INBOX folder, showing only the subject
<5> Mark the message for deletion
-<6> Epunge the INBOX by deleting mails marked for deletion
+<6> Expunge the INBOX by deleting mails marked for deletion
<7> Exit the session
diff --git a/docs/modules/concepts/pages/storage/index.adoc b/docs/modules/concepts/pages/storage/index.adoc
index da74a9da9b..f6fcb56340 100644
--- a/docs/modules/concepts/pages/storage/index.adoc
+++ b/docs/modules/concepts/pages/storage/index.adoc
@@ -7,14 +7,14 @@ Email is useful because any one person can send a message to any other person,
anywhere in the world. The heart of email is the ability to transfer some message
based on a commonly-understood message format between two different systems that
may have been developed entirely independently of each other. The concept is relatively
-simple, but the fact that email is so ubiquitious is simply a miracle.
+simple, but the fact that email is so ubiquitous is simply a miracle.
However, there is more to email than just the transfer of messages.
For starters, I want people I know to be able to send me a mail even when
I happen to be out mountain climbing. I want to be able to receive the message
when I'm not available, then review it afterward when I am back at my desk.
-For this reason, email is by design asynchromous. Time can pass between the moment
+For this reason, email is by design asynchronous. Time can pass between the moment
a mail is sent and the moment it is read.
In the meantime, it needs to be stored somewhere.
@@ -36,5 +36,5 @@ xref:protocols/index.adoc[protocols].
In this section, we describe the two principle types of storage that James manages:
* xref:storage/mailbox.adoc[Mailboxes] for email storage, and
-// "Repository" should be "Diretory". See JAMES-3360.
+// "Repository" should be "Directory". See JAMES-3360.
* xref:storage/users.adoc[User Repository] for data about Mailbox users.
diff --git a/docs/modules/concepts/pages/storage/mailbox.adoc b/docs/modules/concepts/pages/storage/mailbox.adoc
index 51772dc21f..473806e106 100644
--- a/docs/modules/concepts/pages/storage/mailbox.adoc
+++ b/docs/modules/concepts/pages/storage/mailbox.adoc
@@ -15,7 +15,7 @@ The more general term is "Email Storage". It is necessary to store email for
many reasons:
* As a mailbox system — part of a queue to await processing
- * As a persistance mechanism — a place where you can go back and predictably
+ * As a persistence mechanism — a place where you can go back and predictably
locate a message that you may want to refer to again in the future
* As an archive — a place where you may want to store "deleted" emails so that
you can potentially retrieve them if you wish to change your mind later
@@ -118,7 +118,7 @@ https://tools.ietf.org/html/rfc5322[RFC5322] weighs in on how to describe a "mai
== Indexing
-// "Repository" should be "Diretory". See JAMES-3360.
+// "Repository" should be "Directory". See JAMES-3360.
Once a system grows over time it will likely contain many messages
stored in its xref:storage/mailbox.adoc[Mailboxes].
Searching for the right email becomes increasingly difficult. At some point
diff --git a/docs/modules/concepts/pages/storage/users.adoc b/docs/modules/concepts/pages/storage/users.adoc
index a38664c045..ab7937dc72 100644
--- a/docs/modules/concepts/pages/storage/users.adoc
+++ b/docs/modules/concepts/pages/storage/users.adoc
@@ -6,7 +6,7 @@
Whereas xref:storage/mailbox.adoc[mailboxes] are clearly a core component of
any email system, user management is a lighter shade of gray.
-// "Repository" should be "Diretory". See JAMES-3360.
+// "Repository" should be "Directory". See JAMES-3360.
On the one hand, mailboxes ought to match up with actual
xref:user/index.adoc#_user[Users], so there is
a clear relationship between mailbox management and user management.
@@ -25,7 +25,7 @@ amount of unproductive work.
== Common Operations
-// "Repository" should be "Diretory". See JAMES-3360.
+// "Repository" should be "Directory". See JAMES-3360.
Because the user repository is used in the context of managing mailboxes, there
are some operations that are relatively common to any email system.
diff --git a/docs/modules/servers/pages/15-minute-demo.adoc b/docs/modules/servers/pages/15-minute-demo.adoc
index 318a29219b..00ab2246d3 100644
--- a/docs/modules/servers/pages/15-minute-demo.adoc
+++ b/docs/modules/servers/pages/15-minute-demo.adoc
@@ -1,6 +1,6 @@
= Long Demo
-In this demo (~15 minutes), we will set up a runing James demo using a prepared Docker image.
+In this demo (~15 minutes), we will set up a running James demo using a prepared Docker image.
We will then test the server by connecting with an email client. Finally, we
will connect to the server via the REST-based Admin API.
@@ -45,7 +45,7 @@ Explanation:
* `-p "127.0.0.1:8000:8000" attaches the port 8000 to localhost on the host machine to allow us to connect to the Admin API
* `-v $(pwd)/webadmin.properties:/root/conf/webadmin.properties` mounts the webadmin.properties file to configure the Admin API
* The `--name james` parameter gives the running container a name to make it easier to manipulate
- * `linagora/james-jpa-sample:3.4.0` is the image that is used for this demo
+ * `apache/james:demo-latest` is the image that is used for this demo
Docker will pull the image and start the container.
diff --git a/docs/modules/servers/pages/5-minute-demo.adoc b/docs/modules/servers/pages/5-minute-demo.adoc
index 94e95ad799..fb41ffe0bd 100644
--- a/docs/modules/servers/pages/5-minute-demo.adoc
+++ b/docs/modules/servers/pages/5-minute-demo.adoc
@@ -1,6 +1,6 @@
= Short Demo
-In this short demo (~5 minutes), we will set up a runing James demo very quickly
+In this short demo (~5 minutes), we will set up a running James demo very quickly
using a prepared Docker image.
Then you will add a domain, and a user account within that domain.
@@ -24,7 +24,7 @@ Explanation:
* The `-d` parameter runs the container in "detached" mode
* `-p "25:25" -p "143:143"` attaches the image ports to the ports 25 (SMTP) and 143 (IMAP) on the host machine
* The `--name james` parameter gives the running container a name to make it easier to manipulate
- * `linagora/james-jpa-sample:3.4.0` is the image that is used for this demo
+ * `apache/james:demo-latest` is the image that is used for this demo
Docker will pull the image and start the container.
diff --git a/docs/modules/servers/pages/basic/self-hosting.notes b/docs/modules/servers/pages/basic/self-hosting.notes
index 279d640c99..54e065c62b 100644
--- a/docs/modules/servers/pages/basic/self-hosting.notes
+++ b/docs/modules/servers/pages/basic/self-hosting.notes
@@ -49,7 +49,7 @@ This should be the goal of the Basic server.
Regarding "Advanced server":
-Free email servers are generaly old, written in complex languages (C) and extending their behavior is not one of there main concerns.
+Free email servers are generally old, written in complex languages (C) and extending their behavior is not one of there main concerns.
Apache James Advanced server have been designed with extensibility in mind. It provides several extension mechanisms allowing you to easily configure and extend the behavior of your email server in order to make it fits your needs. Java and other JVM languages can be used to write your own extensions.
And for the Apache James Distributed server:
diff --git a/server/apps/distributed-app/docs/modules/ROOT/pages/architecture/index.adoc b/server/apps/distributed-app/docs/modules/ROOT/pages/architecture/index.adoc
index f83a1f98f5..c26d12e963 100644
--- a/server/apps/distributed-app/docs/modules/ROOT/pages/architecture/index.adoc
+++ b/server/apps/distributed-app/docs/modules/ROOT/pages/architecture/index.adoc
@@ -15,7 +15,7 @@ a known pattern.
email bodies, headers or attachments. Different technologies can be used: *Cassandra*, or S3 compatible *Object Storage*
(S3 or Swift).
* *OpenSearch* component empowers full text search on emails. It also enables querying data with unplanned access
-patterns. OpenSearch throughtput do not however match the one of Cassandra thus its use is avoided upon regular workloads.
+patterns. OpenSearch throughput do not however match the one of Cassandra thus its use is avoided upon regular workloads.
* *RabbitMQ* enables James nodes of a same cluster to collaborate together. It is used to implement connected protocols,
notification patterns as well as distributed resilient work queues and mail queue.
* *Tika* (optional) enables text extraction from attachments, thus improving full text search results.
@@ -63,7 +63,7 @@ image::server-components.png[Server components mobilized for SMTP & IMAP]
- The SMTP protocol receives a mail, and enqueue it on the MailQueue
- The MailetContainer will start processing the mail Asynchronously and will take business decisions like storing the
- email localy in a user mailbox. The behaviour of the MailetContainer is highly customizable thanks to the Mailets and
+ email locally in a user mailbox. The behaviour of the MailetContainer is highly customizable thanks to the Mailets and
the Matcher composibility.
- The Mailbox component is responsible of storing a user's mails.
- The user can use the IMAP or the JMAP protocol to retrieve and read his mails.
@@ -105,7 +105,7 @@ denied: missing authentication can, for instance, be a cause. In
addition to prevent disasters upon miss configuration, an email review
of this mail repository can help refine a host spammer blacklist.
** `cassandra://var/mail/rrt-error/` : runtime error upon Recipient
-Rewritting occurred. This is typically due to a loop.
+Rewriting occurred. This is typically due to a loop.
=== Mail Queue
@@ -164,7 +164,7 @@ within the xref:#_blobstore[BlobStore].
==== Search index
Emails are indexed asynchronously in OpenSearch via the xref:#_event_bus[EventBus]
-in order to enpower advanced and fast email full text search.
+in order to empower advanced and fast email full text search.
Text extraction can be set up using link:https://tika.apache.org/[Tika], allowing
to extract the text from attachment, allowing to search your emails based on the attachment
@@ -239,11 +239,11 @@ Users can be managed in Cassandra, or via a LDAP (read only).
=== Recipient rewrite tables
-Storage of Recipients Rewritting rules, in Cassandra.
+Storage of Recipients Rewriting rules, in Cassandra.
==== Mapping types
-James allows using various mapping types for better expressing the intent of your address rewritting logic:
+James allows using various mapping types for better expressing the intent of your address rewriting logic:
* *Domain mapping*: Rewrites the domain of mail addresses. Use it for technical purposes, user will not
be allowed to use the source in their FROM address headers. Domain mappings can be managed via the CLI and
@@ -293,7 +293,7 @@ based on bloom filters can be used and triggered using the WebAdmin REST API.
Allows to control and schedule long running tasks run by other
components. Among other it enables scheduling, progress monitoring,
-cancelation of long running tasks.
+cancellation of long running tasks.
Distributed James leverage a task manager using Event Sourcing and RabbitMQ for messaging.
diff --git a/server/apps/distributed-app/docs/modules/ROOT/pages/configure/blobstore.adoc b/server/apps/distributed-app/docs/modules/ROOT/pages/configure/blobstore.adoc
index 1dbad6a867..9b7d4e0e3d 100644
--- a/server/apps/distributed-app/docs/modules/ROOT/pages/configure/blobstore.adoc
+++ b/server/apps/distributed-app/docs/modules/ROOT/pages/configure/blobstore.adoc
@@ -163,7 +163,7 @@ from being loaded in memory. This settings complements protocol limits.
| Property name | explanation
| objectstorage.bucketPrefix
-| Bucket is an concept in James and similar to Containers in Swift or Buckets in AWS S3.
+| Bucket is a concept in James and similar to Containers in Swift or Buckets in AWS S3.
BucketPrefix is the prefix of bucket names in James BlobStore
| objectstorage.namespace
diff --git a/server/apps/distributed-app/docs/modules/ROOT/pages/configure/imap.adoc b/server/apps/distributed-app/docs/modules/ROOT/pages/configure/imap.adoc
index 33e28c977b..6b8f6d68a1 100644
--- a/server/apps/distributed-app/docs/modules/ROOT/pages/configure/imap.adoc
+++ b/server/apps/distributed-app/docs/modules/ROOT/pages/configure/imap.adoc
@@ -148,7 +148,7 @@ IMAP decoders, processors and encoder can be customized. xref:extending/imap.ado
Check this link:https://github.com/apache/james-project/tree/master/examples/custom-imap[example].
-The following configuration properties are available for extentions:
+The following configuration properties are available for extensions:
.imapserver.xml content
|===
diff --git a/server/apps/distributed-app/docs/modules/ROOT/pages/configure/index.adoc b/server/apps/distributed-app/docs/modules/ROOT/pages/configure/index.adoc
index 888a5af4d5..f333f03a0c 100644
--- a/server/apps/distributed-app/docs/modules/ROOT/pages/configure/index.adoc
+++ b/server/apps/distributed-app/docs/modules/ROOT/pages/configure/index.adoc
@@ -3,8 +3,8 @@
This section presents how to configure the Distributed server.
-The Distributed Server relies on separated files for configuring various components. Some files follow an *xml* format
-and some others follow a *property* format. Some files can be ommited, in which case the functionality can be disabled,
+The Distributed Server relies on separated files for configuring various components. Some files follow a *xml* format
+and some others follow a *property* format. Some files can be omitted, in which case the functionality can be disabled,
or rely on reasonable defaults.
The following configuration files are exposed:
diff --git a/server/apps/distributed-app/docs/modules/ROOT/pages/configure/mailetcontainer.adoc b/server/apps/distributed-app/docs/modules/ROOT/pages/configure/mailetcontainer.adoc
index 3decf5e303..5f50669fa6 100644
--- a/server/apps/distributed-app/docs/modules/ROOT/pages/configure/mailetcontainer.adoc
+++ b/server/apps/distributed-app/docs/modules/ROOT/pages/configure/mailetcontainer.adoc
@@ -10,7 +10,7 @@ xref:architecture/index.adoc#_mail_processing[the mailet container feature descr
Apache James Server includes a number of xref:configure/mailets.adoc[Packaged Mailets] and
xref:configure/matchers.adoc[Packaged Matchers].
-Futhermore, you can write and use with James xref:extending/mail-processing.adoc[your own mailet and matchers].
+Furthermore, you can write and use with James xref:extending/mail-processing.adoc[your own mailet and matchers].
Consult this link:https://github.com/apache/james-project/blob/master/server/apps/distributed-app/sample-configuration/mailetcontainer.xml[example]
to get some examples and hints.
diff --git a/server/apps/distributed-app/docs/modules/ROOT/pages/configure/recipientrewritetable.adoc b/server/apps/distributed-app/docs/modules/ROOT/pages/configure/recipientrewritetable.adoc
index c61d20a86b..45e3ca0519 100644
--- a/server/apps/distributed-app/docs/modules/ROOT/pages/configure/recipientrewritetable.adoc
+++ b/server/apps/distributed-app/docs/modules/ROOT/pages/configure/recipientrewritetable.adoc
@@ -1,7 +1,7 @@
= Distributed James Server — recipientrewritetable.xml
:navtitle: recipientrewritetable.xml
-Here are explanations on the different kinds about xref:architecture/index.adoc#_recipient_rewrite_tables[recipient rewritting].
+Here are explanations on the different kinds about xref:architecture/index.adoc#_recipient_rewrite_tables[recipient rewriting].
Consult this link:https://github.com/apache/james-project/blob/master/server/apps/distributed-app/sample-configuration/recipientrewritetable.xml[example]
to get some examples and hints.
diff --git a/server/apps/distributed-app/docs/modules/ROOT/pages/configure/sieve.adoc b/server/apps/distributed-app/docs/modules/ROOT/pages/configure/sieve.adoc
index b7a27dad59..e9aa56e1fd 100644
--- a/server/apps/distributed-app/docs/modules/ROOT/pages/configure/sieve.adoc
+++ b/server/apps/distributed-app/docs/modules/ROOT/pages/configure/sieve.adoc
@@ -19,7 +19,7 @@ The following Sieve capabilities are supported by Apache James:
- link:https://tools.ietf.org/html/rfc5173[RFC 5173 Body Extension]
- link:https://datatracker.ietf.org/doc/html/rfc5230[RFC 5230 Vacations]
-To be correctly executed, please note that the *Sieve* mailet is required to be positionned prior the
+To be correctly executed, please note that the *Sieve* mailet is required to be positioned prior the
*LocalDelivery* mailet.
== Managing Sieve scripts
diff --git a/server/apps/distributed-app/docs/modules/ROOT/pages/configure/smtp-hooks.adoc b/server/apps/distributed-app/docs/modules/ROOT/pages/configure/smtp-hooks.adoc
index 80118687ff..b7253a4566 100644
--- a/server/apps/distributed-app/docs/modules/ROOT/pages/configure/smtp-hooks.adoc
+++ b/server/apps/distributed-app/docs/modules/ROOT/pages/configure/smtp-hooks.adoc
@@ -3,7 +3,7 @@
This documentation page lists and documents SMTP hooks that can be used within the
Distributed Server SMTP protocol stack in order to customize the way your SMTP server
-behaves with out of the box components.
+behaves without of the box components.
== DNSRBLHandler
@@ -84,7 +84,7 @@ required as well to be spec compliant.
This handler can add a hint to the mail which tells the MailQueue which email should get processed first.
-Normally the MailQueue will just handles Mails in FIFO manner.
+Normally the MailQueue will just handle Mails in FIFO manner.
Valid priority values are 1,5,9 where 9 is the highest.
@@ -203,7 +203,7 @@ Example configuration:
== SpamAssassinHandler
This MessageHandler could be used to check message against spamd before
-accept the email. So its possible to reject a message on smtplevel if a
+accept the email. So it's possible to reject a message on smtplevel if a
configured hits amount is reached.
This handler should be considered experimental.
diff --git a/server/apps/distributed-app/docs/modules/ROOT/pages/configure/smtp.adoc b/server/apps/distributed-app/docs/modules/ROOT/pages/configure/smtp.adoc
index e1831188dc..e5d9abb955 100644
--- a/server/apps/distributed-app/docs/modules/ROOT/pages/configure/smtp.adoc
+++ b/server/apps/distributed-app/docs/modules/ROOT/pages/configure/smtp.adoc
@@ -43,7 +43,7 @@ TLS based protocols.
used in the initial service greeting. The tag may have an optional attribute - *autodetect*. If
the autodetect attribute is present and true, the service will use the local hostname
returned by the Java libraries. If autodetect is absent or false, the body of the tag will be used. In
-this case, if no body is present, the value "localhost" will be used.
+this case, if nobody is present, the value "localhost" will be used.
| connectionTimeout
| This is an optional tag with a non-negative integer body. Connection timeout in seconds.
@@ -70,7 +70,7 @@ supported at this time. Supported values:
* true: announced only to not authorizedAddresses
- * false: don't announce AUTH. If absent, *authorizedAddresses* are set to a wilcard to accept all remote hosts.
+ * false: don't announce AUTH. If absent, *authorizedAddresses* are set to a wildcard to accept all remote hosts.
* announce: like true, but always announce AUTH capability to clients
@@ -129,10 +129,10 @@ James will ignore check token by userInfo if the `auth.oidc.introspection.url` i
If you use SMTP AUTH, addresses that match those specified here will
be permitted to relay without SMTP AUTH. If you do not use SMTP
-AUTH, and you specify addreses here, then only addresses that match
+AUTH, and you specify addresses here, then only addresses that match
those specified will be permitted to relay.
-Addresses may be specified as a an IP address or domain name, with an
+Addresses may be specified as a IP address or domain name, with an
optional netmask, e.g.,
127.*, 127.0.0.0/8, 127.0.0.0/255.0.0.0, and localhost/8 are all the same
@@ -218,7 +218,7 @@ by relayed emails originate from a trusted source. This includes:
* Authenticated SMTP/JMAP users
* Mails generated by the server (eg: bounces)
-* Mails originating froma trusted network as configured in *smtpserver.xml*
+* Mails originating from a trusted network as configured in *smtpserver.xml*
If you wish to ensure that authenticated users can only send email from their own account, you may
optionally set the verifyIdentity element of the smtpserver configuration block to "true".
@@ -227,9 +227,9 @@ optionally set the verifyIdentity element of the smtpserver configuration block
Verify that you have not inadvertently configured your server as an open relay. This is most easily
accomplished by using the service provided at https://mxtoolbox.com/diagnostic.aspx[mxtoolbox.com]. mxtoolbox.com will
-check your mail server and inform you if it is an open relay. This tool further more verifies additional propertiess like:
+check your mail server and inform you if it is an open relay. This tool further more verifies additional properties like:
-* Your DNS condifuration, especially that you mail server IP has a valid reverse DNS entry
+* Your DNS configuration, especially that you mail server IP has a valid reverse DNS entry
* That your SMTP connection is secured
* That you are not an OpenRelay
* This website also allow a quick lookup to ensure your mail server is not in public blacklists.
diff --git a/server/apps/distributed-app/docs/modules/ROOT/pages/extending/index.adoc b/server/apps/distributed-app/docs/modules/ROOT/pages/extending/index.adoc
index 2211e6a1a3..ecd3d4e44f 100644
--- a/server/apps/distributed-app/docs/modules/ROOT/pages/extending/index.adoc
+++ b/server/apps/distributed-app/docs/modules/ROOT/pages/extending/index.adoc
@@ -83,7 +83,7 @@ public class MyMailet extends GenericMailet {
However, to inject an interface into your extension, you will need additional injection definitions.
-To to so:
+To so:
* 1. Given an interface defined in an additional JAR:
@@ -136,7 +136,7 @@ Note that overriding injection definitions of the Distributed Server for your in
=== Starting your components
-Sometime you wish to 'start' your extensions. This can be achieved through defining your own `UserDefinedStartable`:
+Sometimes you wish to 'start' your extensions. This can be achieved through defining your own `UserDefinedStartable`:
```
public class MyStartable implements UserDefinedStartable {
diff --git a/server/apps/distributed-app/docs/modules/ROOT/pages/extending/smtp-hooks.adoc b/server/apps/distributed-app/docs/modules/ROOT/pages/extending/smtp-hooks.adoc
index 2d8b37000b..43b1bb1653 100644
--- a/server/apps/distributed-app/docs/modules/ROOT/pages/extending/smtp-hooks.adoc
+++ b/server/apps/distributed-app/docs/modules/ROOT/pages/extending/smtp-hooks.adoc
@@ -1,7 +1,7 @@
= Distributed James Server — Custom SMTP hooks
:navtitle: Custom SMTP hooks
-SMTP hooks enable extening capabilities of the SMTP server and are run synchronously upon email reception, before the email is
+SMTP hooks enable extending capabilities of the SMTP server and are run synchronously upon email reception, before the email is
enqueued in the MailQueue, and before any mail processing takes place.
== Available generic hooks
diff --git a/server/apps/distributed-app/docs/modules/ROOT/pages/operate/guide.adoc b/server/apps/distributed-app/docs/modules/ROOT/pages/operate/guide.adoc
index 9784bb5eb3..c39a3ecf85 100644
--- a/server/apps/distributed-app/docs/modules/ROOT/pages/operate/guide.adoc
+++ b/server/apps/distributed-app/docs/modules/ROOT/pages/operate/guide.adoc
@@ -215,7 +215,7 @@ When you read a Jmap message, some calculated properties are expected to
be fast to retrieve, like `preview`, `hasAttachment`. James achieves it
by pre-calculating and storing them into a caching table
(`message_fast_view_projection`). Missing caches are populated on
-message reads and will temporary decrease the performance.
+message reads and will temporarily decrease the performance.
==== How to detect the outdated projections
@@ -441,7 +441,7 @@ These options are:
* The https://cassandra.apache.org/doc/latest/operating/compaction.html[compaction algorithms]
* The https://cassandra.apache.org/doc/latest/operating/bloom_filters.html[bloom filter sizing]
* The https://cassandra.apache.org/doc/latest/operating/compression.html?highlight=chunk%20size[chunk size]
-* Thehttps://www.datastax.com/blog/2011/04/maximizing-cache-benefit-cassandra[cachingoptions]
+* The https://www.datastax.com/blog/2011/04/maximizing-cache-benefit-cassandra[cachingoptions]
The compaction algorithms allow a tradeoff between background IO upon
writes and reads. We recommend:
diff --git a/server/apps/distributed-app/docs/modules/ROOT/pages/operate/webadmin.adoc b/server/apps/distributed-app/docs/modules/ROOT/pages/operate/webadmin.adoc
index 9c8dc23fdb..439515bd30 100644
--- a/server/apps/distributed-app/docs/modules/ROOT/pages/operate/webadmin.adoc
+++ b/server/apps/distributed-app/docs/modules/ROOT/pages/operate/webadmin.adoc
@@ -122,7 +122,7 @@ Response codes:
* 200: The check has answered with a Healthy or Degraded status.
* 404: A component with the given name was not found.
-* 503: The check has anwered with a Unhealthy status.
+* 503: The check has answered with an Unhealthy status.
=== List all health checks
@@ -204,8 +204,8 @@ above is returned
One can await the end of a task, then receive its final execution
report.
-That feature is especially usefull for testing purpose but still can
-serve real-life scenari.
+That feature is especially usefully for testing purpose but still can
+serve real-life scenario.
....
curl -XGET http://ip:port/tasks/3294a976-ce63-491e-bd52-1b6f465ed7a2/await?timeout=duration
@@ -2229,7 +2229,7 @@ Response codes:
* 200: The domain’s quota was successfully retrieved
* 404: The domain does not exist
* 405: Domain Quota configuration not supported when virtual hosting is
-desactivated.
+deactivated.
==== Updating the quota for a domain
@@ -2257,7 +2257,7 @@ Response codes:
(-1).
* 404: The domain does not exist
* 405: Domain Quota configuration not supported when virtual hosting is
-desactivated.
+deactivated.
==== Getting the quota count for a domain
@@ -2318,7 +2318,7 @@ Response codes:
* 204: The quota has been updated to unlimited value.
* 404: The domain does not exist
* 405: Domain Quota configuration not supported when virtual hosting is
-desactivated.
+deactivated.
==== Getting the quota size for a domain
@@ -2341,7 +2341,7 @@ Response codes:
domain
* 404: The domain does not exist
* 405: Domain Quota configuration not supported when virtual hosting is
-desactivated.
+deactivated.
==== Updating the quota size for a domain
@@ -2364,7 +2364,7 @@ Response codes:
(-1).
* 404: The domain does not exist
* 405: Domain Quota configuration not supported when virtual hosting is
-desactivated.
+deactivated.
==== Deleting the quota size for a domain
@@ -2811,7 +2811,7 @@ destination addresses will receive it.
Please note that the base address can be optionaly part of the forward
destination. In that case, the base recipient also receive a copy of the
-mail. Otherwise he is ommitted.
+mail. Otherwise he is omitted.
Forwards can be defined for existing users. It then defers from
``groups''.
diff --git a/server/apps/distributed-app/docs/modules/ROOT/pages/run/k8s-logsMetrics.adoc b/server/apps/distributed-app/docs/modules/ROOT/pages/run/k8s-logsMetrics.adoc
index eee17d9e9f..17fd2f45aa 100644
--- a/server/apps/distributed-app/docs/modules/ROOT/pages/run/k8s-logsMetrics.adoc
+++ b/server/apps/distributed-app/docs/modules/ROOT/pages/run/k8s-logsMetrics.adoc
@@ -2,7 +2,7 @@
=== Logs
-James exposes its logs on the console. Then a fluentbit instance scraps
+James exposes its logs on the console. Then a fluent bit instance scraps
and collects them, before being indexed and used by Kibana, with nice
search possibilities.
diff --git a/server/apps/distributed-app/docs/modules/ROOT/pages/run/k8s-values.adoc b/server/apps/distributed-app/docs/modules/ROOT/pages/run/k8s-values.adoc
index 3ad605d32d..d2a4fb7477 100644
--- a/server/apps/distributed-app/docs/modules/ROOT/pages/run/k8s-values.adoc
+++ b/server/apps/distributed-app/docs/modules/ROOT/pages/run/k8s-values.adoc
@@ -102,7 +102,7 @@ using it to expose JMAP and attach our SSL certificates for
SMTP/IMAP/JMAP. Default is false
|james.tls.secretName |the-name-of-a-secret |The name of the secret
-created separately contening the SSL certificate for JMAP, IMAPS and
+created separately contenting the SSL certificate for JMAP, IMAPS and
SMTPS
|===
diff --git a/server/apps/distributed-app/docs/modules/ROOT/pages/run/run-kubernetes.adoc b/server/apps/distributed-app/docs/modules/ROOT/pages/run/run-kubernetes.adoc
index fb4ab3fb10..f5fca89455 100644
--- a/server/apps/distributed-app/docs/modules/ROOT/pages/run/run-kubernetes.adoc
+++ b/server/apps/distributed-app/docs/modules/ROOT/pages/run/run-kubernetes.adoc
@@ -9,7 +9,7 @@ cluster using the link:https://helm.sh[Helm] package manager.
== Before Starting
-Before runnning the Helm chart, James should have particularly access to the following external products:
+Before running the Helm chart, James should have particularly accessed to the following external products:
Apache Cassandra::
- You can deploy Cassandra on Kubernetes with a link:https://github.com/bitnami/charts/tree/master/bitnami/cassandra[Cassandra chart] for testing purpose. However we would recommend running Cassandra on VirtualMachine for better stablilty.
@@ -46,7 +46,7 @@ You can find our Helm chart for James in link:https://github.com/apache/james-pr
The configuration files proper to James are stored in the Chart `james/configs` folder. They are being stored in a `ConfigMap` and then being mounted in the James pod at /root/conf path.
-If you need to change a conf in James, this is were you need to look at.
+If you need to change a conf in James, this is where you need to look at.
For now all configuration files are the same for every deployment, except for `mailetcontainer.xml` that has been excluded (see section below).
@@ -161,7 +161,7 @@ A summary of different resources that could be interesting to have in hand.
### James documentation
* link:https://james.apache.org/[James Official Website]
-* link:https://github.com/apache/james-project[James Github Project]
+* link:https://github.com/apache/james-project[James GitHub Project]
* xref:operate/webadmin.adoc[WebAdmin]
* xref:operate/cli.adoc[James CLI]
* link:https://james.apache.org/server/manage-guice-distributed-james.html[Manage Guice Distributed James]
diff --git a/server/apps/distributed-app/docs/modules/ROOT/partials/HasException.adoc b/server/apps/distributed-app/docs/modules/ROOT/partials/HasException.adoc
index 0cc100a68c..adf66d1d91 100644
--- a/server/apps/distributed-app/docs/modules/ROOT/partials/HasException.adoc
+++ b/server/apps/distributed-app/docs/modules/ROOT/partials/HasException.adoc
@@ -1,7 +1,7 @@
=== HasException
This Matcher determines if the exception specified in the condition or
-the subclasses of it has occured during the processing of the mail.
+the subclasses of it has occurred during the processing of the mail.
If true, all recipients are returned, else null. This matcher presupposes
that the exception has been captured as a Mail attribute
org.apache.mailet.Mail#MAILET_ERROR_ATTRIBUTE_NAME in the process.
diff --git a/server/apps/distributed-app/docs/modules/ROOT/partials/HasHabeasWarrantMark.adoc b/server/apps/distributed-app/docs/modules/ROOT/partials/HasHabeasWarrantMark.adoc
index c49d70dd53..856401306a 100644
--- a/server/apps/distributed-app/docs/modules/ROOT/partials/HasHabeasWarrantMark.adoc
+++ b/server/apps/distributed-app/docs/modules/ROOT/partials/HasHabeasWarrantMark.adoc
@@ -11,7 +11,7 @@ Usage: Place this matcher
</mailet>
....
-in the root processs before the DNSRBL block lists (the InSpammerBlacklist matcher).
+in the root processes before the DNSRBL block lists (the InSpammerBlacklist matcher).
Because the Habeas Warrant Mark is copyright material, I have asked for and
received the following explicit statement from Habeas:
diff --git a/server/apps/distributed-app/docs/modules/ROOT/partials/RecipientRewriteTable.adoc b/server/apps/distributed-app/docs/modules/ROOT/partials/RecipientRewriteTable.adoc
index e9c82d17ea..fe5a2eea7e 100644
--- a/server/apps/distributed-app/docs/modules/ROOT/partials/RecipientRewriteTable.adoc
+++ b/server/apps/distributed-app/docs/modules/ROOT/partials/RecipientRewriteTable.adoc
@@ -5,7 +5,7 @@ implementations for mappings of forwards and aliases.
By specifying an 'errorProcessor' you can specify your logic upon RecipientRewriteTable failures.
-Exemple:
+Example:
....
<mailet match="All" class="RecipientRewriteTable">
diff --git a/server/apps/distributed-app/docs/modules/ROOT/partials/RemoteAddrInNetwork.adoc b/server/apps/distributed-app/docs/modules/ROOT/partials/RemoteAddrInNetwork.adoc
index 793deeab89..3d1bb76905 100644
--- a/server/apps/distributed-app/docs/modules/ROOT/partials/RemoteAddrInNetwork.adoc
+++ b/server/apps/distributed-app/docs/modules/ROOT/partials/RemoteAddrInNetwork.adoc
@@ -1,6 +1,6 @@
=== RemoteAddrInNetwork
-Checks the IP address of the sending server against a comma- delimited list
+Checks the IP address of the sending server against a comma-delimited list
of IP addresses, domain names or sub-nets.
See AbstractNetworkMatcher for details on how to specify entries.
\ No newline at end of file
diff --git a/server/apps/distributed-app/docs/modules/ROOT/partials/RemoteAddrNotInNetwork.adoc b/server/apps/distributed-app/docs/modules/ROOT/partials/RemoteAddrNotInNetwork.adoc
index 793deeab89..3d1bb76905 100644
--- a/server/apps/distributed-app/docs/modules/ROOT/partials/RemoteAddrNotInNetwork.adoc
+++ b/server/apps/distributed-app/docs/modules/ROOT/partials/RemoteAddrNotInNetwork.adoc
@@ -1,6 +1,6 @@
=== RemoteAddrInNetwork
-Checks the IP address of the sending server against a comma- delimited list
+Checks the IP address of the sending server against a comma-delimited list
of IP addresses, domain names or sub-nets.
See AbstractNetworkMatcher for details on how to specify entries.
\ No newline at end of file
diff --git a/server/apps/distributed-app/docs/modules/ROOT/partials/SMIMECheckSignature.adoc b/server/apps/distributed-app/docs/modules/ROOT/partials/SMIMECheckSignature.adoc
index ed15d4f64d..0e88fe347a 100644
--- a/server/apps/distributed-app/docs/modules/ROOT/partials/SMIMECheckSignature.adoc
+++ b/server/apps/distributed-app/docs/modules/ROOT/partials/SMIMECheckSignature.adoc
@@ -10,7 +10,7 @@ to a known trusted certificate.
This check is composed by two steps: firstly it's ensured that the signature
is valid, then it's checked if a chain of trust starting from the signer
certificate and that leads to a trusted certificate can be created. The first
-check verifies that the the message has not been modified after the signature
+check verifies that the message has not been modified after the signature
was put and that the signer's certificate was valid at the time of the
signing. The latter should ensure that the signer is who he declare to be.
diff --git a/server/apps/distributed-app/docs/modules/ROOT/partials/SMTPIsAuthNetwork.adoc b/server/apps/distributed-app/docs/modules/ROOT/partials/SMTPIsAuthNetwork.adoc
index 93dacc7ced..ae04166418 100644
--- a/server/apps/distributed-app/docs/modules/ROOT/partials/SMTPIsAuthNetwork.adoc
+++ b/server/apps/distributed-app/docs/modules/ROOT/partials/SMTPIsAuthNetwork.adoc
@@ -1,6 +1,6 @@
=== SMTPIsAuthNetwork
-Matches mails that are sent by an client which is allowed to relay.
+Matches mails that are sent by a client which is allowed to relay.
....
<mailet match="SMTPIsAuthNetwork" class="<any-class>">
diff --git a/src/homepage/index.html b/src/homepage/index.html
index 268df1f732..4cbbd94dbb 100644
--- a/src/homepage/index.html
+++ b/src/homepage/index.html
@@ -405,7 +405,7 @@ WHAT WILL YOU TRY:</b><br>
<h2>Some statistics...</h2>
</header>
<section>
- <ul class="statistics" onclick="location.href='https://github.com/apache/james-project'" title="Github James Project">
+ <ul class="statistics" onclick="location.href='https://github.com/apache/james-project'" title="GitHub James Project">
<li class="style1">
<span class="icon fa-users"></span>
<strong id="contributor-num"></strong> Contributors
diff --git a/src/site/xdoc/contribute.xml b/src/site/xdoc/contribute.xml
index 12a642a187..d067c504b9 100644
--- a/src/site/xdoc/contribute.xml
+++ b/src/site/xdoc/contribute.xml
@@ -168,7 +168,7 @@
<p>
Clone the source code of the project from its
<a href="git://git.apache.org/james-project.git">apache git repository</a>
- or its <a href="https://github.com/apache/james-project">Github</a>
+ or its <a href="https://github.com/apache/james-project">GitHub</a>
<br />
Create your branch and name it with the JIRA ticket number.<br />
Create a Pull Request with your branch name and prefix its different commits with the same name.
@@ -281,7 +281,7 @@ Here is some more details about what my commit does, and the rationals of the ch
</section>
<section name="Code Patches">
- <p>While we definitely prefer receiving contributions under the form of Github pull requests,
+ <p>While we definitely prefer receiving contributions under the form of GitHub pull requests,
in order to still be vendor neutral on the contribution process, we do accept submission of patches, in a process described
below.
</p>
diff --git a/src/site/xdoc/guidelines.xml b/src/site/xdoc/guidelines.xml
index adde2b945d..a100cea417 100644
--- a/src/site/xdoc/guidelines.xml
+++ b/src/site/xdoc/guidelines.xml
@@ -227,7 +227,7 @@
<li>Establishing an Apache profile with the Apache secretary.</li>
<li>Access will directly be granted on the<a href="https://issues.apache.org/jira/projects/JAMES">JIRA</a>,
the ASF Git repository and the <a href="https://ci-builds.apache.org/job/james/job/ApacheJames/">ci</a>.</li>
- <li>Extra steps should be taken for Github access (see below).</li>
+ <li>Extra steps should be taken for GitHub access (see below).</li>
<li>A PMC should have had announced your nomination. If you have not already been doing it, we strongly
encourage you to write an email on public mailing list, presenting you, and your motivations toward
contributing on Apache James. A reply to the announce would do the trick!</li>
@@ -235,14 +235,14 @@
<h3>Accessing Apache GitHub as a Committer</h3>
<ul>
- <li>Verify you have a Github ID enabled with <a href="https://help.github.com/articles/securing-your-account-with-two-factor-authentication-2fa/">2FA</a></li>
- <li>Enter your Github ID into your <a href="https://id.apache.org/">Apache ID profile</a></li>
+ <li>Verify you have a GitHub ID enabled with <a href="https://help.github.com/articles/securing-your-account-with-two-factor-authentication-2fa/">2FA</a></li>
+ <li>Enter your GitHub ID into your <a href="https://id.apache.org/">Apache ID profile</a></li>
<li>Merge your Apache and GitHub accounts using <a href="https://gitbox.apache.org/setup/">GitBox</a> (Apache Account Linking utility). You should see 3 green checks in GitBox.</li>
</ul>
<p>Wait at least 30 minutes for an email inviting you to Apache GitHub Organization and accept invitation.</p>
- <p>After accepting the Github Invitation verify that you are a member of the <a href="https://github.com/orgs/apache/teams/james-committers">GitHub Apache James team</a>.</p>
+ <p>After accepting the GitHub Invitation verify that you are a member of the <a href="https://github.com/orgs/apache/teams/james-committers">GitHub Apache James team</a>.</p>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org