Merge pull request #547 from owncloud/fixwarnings

fix some issues

admin_manual/configuration/configuration_encryption.rst

@@ -25,6 +25,46 @@ encryption keys are stored in following folders:
    `this blog post <https://owncloud.org/blog/how-owncloud-uses-encryption-to-protect-your-data/>`_
    for more details.
 
+Enabling the Encryption App
+---------------------------
+
+Though ownCloud provides the Encryption app in the server download, it is
+disabled by default.  To enable the Encryption app:
+
+1. Access the ownCloud server as administrator.
+
+2. In the Apps Selection Menu, click "+".
+
+   All apps appear in the Apps Information field.
+
+3. Scroll down the apps list and click the Encryption app.
+
+   .. figure:: ../images/encryption_enabling.png
+
+   **Encryption app (Enabling)**
+
+4. Click the :guilabel:`Enable` button.
+
+   The Encryption app is enabled.
+
+Decrypting Encrypted Files
+--------------------------
+
+If the Encryption app is disabled after users have already stored encrypted
+data, users are prompted to decrypt their files again in their personal
+settings. Once done, users can continue to use their ownCloud without
+encryption.
+
+Settings
+--------
+
+Once the encryption app is enabled, additional settings appear on the Admin
+settings page.  These settings include the ability to:
+
+* Set a recovery key password.
+* Enable or disable the use of the recovery key password.
+
+
 Enable File Recovery Feature
 ----------------------------
 
@@ -45,10 +85,10 @@ at the top of the user management settings. After entering the recovery-key
 password the admin can change the user's log-in password which will
 automatically recover the user's file.
 
-If you use a user back-end which doesn't allow you to change the log-in
+If you use a user backend which does not allow you to change the log-in
 password directly within ownCloud, e.g. the LDAP back-end, than you can follow
 the same procedure to recover a user's files. The only difference is that
-you need to change the log-in password additionally at your back-end. In this
+you need to change the log-in password additionally at your backend. In this
 case make sure to use both times the same password.
 
 LDAP and other external user back-ends

admin_manual/whats_new_admin.rst

@@ -1,8 +1,8 @@
 What's New for Admins in ownCloud 7
-=================
+===================================
 
 New User Management
-------------------
+-------------------
 
 Admins can now view all ownCloud users in a single scrolling window, filter user 
 lists by group, and search by user display name using the new text filter. User 
@@ -11,7 +11,7 @@ user and the last time they logged in. New groups can be added with a click of
 a button.
 
 External Storage
----------------
+----------------
 
 Major improvements to the external storage app include support for FTP, Dropbox, 
 Google Drive, sFTP, Swift, S3, WebDAV, SMB/CIFS and more storage locations to 
@@ -20,7 +20,7 @@ in their Personal tabs. Further performance improvements have made externally
 mounted storage faster and more responsive.
 
 Server to Server Sharing
-----------------------
+------------------------
 
 ownCloud 7 servers can now connect shares with each other. With just a 
 few clicks you can easily and securely create public shares that are available 
@@ -29,7 +29,7 @@ also create their own public shares.
 
 
 SharePoint Integration (Enterprise Edition only)
-----------------------
+------------------------------------------------
 
 Native SharePoint support has been added to ownCloud 7 Enterprise Edition as a 
 secondary storage location for SharePoint 2007, 2010 and 2013. When this is 
@@ -41,7 +41,7 @@ ownCloud preserves SharePoint ACLs to ensure content is restricted per
 SharePoint rules.
 
 Windows Network Drive Integration (Enterprise Edition only)
---------------------------------
+-----------------------------------------------------------
 
 ownCloud has always supported mounting Windows network drives, and in OC7 EE it 
 is easier than ever for the administrator to mount Windows Network Drives 
@@ -52,7 +52,7 @@ devices and the Windows network drives.
 
 
 Sharing
-------
+-------
 
 Sharing has been dramatically enhanced and streamlined, making it more flexible, 
 faster and accessible. Improvements include:
@@ -71,21 +71,21 @@ faster and accessible. Improvements include:
 
  
 SMTP Configuration Wizard
------------------------
+-------------------------
 
 The new graphical SMTP configuration connects to your mail server in just a few 
 clicks, so that ownCloud can send automated messages to users. ownCloud 
 connects via PHP, Sendmail, or standard SMTP.
 
 Editable email Templates
--------------------
+------------------------
 
 ownCloud admins can now edit the email templates that ownCloud uses for 
 automatic notifications on the Admin page.
 
 
 Active Directory and LDAP Enhancements
