[Pkg-owncloud-commits] [owncloud-doc] 157/227: change 'smtp wizard' to 'email wizard'
David Prévot
taffit at moszumanska.debian.org
Sat Oct 11 17:20:45 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud-doc.
commit c66df3ceb1e90aa99f20a9a9b124047545cdf6e6
Author: Carla Schroder <carla at owncloud.com>
Date: Tue Sep 23 08:57:11 2014 -0700
change 'smtp wizard' to 'email wizard'
---
admin_manual/configuration/configuration_mail.rst | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/admin_manual/configuration/configuration_mail.rst b/admin_manual/configuration/configuration_mail.rst
index 4de9c2b..e1ef02f 100644
--- a/admin_manual/configuration/configuration_mail.rst
+++ b/admin_manual/configuration/configuration_mail.rst
@@ -10,7 +10,7 @@ existing mail server. You must have a functioning mail server for ownCloud to be
able to send emails. You may have a mail server on the same machine as ownCloud,
or it may be a remote server.
-ownCloud 7 introduces a new feature, the graphical SMTP Configuration Wizard.
+ownCloud 7 introduces a new feature, the graphical Email Configuration Wizard.
.. figure:: ../images/smtp-config-wizard.png
@@ -18,13 +18,13 @@ With the new wizard, connecting ownCloud to your mail server is fast and easy.
The wizard fills in the values in ``config/config.php``, so you may use either
or both as you prefer.
-The ownCloud SMTP wizard supports three types of mail server connections: SMTP,
-PHP, and Sendmail. Use the SMTP configurator for a remote server, and PHP or
-Sendmail when your mail server is on the same machine as ownCloud.
+The ownCloud Email wizard supports three types of mail server connections:
+SMTP, PHP, and Sendmail. Use the SMTP configurator for a remote server, and PHP
+or Sendmail when your mail server is on the same machine as ownCloud.
.. note:: The Sendmail option refers to the Sendmail SMTP server, and any
- drop-in Sendmail replacement such as Postfix, Exim, or Courier. All of these
- include a ``sendmail`` binary, and are freely-interchangeable.
+ drop-in Sendmail replacement such as Postfix, Exim, or Courier. All of
+ these include a ``sendmail`` binary, and are freely-interchangeable.
Configuring an SMTP Server
--------------------------
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-doc.git
More information about the Pkg-owncloud-commits
mailing list