public inbox for pmg-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Dylan Whyte <d.whyte@proxmox.com>
To: pmg-devel@lists.proxmox.com
Subject: [pmg-devel] [PATCH pmg-docs 1/3] replace "e-mail" with "email"
Date: Wed, 26 May 2021 16:08:49 +0200	[thread overview]
Message-ID: <20210526140851.11670-1-d.whyte@proxmox.com> (raw)

in accordance with our technical writing guide

Signed-off-by: Dylan Whyte <d.whyte@proxmox.com>
---
 pmg-installation.adoc        |  8 ++++----
 pmg-intro.adoc               | 18 ++++++++--------
 pmg-planning-deployment.adoc | 40 ++++++++++++++++++------------------
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/pmg-installation.adoc b/pmg-installation.adoc
index 943ca9d..017bfd3 100644
--- a/pmg-installation.adoc
+++ b/pmg-installation.adoc
@@ -166,18 +166,18 @@ installation.
 
 . Configure {pmg} to forward the incoming SMTP traffic to your Mail
 server ('Configuration/Mail Proxy/Default Relay') - 'Default
-Relay' is your e-mail server.
+Relay' is your email server.
 
-. Configure your e-mail server to send all outgoing messages through
+. Configure your email server to send all outgoing messages through
 your {pmg} ('Smart Host', port 26 by default).
 
 For detailed deployment scenarios see chapter
 xref:chapter_deployment[Planning for Deployment].
 
 After the installation you have to route all your incoming and
-outgoing e-mail traffic to the {pmg}. For incoming traffic you
+outgoing email traffic to the {pmg}. For incoming traffic you
 have to configure your firewall and/or DNS settings. For outgoing
-traffic you need to change the existing e-mail server configuration.
+traffic you need to change the existing email server configuration.
 
 
 [[advanced_lvm_options]]
diff --git a/pmg-intro.adoc b/pmg-intro.adoc
index 7d90e41..ee6e1a1 100644
--- a/pmg-intro.adoc
+++ b/pmg-intro.adoc
@@ -4,11 +4,11 @@ Introduction
 What is {pmg}?
 --------------
 
-E-mail security begins at the gateway by controlling all incoming and
-outgoing e-mail messages. {pmg} addresses the full spectrum of
-unwanted e-mail traffic, focusing spam and virus detection. {pmg}
+Email security begins at the gateway by controlling all incoming and
+outgoing email messages. {pmg} addresses the full spectrum of
+unwanted email traffic, focusing spam and virus detection. {pmg}
 provides a powerful and affordable server solution to eliminate spam,
-viruses and blocking undesirable content from your e-mail system. All
+viruses and blocking undesirable content from your email system. All
 products are self-installing and can be used without deep knowledge of
 Linux.
 
@@ -52,7 +52,7 @@ SMTP Whitelist::
 
 Exclude senders from SMTP blocking. To prevent all SMTP checks
 (Greylisting, Receiver Verification, SPF and DNSBL) and accept all
-e-mails for the analysis in the filter rule system, you can add the
+emails for the analysis in the filter rule system, you can add the
 following to this list: Domains (Sender/Receiver), Mail address
 (Sender/Receiver), Regular Expression (Sender/Receiver), IP address
 (Sender), IP network (Sender)
@@ -146,15 +146,15 @@ offers a lot of powerful objects to configure your own custom system.
 
 WHO - objects::
 
-Who is the sender or receiver of the e-mail?
+Who is the sender or receiver of the email?
 
 WHAT - objects::
 
-What is in the e-mail?
+What is in the email?
 
 WHEN - objects::
 
-When is the e-mail received by {pmg}?
+When is the email received by {pmg}?
 
 ACTIONS - objects::
 
@@ -166,7 +166,7 @@ out or both).
 
 Options range from simple spam and virus filter setups to
 sophisticated, highly customized configurations blocking certain types
-of e-mails and generating notifications.
+of emails and generating notifications.
 
 Web-based Management Interface
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/pmg-planning-deployment.adoc b/pmg-planning-deployment.adoc
index 0b1c5dd..6d1ab9f 100644
--- a/pmg-planning-deployment.adoc
+++ b/pmg-planning-deployment.adoc
@@ -2,53 +2,53 @@
 Planning for Deployment
 =======================
 
