first updates

admin_manual/configuration/configuration_mail.rst

@@ -2,7 +2,7 @@ Mail Configuration
 ==================
 ownCloud does not contain a full email program but contains some parameters to
 allow to send e.g. password reset email to the users. This function relies on
-the `PHPMailer library <http://sourceforge.net/projects/phpmailer/>`_. To
+the `PHPMailer library <https://github.com/PHPMailer/PHPMailer>`_. To
 take advantage of this function it needs to be configured properly.
 
 
@@ -181,23 +181,12 @@ be able to send email out of the box.
 Send a Test Email
 -----------------
 
-The only way to test your email configuration is, to force a login failure,
-because a function to send a test email has not be implemented yet.
+To test your email configuration, save your email address in your personal
+settings and then use the **Send email** button in *Email Server* section
+of the Admin settings page.
 
-First make sure that you are using a full qualified domain and not an ip address in the ownCloud URL, like::
 
-  http://my-owncloud-server.domain.dom/owncloud/
-
-The password reset function fetches the domain name from that URL to build the
-email sender address, e.g.::
-
-  john@domain.dom
-
-Next you need to enter your login and an *invalid* password. As soon as you
-press the login button the login mask reappears and a **I’ve forgotten my password** link will be shown above the login
-field. Click on that link, re-enter your login and press the **Reset password** button - that's all.
-
-Trouble shooting
+Troubleshooting
 ----------------
 
 My web domain is different from my mail domain?
@@ -310,7 +299,7 @@ Enable Debug Mode
 
 If you are still not able to send email it might be useful to activate
 further debug messages by setting the following parameter. Right after
-you have pressed the **Reset password** button, as described before, a
+you have pressed the **Send email** button, as described before, a
 lot of **SMTP -> get_lines(): ...** messages will be written on the
 screen.
 

admin_manual/configuration/configuring_big_file_upload.rst

@@ -20,16 +20,22 @@ Enabling uploading big files
 ============================
 Note: The order of the following steps is important! If you swap steps described below, the settings may fail.
 
-**Go to the admin section in the ownCloud-WebUI and do the following:**
+**Go to the admin section in the ownCloud Web Interface and do the following:**
 
 * Under "File handling" set the Maximum upload size to the desired value (e.g. 16GB)
 * Click the "save"-Button
 
 **Open the php.ini - file**
 
+You can easily learn the loaded configuration file by saving ``<?php phpinfo(); ?>`` code piece
+into a php file and calling it with your browser. Then look for the **Loaded Configuration File** value.
+
+Alternatively:
+
 * Under Debian or SUSE and their derivatives this file lies at /etc/php5/apache2/php.ini
 * On Windows, you can find this file within C:/Program Files (x86)/PHP/PHP.ini 
 
+
 **Do the following:**
 
 * Set the following three parameters inside th php.ini to the same value as chosen inside the admin-section one step before:

admin_manual/configuration/index.rst

@@ -19,7 +19,6 @@ Configuration
    configuration_language
    configuration_logging
    configuration_mail
-   configuration_maintenance
    configuration_preview
    configuration_reverseproxy
    configuring_big_file_upload

admin_manual/index.rst

@@ -66,7 +66,6 @@ This chapter covers ownCloud and web server configuration.
 * :doc:`configuration/configuration_3rdparty`
 * :doc:`configuration/custom_user_backend`
 * :doc:`configuration/configuration_custom_clients`
-* :doc:`configuration/configuration_maintenance`
 * :doc:`configuration/configuration_knowledgebase`
 * :doc:`configuration/configuration_logging`
 * :doc:`configuration/configuration_language`
@@ -75,6 +74,8 @@ Maintenance
 ===========
 This chapter covers maintenance tasks such as updating or migrating to a new version.
 
+
+* :doc:`maintenance/enable_maintenance`
 * :doc:`maintenance/migrating`
 * :doc:`maintenance/update`
 

admin_manual/maintenance/index.rst

@@ -5,6 +5,7 @@ Maintenance
 .. toctree::
    :maxdepth: 1
 
+   enable_maintenance
    backup
    update
    restore

admin_manual/maintenance/migrating.rst

@@ -4,7 +4,7 @@ Migrating ownCloud Installations
 
 To migrate an ownCloud install, follow those steps:
 
-#. Backup data/config folders and your database (look at "Backing Up ownCloud")
+#. Backup data/config folders and your database (see :doc:`backup`)
 #. Move your data
-#. Restore your data/config folders and your database (look at "Restore ownCloud")
+#. Restore your data/config folders and your database (see :doc:`restore`)
 #. Update config.php of any changes to your database connection