[Pkg-owncloud-commits] [owncloud-doc] 34/227: Merge branch 'master' into alrac2

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud-doc.

commit 56c5d8f7cca44486da2f217e7b8fc69538d1a99b
Merge: 967ea85 08d4637
Author: Carla Schroder <carla at owncloud.com>
Date:   Tue Sep 2 08:57:22 2014 -0700

    Merge branch 'master' into alrac2
    
    Conflicts:
    	admin_manual/configuration/configuration_mail.rst

 admin_manual/configuration/configuration_mail.rst  | 17 ++++
 .../configuration/configuring_big_file_upload.rst  | 61 ++++++++------
 .../configuration/server_to_server_managing.rst    | 14 ++--
 admin_manual/whats_new_admin.rst                   | 93 ++++++++++++++++++++++
 developer_manual/app/css.rst                       | 53 +++++++++++-
 developer_manual/testing/index.rst                 |  4 +-
 user_manual/whats_new.rst                          | 61 +++++++++++++-
 7 files changed, 263 insertions(+), 40 deletions(-)

diff --cc admin_manual/configuration/configuration_mail.rst
index e14de56,01e7c56..44664b0
--- a/admin_manual/configuration/configuration_mail.rst
+++ b/admin_manual/configuration/configuration_mail.rst
@@@ -423,3 -326,16 +423,20 @@@ using the ``telnet`` command
    221 smtp.domain.dom closing connection
    Connection closed by foreign host.
  
++=======
+ Enabling Debug Mode
+ -------------------
+ 
 -If you are unable to send email, it might be useful to activate further debug messages by enabling the mail_smtpdebug parameter:
++If you are unable to send email, it might be useful to activate further debug
++messages by enabling the mail_smtpdebug parameter:
+ 
+ .. code-block:: php
+ 
+   <?php
+ 
+     "mail_smtpdebug" => true,
+ 
 -.. note:: Immediately after pressing the **Send email** button, as described before, several **SMTP -> get_lines(): ...** messages appear on the screen.  This is expected behavior and can be ignored.
++.. note:: Immediately after pressing the **Send email** button, as described
++   before, several **SMTP -> get_lines(): ...** messages appear on the screen.
++   This is expected behavior and can be ignored.
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-doc.git