-Easy integration into existing e-mail server architecture
+Easy integration into existing email server architecture
 ---------------------------------------------------------
 
-In this sample configuration, your e-mail traffic (SMTP) arrives on
-the firewall and will be directly forwarded to your e-mail server.
+In this sample configuration, your email traffic (SMTP) arrives on
+the firewall and will be directly forwarded to your email server.
 
 image::images/2018_IT_infrastructure_without_Proxmox_Mail_Gateway_final_1024.png[]
 
-By using the {pmg}, all your e-mail traffic is forwarded to the
-Proxmox Mail Gateway, which filters the e-mail traffic and
-removes unwanted e-mails. You can manage incoming and outgoing mail
+By using the {pmg}, all your email traffic is forwarded to the
+Proxmox Mail Gateway, which filters the email traffic and
+removes unwanted emails. You can manage incoming and outgoing mail
 traffic.
 
 image::images/2018_IT_infrastructure_with_Proxmox_Mail_Gateway_final_1024.png[]
 
 
-Filtering outgoing e-mails
+Filtering outgoing emails
 --------------------------
 
-Many e-mail filtering solutions do not scan outgoing mails. In contrast, {pmg} is
-designed to scan both incoming and outgoing e-mails. This has two major
+Many email filtering solutions do not scan outgoing mails. In contrast, {pmg} is
+designed to scan both incoming and outgoing emails. This has two major
 advantages:
 
 . {pmg} is able to detect viruses sent from an internal host. In many
 countries you are liable for sending viruses to other
-people. The outgoing e-mail scanning feature is an additional
+people. The outgoing email scanning feature is an additional
 protection to avoid that.
 
-. {pmg} can gather statistics about outgoing e-mails too. Statistics
-about incoming e-mails looks nice, but they are quite
-useless. Consider two users, user-1 receives 10 e-mails from news
-portals and wrote 1 e-mail to a person you never heard from. While
-user-2 receives 5 e-mails from a customer and sent 5 e-mails
+. {pmg} can gather statistics about outgoing emails too. Statistics
+about incoming emails looks nice, but they are quite
+useless. Consider two users, user-1 receives 10 emails from news
+portals and wrote 1 email to a person you never heard from. While
+user-2 receives 5 emails from a customer and sent 5 emails
 back. Which user do you consider more active? I am sure it's user-2,
 because he communicates with your customers. {pmg} advanced address
 statistics can show you this important information. A solution which
-does not scan outgoing e-mail cannot do that.
+does not scan outgoing email cannot do that.
 
-To enable outgoing e-mail filtering you just need to send all outgoing
-e-mails through your {pmg} (usually by specifying Proxmox as
-"smarthost" on your e-mail server).
+To enable outgoing email filtering you just need to send all outgoing
+emails through your {pmg} (usually by specifying Proxmox as
+"smarthost" on your email server).
 
 [[firewall_settings]]
 Firewall settings
 -----------------
 
-In order to pass e-mail traffic to the {pmg} you need to allow traffic on the
+In order to pass email traffic to the {pmg} you need to allow traffic on the
 SMTP port. Our software uses the Network Time Protocol (NTP) for time
 synchronization, RAZOR, DNS, SSH, HTTP and port 8006 for the web-based
 management interface.
-- 
2.20.1





             reply	other threads:[~2021-05-26 14:15 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-26 14:08 Dylan Whyte [this message]
2021-05-26 14:08 ` [pmg-devel] [PATCH pmg-docs 2/3] introduction language fix-up Dylan Whyte
2021-05-26 14:08 ` [pmg-devel] [PATCH pmg-docs 3/3] planning deployment - " Dylan Whyte
2021-05-27  5:45 ` [pmg-devel] [PATCH pmg-docs 1/3] replace "e-mail" with "email" Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210526140851.11670-1-d.whyte@proxmox.com \
    --to=d.whyte@proxmox.com \
    --cc=pmg-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal