From 2453910003b38136fbc1b955ad8352f9b8ea95c0 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 19 Jul 2017 13:34:15 +0200 Subject: [PATCH 1/5] Update .drone.yml --- .drone.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index f788087d1..41bce2d7e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,6 +2,4 @@ pipeline: documentation: image: nextcloudci/documentation:1.0.11 commands: - - (cd user_manual && make html-all) - - (cd admin_manual && make html-all) - - (cd developer_manual && make html-all) + - make all From 6d8af1bff4b9c828cdc83fbed626783eaff07895 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 19 Jul 2017 16:44:17 +0200 Subject: [PATCH 2/5] Fix admin manual Signed-off-by: Morris Jobke --- .../configuration_files/big_file_upload_configuration.rst | 2 +- .../configuration_server/config_sample_php_parameters.rst | 4 ---- admin_manual/maintenance/update.rst | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/admin_manual/configuration_files/big_file_upload_configuration.rst b/admin_manual/configuration_files/big_file_upload_configuration.rst index 0abb1d53f..778c22b0a 100644 --- a/admin_manual/configuration_files/big_file_upload_configuration.rst +++ b/admin_manual/configuration_files/big_file_upload_configuration.rst @@ -80,7 +80,7 @@ nginx * `client_body_temp_path `_ Since nginx 1.7.11 a new config option `fastcgi_request_buffering -`_ is availabe. Setting this option to ``fastcgi_request_buffering off;`` in your nginx config might help with timeouts during the upload. Furthermore it helps if you're running out of disc space on the tmp partition of your system. diff --git a/admin_manual/configuration_server/config_sample_php_parameters.rst b/admin_manual/configuration_server/config_sample_php_parameters.rst index ddd01eb52..c1e00eb71 100644 --- a/admin_manual/configuration_server/config_sample_php_parameters.rst +++ b/admin_manual/configuration_server/config_sample_php_parameters.rst @@ -965,10 +965,6 @@ concerns: - OC\\Preview\\TIFF - OC\\Preview\\Font -.. note:: Troubleshooting steps for the MS Word previews are available - at the :doc:`../configuration_files/collaborative_documents_configuration` - section of the Administrators Manual. - The following providers are not available in Microsoft Windows: - OC\\Preview\\Movie diff --git a/admin_manual/maintenance/update.rst b/admin_manual/maintenance/update.rst index 4287918ee..398bcf4bc 100644 --- a/admin_manual/maintenance/update.rst +++ b/admin_manual/maintenance/update.rst @@ -40,7 +40,7 @@ The build-in updater performs these operations: actions are executed while running the update of the code. * **Create backup:** creates a backup of the existing code base in ``/updater-INSTANCEID/backups/nextcloud-CURRENTVERSION/`` inside of the - data directory (this does not contain the ``/data``directory nor the + data directory (this does not contain the ``/data`` directory nor the database). * **Downloading:** downloads the code in the version it should update to. This is also shown in the web UI before the update is started. This archive is From d4f31bbf3d7c3e519ec84a9f27ab10c1b6599829 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 19 Jul 2017 16:54:18 +0200 Subject: [PATCH 3/5] Fix developer manual Signed-off-by: Morris Jobke --- developer_manual/android_library/examples.rst | 10 +++++----- developer_manual/general/codingguidelines.rst | 10 +++++----- developer_manual/general/devenv.rst | 3 ++- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/developer_manual/android_library/examples.rst b/developer_manual/android_library/examples.rst index c1f4a477b..dae2587ec 100644 --- a/developer_manual/android_library/examples.rst +++ b/developer_manual/android_library/examples.rst @@ -90,7 +90,7 @@ Code example // do your stuff here } } - … + // … } Read folder @@ -121,7 +121,7 @@ Code example // do your stuff here } } - … + // … } Read file @@ -148,7 +148,7 @@ Code example // do your stuff here } } - … + // … } Delete file or folder @@ -174,7 +174,7 @@ Code example // do your stuff here } } - … + // … } @@ -279,7 +279,7 @@ Code example // do your stuff here } } - … + // … } Read shared items by link diff --git a/developer_manual/general/codingguidelines.rst b/developer_manual/general/codingguidelines.rst index 1a04d7fcf..5317ba4ba 100644 --- a/developer_manual/general/codingguidelines.rst +++ b/developer_manual/general/codingguidelines.rst @@ -31,11 +31,11 @@ The most important labels and their meaning: * #needs info - this issue needs further information from the reporter, see `triaging <../bugtracker/triaging.html>`_ * #high #medium #low signify how important the bug is. * Tags showing the state of the issue or PR, numbered 0-4: - * #0 - Needs triage - ready to start development on this - * #1 - To develop - ready to start development on this - * #2 - Developing - development in progress - * #3 - To Review - ready for review - * #4 - To Release - reviewed PR that awaits unfreeze of a branch to get merged + * #0 - Needs triage - ready to start development on this + * #1 - To develop - ready to start development on this + * #2 - Developing - development in progress + * #3 - To Review - ready for review + * #4 - To Release - reviewed PR that awaits unfreeze of a branch to get merged * Feature tags: #feature: something. These tags indicate the features across apps and components which are impacted by the issue or which the PR is related to If you want a label not in the list above, please first discuss on the mailing list. diff --git a/developer_manual/general/devenv.rst b/developer_manual/general/devenv.rst index 3ebd77500..9066450e9 100644 --- a/developer_manual/general/devenv.rst +++ b/developer_manual/general/devenv.rst @@ -21,9 +21,10 @@ Get the source There are two ways to obtain Nextcloud sources: * Using the `stable version `_ -.. TODO ON RELEASE: Update version number above on release * Using the development version from `GitHub`_ which will be explained below. +.. TODO ON RELEASE: Update version number above on release + To check out the source from `GitHub`_ you will need to install git (see `Setting up git `_ from the GitHub help) Gather information about server setup From da36ee9f4eaba38f93fa4e0b64a5ab3b1bda1f1c Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 19 Jul 2017 17:03:45 +0200 Subject: [PATCH 4/5] Fix user manual Signed-off-by: Morris Jobke --- user_manual/files/desktop_mobile_sync.rst | 1 + user_manual/files/encrypting_files.rst | 4 ++-- user_manual/pim/contacts.rst | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/user_manual/files/desktop_mobile_sync.rst b/user_manual/files/desktop_mobile_sync.rst index 9a1383bf3..53539d26a 100644 --- a/user_manual/files/desktop_mobile_sync.rst +++ b/user_manual/files/desktop_mobile_sync.rst @@ -18,6 +18,7 @@ Its usage is documented separately in the `Nextcloud/ownCloud Desktop Client Man .. _`Nextcloud/ownCloud Desktop Client Manual`: https://doc.owncloud.org/desktop/2.2/ .. _Nextcloud Desktop Client Manual: https://docs.nextcloud.org/ +.. _Nextcloud Sync Client: https://nextcloud.com/install/#install-clients Mobile Clients -------------- diff --git a/user_manual/files/encrypting_files.rst b/user_manual/files/encrypting_files.rst index 1bdf9fd2d..401429f92 100644 --- a/user_manual/files/encrypting_files.rst +++ b/user_manual/files/encrypting_files.rst @@ -105,7 +105,7 @@ the share. This updates the encryption, and then the share owner can remove the individual shares. Recovery Key Password -~~~~~~~~~~~~~~~~~~~~~ +^^^^^^^^^^^^^^^^^^^^^ If your Nextcloud administrator has enabled the recovery key feature, you can choose to use this feature for your account. If you enable "Password recovery" @@ -132,7 +132,7 @@ There may be other files that are not encrypted; only files that are exposed to third-party storage providers are guaranteed to be encrypted. Change Private Key Password -~~~~~~~~~~~~~~~~~~~~~~~~~~~ +^^^^^^^^^^^^^^^^^^^^^^^^^^^ This option is only available if your log-in password, but not your encryption password, was changed by your administrator. This can occur if your Nextcloud diff --git a/user_manual/pim/contacts.rst b/user_manual/pim/contacts.rst index 71bf6af17..d9b34a746 100644 --- a/user_manual/pim/contacts.rst +++ b/user_manual/pim/contacts.rst @@ -3,4 +3,4 @@ Using the Contacts App ====================== The Contacts app is not enabled by default in Nextcloud |version| and needs to -be enabled separately. \ No newline at end of file +be enabled separately. From 3ad6dbb5b10a560105480e96651a6e8838041258 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Thu, 20 Jul 2017 18:35:43 +0200 Subject: [PATCH 5/5] Pending stable11 fixes Signed-off-by: Morris Jobke --- admin_manual/index.rst | 3 --- admin_manual/installation/selinux_configuration.rst | 4 ++-- user_manual/files/encrypting_files.rst | 4 ++-- user_manual/user_2fa.rst | 4 ++-- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/admin_manual/index.rst b/admin_manual/index.rst index e91079ba3..8df9aa8e9 100644 --- a/admin_manual/index.rst +++ b/admin_manual/index.rst @@ -16,9 +16,6 @@ Nextcloud server is available: * As a free, full featured community-supported server, with all enterprise features. * Or with full enterprise support, including phone and email access to Nextcloud developers. -See :doc:`../release_notes` for more information on the different Nextcloud -editions. - Videos and Blogs ---------------- diff --git a/admin_manual/installation/selinux_configuration.rst b/admin_manual/installation/selinux_configuration.rst index 57adf9a70..2d9dcd156 100644 --- a/admin_manual/installation/selinux_configuration.rst +++ b/admin_manual/installation/selinux_configuration.rst @@ -132,5 +132,5 @@ Nextcloud directory:: It is much stronger security to have a more fine-grained ruleset as in the examples at the beginning, so use this only for testing and troubleshooting. It - has a similar effect to disabling SELinux, so don't use it on production - systems. +has a similar effect to disabling SELinux, so don't use it on production +systems. diff --git a/user_manual/files/encrypting_files.rst b/user_manual/files/encrypting_files.rst index 401429f92..d145947d2 100644 --- a/user_manual/files/encrypting_files.rst +++ b/user_manual/files/encrypting_files.rst @@ -33,14 +33,14 @@ Encryption FAQ How Can Encryption Be Disabled? ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -The only way to disable encryption is to run the :ref:`"decrypt all" ` +The only way to disable encryption is to run the `"decrypt all" <../../admin_manual/configuration_server/occ_command.html#encryption-label>`_ script, which decrypts all files and disables encryption. Is It Possible To Disable Encryption With The Recovery Key? ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Yes, *if* every user uses the :ref:`file recovery key -`, :ref:`"decrypt all" ` will use it +`, `"decrypt all" <../../admin_manual/configuration_server/occ_command.html#encryption-label>`_ will use it to decrypt all files. Can Encryption Be Disabled Without The User’s Password? diff --git a/user_manual/user_2fa.rst b/user_manual/user_2fa.rst index 3fbd3984b..f13d11dda 100644 --- a/user_manual/user_2fa.rst +++ b/user_manual/user_2fa.rst @@ -60,8 +60,8 @@ enter the TOTP code in your browser. Just enter your code: If the code was correct you will be redirected to your Nextcloud account. .. note:: Since the code is time-based, it’s important that your server’s and -your smartphone’s clock are almost in sync. A time drift of a few seconds -won’t be a problem. + your smartphone’s clock are almost in sync. A time drift of a few seconds + won’t be a problem. Using client applications with two-factor authentication ========================================================