Your message dated Thu, 11 Dec 2014 20:42:17 +0100 with message-id <5489F399.8040802@thykier.net> and subject line Re: Bug#772492: unblock: owncloud-doc/0_20141208-2 has caused the Debian Bug report #772492, regarding unblock: owncloud-doc/0_20141208-2 to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner@bugs.debian.org immediately.) -- 772492: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=772492 Debian Bug Tracking System Contact owner@bugs.debian.org with problems
--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: unblock: owncloud-doc/0_20141201-2
- From: David Prévot <taffit@debian.org>
- Date: Sun, 07 Dec 2014 15:24:10 -0400
- Message-id: <[🔎] 5484A95A.9090407@debian.org>
- In-reply-to: <[🔎] 54815FEF.7090504@thykier.net>
- References: <[🔎] 20141203192407.GA5599@persil.tilapin.org> <[🔎] 54815FEF.7090504@thykier.net>
Package: release.debian.org Severity: normal User: release.debian.org@packages.debian.org Usertags: unblock Le 05/12/2014 03:34, Niels Thykier a écrit : > The -doc package can follow after that. As proposed on #771954, here is the unblock request for the ownCloud documentation, (built and) shipped in its own package. Many files have been renamed, so here is a git diff instead of a traditional debdiff: git diff -M30% debian/0_20141107-1..debian/0_20141201-2 | \ filterdiff -x '*/developer_manual/*' -x '*/index/*' The developer_manual and index changes are irrelevant since they are not used during the build nor shipped in the binary package. The changelog just tries to document the relevant upstream changes: > owncloud-doc (0~20141201-2) unstable; urgency=medium > > * Upload to unstable in sync with owncloud 7.0.4~rc1+dfsg-2 > > -- David Prévot <taffit@debian.org> Sun, 07 Dec 2014 11:52:51 -0400 > > owncloud-doc (0~20141201-1) experimental; urgency=medium > > * Upload to experimental in sync with owncloud 7.0.4~rc1+dfsg-1 > > [ Jos Poortvliet ] > * improve the description of 3rd party app handling, hopefully dealing with > lots of confusion about that. > > [ Carla Schroder ] > * reorganize and clean up CE admin manual > * remove index.rst, replace with contents.rst > * added note that encryption increases file size > > [ Morris Jobke ] > * update documentation generated from config.sample.php > > -- David Prévot <taffit@debian.org> Mon, 01 Dec 2014 17:47:13 -0400 unblock owncloud-doc/0_20141201-2 Thanks in advance for considering Regards Daviddiff --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 207c117..3ecd015 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 6845c8a..cacc8a1 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 98% rename from admin_manual/configuration/configuration_config_sample_php.rst rename to admin_manual/configuration/config_sample_php_parameters.rst index a985bb2..d08ae3e 100644 --- a/admin_manual/configuration/configuration_config_sample_php.rst +++ b/admin_manual/configuration/config_sample_php_parameters.rst @@ -44,7 +44,7 @@ and you should never use it. 'trusted_domains' => array ( 'demo.example.org', - 'otherdomain.example.org:8080', + 'otherdomain.example.org', ), Your list of trusted domains that users can log into. Specifying trusted @@ -56,7 +56,8 @@ necessary security checks. 'datadirectory' => '/var/www/owncloud/data', Where user files are stored; this defaults to ``data/`` in the ownCloud -directory. The SQLite database is also stored here, when you use SQLite. +directory. The SQLite database is also stored here, when you use SQLite. (SQLite is +available only in ownCloud Community Edition) :: @@ -618,6 +619,8 @@ Options for the Apps folder, Apps store, and App code checker. When enabled, admins may install apps from the ownCloud app store. +The app store is disabled by default for ownCloud Enterprise Edition + :: 'appstoreurl' => 'https://api.owncloud.com/v1', @@ -946,7 +949,8 @@ One way to test is applying for a trystack account at http://trystack.org/ 'mssql' ), -Database types that are supported for installation. +Database types that are supported for installation. (SQLite is available only in +ownCloud Community Edition, oci and mssql only for the Enterprise Edition) Available: - sqlite (SQLite3) 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 c3c8c11..1aba7e6 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/configuration_encryption.rst b/admin_manual/configuration/encryption_configuration.rst similarity index 73% rename from admin_manual/configuration/configuration_encryption.rst rename to admin_manual/configuration/encryption_configuration.rst index 0569bc8..640d272 100644 --- a/admin_manual/configuration/configuration_encryption.rst +++ b/admin_manual/configuration/encryption_configuration.rst @@ -1,12 +1,17 @@ -Using Server-Side Encryption -============================ +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 storage that is connected to your ownCloud server. Encryption and decryption are performed on the ownCloud server. All files sent to remote storage (for example Dropbox and Google Drive) will be encrypted by the ownCloud server, and upon -retrieval, decrypted before serving them to you and anyone you have shared them with. +retrieval, decrypted before serving them to you and anyone you have shared them +with. + +.. note:: Encrypting files increases their size by roughly 35%, so you must take this into + account when you are provisioning storage and setting storage quotas. User's quotas are + based on the unencrypted file size, and not the encrypted file size. When files on external storage are encrypted in ownCloud, you cannot share them directly from the external storage services, but only through ownCloud sharing @@ -19,7 +24,8 @@ The Encryption app generates a strong encryption key, which is unlocked by user's passwords. So your users don't need to track an extra password, but simply log in as they normally do. -Encryption is applied server-wide; it cannot be applied to selected users. +Encryption is applied server-wide; it cannot be applied to selected users or +files. The Encryption app encrypts only the contents of files, and not filenames and folder structures. @@ -40,13 +46,14 @@ The encryption keys are stored in following folders: .. note:: Encryption keys are stored only on the ownCloud server, eliminating exposure of your data to third party storage providers. The encryption app does **not** protect your data if your ownCloud server is compromised, and it - does not protect users from snoopy ownCloud admins. This would require client - side encryption, which this app does not provide. If your ownCloud server - is not connected to any external storage services then it is better to - use other encryption tools, such as file-level or whole-disk encryption. Read + does not prevent ownCloud administrators from reading user's files. This + would require client-side encryption, which this app does not provide. If + your ownCloud server is not connected to any external storage services then + it is better to use other encryption tools, such as file-level or + whole-disk encryption. Read `How ownCloud uses encryption to protect your data - <https://owncloud.org/blog/how-owncloud-uses-encryption-to-protect-your-data/>`_. for - more details. + <https://owncloud.org/blog/how-owncloud-uses-encryption-to-protect-your-data/>`_ + for more information. Enabling the Encryption App --------------------------- @@ -71,18 +78,18 @@ minutes depending on how many files you have. When the encryption process is complete you'll be returned to your default ownCloud page. Every user will go through this process when they log in after -you enable encryption, and each user will get unique encryption keys. Users can -still change their passwords whenever they want on their Personal pages. +you enable encryption, and each user will get unique encryption keys. Users can change +their passwords whenever they want on their Personal pages, and ownCloud will update +their encryption keys automatically/ Sharing Encrypted Files ----------------------- -Only users who have private encryption keys (via logging out and logging back in to -create their keys) have access to shared encrypted files and folders. Users who have not -yet created their private encryption keys will not have access to encrypted shared files; -they will see folders and filenames, but will not be able to open or download the files. -They will see a yellow warning banner that says "Encryption App is enabled but your keys -are not initialized, please log-out and log-in again." +Only users who have private encryption keys have access to shared encrypted files and +folders. Users who have not yet created their private encryption keys will not have access +to encrypted shared files; they will see folders and filenames, but will not be able to +open or download the files. They will see a yellow warning banner that says "Encryption +App is enabled but your keys are not initialized, please log-out and log-in again." Share owners may need to re-share files after encryption is enabled; users trying to access the share will see a message advising them to ask the share owner to re-share the @@ -92,7 +99,6 @@ then the share owner can remove the individual shares. .. figure:: ../images/encryption9.png - Decrypting Encrypted Files -------------------------- @@ -104,29 +110,26 @@ files". .. figure:: ../images/encryption4.png -Go to your Personal page and enter your password in the Encryption removal form, -and your files will all be decrypted. +Go to your Personal page and enter your password in the Encryption removal form, and your +files will all be decrypted. .. figure:: ../images/encryption5.png Your users will also have to follow this step to decrypt their files. If something goes wrong with decryption, click the ``Restore Encryption Keys`` button to re-encrypt your files, and then review your logfile to see what -happened. Though it would be very unusual for the decryption to fail as -decryption is routine and reliable. +happened. Enabling a File Recovery Key ---------------------------- If you lose your ownCloud password, then you lose access to your encrypted files. If one -of your users loses their ownCloud password their files are unrecoverable. You -cannot reset their password in the normal way; you'll see a yellow banner -warning "Please provide an admin recovery password, otherwise all user data will -be lost". +of your users loses their ownCloud password their files are unrecoverable. You cannot +reset their password in the normal way; you'll see a yellow banner warning "Please provide +an admin recovery password, otherwise all user data will be lost". To avoid all this, create a Recovery Key. Go to the Encryption section of your -Admin page and set a recovery key password. Obviously, do not lose this -password. +Admin page and set a recovery key password. .. figure:: ../images/encryption6.png @@ -164,3 +167,23 @@ to match on their next ownCloud login. The user will need both their old and new to do this. If you have enabled the Recovery Key then you can change a user's password in the ownCloud Users panel to match their back-end password, and then, of course, notify the user and give them their new password. + +"Missing requirements" Message on Windows Servers +------------------------------------------------- + +If you get a "Missing requirements" error message when you enable encryption on +a Windows server, enter the absolute location of your openSSL configuration file in +``config.php``:: + + 'openssl' => array( + 'config' => 'C:\path\to\openssl.cnf', + ), + +For example, in a typical installation on a 64-bit Windows 7 system it looks like this:: + + 'openssl' => array( + 'config' => 'C:\OpenSSL-Win64\openssl.cnf', + ), + +There are many ways to configure OpenSSL, so be sure to verify your correct file +location. 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 58e212a..f0997b4 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 <custom_mount_config_gui>` in the +It is recommended to use the :doc:`Web-GUI <external_storage_configuration_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 2e89568..4f5b105 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 d035c5e..610caaf 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 1a56585..9523e13 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 + encryption_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_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 14f8adc..9f4f8af 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 83b101f..164abb9 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/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 92ce040..aa7f2dc 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 1d7e1e4..8883820 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 3d81ffc..4bf8968 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 99% rename from admin_manual/configuration/configuration_users.rst rename to admin_manual/configuration/user_configuration.rst index 5f86387..d16dbf3 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:`encryption_configuration`. Renaming a User ~~~~~~~~~~~~~~~ diff --git a/admin_manual/contents.rst b/admin_manual/contents.rst index 2dded81..b454d5a 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 8efc72a..717a056 100644 --- a/admin_manual/index.rst +++ b/admin_manual/index.rst @@ -5,7 +5,7 @@ Introduction Welcome to the ownCloud Administrator Guide. This guide describes administrator tasks for ownCloud; a flexible, open source, file synchronization and sharing solution. ownCloud is comprised of a server running on either a -Linux or Microsoft Word platform as well as client applications for Microsoft +Linux or Microsoft Windows platform as well as client applications for Microsoft Windows, Mac OS X and Linux (Desktop Client) and mobile clients for both the Android and Apple iOS operating system. @@ -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` - -.. 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. +* :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/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/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 e123ab9..95d3331 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 36% rename from admin_manual/configuration/configuration_apps.rst rename to admin_manual/installation/apps_management_installation.rst index 3ed23ba..c22c913 100644 --- a/admin_manual/configuration/configuration_apps.rst +++ b/admin_manual/installation/apps_management_installation.rst @@ -1,6 +1,7 @@ -Apps Configuration -================== -After installing ownCloud, you might want to provide added functionality on top of the core functionality that is installed by default. ownCloud enables you to enhance your experience and your user's experiences by installing various *apps*. +Installing and Managing Apps +============================= + +After installing ownCloud, you may provide added functionality by installing applications. Viewing Enabled Apps -------------------- @@ -22,26 +23,33 @@ During the ownCloud installation, some apps are enabled by default. To see which Managing Apps ------------- -In the Apps page, you can enable or disable applications, as well as modify any app settings, by clicking the app name. If an app is already enabled, it appears highlighted in the list. In addition, enabled apps appear at the top of the app list in the Apps Information Field. In contrast, disabled apps appear below any enabled apps in the list and are not highlighted. - -To modify an app: - -1. Click the app that you want to modify. - - The app is highlighted and any available settings for the app appear in the Application View window. - -2. Make any desired changes to the app. - - All app changes are applied dynamically as soon as you select the change. As there are many apps available for use with ownCloud, we do not list all apps or apps settings that are available to you. However, we have documented several standard apps (for example, the Contacts and Calendar apps) that are directly supported. +In the Apps page, you can enable or disable applications. If an app is already enabled, it +appears highlighted in the list. In addition, enabled apps appear at the top of the app +list in the Apps Information Field. In contrast, disabled apps appear below any enabled +apps in the list and are not highlighted. Some apps have some configurable options on the +Apps page, but mainly they are enabled or disabled here, and they are configured on your +ownCloud Admin page. Adding Third Party Apps ----------------------- -As mentioned earlier, ownCloud supports a number of different apps. Some apps are developed and supported by ownCloud directly, while other apps are created by third parties and either included in or available for your ownCloud server installation. Any apps that are not developed by ownCloud show a *3rd party* designation. +Some apps are developed and supported by ownCloud directly, while other apps are created +by third parties and either included in or available for your ownCloud server +installation. Any apps that are not developed by ownCloud show a *3rd party* +designation. Install unsupported apps at your own risk. + +Sometimes the installation of a third-party app fails silently, possibly because +``'appcodechecker' => true,`` is enabled in ``config.php``. When ``appcodechecker`` is +enabled it checks if third-party apps are using the private API, rather than the public +API. If they are then they will not be installed. -To understand what an application does, you can click the app name to view a description of the app and any of the app settings in the Application View field. +To understand what an application does, you can click the app name to view a description +of the app and any of the app settings in the Application View field. Clicking the +*Enable* button will enable the app. If the app is a third party app, it will be +downloaded from the app store, installed and enabled. -Though ownCloud provides many apps in the server installation, you can view many more apps at the `ownCloud apps store <http://apps.owncloud.com/>`_. +Though ownCloud provides many apps in the server installation, you can view more in +the `ownCloud apps store <http://apps.owncloud.com/>`_. To view or install apps from the ownCloud apps store: @@ -51,25 +59,39 @@ To view or install apps from the ownCloud apps store: The ownCloud apps store launches. -3. Read about any of the apps in the ownCloud app store and install any that you like. +3. Read about any of the apps in the ownCloud app store and download any that you like. + +4. Extract a downloaded compressed file and place the contents (which should themselves be +contained in a folder with the app name) in the apps folder in your ownCloud +installation, typically ``owncloud/apps``. -.. note:: If you would like to create or add your own ownCloud app, please use the *Add your App...* button on the same page. This button redirects you to our `Developer Center <http://owncloud.org/dev>`_ where you can find information about creating and adding your own apps. +5. Ensure the permissions and ownership are similar to the other ownCloud apps. Typically, +access rights are **rwxr-x---**, or **0750** in octal notation, and the owner and group +are your HTTP user. On CentOS this is ``apache``, Ubuntu is ``www-data``, and on openSUSE +is it ``wwwrun:www``. + +.. note:: If you would like to create or add your own ownCloud app, please use the + *Add your App...* button on the same page. This button redirects you to our + `Developer Center <http://owncloud.org/dev>`_ where you can find information about + creating and adding your own apps. Setting App Parameters ---------------------- -Parameters are set in the :file:`config/config.php` inside the **$CONFIG** array. -Use custom app directories -~~~~~~~~~~~~~~~~~~~~~~~~~~ -Use the **apps_paths** array to set the apps folders which should be scanned -for available apps and/or where user specific apps should be installed.The key -**path** defines the absolute file system path to the app folder. The key -**url** defines the http web path to that folder, starting at the ownCloud -web root. The key **writable** indicates if a user can install apps in that -folder. +Most app parameters are configured on your Admin page, and some are set in +:file:`config/config.php`. Always try your Admin page first. + +Using Custom App Directories +---------------------------- -.. note:: If you want to make sure that the default **/apps/** folder only contains apps shipped with ownCloud, you - should follow the example and set-up a **/apps2/** folder which will be used to store all apps downloaded by users +Use the **apps_paths** array in `config.php` to set any custom apps directory locations. +The key **path** defines the absolute file system path to the app folder. The key **url** +defines the HTTP web path to that folder, starting at the ownCloud web root. The key +**writable** indicates if a user can install apps in that folder. + +.. note:: To ensure that the default **/apps/** folder only contains apps + shipped with ownCloud, follow this example to setup an **/apps2/** folder + which will be used to store all other apps. .. code-block:: php @@ -88,10 +110,11 @@ folder. ), ), - Using Your Own Appstore -~~~~~~~~~~~~~~~~~~~~~~~ -You can enable the installation of apps from your own apps store. However, this requires that you can write to at least one of the configured apps directories. +----------------------- + +You can enable the installation of apps from your own apps store. This requires that you +can write to at least one of the configured apps directories. To enable installation from your own apps store: @@ -101,7 +124,8 @@ To enable installation from your own apps store: 2. Set the **appstoreurl** to the URL of your ownCloud apps store. - This parameter is used to set the http path to the ownCloud apps store. The appstore server must use :abbr:`OCS (Open Collaboration Services)`. + This parameter is used to set the http path to the ownCloud apps store. The appstore + server must use :abbr:`OCS (Open Collaboration Services)`. .. code-block:: php @@ -110,14 +134,4 @@ To enable installation from your own apps store: "appstoreenabled" => true, "appstoreurl" => "http://api.apps.owncloud.com/v1";, -Guarding Against Malicious Code -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -You can enable checks for malicious code fragments in third party apps -by setting the **appcodechecker** parameter. - -.. code-block:: php - - <?php - - "appcodechecker" => false, + 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 a7479a2..b7f8fe3 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 312b972..eecb2d9 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 0a1fae1..a48e657 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 95% rename from admin_manual/installation/configuration_nginx.rst rename to admin_manual/installation/nginx_configuration.rst index 0cbc808..4cb91a0 100644 --- a/admin_manual/installation/configuration_nginx.rst +++ b/admin_manual/installation/nginx_configuration.rst @@ -2,6 +2,8 @@ Nginx Configuration =================== - You need to insert the following code into **your nginx config file.** +- The config assumes that ownCloud is installed in /var/www/owncloud and + that it is accessed via http(s)://cloud.example.com. - Adjust **server_name**, **root**, **ssl_certificate** and **ssl_certificate_key** to suit your needs. - Make sure your SSL certificates are readable by the server (see `Nginx HTTP @@ -29,7 +31,7 @@ Nginx Configuration ssl_certificate_key /etc/ssl/nginx/cloud.example.com.key; # Path to the root of your installation - root /var/www/; + root /var/www/owncloud/; # set max upload size client_max_body_size 10G; fastcgi_buffers 64 4K; 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 96% rename from admin_manual/installation/installation_source.rst rename to admin_manual/installation/source_installation.rst index c68635a..d71bfa6 100644 --- a/admin_manual/installation/installation_source.rst +++ b/admin_manual/installation/source_installation.rst @@ -26,6 +26,7 @@ To run ownCloud, your web server must have the following installed: * PHP module libxml * PHP module mb multibyte * PHP module SimpleXML +* PHP module XMLWriter * PHP module zip * PHP module zlib @@ -183,10 +184,15 @@ For hardened security we highly recommend setting the permissions on your ownCl as possible. These commands should be executed immediately after the initial installation:: chown -R root:root /path/to/owncloud/ + chmod -R 755 /path/to/owncloud/ chown <http-user>:<http-user> /path/to/owncloud/config/config.php + chmod 750 /path/to/owncloud/config/config.php chown -R <http-user>:<http-user> /path/to/owncloud/data/ + chmod -R 750 /path/to/owncoud/data chown root:root /path/to/owncloud/data/.htaccess + chmod 755 /path/to/owncloud/data/.htaccess chown <http-user>:<http-user> /path/to/owncloud/apps/ + chmod 750 /path/to/owncloud/apps/ These strict permissions will prevent the Updater app from working. If you use the Updater app, it needs your whole ownCloud directory to be owned by the http-user, like these examples: @@ -344,8 +350,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 +404,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 01d4076..295b241 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 78abc66..0b687f5 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/convert_db.rst b/admin_manual/maintenance/convert_db.rst index c53c610..2903336 100644 --- a/admin_manual/maintenance/convert_db.rst +++ b/admin_manual/maintenance/convert_db.rst @@ -15,6 +15,12 @@ In ownCloud root folder call php occ db:convert-type [options] type username hostname database +Available values for the ``type`` parameter are: + +* mysql (for MySQL or MariaDB) +* oci (for Oracle) +* pgsql (for PostgreSQL) + The Options * ``--port="3306"`` the database port (optional) diff --git a/admin_manual/maintenance/upgrade.rst b/admin_manual/maintenance/upgrade.rst index 6ca4431..c27330e 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. diff --git a/debian/changelog b/debian/changelog index 1212c03..a07bd99 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,27 @@ +owncloud-doc (0~20141201-2) unstable; urgency=medium + + * Upload to unstable in sync with owncloud 7.0.4~rc1+dfsg-2 + + -- David Prévot <taffit@debian.org> Sun, 07 Dec 2014 11:52:51 -0400 + +owncloud-doc (0~20141201-1) experimental; urgency=medium + + * Upload to experimental in sync with owncloud 7.0.4~rc1+dfsg-1 + + [ Jos Poortvliet ] + * improve the description of 3rd party app handling, hopefully dealing with + lots of confusion about that. + + [ Carla Schroder ] + * reorganize and clean up CE admin manual + * remove index.rst, replace with contents.rst + * added note that encryption increases file size + + [ Morris Jobke ] + * update documentation generated from config.sample.php + + -- David Prévot <taffit@debian.org> Mon, 01 Dec 2014 17:47:13 -0400 + owncloud-doc (0~20141107-1) unstable; urgency=medium [ leron49 ] diff --git a/developer_manual/android_library/index.rst b/developer_manual/android_library/index.rst index 8c9a40e..8209321 100644 diff --git a/developer_manual/app/controllers.rst b/developer_manual/app/controllers.rst index 5098f7b..da07754 100644 diff --git a/developer_manual/app/index.rst b/developer_manual/app/index.rst index 1891190..74cb7a4 100644 diff --git a/developer_manual/app/routes.rst b/developer_manual/app/routes.rst index f8de1fd..5cf8a2e 100644 diff --git a/developer_manual/bugtracker/index.rst b/developer_manual/bugtracker/index.rst index 98ea525..41ff8d9 100644 diff --git a/developer_manual/commun/index.rst b/developer_manual/commun/index.rst index ee564fb..ee08342 100644 diff --git a/developer_manual/conf.py b/developer_manual/conf.py index 65c0fe9..407d985 100644 diff --git a/developer_manual/contents.rst b/developer_manual/contents.rst deleted file mode 100644 index 372a656..0000000 diff --git a/developer_manual/core/index.rst b/developer_manual/core/index.rst index 8a59ad1..147c476 100644 diff --git a/developer_manual/general/codingguidelines.rst b/developer_manual/general/codingguidelines.rst index 7b73d9a..7cf9048 100644 diff --git a/developer_manual/general/index.rst b/developer_manual/general/index.rst index 0343d06..f7cc212 100644 diff --git a/developer_manual/index.rst b/developer_manual/index.rst index 917b0ad..de75795 100644 diff --git a/developer_manual/ios_library/examples.rst b/developer_manual/ios_library/examples.rst index 26f921c..76aaf06 100644 diff --git a/developer_manual/ios_library/index.rst b/developer_manual/ios_library/index.rst index 849bfee..814ad69 100644 diff --git a/developer_manual/ios_library/library_installation.rst b/developer_manual/ios_library/library_installation.rst index 7ec5569..03eee3d 100644 diff --git a/developer_manual/testing/index.rst b/developer_manual/testing/index.rst index 9c0d479..40cb713 100644 diff --git a/index/index.rst b/index/index.rst index 044ede2..35b5614 100644Attachment: signature.asc
Description: OpenPGP digital signature
--- End Message ---
--- Begin Message ---
- To: David Prévot <taffit@debian.org>, 772492-done@bugs.debian.org
- Subject: Re: Bug#772492: unblock: owncloud-doc/0_20141208-2
- From: Niels Thykier <niels@thykier.net>
- Date: Thu, 11 Dec 2014 20:42:17 +0100
- Message-id: <5489F399.8040802@thykier.net>
- In-reply-to: <[🔎] 54888CDC.6010404@debian.org>
- References: <[🔎] 20141203192407.GA5599@persil.tilapin.org> <[🔎] 54815FEF.7090504@thykier.net> <[🔎] 5482427C.8050709@debian.org> <[🔎] 5482D001.1040108@thykier.net> <[🔎] 5484A647.9050204@debian.org> <[🔎] 54860E09.5090805@thykier.net> <[🔎] 548787AD.9090604@debian.org> <[🔎] 5487D020.6000600@thykier.net> <[🔎] 54888CDC.6010404@debian.org>
On 2014-12-10 19:11, David Prévot wrote: > Control: retitle -1 unblock: owncloud-doc/0_20141208-2 > > Hi Niels, > > Le 10/12/2014 00:46, Niels Thykier a écrit : > >> Feel free to add those changes on top of the original upload. > > Follow up from #771954: updated (and filtered) git diff from the version > currently in testing attached. > > git diff -M30% debian/0_20141107-1..debian/0_20141208-2 | \ > filterdiff -x '*/developer_manual/*' -x '*/index/*' -x '*/go.php' > > Regards > > David > Unblocked (with its related -doc package), thanks. ~Niels
--- End Message ---