diff --git a/admin_manual/contents.rst b/admin_manual/contents.rst index f8e03bca7..efc53481e 100644 --- a/admin_manual/contents.rst +++ b/admin_manual/contents.rst @@ -24,11 +24,11 @@ Enterprise Subscription Only .. toctree:: :maxdepth: 3 - enterprise_installation/index - enterprise_clients/index - enterprise_server_branding/index - enterprise_external_storage/index - enterprise_user_management/index - enterprise_file_management/index - enterprise_logging/index - enterprise_firewall/index + enterprise-only/enterprise_installation/index + enterprise-only/enterprise_clients/index + enterprise-only/enterprise_server_branding/index + enterprise-only/enterprise_external_storage/index + enterprise-only/enterprise_user_management/index + enterprise-only/enterprise_file_management/index + enterprise-only/enterprise_logging/index + enterprise-only/enterprise_firewall/index diff --git a/admin_manual/enterprise_clients/creating_branded_apps.rst b/admin_manual/enterprise-only/enterprise_clients/creating_branded_apps.rst similarity index 97% rename from admin_manual/enterprise_clients/creating_branded_apps.rst rename to admin_manual/enterprise-only/enterprise_clients/creating_branded_apps.rst index d282b3f1c..971256b3e 100644 --- a/admin_manual/enterprise_clients/creating_branded_apps.rst +++ b/admin_manual/enterprise-only/enterprise_clients/creating_branded_apps.rst @@ -14,7 +14,7 @@ the completed, customized apps are loaded into your account. You must supply your own artwork, and you'll find all the specifications and required elements in ownBrander. -.. image:: ../images/ownbrander-1.png +.. image:: images/ownbrander-1.png Building a Branded Desktop Sync Client -------------------------------------- diff --git a/admin_manual/enterprise-only/enterprise_clients/custom_client_repos.rst b/admin_manual/enterprise-only/enterprise_clients/custom_client_repos.rst new file mode 100644 index 000000000..e1882b601 --- /dev/null +++ b/admin_manual/enterprise-only/enterprise_clients/custom_client_repos.rst @@ -0,0 +1,6 @@ +=================================== +Custom Client Download Repositories +=================================== + +See :doc:`../../configuration_server/custom_client_repos` to learn how to test +and configure custom download repository URLs for your branded clients. diff --git a/admin_manual/images/ownbrander-1.png b/admin_manual/enterprise-only/enterprise_clients/images/ownbrander-1.png similarity index 100% rename from admin_manual/images/ownbrander-1.png rename to admin_manual/enterprise-only/enterprise_clients/images/ownbrander-1.png diff --git a/admin_manual/enterprise_clients/index.rst b/admin_manual/enterprise-only/enterprise_clients/index.rst similarity index 100% rename from admin_manual/enterprise_clients/index.rst rename to admin_manual/enterprise-only/enterprise_clients/index.rst diff --git a/admin_manual/enterprise_external_storage/enterprise_only_auth.rst b/admin_manual/enterprise-only/enterprise_external_storage/enterprise_only_auth.rst similarity index 100% rename from admin_manual/enterprise_external_storage/enterprise_only_auth.rst rename to admin_manual/enterprise-only/enterprise_external_storage/enterprise_only_auth.rst diff --git a/admin_manual/enterprise_external_storage/images/app-sharepoint-enable.png b/admin_manual/enterprise-only/enterprise_external_storage/images/app-sharepoint-enable.png similarity index 100% rename from admin_manual/enterprise_external_storage/images/app-sharepoint-enable.png rename to admin_manual/enterprise-only/enterprise_external_storage/images/app-sharepoint-enable.png diff --git a/admin_manual/enterprise_external_storage/images/auth_backends-2.png b/admin_manual/enterprise-only/enterprise_external_storage/images/auth_backends-2.png similarity index 100% rename from admin_manual/enterprise_external_storage/images/auth_backends-2.png rename to admin_manual/enterprise-only/enterprise_external_storage/images/auth_backends-2.png diff --git a/admin_manual/enterprise_external_storage/images/auth_backends.png b/admin_manual/enterprise-only/enterprise_external_storage/images/auth_backends.png similarity index 100% rename from admin_manual/enterprise_external_storage/images/auth_backends.png rename to admin_manual/enterprise-only/enterprise_external_storage/images/auth_backends.png diff --git a/admin_manual/images/jive_2.png b/admin_manual/enterprise-only/enterprise_external_storage/images/jive_2.png similarity index 100% rename from admin_manual/images/jive_2.png rename to admin_manual/enterprise-only/enterprise_external_storage/images/jive_2.png diff --git a/admin_manual/images/jive_config.png b/admin_manual/enterprise-only/enterprise_external_storage/images/jive_config.png similarity index 100% rename from admin_manual/images/jive_config.png rename to admin_manual/enterprise-only/enterprise_external_storage/images/jive_config.png diff --git a/admin_manual/enterprise_external_storage/images/ldap-home-connector-1.png b/admin_manual/enterprise-only/enterprise_external_storage/images/ldap-home-connector-1.png similarity index 100% rename from admin_manual/enterprise_external_storage/images/ldap-home-connector-1.png rename to admin_manual/enterprise-only/enterprise_external_storage/images/ldap-home-connector-1.png diff --git a/admin_manual/enterprise_external_storage/images/ldap-home-connector-2.png b/admin_manual/enterprise-only/enterprise_external_storage/images/ldap-home-connector-2.png similarity index 100% rename from admin_manual/enterprise_external_storage/images/ldap-home-connector-2.png rename to admin_manual/enterprise-only/enterprise_external_storage/images/ldap-home-connector-2.png diff --git a/admin_manual/enterprise_external_storage/images/ldap-home-connector-3.png b/admin_manual/enterprise-only/enterprise_external_storage/images/ldap-home-connector-3.png similarity index 100% rename from admin_manual/enterprise_external_storage/images/ldap-home-connector-3.png rename to admin_manual/enterprise-only/enterprise_external_storage/images/ldap-home-connector-3.png diff --git a/admin_manual/enterprise_external_storage/images/sharepoint-1.png b/admin_manual/enterprise-only/enterprise_external_storage/images/sharepoint-1.png similarity index 100% rename from admin_manual/enterprise_external_storage/images/sharepoint-1.png rename to admin_manual/enterprise-only/enterprise_external_storage/images/sharepoint-1.png diff --git a/admin_manual/enterprise_external_storage/images/sharepoint-2.png b/admin_manual/enterprise-only/enterprise_external_storage/images/sharepoint-2.png similarity index 100% rename from admin_manual/enterprise_external_storage/images/sharepoint-2.png rename to admin_manual/enterprise-only/enterprise_external_storage/images/sharepoint-2.png diff --git a/admin_manual/enterprise_external_storage/images/sharepoint-3.png b/admin_manual/enterprise-only/enterprise_external_storage/images/sharepoint-3.png similarity index 100% rename from admin_manual/enterprise_external_storage/images/sharepoint-3.png rename to admin_manual/enterprise-only/enterprise_external_storage/images/sharepoint-3.png diff --git a/admin_manual/enterprise_external_storage/images/sharepoint-4.png b/admin_manual/enterprise-only/enterprise_external_storage/images/sharepoint-4.png similarity index 100% rename from admin_manual/enterprise_external_storage/images/sharepoint-4.png rename to admin_manual/enterprise-only/enterprise_external_storage/images/sharepoint-4.png diff --git a/admin_manual/enterprise_external_storage/images/sharepoint-drive-config.png b/admin_manual/enterprise-only/enterprise_external_storage/images/sharepoint-drive-config.png similarity index 100% rename from admin_manual/enterprise_external_storage/images/sharepoint-drive-config.png rename to admin_manual/enterprise-only/enterprise_external_storage/images/sharepoint-drive-config.png diff --git a/admin_manual/enterprise_external_storage/images/wnd-1.png b/admin_manual/enterprise-only/enterprise_external_storage/images/wnd-1.png similarity index 100% rename from admin_manual/enterprise_external_storage/images/wnd-1.png rename to admin_manual/enterprise-only/enterprise_external_storage/images/wnd-1.png diff --git a/admin_manual/enterprise_external_storage/images/wnd-2.png b/admin_manual/enterprise-only/enterprise_external_storage/images/wnd-2.png similarity index 100% rename from admin_manual/enterprise_external_storage/images/wnd-2.png rename to admin_manual/enterprise-only/enterprise_external_storage/images/wnd-2.png diff --git a/admin_manual/enterprise_external_storage/images/wnd-3.jpg b/admin_manual/enterprise-only/enterprise_external_storage/images/wnd-3.jpg similarity index 100% rename from admin_manual/enterprise_external_storage/images/wnd-3.jpg rename to admin_manual/enterprise-only/enterprise_external_storage/images/wnd-3.jpg diff --git a/admin_manual/enterprise_external_storage/images/wnd-3.png b/admin_manual/enterprise-only/enterprise_external_storage/images/wnd-3.png similarity index 100% rename from admin_manual/enterprise_external_storage/images/wnd-3.png rename to admin_manual/enterprise-only/enterprise_external_storage/images/wnd-3.png diff --git a/admin_manual/enterprise_external_storage/index.rst b/admin_manual/enterprise-only/enterprise_external_storage/index.rst similarity index 100% rename from admin_manual/enterprise_external_storage/index.rst rename to admin_manual/enterprise-only/enterprise_external_storage/index.rst diff --git a/admin_manual/enterprise_external_storage/jive_configuration.rst b/admin_manual/enterprise-only/enterprise_external_storage/jive_configuration.rst similarity index 99% rename from admin_manual/enterprise_external_storage/jive_configuration.rst rename to admin_manual/enterprise-only/enterprise_external_storage/jive_configuration.rst index 22a508e88..e3b587758 100644 --- a/admin_manual/enterprise_external_storage/jive_configuration.rst +++ b/admin_manual/enterprise-only/enterprise_external_storage/jive_configuration.rst @@ -23,7 +23,7 @@ The Jive application is installed under the owncloud/apps directory on the serve admin screen. This app is only available for ownCloud EE v6 or higher. Go to the ownCloud admin screen section “Jive backend parameters” to configure the app to match your Jive server system parameters. -.. image:: ../images/jive_config.png +.. image:: images/jive_config.png +----------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------+ | Parameter | Description | Values | @@ -83,7 +83,7 @@ The ownCloud Jive plugin can be used in various ways to extend the access to the Web Client Use Cases -------------------- -.. image:: ../images/jive_2.png +.. image:: images/jive_2.png :width: 3.2398in :height: 2.9898in diff --git a/admin_manual/enterprise_external_storage/ldap_home_connector_configuration.rst b/admin_manual/enterprise-only/enterprise_external_storage/ldap_home_connector_configuration.rst similarity index 100% rename from admin_manual/enterprise_external_storage/ldap_home_connector_configuration.rst rename to admin_manual/enterprise-only/enterprise_external_storage/ldap_home_connector_configuration.rst diff --git a/admin_manual/enterprise_external_storage/s3_swift_as_primary_object_store_configuration.rst b/admin_manual/enterprise-only/enterprise_external_storage/s3_swift_as_primary_object_store_configuration.rst similarity index 100% rename from admin_manual/enterprise_external_storage/s3_swift_as_primary_object_store_configuration.rst rename to admin_manual/enterprise-only/enterprise_external_storage/s3_swift_as_primary_object_store_configuration.rst diff --git a/admin_manual/enterprise_external_storage/sharepoint-integration_configuration.rst b/admin_manual/enterprise-only/enterprise_external_storage/sharepoint-integration_configuration.rst similarity index 100% rename from admin_manual/enterprise_external_storage/sharepoint-integration_configuration.rst rename to admin_manual/enterprise-only/enterprise_external_storage/sharepoint-integration_configuration.rst diff --git a/admin_manual/enterprise_external_storage/windows-network-drive_configuration.rst b/admin_manual/enterprise-only/enterprise_external_storage/windows-network-drive_configuration.rst similarity index 99% rename from admin_manual/enterprise_external_storage/windows-network-drive_configuration.rst rename to admin_manual/enterprise-only/enterprise_external_storage/windows-network-drive_configuration.rst index b9743eb9e..d5aac89f6 100644 --- a/admin_manual/enterprise_external_storage/windows-network-drive_configuration.rst +++ b/admin_manual/enterprise-only/enterprise_external_storage/windows-network-drive_configuration.rst @@ -96,7 +96,7 @@ the server address, the share name, and the folder you want to connect to. ``Internal Username Attribute`` must be set to the ``samaccountname`` for either the share or the root to work, and the user's home directory needs to match the ``samaccountname``. (See - :doc:`../configuration_user/user_auth_ldap`.) + :doc:`../../configuration_user/user_auth_ldap`.) 6. Then your login credentials. .. figure:: images/wnd-3.png diff --git a/admin_manual/enterprise_file_management/files_drop.rst b/admin_manual/enterprise-only/enterprise_file_management/files_drop.rst similarity index 96% rename from admin_manual/enterprise_file_management/files_drop.rst rename to admin_manual/enterprise-only/enterprise_file_management/files_drop.rst index 82fce5af8..76e37b5ad 100644 --- a/admin_manual/enterprise_file_management/files_drop.rst +++ b/admin_manual/enterprise-only/enterprise_file_management/files_drop.rst @@ -38,7 +38,7 @@ On your Personal page you should now see a URL for your upload directory. Share this URL with anyone you want to allow uploads to your File Drop folder. Note that the maximum upload size in this example is 512MB. (The default ownCloud upload file size limit is 512MB. See -:doc:`../configuration_files/big_file_upload_configuration` to learn how to +:doc:`../../configuration_files/big_file_upload_configuration` to learn how to customize this.) .. image:: images/files-drop-4.png diff --git a/admin_manual/enterprise_file_management/files_tagging.rst b/admin_manual/enterprise-only/enterprise_file_management/files_tagging.rst similarity index 100% rename from admin_manual/enterprise_file_management/files_tagging.rst rename to admin_manual/enterprise-only/enterprise_file_management/files_tagging.rst diff --git a/admin_manual/enterprise_file_management/images/files-drop-1.png b/admin_manual/enterprise-only/enterprise_file_management/images/files-drop-1.png similarity index 100% rename from admin_manual/enterprise_file_management/images/files-drop-1.png rename to admin_manual/enterprise-only/enterprise_file_management/images/files-drop-1.png diff --git a/admin_manual/enterprise_file_management/images/files-drop-2.png b/admin_manual/enterprise-only/enterprise_file_management/images/files-drop-2.png similarity index 100% rename from admin_manual/enterprise_file_management/images/files-drop-2.png rename to admin_manual/enterprise-only/enterprise_file_management/images/files-drop-2.png diff --git a/admin_manual/enterprise_file_management/images/files-drop-3.png b/admin_manual/enterprise-only/enterprise_file_management/images/files-drop-3.png similarity index 100% rename from admin_manual/enterprise_file_management/images/files-drop-3.png rename to admin_manual/enterprise-only/enterprise_file_management/images/files-drop-3.png diff --git a/admin_manual/enterprise_file_management/images/files-drop-4.png b/admin_manual/enterprise-only/enterprise_file_management/images/files-drop-4.png similarity index 100% rename from admin_manual/enterprise_file_management/images/files-drop-4.png rename to admin_manual/enterprise-only/enterprise_file_management/images/files-drop-4.png diff --git a/admin_manual/enterprise_file_management/images/files-drop-5.png b/admin_manual/enterprise-only/enterprise_file_management/images/files-drop-5.png similarity index 100% rename from admin_manual/enterprise_file_management/images/files-drop-5.png rename to admin_manual/enterprise-only/enterprise_file_management/images/files-drop-5.png diff --git a/admin_manual/enterprise_file_management/images/files-drop-6.png b/admin_manual/enterprise-only/enterprise_file_management/images/files-drop-6.png similarity index 100% rename from admin_manual/enterprise_file_management/images/files-drop-6.png rename to admin_manual/enterprise-only/enterprise_file_management/images/files-drop-6.png diff --git a/admin_manual/enterprise_file_management/images/files-drop-7.png b/admin_manual/enterprise-only/enterprise_file_management/images/files-drop-7.png similarity index 100% rename from admin_manual/enterprise_file_management/images/files-drop-7.png rename to admin_manual/enterprise-only/enterprise_file_management/images/files-drop-7.png diff --git a/admin_manual/enterprise_file_management/images/workflow-1.png b/admin_manual/enterprise-only/enterprise_file_management/images/workflow-1.png similarity index 100% rename from admin_manual/enterprise_file_management/images/workflow-1.png rename to admin_manual/enterprise-only/enterprise_file_management/images/workflow-1.png diff --git a/admin_manual/enterprise_file_management/images/workflow-2.png b/admin_manual/enterprise-only/enterprise_file_management/images/workflow-2.png similarity index 100% rename from admin_manual/enterprise_file_management/images/workflow-2.png rename to admin_manual/enterprise-only/enterprise_file_management/images/workflow-2.png diff --git a/admin_manual/enterprise_file_management/images/workflow-3.png b/admin_manual/enterprise-only/enterprise_file_management/images/workflow-3.png similarity index 100% rename from admin_manual/enterprise_file_management/images/workflow-3.png rename to admin_manual/enterprise-only/enterprise_file_management/images/workflow-3.png diff --git a/admin_manual/enterprise_file_management/images/workflow-4.png b/admin_manual/enterprise-only/enterprise_file_management/images/workflow-4.png similarity index 100% rename from admin_manual/enterprise_file_management/images/workflow-4.png rename to admin_manual/enterprise-only/enterprise_file_management/images/workflow-4.png diff --git a/admin_manual/enterprise_file_management/index.rst b/admin_manual/enterprise-only/enterprise_file_management/index.rst similarity index 100% rename from admin_manual/enterprise_file_management/index.rst rename to admin_manual/enterprise-only/enterprise_file_management/index.rst diff --git a/admin_manual/enterprise_firewall/file_firewall.rst b/admin_manual/enterprise-only/enterprise_firewall/file_firewall.rst similarity index 100% rename from admin_manual/enterprise_firewall/file_firewall.rst rename to admin_manual/enterprise-only/enterprise_firewall/file_firewall.rst diff --git a/admin_manual/enterprise_firewall/images/firewall-1.png b/admin_manual/enterprise-only/enterprise_firewall/images/firewall-1.png similarity index 100% rename from admin_manual/enterprise_firewall/images/firewall-1.png rename to admin_manual/enterprise-only/enterprise_firewall/images/firewall-1.png diff --git a/admin_manual/enterprise_firewall/images/firewall-2.png b/admin_manual/enterprise-only/enterprise_firewall/images/firewall-2.png similarity index 100% rename from admin_manual/enterprise_firewall/images/firewall-2.png rename to admin_manual/enterprise-only/enterprise_firewall/images/firewall-2.png diff --git a/admin_manual/enterprise_firewall/images/firewall-3.png b/admin_manual/enterprise-only/enterprise_firewall/images/firewall-3.png similarity index 100% rename from admin_manual/enterprise_firewall/images/firewall-3.png rename to admin_manual/enterprise-only/enterprise_firewall/images/firewall-3.png diff --git a/admin_manual/enterprise_firewall/index.rst b/admin_manual/enterprise-only/enterprise_firewall/index.rst similarity index 100% rename from admin_manual/enterprise_firewall/index.rst rename to admin_manual/enterprise-only/enterprise_firewall/index.rst diff --git a/admin_manual/enterprise_installation/index.rst b/admin_manual/enterprise-only/enterprise_installation/index.rst similarity index 100% rename from admin_manual/enterprise_installation/index.rst rename to admin_manual/enterprise-only/enterprise_installation/index.rst diff --git a/admin_manual/enterprise_installation/license_keys_installation.rst b/admin_manual/enterprise-only/enterprise_installation/license_keys_installation.rst similarity index 100% rename from admin_manual/enterprise_installation/license_keys_installation.rst rename to admin_manual/enterprise-only/enterprise_installation/license_keys_installation.rst diff --git a/admin_manual/enterprise_installation/linux_installation.rst b/admin_manual/enterprise-only/enterprise_installation/linux_installation.rst similarity index 74% rename from admin_manual/enterprise_installation/linux_installation.rst rename to admin_manual/enterprise-only/enterprise_installation/linux_installation.rst index 3eb7c87b3..3e421fd69 100644 --- a/admin_manual/enterprise_installation/linux_installation.rst +++ b/admin_manual/enterprise-only/enterprise_installation/linux_installation.rst @@ -13,19 +13,22 @@ up your Linux package manager. After you have completed your initial installation of ownCloud as detailed in the README, follow the instructions in -:doc:`../installation/installation_wizard` to finish setting up ownCloud. +:doc:`../../installation/installation_wizard` to finish setting up ownCloud. To upgrade your Enterprise Subscription, refer to -:doc:`../maintenance/upgrade`. +:doc:`../../maintenance/upgrade`. Manual Installation ------------------- -Download the ownCloud archive from your account at https://customer.owncloud.com/owncloud, then follow the instructions at :doc:`../installation/source_installation`. +Download the ownCloud archive from your account at +https://customer.owncloud.com/owncloud, then follow the instructions at +:doc:`../../installation/source_installation`. SELinux ------- Linux distributions that use SELinux need to take some extra steps so that ownCloud will operate correctly under SELinux. Please see -:doc:`../installation/selinux_configuration` for some recommended configurations. +:doc:`../../installation/selinux_configuration` for some recommended +configurations. diff --git a/admin_manual/enterprise_installation/supported_apps_installation.rst b/admin_manual/enterprise-only/enterprise_installation/supported_apps_installation.rst similarity index 81% rename from admin_manual/enterprise_installation/supported_apps_installation.rst rename to admin_manual/enterprise-only/enterprise_installation/supported_apps_installation.rst index 919d44760..fdb12a18e 100644 --- a/admin_manual/enterprise_installation/supported_apps_installation.rst +++ b/admin_manual/enterprise-only/enterprise_installation/supported_apps_installation.rst @@ -2,7 +2,7 @@ Supported ownCloud Enterprise Subscription Apps =============================================== -See :doc:`../installation/apps_supported` for a list of supported apps. +See :doc:`../../installation/apps_supported` for a list of supported apps. .. note:: 3rd party and unsupported apps must be disabled before performing a system upgrade. Then install the upgraded versions, and after the diff --git a/admin_manual/enterprise_logging/enterprise_logging_apps.rst b/admin_manual/enterprise-only/enterprise_logging/enterprise_logging_apps.rst similarity index 92% rename from admin_manual/enterprise_logging/enterprise_logging_apps.rst rename to admin_manual/enterprise-only/enterprise_logging/enterprise_logging_apps.rst index 32d1ebd0c..40927ed7e 100644 --- a/admin_manual/enterprise_logging/enterprise_logging_apps.rst +++ b/admin_manual/enterprise-only/enterprise_logging/enterprise_logging_apps.rst @@ -16,6 +16,6 @@ View your logfiles on your admin page. Click the **Download logfile** button to dump the plain text log, or open the logfile directly in a text editor. The default location is ``owncloud/data/owncloud.log``. -See :doc:`../configuration_server/logging_configuration` and +See :doc:`../../configuration_server/logging_configuration` and :doc:`../enterprise_file_management/files_tagging` for more information on logging and tagging. diff --git a/admin_manual/enterprise_logging/images/logging-1.png b/admin_manual/enterprise-only/enterprise_logging/images/logging-1.png similarity index 100% rename from admin_manual/enterprise_logging/images/logging-1.png rename to admin_manual/enterprise-only/enterprise_logging/images/logging-1.png diff --git a/admin_manual/enterprise_logging/index.rst b/admin_manual/enterprise-only/enterprise_logging/index.rst similarity index 100% rename from admin_manual/enterprise_logging/index.rst rename to admin_manual/enterprise-only/enterprise_logging/index.rst diff --git a/admin_manual/enterprise_server_branding/enterprise_server_branding.rst b/admin_manual/enterprise-only/enterprise_server_branding/enterprise_server_branding.rst similarity index 97% rename from admin_manual/enterprise_server_branding/enterprise_server_branding.rst rename to admin_manual/enterprise-only/enterprise_server_branding/enterprise_server_branding.rst index b5ed26f6e..728c8942c 100644 --- a/admin_manual/enterprise_server_branding/enterprise_server_branding.rst +++ b/admin_manual/enterprise-only/enterprise_server_branding/enterprise_server_branding.rst @@ -18,7 +18,7 @@ ownBrander app enabled on your account. When you complete the steps in the wizard the ownBrander service builds your new branded theme, and in 24-48 hours you'll see it in your account. -.. figure:: ../images/ownbrander-1.png +.. figure:: images/ownbrander-1.png :alt: ownBrander app button is on the top left of your ownCloud Web GUI, after clicking the down arrow at the right of the ownCloud logo @@ -28,7 +28,7 @@ need a number of images in specific sizes and formats, and the wizard tells you what you need. Example images are on the right, and you can click to enlarge them. -.. figure:: ../images/webbrander-1.png +.. figure:: images/webbrander-1.png :alt: ownBrander wizard with instructions, upload buttons for your custom branded images, and example screenshots diff --git a/admin_manual/enterprise-only/enterprise_server_branding/images/ownbrander-1.png b/admin_manual/enterprise-only/enterprise_server_branding/images/ownbrander-1.png new file mode 100644 index 000000000..3be47ba0f Binary files /dev/null and b/admin_manual/enterprise-only/enterprise_server_branding/images/ownbrander-1.png differ diff --git a/admin_manual/images/webbrander-1.png b/admin_manual/enterprise-only/enterprise_server_branding/images/webbrander-1.png similarity index 100% rename from admin_manual/images/webbrander-1.png rename to admin_manual/enterprise-only/enterprise_server_branding/images/webbrander-1.png diff --git a/admin_manual/enterprise_server_branding/index.rst b/admin_manual/enterprise-only/enterprise_server_branding/index.rst similarity index 100% rename from admin_manual/enterprise_server_branding/index.rst rename to admin_manual/enterprise-only/enterprise_server_branding/index.rst diff --git a/admin_manual/images/shib-gui1.png b/admin_manual/enterprise-only/enterprise_user_management/images/shib-gui1.png similarity index 100% rename from admin_manual/images/shib-gui1.png rename to admin_manual/enterprise-only/enterprise_user_management/images/shib-gui1.png diff --git a/admin_manual/images/shib-gui2.png b/admin_manual/enterprise-only/enterprise_user_management/images/shib-gui2.png similarity index 100% rename from admin_manual/images/shib-gui2.png rename to admin_manual/enterprise-only/enterprise_user_management/images/shib-gui2.png diff --git a/admin_manual/images/shib-gui4.png b/admin_manual/enterprise-only/enterprise_user_management/images/shib-gui4.png similarity index 100% rename from admin_manual/images/shib-gui4.png rename to admin_manual/enterprise-only/enterprise_user_management/images/shib-gui4.png diff --git a/admin_manual/images/shib-gui5.png b/admin_manual/enterprise-only/enterprise_user_management/images/shib-gui5.png similarity index 100% rename from admin_manual/images/shib-gui5.png rename to admin_manual/enterprise-only/enterprise_user_management/images/shib-gui5.png diff --git a/admin_manual/images/shib-gui6.png b/admin_manual/enterprise-only/enterprise_user_management/images/shib-gui6.png similarity index 100% rename from admin_manual/images/shib-gui6.png rename to admin_manual/enterprise-only/enterprise_user_management/images/shib-gui6.png diff --git a/admin_manual/images/shibboleth-personal.png b/admin_manual/enterprise-only/enterprise_user_management/images/shibboleth-personal.png similarity index 100% rename from admin_manual/images/shibboleth-personal.png rename to admin_manual/enterprise-only/enterprise_user_management/images/shibboleth-personal.png diff --git a/admin_manual/enterprise_user_management/index.rst b/admin_manual/enterprise-only/enterprise_user_management/index.rst similarity index 100% rename from admin_manual/enterprise_user_management/index.rst rename to admin_manual/enterprise-only/enterprise_user_management/index.rst diff --git a/admin_manual/enterprise_user_management/user_auth_shibboleth.rst b/admin_manual/enterprise-only/enterprise_user_management/user_auth_shibboleth.rst similarity index 98% rename from admin_manual/enterprise_user_management/user_auth_shibboleth.rst rename to admin_manual/enterprise-only/enterprise_user_management/user_auth_shibboleth.rst index 254bd0ec5..8a899efd5 100644 --- a/admin_manual/enterprise_user_management/user_auth_shibboleth.rst +++ b/admin_manual/enterprise-only/enterprise_user_management/user_auth_shibboleth.rst @@ -158,7 +158,7 @@ After enabling the Shibboleth app on your Apps page, you need to choose the app mode and map the necessary Shibboleth environment variables to ownCloud user attributes on your Admin page. -.. figure:: ../images/shib-gui5.png +.. figure:: images/shib-gui5.png :alt: Shibboleth configuration screen. *figure 1: Enabling Shibboleth on the ownCloud Admin page* @@ -189,7 +189,7 @@ allows another user backend, eg. the LDAP app, to provide the ``displayname``, environment variable and tries to find an LDAP user with that ``uid``. For this to work the LDAP backend also needs to be configured to use the **sAMAccountName** as the **Internal Username Attribute** in the - :doc:`LDAP expert settings <../configuration_user/user_auth_ldap>`. + :doc:`LDAP expert settings <../../configuration_user/user_auth_ldap>`. .. note:: In many scenarios Shibboleth is not intended to hide the user's password from the service provider, but only to implement SSO. If that is @@ -202,7 +202,7 @@ In **Autoprovision Users** mode the app will not ask another user backend, but instead provision users on the fly by reading the two additional environment variables for display name and email address. -.. figure:: ../images/shib-gui6.png +.. figure:: images/shib-gui6.png :alt: Dropdowns for mapping Shibboleth environment configuration variables to ownCloud user attributes. *figure 2: Mapping Shibboleth environment configuration variables to ownCloud @@ -242,7 +242,7 @@ shows a test Shibboleth login screen from `Testshib.org `_ on the ownCloud desktop sync client. -.. figure:: ../images/shib-gui1.png +.. figure:: images/shib-gui1.png :alt: First client login screen. *figure 3: First login screen* @@ -251,7 +251,7 @@ Then after going through the setup wizard, the desktop sync client displays the server and login information just like it does for any other ownCloud server connections. -.. figure:: ../images/shib-gui4.png +.. figure:: images/shib-gui4.png :alt: The ownCloud client shows which server you are connected to. *figure 4: ownCloud client displays server information* @@ -269,7 +269,7 @@ WebDAV Url, for example ``https://cloud.example.com/remote.php/nonshib-webdav/`` to log in with their username and password. The password is generated on the Personal settings page. -.. image:: ../images/shibboleth-personal.png +.. image:: images/shibboleth-personal.png .. note:: In **Single sign-on only** mode the alternative WebDAV Url feature will not work, as we have no way to store the WebDAV password. Instead the diff --git a/admin_manual/enterprise_clients/custom_client_repos.rst b/admin_manual/enterprise_clients/custom_client_repos.rst deleted file mode 100644 index 8b52616ef..000000000 --- a/admin_manual/enterprise_clients/custom_client_repos.rst +++ /dev/null @@ -1,6 +0,0 @@ -=================================== -Custom Client Download Repositories -=================================== - -See :doc:`../configuration_server/custom_client_repos` to learn how test and -configure custom download repository URLs for your branded clients. diff --git a/admin_manual/installation/linux_installation.rst b/admin_manual/installation/linux_installation.rst index 9988505ad..744e9e09e 100644 --- a/admin_manual/installation/linux_installation.rst +++ b/admin_manual/installation/linux_installation.rst @@ -70,8 +70,8 @@ to the next major release before you're ready. Installing ownCloud Enterprise Subscription ------------------------------------------- -See :doc:`../enterprise_installation/linux_installation` for instructions on -installing ownCloud Enterprise Subscription. +See :doc:`../enterprise-only/enterprise_installation/linux_installation` for +instructions on installing ownCloud Enterprise Subscription. Downgrading Not Supported ------------------------- diff --git a/admin_manual/installation/source_installation.rst b/admin_manual/installation/source_installation.rst index 451c99576..1ee086204 100644 --- a/admin_manual/installation/source_installation.rst +++ b/admin_manual/installation/source_installation.rst @@ -8,7 +8,7 @@ ownCloud engineers, and you can use your package manager to keep your ownCloud server up-to-date. .. note:: Enterprise Subscription customers should refer to - :doc:`../enterprise_installation/linux_installation` + :doc:`../enterprise-only/enterprise_installation/linux_installation` If there are no packages for your Linux distribution, or you prefer installing from the source tarball, you can setup ownCloud from scratch using a classic diff --git a/admin_manual/maintenance/upgrade.rst b/admin_manual/maintenance/upgrade.rst index 68730131d..1af32b535 100644 --- a/admin_manual/maintenance/upgrade.rst +++ b/admin_manual/maintenance/upgrade.rst @@ -14,7 +14,8 @@ There are three ways to upgrade your ownCloud server: from `owncloud.org/install/`_. * Enterprise Subscription customers will use their Enterprise software repositories to maintain their ownCloud servers, rather than the Open Build - Service. Please see :doc:`../enterprise_installation/linux_installation` for + Service. Please see + :doc:`../enterprise-only/enterprise_installation/linux_installation` for more information. When an update is available for your ownCloud server, you will see a diff --git a/admin_manual/whats_new_admin.rst b/admin_manual/whats_new_admin.rst index cb0b500d1..b69038467 100644 --- a/admin_manual/whats_new_admin.rst +++ b/admin_manual/whats_new_admin.rst @@ -32,9 +32,9 @@ Enterprise Only --------------- * Advanced tagging management with the Workflow app. - (:doc:`enterprise_file_management/files_tagging`) + (:doc:`enterprise-only/enterprise_file_management/files_tagging`) * Advanced authentication backends. - (:doc:`enterprise_external_storage/enterprise_only_auth`) + (:doc:`enterprise-only/enterprise_external_storage/enterprise_only_auth`) * Password policy app for share links, for setting password requirements such as minimum length and required characters. (:ref:`password_policy_label`)