From 7bd4fb801adcad64e676ef06400398bcfc8c769e Mon Sep 17 00:00:00 2001 From: Carla Schroder Date: Mon, 17 Nov 2014 19:21:51 -0800 Subject: [PATCH] reorganize and clean up CE admin manual --- ...ivirus.rst => antivirus_configuration.rst} | 0 ...mation.rst => automatic_configuration.rst} | 21 ++-- ....rst => background_jobs_configuration.rst} | 0 ....rst => big_file_upload_configuration.rst} | 2 +- ...collaborative_documents_configuration.rst} | 0 ...p.rst => config_sample_php_parameters.rst} | 0 ...ts.rst => custom_client_configuration.rst} | 0 ...atabase.rst => database_configuration.rst} | 0 ...ation_mail.rst => email_configuration.rst} | 4 +- ...rst => external_storage_configuration.rst} | 2 +- ...=> external_storage_configuration_gui.rst} | 2 +- ...ing.rst => file_sharing_configuration.rst} | 0 ...locking.rst => files_locking_enabling.rst} | 4 +- admin_manual/configuration/index.rst | 54 ++++----- ...js_css_asset_management_configuration.rst} | 4 +- ...se.rst => knowledgebase_configuration.rst} | 0 ...anguage.rst => language_configuration.rst} | 0 ..._logging.rst => logging_configuration.rst} | 0 ...preview.rst => previews_configuration.rst} | 4 +- ...xy.rst => reverse_proxy_configuration.rst} | 0 ...ng_search.rst => search_configuration.rst} | 0 ... server_side_encryption_configuration.rst} | 4 +- ...rst => server_to_server_configuration.rst} | 0 ...=> serving_static_files_configuration.rst} | 5 +- ...y.rst => thirdparty_php_configuration.rst} | 4 +- ...backend.rst => user_auth_ftp_smb_imap.rst} | 8 +- .../{auth_ldap.rst => user_auth_ldap.rst} | 0 ...ation_users.rst => user_configuration.rst} | 2 +- admin_manual/contents.rst | 5 - admin_manual/index.rst | 103 ++++++++++-------- ...pliance.rst => appliance_installation.rst} | 4 +- .../apps_management_installation.rst} | 0 ...iawatha.rst => hiawatha_configuration.rst} | 0 admin_manual/installation/index.rst | 23 ++-- .../installation/installation_wizard.rst | 2 +- ...ighttpd.rst => lighttpd_configuration.rst} | 0 ...ation_linux.rst => linux_installation.rst} | 2 +- ...ation_macos.rst => macos_installation.rst} | 0 ...tion_nginx.rst => nginx_configuration.rst} | 0 ...ion_others.rst => others_installation.rst} | 0 ...ion_source.rst => source_installation.rst} | 14 +-- ...tallation_ucs.rst => ucs_installation.rst} | 0 ...n_windows.rst => windows_installation.rst} | 2 +- ...ration_yaws.rst => yaws_configuration.rst} | 0 admin_manual/issues/index.rst | 4 +- admin_manual/maintenance/upgrade.rst | 2 +- 46 files changed, 150 insertions(+), 131 deletions(-) rename admin_manual/configuration/{configuration-antivirus.rst => antivirus_configuration.rst} (100%) rename admin_manual/configuration/{configuration_automation.rst => automatic_configuration.rst} (86%) rename admin_manual/configuration/{background_jobs.rst => background_jobs_configuration.rst} (100%) rename admin_manual/configuration/{configuring_big_file_upload.rst => big_file_upload_configuration.rst} (98%) rename admin_manual/configuration/{configuring_documents.rst => collaborative_documents_configuration.rst} (100%) rename admin_manual/configuration/{configuration_config_sample_php.rst => config_sample_php_parameters.rst} (100%) rename admin_manual/configuration/{configuration_custom_clients.rst => custom_client_configuration.rst} (100%) rename admin_manual/configuration/{configuration_database.rst => database_configuration.rst} (100%) rename admin_manual/configuration/{configuration_mail.rst => email_configuration.rst} (99%) rename admin_manual/configuration/{custom_mount_config.rst => external_storage_configuration.rst} (99%) rename admin_manual/configuration/{custom_mount_config_gui.rst => external_storage_configuration_gui.rst} (99%) rename admin_manual/configuration/{configuration_file_sharing.rst => file_sharing_configuration.rst} (100%) rename admin_manual/configuration/{configuration_files_locking.rst => files_locking_enabling.rst} (93%) rename admin_manual/configuration/{configuration_assets.rst => js_css_asset_management_configuration.rst} (86%) rename admin_manual/configuration/{configuration_knowledgebase.rst => knowledgebase_configuration.rst} (100%) rename admin_manual/configuration/{configuration_language.rst => language_configuration.rst} (100%) rename admin_manual/configuration/{configuration_logging.rst => logging_configuration.rst} (100%) rename admin_manual/configuration/{configuration_preview.rst => previews_configuration.rst} (98%) rename admin_manual/configuration/{configuration_reverseproxy.rst => reverse_proxy_configuration.rst} (100%) rename admin_manual/configuration/{configuring_search.rst => search_configuration.rst} (100%) rename admin_manual/configuration/{configuration_encryption.rst => server_side_encryption_configuration.rst} (99%) rename admin_manual/configuration/{server_to_server_managing.rst => server_to_server_configuration.rst} (100%) rename admin_manual/configuration/{xsendfile.rst => serving_static_files_configuration.rst} (98%) rename admin_manual/configuration/{configuration_3rdparty.rst => thirdparty_php_configuration.rst} (92%) rename admin_manual/configuration/{custom_user_backend.rst => user_auth_ftp_smb_imap.rst} (92%) rename admin_manual/configuration/{auth_ldap.rst => user_auth_ldap.rst} (100%) rename admin_manual/configuration/{configuration_users.rst => user_configuration.rst} (98%) rename admin_manual/installation/{installation_appliance.rst => appliance_installation.rst} (97%) rename admin_manual/{configuration/configuration_apps.rst => installation/apps_management_installation.rst} (100%) rename admin_manual/installation/{configuration_hiawatha.rst => hiawatha_configuration.rst} (100%) rename admin_manual/installation/{configuration_lighttpd.rst => lighttpd_configuration.rst} (100%) rename admin_manual/installation/{installation_linux.rst => linux_installation.rst} (94%) rename admin_manual/installation/{installation_macos.rst => macos_installation.rst} (100%) rename admin_manual/installation/{configuration_nginx.rst => nginx_configuration.rst} (100%) rename admin_manual/installation/{installation_others.rst => others_installation.rst} (100%) rename admin_manual/installation/{installation_source.rst => source_installation.rst} (98%) rename admin_manual/installation/{installation_ucs.rst => ucs_installation.rst} (100%) rename admin_manual/installation/{installation_windows.rst => windows_installation.rst} (99%) rename admin_manual/installation/{configuration_yaws.rst => yaws_configuration.rst} (100%) diff --git a/admin_manual/configuration/configuration-antivirus.rst b/admin_manual/configuration/antivirus_configuration.rst similarity index 100% rename from admin_manual/configuration/configuration-antivirus.rst rename to admin_manual/configuration/antivirus_configuration.rst diff --git a/admin_manual/configuration/configuration_automation.rst b/admin_manual/configuration/automatic_configuration.rst similarity index 86% rename from admin_manual/configuration/configuration_automation.rst rename to admin_manual/configuration/automatic_configuration.rst index 207c117e1..3ecd015ec 100644 --- a/admin_manual/configuration/configuration_automation.rst +++ b/admin_manual/configuration/automatic_configuration.rst @@ -1,8 +1,9 @@ -Defining Automatic Configuration -================================ +Automatic Configuration Setup +============================= If you need to install ownCloud on multiple servers, you normally do not want -to set up each instance separately as described in the :doc:`configuration_database`. +to set up each instance separately as described in the +:doc:`database_configuration`. For this reason, ownCloud provides an automatic configuration feature. To take advantage of this feature, you must create a configuration file, called @@ -69,7 +70,9 @@ Using the following parameter settings, the "Finish setup" screen requests data "dbtableprefix" => "", ); -.. note:: Keep in mind that the automatic configuration does not eliminate the need for creating the database user and database in advance, as described in :doc:`configuration_database`. +.. note:: Keep in mind that the automatic configuration does not eliminate the need for + creating the database user and database in advance, as described in + :doc:`database_configuration`. PostgreSQL Database ~~~~~~~~~~~~~~~~~~~ @@ -87,7 +90,9 @@ Using the following parameter settings, the "Finish setup" screen requests data "dbtableprefix" => "", ); -.. note:: Keep in mind that the automatic configuration does not eliminate the need for creating the database user and database in advance, as described in :doc:`configuration_database`. +.. note:: Keep in mind that the automatic configuration does not eliminate the need for + creating the database user and database in advance, as described in + :doc:`database_configuration`. All Parameters ~~~~~~~~~~~~~~ @@ -109,5 +114,7 @@ Using the following parameter settings, because all parameters are already confi "directory" => "/www/htdocs/owncloud/data", ); -.. note:: Keep in mind that the automatic configuration does not eliminate the need for creating the database user and database in advance, as described in :doc:`configuration_database`. - +.. note:: Keep in mind that the automatic configuration does not eliminate the need for + creating the database user and database in advance, as described in + :doc:`database_configuration`. + \ No newline at end of file diff --git a/admin_manual/configuration/background_jobs.rst b/admin_manual/configuration/background_jobs_configuration.rst similarity index 100% rename from admin_manual/configuration/background_jobs.rst rename to admin_manual/configuration/background_jobs_configuration.rst diff --git a/admin_manual/configuration/configuring_big_file_upload.rst b/admin_manual/configuration/big_file_upload_configuration.rst similarity index 98% rename from admin_manual/configuration/configuring_big_file_upload.rst rename to admin_manual/configuration/big_file_upload_configuration.rst index 6845c8acc..cacc8a13e 100644 --- a/admin_manual/configuration/configuring_big_file_upload.rst +++ b/admin_manual/configuration/big_file_upload_configuration.rst @@ -21,7 +21,7 @@ This is important, because you possibly could not watch otherwise whether the desired changes take effect. Enabling uploading big files -============================ +---------------------------- **Configuring your webserver** diff --git a/admin_manual/configuration/configuring_documents.rst b/admin_manual/configuration/collaborative_documents_configuration.rst similarity index 100% rename from admin_manual/configuration/configuring_documents.rst rename to admin_manual/configuration/collaborative_documents_configuration.rst diff --git a/admin_manual/configuration/configuration_config_sample_php.rst b/admin_manual/configuration/config_sample_php_parameters.rst similarity index 100% rename from admin_manual/configuration/configuration_config_sample_php.rst rename to admin_manual/configuration/config_sample_php_parameters.rst diff --git a/admin_manual/configuration/configuration_custom_clients.rst b/admin_manual/configuration/custom_client_configuration.rst similarity index 100% rename from admin_manual/configuration/configuration_custom_clients.rst rename to admin_manual/configuration/custom_client_configuration.rst diff --git a/admin_manual/configuration/configuration_database.rst b/admin_manual/configuration/database_configuration.rst similarity index 100% rename from admin_manual/configuration/configuration_database.rst rename to admin_manual/configuration/database_configuration.rst diff --git a/admin_manual/configuration/configuration_mail.rst b/admin_manual/configuration/email_configuration.rst similarity index 99% rename from admin_manual/configuration/configuration_mail.rst rename to admin_manual/configuration/email_configuration.rst index c3c8c11a0..1aba7e69c 100644 --- a/admin_manual/configuration/configuration_mail.rst +++ b/admin_manual/configuration/email_configuration.rst @@ -1,5 +1,5 @@ -Mail Configuration -================== +Email Configuration +=================== ownCloud is capable of sending password reset emails, notifying users of new file shares, changes in files, and activity notifications. Your users configure diff --git a/admin_manual/configuration/custom_mount_config.rst b/admin_manual/configuration/external_storage_configuration.rst similarity index 99% rename from admin_manual/configuration/custom_mount_config.rst rename to admin_manual/configuration/external_storage_configuration.rst index 58e212a73..f0997b48a 100644 --- a/admin_manual/configuration/custom_mount_config.rst +++ b/admin_manual/configuration/external_storage_configuration.rst @@ -32,7 +32,7 @@ Please keep in mind that some formatting has been applied and carriage returns have been added for better readability. In the :file:`data/mount.json` all values need to be concatenated and written in a row without these modifications! -It is recommended to use the :doc:`Web-GUI ` in the +It is recommended to use the :doc:`Web-GUI ` in the administrator panel to add, remove or modify mount options to prevent any problems! Example diff --git a/admin_manual/configuration/custom_mount_config_gui.rst b/admin_manual/configuration/external_storage_configuration_gui.rst similarity index 99% rename from admin_manual/configuration/custom_mount_config_gui.rst rename to admin_manual/configuration/external_storage_configuration_gui.rst index 2e895688d..4f5b10566 100644 --- a/admin_manual/configuration/custom_mount_config_gui.rst +++ b/admin_manual/configuration/external_storage_configuration_gui.rst @@ -337,6 +337,6 @@ above) and will be replaced by the user login. Although configuration may be done by making modifications to the ``mount.json`` file, it is recommended to use the Web-GUI in the administrator panel (as described in the above section) to add, remove, or modify mount -options to prevent any problems. See :doc:`custom_mount_config` for +options to prevent any problems. See :doc:`external_storage_configuration` for configuration examples. diff --git a/admin_manual/configuration/configuration_file_sharing.rst b/admin_manual/configuration/file_sharing_configuration.rst similarity index 100% rename from admin_manual/configuration/configuration_file_sharing.rst rename to admin_manual/configuration/file_sharing_configuration.rst diff --git a/admin_manual/configuration/configuration_files_locking.rst b/admin_manual/configuration/files_locking_enabling.rst similarity index 93% rename from admin_manual/configuration/configuration_files_locking.rst rename to admin_manual/configuration/files_locking_enabling.rst index d035c5ea4..610caafa2 100644 --- a/admin_manual/configuration/configuration_files_locking.rst +++ b/admin_manual/configuration/files_locking_enabling.rst @@ -1,5 +1,5 @@ -Using the Files Locking App ---------------------------- +Files Locking App Configuration +------------------------------- The Files Locking application enables ownCloud to lock files while reading or writing to and from backend storage. The purpose of the app is to avoid file diff --git a/admin_manual/configuration/index.rst b/admin_manual/configuration/index.rst index 1a5658585..c4915c06c 100644 --- a/admin_manual/configuration/index.rst +++ b/admin_manual/configuration/index.rst @@ -5,30 +5,30 @@ Configuration .. toctree:: :maxdepth: 1 - configuration_apps - configuration_users - auth_ldap - server_to_server_managing - background_jobs - configuring_documents - configuration_assets - configuration_3rdparty - configuration-antivirus - configuration_automation - configuration_custom_clients - configuration_database - configuration_encryption - configuration_knowledgebase - configuration_language - configuration_logging - configuration_mail - configuration_preview - configuration_reverseproxy - configuration_file_sharing - configuring_big_file_upload - custom_mount_config_gui - custom_mount_config - custom_user_backend - xsendfile - configuring_search - configuration_config_sample_php + antivirus_configuration + automatic_configuration + background_jobs_configuration + big_file_upload_configuration + collaborative_documents_configuration.rst + config_sample_php_parameters + custom_client_configuration + database_configuration + email_configuration + external_storage_configuration_gui + external_storage_configuration + file_sharing_configuration + files_locking_enabling + js_css_asset_management_configuration + knowledgebase_configuration + language_configuration + logging_configuration + previews_configuration + reverse_proxy_configuration + search_configuration + server_side_encryption_configuration + server_to_server_configuration + serving_static_files_configuration + thirdparty_php_configuration + user_auth_ftp_smb_imap + user_auth_ldap + user_configuration \ No newline at end of file diff --git a/admin_manual/configuration/configuration_assets.rst b/admin_manual/configuration/js_css_asset_management_configuration.rst similarity index 86% rename from admin_manual/configuration/configuration_assets.rst rename to admin_manual/configuration/js_css_asset_management_configuration.rst index 14f8adc83..9f4f8af46 100644 --- a/admin_manual/configuration/configuration_assets.rst +++ b/admin_manual/configuration/js_css_asset_management_configuration.rst @@ -1,5 +1,5 @@ -Asset Management -================ +JavaScript and CSS Asset Management +=================================== In production environments, JavaScript and CSS files are delivered in a concatenated and compressed format. diff --git a/admin_manual/configuration/configuration_knowledgebase.rst b/admin_manual/configuration/knowledgebase_configuration.rst similarity index 100% rename from admin_manual/configuration/configuration_knowledgebase.rst rename to admin_manual/configuration/knowledgebase_configuration.rst diff --git a/admin_manual/configuration/configuration_language.rst b/admin_manual/configuration/language_configuration.rst similarity index 100% rename from admin_manual/configuration/configuration_language.rst rename to admin_manual/configuration/language_configuration.rst diff --git a/admin_manual/configuration/configuration_logging.rst b/admin_manual/configuration/logging_configuration.rst similarity index 100% rename from admin_manual/configuration/configuration_logging.rst rename to admin_manual/configuration/logging_configuration.rst diff --git a/admin_manual/configuration/configuration_preview.rst b/admin_manual/configuration/previews_configuration.rst similarity index 98% rename from admin_manual/configuration/configuration_preview.rst rename to admin_manual/configuration/previews_configuration.rst index 83b101f7f..164abb94c 100644 --- a/admin_manual/configuration/configuration_preview.rst +++ b/admin_manual/configuration/previews_configuration.rst @@ -1,5 +1,5 @@ -Preview Configuration -===================== +Previews Configuration +====================== The ownCloud thumbnail system is used to generate thumbnails from various file types, which are then shown as thumbnails in the Files application of the web interface, or as a larger preview for public shared links. diff --git a/admin_manual/configuration/configuration_reverseproxy.rst b/admin_manual/configuration/reverse_proxy_configuration.rst similarity index 100% rename from admin_manual/configuration/configuration_reverseproxy.rst rename to admin_manual/configuration/reverse_proxy_configuration.rst diff --git a/admin_manual/configuration/configuring_search.rst b/admin_manual/configuration/search_configuration.rst similarity index 100% rename from admin_manual/configuration/configuring_search.rst rename to admin_manual/configuration/search_configuration.rst diff --git a/admin_manual/configuration/configuration_encryption.rst b/admin_manual/configuration/server_side_encryption_configuration.rst similarity index 99% rename from admin_manual/configuration/configuration_encryption.rst rename to admin_manual/configuration/server_side_encryption_configuration.rst index 0569bc8c2..b92c35b38 100644 --- a/admin_manual/configuration/configuration_encryption.rst +++ b/admin_manual/configuration/server_side_encryption_configuration.rst @@ -1,5 +1,5 @@ -Using Server-Side Encryption -============================ +Server-Side Encryption Configuration +==================================== ownCloud includes a server-side encryption application. The Encryption app encrypts all files stored on the ownCloud server, and all files on remote diff --git a/admin_manual/configuration/server_to_server_managing.rst b/admin_manual/configuration/server_to_server_configuration.rst similarity index 100% rename from admin_manual/configuration/server_to_server_managing.rst rename to admin_manual/configuration/server_to_server_configuration.rst diff --git a/admin_manual/configuration/xsendfile.rst b/admin_manual/configuration/serving_static_files_configuration.rst similarity index 98% rename from admin_manual/configuration/xsendfile.rst rename to admin_manual/configuration/serving_static_files_configuration.rst index 92ce0408a..aa7f2dc9a 100644 --- a/admin_manual/configuration/xsendfile.rst +++ b/admin_manual/configuration/serving_static_files_configuration.rst @@ -1,5 +1,6 @@ -Serving static files via web server -=================================== +Serving Static Files for Better Performance +=========================================== + Since ownCloud 5 it is possible to let web servers handle static file serving. This should generally improve performance (web servers are optimized for this) and in some cases permits controlled file serving (i.e. pause and resume downloads). diff --git a/admin_manual/configuration/configuration_3rdparty.rst b/admin_manual/configuration/thirdparty_php_configuration.rst similarity index 92% rename from admin_manual/configuration/configuration_3rdparty.rst rename to admin_manual/configuration/thirdparty_php_configuration.rst index 1d7e1e44b..8883820a5 100644 --- a/admin_manual/configuration/configuration_3rdparty.rst +++ b/admin_manual/configuration/thirdparty_php_configuration.rst @@ -1,5 +1,5 @@ -Using Third Party Components -============================ +Using Third Party PHP Components +================================ ownCloud uses some third party PHP components to provide some of its functionality. These components are part of the software package and are contained in the **/3rdparty** folder. diff --git a/admin_manual/configuration/custom_user_backend.rst b/admin_manual/configuration/user_auth_ftp_smb_imap.rst similarity index 92% rename from admin_manual/configuration/custom_user_backend.rst rename to admin_manual/configuration/user_auth_ftp_smb_imap.rst index 3d81ffcf7..4bf896881 100644 --- a/admin_manual/configuration/custom_user_backend.rst +++ b/admin_manual/configuration/user_auth_ftp_smb_imap.rst @@ -1,7 +1,7 @@ -Custom User Backend Configuration -================================= +User Authentication with IMAP, SMB, and FTP +=========================================== -Starting with ownCloud 4.5 is possible to configure additional user backends +You may configure additional user backends in ownCloud's configuration :file:`config/config.php` using the following syntax: @@ -63,7 +63,7 @@ Provides authentication against Samba servers ), FTP -~~~ +--- Provides authentication against FTP servers diff --git a/admin_manual/configuration/auth_ldap.rst b/admin_manual/configuration/user_auth_ldap.rst similarity index 100% rename from admin_manual/configuration/auth_ldap.rst rename to admin_manual/configuration/user_auth_ldap.rst diff --git a/admin_manual/configuration/configuration_users.rst b/admin_manual/configuration/user_configuration.rst similarity index 98% rename from admin_manual/configuration/configuration_users.rst rename to admin_manual/configuration/user_configuration.rst index 5f86387ca..e066d45c3 100644 --- a/admin_manual/configuration/configuration_users.rst +++ b/admin_manual/configuration/user_configuration.rst @@ -65,7 +65,7 @@ You cannot recover a user's password, but you can set a new one: the user with their password If you have encryption enabled, there are special considerations for user -password resets. Please see :doc:`configuration_encryption`. +password resets. Please see :doc:`server_side_encryption_configuration`. Renaming a User ~~~~~~~~~~~~~~~ diff --git a/admin_manual/contents.rst b/admin_manual/contents.rst index 2dded81e3..b454d5a86 100644 --- a/admin_manual/contents.rst +++ b/admin_manual/contents.rst @@ -17,8 +17,3 @@ ownCloud documentation contents configuration/index maintenance/index issues/index - -Indices and tables -================== - -* :ref:`genindex` diff --git a/admin_manual/index.rst b/admin_manual/index.rst index a622d6792..f779b134e 100644 --- a/admin_manual/index.rst +++ b/admin_manual/index.rst @@ -25,58 +25,66 @@ user interface or how to install clients on the server, refer to the following: Document Structure ------------------ -This document is broken out into three major sections -- Installation, -Configuration, and Maintenance. The following sections provide detailed -information about various tasks associated with each of these sections. - +This document is broken out into three major sections -- Installation, Configuration, and +Maintenance. The Issues sections has instructions for reporting bugs. The following +sections provide detailed information about various tasks associated with each of these +sections. Installation ============ This section provides detailed instructions on how to install ownCloud in different scenarios. It contains the following topics: -* :doc:`installation/installation_linux` (recommended) -* :doc:`installation/installation_windows` -* :doc:`installation/installation_source` -* :doc:`installation/installation_others` -* :doc:`installation/installation_ucs` -* :doc:`installation/installation_macos` (not supported) -* :doc:`installation/installation_appliance` +* :doc:`installation/appliance_installation` +* :doc:`installation/apps_management_installation` +* :doc:`installation/hiawatha_configuration` +* :doc:`installation/installation_wizard` +* :doc:`installation/lighttpd_configuration` +* :doc:`installation/linux_installation` (recommended) +* :doc:`installation/macos_installation` (not supported) +* :doc:`installation/nginx_configuration` +* :doc:`installation/others_installation` +* :doc:`installation/source_installation` +* :doc:`installation/ucs_installation` +* :doc:`installation/windows_installation` +* :doc:`installation/yaws_configuration` -.. note:: If you just want to try out ownCloud in a virtual machine, without - any configuration, refer to :doc:`installation/installation_appliance`. For - your convenience, this topic contains ready-to-use images. +.. note:: If you just want to try out ownCloud in a virtual machine, without any + configuration, refer to :doc:`installation/appliance_installation`. For your + convenience, this topic contains ready-to-use images. Configuration ============= -This section describes how to configure ownCloud and your web server. It +This section describes how to configure ownCloud and your Web server. It contains the following topics: -* :doc:`configuration/configuration_apps` -* :doc:`configuration/configuration_file_sharing` -* :doc:`configuration/configuration_users` -* :doc:`configuration/configuration_database` -* :doc:`configuration/auth_ldap` -* :doc:`configuration/server_to_server_managing` -* :doc:`configuration/custom_mount_config_gui` -* :doc:`configuration/custom_mount_config` -* :doc:`configuration/background_jobs` -* :doc:`configuration/configuration_mail` -* :doc:`configuration/configuration_automation` -* :doc:`configuration/configuration_encryption` -* :doc:`configuration/configuring_big_file_upload` -* :doc:`configuration/configuration_reverseproxy` -* :doc:`configuration/xsendfile` -* :doc:`configuration/configuration_3rdparty` -* :doc:`configuration/custom_user_backend` -* :doc:`configuration/configuration_custom_clients` -* :doc:`configuration/configuration_knowledgebase` -* :doc:`configuration/configuration_logging` -* :doc:`configuration/configuration_language` -* :doc:`configuration/configuration-antivirus` -* :doc:`configuration/configuration_preview` -* :doc:`configuration/configuring_search` -* :doc:`configuration/configuration_config_sample_php` +* :doc:`configuration/antivirus_configuration` +* :doc:`configuration/automatic_configuration` +* :doc:`configuration/background_jobs_configuration` +* :doc:`configuration/big_file_upload_configuration` +* :doc:`configuration/collaborative_documents_configuration` +* :doc:`configuration/config_sample_php_parameters` +* :doc:`configuration/custom_client_configuration` +* :doc:`configuration/database_configuration` +* :doc:`configuration/email_configuration` +* :doc:`configuration/external_storage_configuration_gui` +* :doc:`configuration/external_storage_configuration` +* :doc:`configuration/file_sharing_configuration` +* :doc:`configuration/files_locking_enabling` +* :doc:`configuration/js_css_asset_management_configuration` +* :doc:`configuration/knowledgebase_configuration` +* :doc:`configuration/language_configuration` +* :doc:`configuration/logging_configuration` +* :doc:`configuration/previews_configuration` +* :doc:`configuration/reverse_proxy_configuration` +* :doc:`configuration/search_configuration` +* :doc:`configuration/server_side_encryption_configuration` +* :doc:`configuration/server_to_server_configuration` +* :doc:`configuration/serving_static_files_configuration` +* :doc:`configuration/thirdparty_php_configuration` +* :doc:`configuration/user_auth_ftp_smb_imap` +* :doc:`configuration/user_auth_ldap` +* :doc:`configuration/user_configuration` Maintenance =========== @@ -85,10 +93,17 @@ This sections describes the maintenance tasks associated with the ownCloud server (for example, updating or migrating to a new version of ownCloud). It contains the following topics: -* :doc:`maintenance/enable_maintenance` * :doc:`maintenance/backup` +* :doc:`maintenance/convert_db` +* :doc:`maintenance/enable_maintenance` +* :doc:`maintenance/migrating` +* :doc:`maintenance/restore` * :doc:`maintenance/update` * :doc:`maintenance/upgrade` -* :doc:`maintenance/restore` -* :doc:`maintenance/migrating` -* :doc:`maintenance/convert_db` + +Issues +====== + +What to do when you have problems, and where to report bugs. + +* :doc:`issues/index` \ No newline at end of file diff --git a/admin_manual/installation/installation_appliance.rst b/admin_manual/installation/appliance_installation.rst similarity index 97% rename from admin_manual/installation/installation_appliance.rst rename to admin_manual/installation/appliance_installation.rst index e123ab968..95d333126 100644 --- a/admin_manual/installation/installation_appliance.rst +++ b/admin_manual/installation/appliance_installation.rst @@ -1,5 +1,5 @@ -Appliances ----------- +ownCloud Appliances +=================== If you are looking for virtual machine images, check the Software Appliances section. The Hardware Appliances section is of interest for people seeking to diff --git a/admin_manual/configuration/configuration_apps.rst b/admin_manual/installation/apps_management_installation.rst similarity index 100% rename from admin_manual/configuration/configuration_apps.rst rename to admin_manual/installation/apps_management_installation.rst diff --git a/admin_manual/installation/configuration_hiawatha.rst b/admin_manual/installation/hiawatha_configuration.rst similarity index 100% rename from admin_manual/installation/configuration_hiawatha.rst rename to admin_manual/installation/hiawatha_configuration.rst diff --git a/admin_manual/installation/index.rst b/admin_manual/installation/index.rst index a7479a2c8..b7f8fe3f3 100644 --- a/admin_manual/installation/index.rst +++ b/admin_manual/installation/index.rst @@ -5,15 +5,16 @@ Installation .. toctree:: :maxdepth: 1 - installation_appliance - installation_linux - installation_macos - installation_windows - installation_ucs - installation_source - installation_others + appliance_installation + apps_management_installation + hiawatha_configuration installation_wizard - configuration_nginx - configuration_lighttpd - configuration_yaws - configuration_hiawatha.rst \ No newline at end of file + lighttpd_configuration + linux_installation + macos_installation + nginx_configuration + others_installation + source_installation + ucs_installation + windows_installation + yaws_configuration \ No newline at end of file diff --git a/admin_manual/installation/installation_wizard.rst b/admin_manual/installation/installation_wizard.rst index 312b97274..eecb2d976 100644 --- a/admin_manual/installation/installation_wizard.rst +++ b/admin_manual/installation/installation_wizard.rst @@ -50,7 +50,7 @@ Database choice * For a guideline on which database system to choose, and on pointers how to set them up for being available for php/ownCloud, see - :doc:`../configuration/configuration_database` + :doc:`../configuration/database_configuration` * Note that you will only be able to choose among the PHP database connectors which are actually installed on the system. diff --git a/admin_manual/installation/configuration_lighttpd.rst b/admin_manual/installation/lighttpd_configuration.rst similarity index 100% rename from admin_manual/installation/configuration_lighttpd.rst rename to admin_manual/installation/lighttpd_configuration.rst diff --git a/admin_manual/installation/installation_linux.rst b/admin_manual/installation/linux_installation.rst similarity index 94% rename from admin_manual/installation/installation_linux.rst rename to admin_manual/installation/linux_installation.rst index 0a1fae14b..a48e6574e 100644 --- a/admin_manual/installation/installation_linux.rst +++ b/admin_manual/installation/linux_installation.rst @@ -6,7 +6,7 @@ Supported Distribution Packages Ready-to-use packages are available at `openSUSE Build Service`_ for a variety of Linux distributions. -If your distribution is not listed please follow :doc:`installation_source`. +If your distribution is not listed please follow :doc:`source_installation`. .. _openSUSE Build Service: http://software.opensuse.org/download.html?project=isv:ownCloud:community&package=owncloud diff --git a/admin_manual/installation/installation_macos.rst b/admin_manual/installation/macos_installation.rst similarity index 100% rename from admin_manual/installation/installation_macos.rst rename to admin_manual/installation/macos_installation.rst diff --git a/admin_manual/installation/configuration_nginx.rst b/admin_manual/installation/nginx_configuration.rst similarity index 100% rename from admin_manual/installation/configuration_nginx.rst rename to admin_manual/installation/nginx_configuration.rst diff --git a/admin_manual/installation/installation_others.rst b/admin_manual/installation/others_installation.rst similarity index 100% rename from admin_manual/installation/installation_others.rst rename to admin_manual/installation/others_installation.rst diff --git a/admin_manual/installation/installation_source.rst b/admin_manual/installation/source_installation.rst similarity index 98% rename from admin_manual/installation/installation_source.rst rename to admin_manual/installation/source_installation.rst index c68635a04..9ac2c4ef5 100644 --- a/admin_manual/installation/installation_source.rst +++ b/admin_manual/installation/source_installation.rst @@ -344,8 +344,8 @@ Example config for Apache 2.4: * In order for the maximum upload size to be configurable, the :file:`.htaccess` in the ownCloud folder needs to be made writable by the - server (this should already be done, see section `Set the Directory - Permissions`_). + server (this should already be done, see section ``Set the Directory + Permissions``). * You should make sure that any built-in WebDAV module of your web server is disabled (at least for the ownCloud directory), as it will interfere with @@ -398,20 +398,20 @@ Other Web Servers **Microsoft Internet Information Server (IIS)** -See :doc:`installation_windows` for further instructions. +See :doc:`windows_installation` for further instructions. **Nginx Configuration** -See :doc:`configuration_nginx` +See :doc:`nginx_configuration` **Lighttpd Configuration** -See :doc:`configuration_lighttpd` +See :doc:`lighttpd_configuration` **Yaws Configuration** -See :doc:`configuration_yaws` +See :doc:`yaws_configuration` **Hiawatha Configuration** -See :doc:`configuration_hiawatha` +See :doc:`hiawatha_configuration` diff --git a/admin_manual/installation/installation_ucs.rst b/admin_manual/installation/ucs_installation.rst similarity index 100% rename from admin_manual/installation/installation_ucs.rst rename to admin_manual/installation/ucs_installation.rst diff --git a/admin_manual/installation/installation_windows.rst b/admin_manual/installation/windows_installation.rst similarity index 99% rename from admin_manual/installation/installation_windows.rst rename to admin_manual/installation/windows_installation.rst index 01d407604..295b2412d 100644 --- a/admin_manual/installation/installation_windows.rst +++ b/admin_manual/installation/windows_installation.rst @@ -1,5 +1,5 @@ Windows 7 and Windows Server 2008 ---------------------------------- +================================= .. note:: While ownCloud will run in any standard PHP environment, including IIS or Apache on Windows, there are known issues. diff --git a/admin_manual/installation/configuration_yaws.rst b/admin_manual/installation/yaws_configuration.rst similarity index 100% rename from admin_manual/installation/configuration_yaws.rst rename to admin_manual/installation/yaws_configuration.rst diff --git a/admin_manual/issues/index.rst b/admin_manual/issues/index.rst index 78abc667d..0b687f5d6 100644 --- a/admin_manual/issues/index.rst +++ b/admin_manual/issues/index.rst @@ -1,6 +1,6 @@ -=========== +====== Issues -=========== +====== If you think you have found a bug in ownCloud, please: diff --git a/admin_manual/maintenance/upgrade.rst b/admin_manual/maintenance/upgrade.rst index 6ca44311c..c27330e30 100644 --- a/admin_manual/maintenance/upgrade.rst +++ b/admin_manual/maintenance/upgrade.rst @@ -49,7 +49,7 @@ current ownCloud tarball with ``wget``: ``wget http://download.owncloud.org/community/owncloud-latest.tar.bz2`` For Windows operating systems. see the installation instruction in -:doc:`../installation/installation_windows`. +:doc:`../installation/windows_installation`. 5. Stop your web server.