-------------------
+--------------------------------------
 
 Several improvements have been made to the LDAP and Active Directory plug-in 
 application, improving both the performance of the application as well as the 

user_manual/files/encryption.rst

@@ -31,44 +31,11 @@ The current version of the Encryption app encrypts all files stored in ownCloud
    `this blog post <https://owncloud.org/blog/how-owncloud-uses-encryption-to-protect-your-data/>`_
    for more details.
 
-Enabling the Encryption App
----------------------------
-
-Though ownCloud provides the Encryption app in the server download, it is
-disabled by default.  To enable the Encryption app:
-
-1. Access the ownCloud server as administrator.
-
-2. In the Apps Selection Menu, click "+".
-
-   All apps appear in the Apps Information field.
-
-3. Scroll down the apps list and click the Encryption app.
-
-   .. figure:: ../images/encryption_enabling.png
-
-   **Encryption app (Enabling)**
-
-4. Click the :guilabel:`Enable` button.
-
-   The Encryption app is enabled.
-
-Decrypting Encrypted Files
---------------------------
-
-If the Encryption app is disabled after users have already stored encrypted
-data, users are prompted to decrypt their files again in their personal
-settings. Once done, users can continue to use their ownCloud without
-encryption.
-
 Settings
 --------
 
-Once the encryption app is enabled, additional settings appear on the Admin
-settings page.  These settings include the ability to:
-
-* Set a recovery key password.
-* Enable or disable the use of the recovery key password.
+If the administrator enabled Encryption app, one or all of the following settings will be
+visible in your personal settings page.
 
 Recovery Key Password
 ~~~~~~~~~~~~~~~~~~~~~

user_manual/webinterface.rst

@@ -33,7 +33,6 @@ To access the ownCloud web interface:
    The ownCloud main interface opens.
 
    .. figure:: images/oc_main_web.png
-      :scale: 90%
 
    **ownCloud main user interface**
 
@@ -45,7 +44,6 @@ Once you have accessed the ownCloud Server main web interface you can add files,
 (if you are administering the server) or by your server administrator.
 
 .. figure:: images/oc_main_web_labelled.png
-   :scale: 90%
 
 **Navigating the main user interface**
 

user_manual/whats_new.rst

@@ -1,8 +1,8 @@
 What's New for Users in ownCloud 7
-=================
+==================================
 
 No More Shared Folder
-------------------------------
+---------------------
 
 The Shared folder has been removed from ownCloud 7. If you are upgrading 
 from older ownCloud versions you will still have your old Shared folder, 
@@ -11,28 +11,29 @@ folder is no longer required. You can now create your own folders for
 storing shared files, and organize and move them around like any other files.
 
 Selective Sync
----------
+--------------
+
 The desktop client now makes it easier for users to configure which folders 
 on their ownCloud instances should be syncing with the desktop, and can easily 
 make changes for special circumstances such as travel and special projects.
 
 
 Server to Server Sharing
-----------------------
+------------------------
 
 ownCloud 7 servers can now connect shares directly with each other. With just a 
 few clicks you can easily and securely connect to public shares on other 
 ownCloud servers, and optionally create public shares for sharing your own files 
-if your admin allows it. 
+if your admin allows it.
 
 File and Activity Notifications
-------------------
+-------------------------------
 
 In ownCloud 7 you can set up automatic notifications of tracked 
 activities such as new shares, and changed or deleted files.
 
 ownCloud Documents with Word Conversion
--------------------------------
+---------------------------------------
 
 You can convert Word documents on the fly: open them in ownCloud for 
 editing, and live editing with other users, and when you close it reverts 
@@ -40,11 +41,11 @@ to its original Word format with all of your changes embedded.
 
 
 Mobile Web Browser Support
----------------
+--------------------------
 
 ownCloud 7 is friendly to small screens, and can be used on most tablet and 
 mobile browsers without requiring the use of a native mobile app. This provides 
-support for devices that don't have a native app, like Microsoft and 
+support for devices that do not have a native app, like Microsoft and
 Blackberry.
 
 Lazy Loading Files
@@ -55,10 +56,9 @@ files as you scroll down the page instead of loading all of them when you open
 the page.
 
 Object Stores as Primary Storage
----------------------------
+--------------------------------
 
 ownCloud can now leverage SWIFT object stores as primary storage for ownCloud 
 files. Users can choose the best option for their specific needs: local 
-storage, 
-network filesystem mounts, or SWIFT object stores.
+storage, network filesystem mounts, or SWIFT object stores.