diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt deleted file mode 100644 index 762a42830..000000000 --- a/doc/CMakeLists.txt +++ /dev/null @@ -1,93 +0,0 @@ -if(SPHINX_FOUND) - - # Sphinx cache with pickled ReST documents - set(SPHINX_CACHE_DIR "${CMAKE_CURRENT_BINARY_DIR}/_doctrees") - # HTML output directory - set(SPHINX_HTML_DIR "${CMAKE_CURRENT_BINARY_DIR}/html") - set(SPHINX_PDF_DIR "${CMAKE_CURRENT_BINARY_DIR}/latex") - set(SPHINX_QCH_DIR "${CMAKE_CURRENT_BINARY_DIR}/qthelp") - set(SPHINX_HTMLHELP_DIR "${CMAKE_CURRENT_BINARY_DIR}/htmlhelp") - set(MSHTML_COMPILER wine 'C:\\Program Files\\HTML Help Workshop\\hhc.exe') - # assets - set(LATEX_LOGO "${CMAKE_CURRENT_SOURCE_DIR}/logo-blue.pdf") - - set(APPLICATION_DOC_DIR "${CMAKE_INSTALL_DOCDIR}/${PACKAGE}") - install(DIRECTORY ${SPHINX_HTML_DIR} DESTINATION ${APPLICATION_DOC_DIR} OPTIONAL) - install(DIRECTORY ${SPHINX_PDF_DIR} DESTINATION ${APPLICATION_DOC_DIR} OPTIONAL) - install(DIRECTORY ${SPHINX_QCH_DIR} DESTINATION ${APPLICATION_DOC_DIR} OPTIONAL) - - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in" conf.py @ONLY) - - if(WITH_DOC) - add_custom_target(doc ALL DEPENDS doc-html COMMENT "Building documentation...") - else(WITH_DOC) - add_custom_target(doc DEPENDS doc-html COMMENT "Building documentation...") - endif(WITH_DOC) - - if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ocdoc/_shared_assets") - add_dependencies(doc doc-html-org) - add_dependencies(doc doc-html-com) - endif() - - if(PDFLATEX_FOUND) - # if this still fails on Debian/Ubuntu, run - # apt-get install texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended - add_custom_target(doc-latex ${SPHINX_EXECUTABLE} - -q -c . -b latex - -d ${SPHINX_CACHE_DIR}/latex - -D latex_logo=${LATEX_LOGO} - ${CMAKE_CURRENT_SOURCE_DIR} - ${SPHINX_PDF_DIR} ) - - set(MAKE "make" CACHE FILEPATH "make to be used for documentation generation if not using make as generator anyway") - if(CMAKE_GENERATOR MATCHES "Makefiles") - set(MAKE "$(MAKE)") - endif() - - add_custom_target(doc-pdf ${MAKE} -C ${SPHINX_PDF_DIR} all-pdf - DEPENDS doc-latex ) - add_dependencies(doc doc-pdf) - endif(PDFLATEX_FOUND) - if (EXISTS ${QT_QCOLLECTIONGENERATOR_EXECUTABLE}) - add_custom_target( doc-qch-sphinx ${SPHINX_EXECUTABLE} - -q -c . -b qthelp - -d ${SPHINX_CACHE_DIR}/qthelp - ${CMAKE_CURRENT_SOURCE_DIR} - ${SPHINX_QCH_DIR} ) - add_custom_target( doc-qch ${QT_QCOLLECTIONGENERATOR_EXECUTABLE} - ${SPHINX_QCH_DIR}/*.qhcp - DEPENDS doc-qch-sphinx ) - add_dependencies(doc doc-qch) - endif() - add_custom_target( doc-html ${SPHINX_EXECUTABLE} - -q -c . -b html - -d ${SPHINX_CACHE_DIR}/html - ${CMAKE_CURRENT_SOURCE_DIR} - ${SPHINX_HTML_DIR}/unthemed ) - add_custom_target( doc-html-org ${SPHINX_EXECUTABLE} - -q -c . -b html - -d ${SPHINX_CACHE_DIR}/html - -D html_theme=owncloud_org - ${CMAKE_CURRENT_SOURCE_DIR} - ${SPHINX_HTML_DIR}/org ) - add_custom_target( doc-html-com ${SPHINX_EXECUTABLE} - -q -c . -b html - -d ${SPHINX_CACHE_DIR}/html - -D html_theme=owncloud_com - ${CMAKE_CURRENT_SOURCE_DIR} - ${SPHINX_HTML_DIR}/com ) - - ## Building CHM files requires HTML Help Workshop. Since it requires wine - ## with special dependencies, it's impossible to write a cmake check for it. - ## This is why doc-chm is not a dependency for doc. Instead, run - ## doc/scripts/htmlhelp.exe to install them and run this target - ## explicitly. - add_custom_target( doc-chm-sphinx ${SPHINX_EXECUTABLE} - -q -c . -b htmlhelp - -D html_theme=basic - -d ${SPHINX_CACHE_DIR}/htmlhelp - ${CMAKE_CURRENT_SOURCE_DIR} - ${SPHINX_HTMLHELP_DIR} ) - add_custom_target( doc-chm pushd ${SPHINX_HTMLHELP_DIR}; ${MSHTML_COMPILER} *.hhp; popd - DEPENDS doc-chm-sphinx ) -endif(SPHINX_FOUND) \ No newline at end of file diff --git a/doc/Makefile b/doc/Makefile index 04196f9b9..7932760b0 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -43,22 +43,17 @@ help: clean: -rm -rf $(BUILDDIR)/* -html: html-org +html: html-com -html-all: html-release html-org html-com +html-all: html-release html-com html-release: - $(SPHINXBUILD) -b html -D html_theme='owncloud_release' $(ALLSPHINXOPTS) $(BUILDDIR)/html/release + $(SPHINXBUILD) -b html -D html_theme='nextcloud_release' $(ALLSPHINXOPTS) $(BUILDDIR)/html/release @echo @echo "Build finished. The HTML pages are in $(BUILDDIR)/html/release." -html-org: - $(SPHINXBUILD) -b html -D html_theme='owncloud_org' $(ALLSPHINXOPTS) $(BUILDDIR)/html/org - @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/html/org." - html-com: - $(SPHINXBUILD) -b html -D html_theme='owncloud_com' $(ALLSPHINXOPTS) $(BUILDDIR)/html/com + $(SPHINXBUILD) -b html -D html_theme='nextcloud_com' $(ALLSPHINXOPTS) $(BUILDDIR)/html/com @echo @echo "Build finished. The HTML pages are in $(BUILDDIR)/html/com." diff --git a/doc/advancedusage.rst b/doc/advancedusage.rst index 446352c97..e0a824662 100644 --- a/doc/advancedusage.rst +++ b/doc/advancedusage.rst @@ -19,10 +19,10 @@ Environment Variables .. index:: env vars .. include:: envvars.rst -ownCloud Command Line Client ----------------------------- -.. index:: owncloudcmd -.. include:: owncloudcmd.rst +Nextcloud Command Line Client +----------------------------- +.. index:: nextcloudcmd +.. include:: nextcloudcmd.rst Low Disk Space -------------- diff --git a/doc/architecture.rst b/doc/architecture.rst index 9229ced33..de2fbf957 100644 --- a/doc/architecture.rst +++ b/doc/architecture.rst @@ -3,17 +3,17 @@ Appendix B: History and Architecture .. index:: architecture -ownCloud provides desktop sync clients to synchronize the contents of local -directories from computers, tablets, and handheld devices to the ownCloud +Nextcloud provides desktop sync clients to synchronize the contents of local +directories from computers, tablets, and handheld devices to the Nextcloud server. Synchronization is accomplished using csync_, a bidirectional file synchronizing tool that provides both a command line client as well as a library. A special module for csync was written to synchronize with the -ownCloud built-in WebDAV server. +Nextcloud built-in WebDAV server. -The ownCloud Client software is written in C++ using the `Qt Framework`_. As a -result, the ownCloud Client runs on Linux, Windows, and MacOS. +The Nextcloud Client software is written in C++ using the `Qt Framework`_. As a +result, the Nextcloud Client runs on Linux, Windows, and MacOS. .. _csync: http://www.csync.org .. _`Qt Framework`: http://www.qt-project.org @@ -29,14 +29,14 @@ same. When synchronized: synchronized repository. - If a file is deleted in one repository, it is deleted in any other. -It is important to note that the ownCloud synchronization process does not use +It is important to note that the Nextcloud synchronization process does not use a typical client/server system where the server is always master. This is a -major difference between the ownCloud synchronization process and other systems +major difference between the Nextcloud synchronization process and other systems like a file backup, where only changes to files or folders and the addition of new files are propagated, but these files and folders are never deleted unless explicitly deleted in the backup. -During synchronization, the ownCloud Client checks both repositories for +During synchronization, the Nextcloud Client checks both repositories for changes frequently. This process is referred to as a *sync run*. In between sync runs, the local repository is monitored by a file system monitoring process that starts a sync run immediately if something was edited, added, or @@ -46,7 +46,7 @@ Synchronization by Time versus ETag ----------------------------------- .. index:: time stamps, file times, etag, unique id -Until the release of ownCloud 4.5 and ownCloud Client 1.1, the ownCloud +Until the release of the client version 1.1, the Nextcloud synchronization process employed a single file property -- the file modification time -- to decide which file was newer and needed to be synchronized to the other repository. @@ -58,23 +58,19 @@ general meaning. One design goal of csync is to not require a special server component. This design goal is why csync was chosen as the backend component. To compare the modification times of two files from different systems, csync -must operate on the same base. Before ownCloud Client version 1.1.0, csync +must operate on the same base. Before client version 1.1.0, csync required both device repositories to run on the exact same time. This requirement was achieved through the use of enterprise standard `NTP time synchronization`_ on all machines. -Because this timing strategy is rather fragile without the use of NTP, ownCloud -4.5 introduced a unique number (for each file?) that changes whenever the file +Because this timing strategy is rather fragile without the use of NTP, the Nextcloud +server provides a unique number that changes whenever the file changes. Although this number is a unique value, it is not a hash of the file. Instead, it is a randomly chosen number, that is transmitted in the Etag_ field. Because the file number changes if the file changes, its use is guaranteed to determine if one of the files has changed and, thereby, launching a synchronization process. -.. note:: ownCloud Client release 1.1 and later requires file ID capabilities - on the ownCloud server. Servers that run with release earlier than 4.5.0 do - not support using the file ID functionality. - Before the 1.3.0 release of the Desktop Client, the synchronization process might create false conflict files if time deviates. Original and changed files conflict only in their timestamp, but not in their content. This behavior was @@ -85,29 +81,6 @@ contained files or directories is modified. Because this is a recursive process, it significantly reduces the effort required for a synchronization cycle, because the client only analyzes directories with a modified ID. - -The following table outlines the different synchronization methods used, -depending on server/client combination: - -.. index:: compatiblity table - -+--------------------+-------------------+----------------------------+ -| Server Version | Client Version | Sync Methods | -+====================+===================+============================+ -| 4.0.x or earlier | 1.0.5 or earlier | Time Stamp | -+--------------------+-------------------+----------------------------+ -| 4.0.x or earlier | 1.1 or later | n/a (incompatible) | -+--------------------+-------------------+----------------------------+ -| 4.5 or later | 1.0.5 or earlier | Time Stamp | -+--------------------+-------------------+----------------------------+ -| 4.5 or later | 1.1 or later | File ID, Time Stamp | -+--------------------+-------------------+----------------------------+ - -We strongly recommend using ownCloud Server release 4.5 or later when using -ownCloud Client 1.1 or later. Using an incompatible time stamp-based -synchronization mechanism can lead to data loss in rare cases, especially when -multiple clients are involved and one utilizes a non-synchronized NTP time. - .. _`NTP time synchronization`: http://en.wikipedia.org/wiki/Network_Time_Protocol .. _Etag: http://en.wikipedia.org/wiki/HTTP_ETag @@ -124,7 +97,7 @@ determines that the file has been modified in the local repository. detecting changes, because the value does not depend on time shifts and such. -For the remote (that is, ownCloud server) repository, the client compares the +For the remote (that is, Nextcloud server) repository, the client compares the ETag of each file with its expected value. Again, the expected ETag value is queried from the client database. If the ETag is the same, the file has not changed and no synchronization occurs. @@ -143,138 +116,139 @@ the remote file will be downloaded and saved as message.txt. Conflict files are always created on the client and never on the server. -Checksum Algorithm Negotiation ------------------------------- +.. + Checksum Algorithm Negotiation + ------------------------------ -In ownCloud 10.0 we implemented a checksum feature which checks the file integrity on upload and download by computing a checksum after the file transfer finishes. -The client queries the server capabilities after login to decide which checksum algorithm to use. -Currently, SHA1 is hard-coded in the official server release and can't be changed by the end-user. -Note that the server additionally also supports MD5 and Adler-32, but the desktop client will always use the checksum algorithm announced in the capabilities: + In ownCloud 10.0 we implemented a checksum feature which checks the file integrity on upload and download by computing a checksum after the file transfer finishes. + The client queries the server capabilities after login to decide which checksum algorithm to use. + Currently, SHA1 is hard-coded in the official server release and can't be changed by the end-user. + Note that the server additionally also supports MD5 and Adler-32, but the desktop client will always use the checksum algorithm announced in the capabilities: -:: + :: - GET http://localhost:8000/ocs/v1.php/cloud/capabilities?format=json + GET http://localhost:8000/ocs/v1.php/cloud/capabilities?format=json -:: + :: - json - { - "ocs":{ - "meta":{ - "status":"ok", - "statuscode":100, - "message":"OK", - "totalitems":"", - "itemsperpage":"" - }, - "data":{ - "version":{ - "major":10, - "minor":0, - "micro":0, - "string":"10.0.0 beta", - "edition":"Community" - }, - "capabilities":{ - "core":{ - "pollinterval":60, - "webdav-root":"remote.php/webdav" - }, - "dav":{ - "chunking":"1.0" - }, - "files_sharing":{ - "api_enabled":true, - "public":{ - "enabled":true, - "password":{ - "enforced":false - }, - "expire_date":{ - "enabled":false - }, - "send_mail":false, - "upload":true - }, - "user":{ - "send_mail":false - }, - "resharing":true, - "group_sharing":true, - "federation":{ - "outgoing":true, - "incoming":true - } - }, - "checksums":{ - "supportedTypes":[ - "SHA1" - ], - "preferredUploadType":"SHA1" - }, - "files":{ - "bigfilechunking":true, - "blacklisted_files":[ - ".htaccess" - ], - "undelete":true, - "versioning":true - } - } - } - } - } + json + { + "ocs":{ + "meta":{ + "status":"ok", + "statuscode":100, + "message":"OK", + "totalitems":"", + "itemsperpage":"" + }, + "data":{ + "version":{ + "major":10, + "minor":0, + "micro":0, + "string":"10.0.0 beta", + "edition":"Community" + }, + "capabilities":{ + "core":{ + "pollinterval":60, + "webdav-root":"remote.php/webdav" + }, + "dav":{ + "chunking":"1.0" + }, + "files_sharing":{ + "api_enabled":true, + "public":{ + "enabled":true, + "password":{ + "enforced":false + }, + "expire_date":{ + "enabled":false + }, + "send_mail":false, + "upload":true + }, + "user":{ + "send_mail":false + }, + "resharing":true, + "group_sharing":true, + "federation":{ + "outgoing":true, + "incoming":true + } + }, + "checksums":{ + "supportedTypes":[ + "SHA1" + ], + "preferredUploadType":"SHA1" + }, + "files":{ + "bigfilechunking":true, + "blacklisted_files":[ + ".htaccess" + ], + "undelete":true, + "versioning":true + } + } + } + } + } -Upload -~~~~~~ + Upload + ~~~~~~ -A checksum is calculated with the previously negotiated algorithm by the client and sent along with the file in an HTTP Header. -```OC-Checksum: [algorithm]:[checksum]``` + A checksum is calculated with the previously negotiated algorithm by the client and sent along with the file in an HTTP Header. + ```OC-Checksum: [algorithm]:[checksum]``` -.. image:: ./images/checksums/client-activity.png + .. image:: ./images/checksums/client-activity.png -During file upload, the server computes SHA1, MD5, and Adler-32 checksums and compares one of them to the checksum supplied by the client. + During file upload, the server computes SHA1, MD5, and Adler-32 checksums and compares one of them to the checksum supplied by the client. -On mismatch, the server returns HTTP Status code 400 (Bad Request) thus signaling the client that the upload failed. -The server then discards the upload, and the client blacklists the file: + On mismatch, the server returns HTTP Status code 400 (Bad Request) thus signaling the client that the upload failed. + The server then discards the upload, and the client blacklists the file: -.. image:: ./images/checksums/testing-checksums.png + .. image:: ./images/checksums/testing-checksums.png -:: + :: - - - Sabre\DAV\Exception\BadRequest - The computed checksum does not match the one received from the - client. - + + + Sabre\DAV\Exception\BadRequest + The computed checksum does not match the one received from the + client. + -The client retries the upload using exponential back-off. -On success (matching checksum) the computed checksums are stored by the server in ``oc_filecache`` alongside the file. + The client retries the upload using exponential back-off. + On success (matching checksum) the computed checksums are stored by the server in ``oc_filecache`` alongside the file. -Chunked Upload -~~~~~~~~~~~~~~ + Chunked Upload + ~~~~~~~~~~~~~~ -Mostly same as above. -The checksum of the full file is sent with every chunk of the file. -But the server only compares the checksum after receiving the checksum sent with the last chunk. + Mostly same as above. + The checksum of the full file is sent with every chunk of the file. + But the server only compares the checksum after receiving the checksum sent with the last chunk. -Download -~~~~~~~~ + Download + ~~~~~~~~ -The server sends the checksum in an HTTP header with the file. (same format as above). -If no checksum is found in ``oc_filecache`` (freshly mounted external storage) it is computed and stored in ``oc_filecache`` on the first download. -The checksum is then provided on all subsequent downloads but not on the first. + The server sends the checksum in an HTTP header with the file. (same format as above). + If no checksum is found in ``oc_filecache`` (freshly mounted external storage) it is computed and stored in ``oc_filecache`` on the first download. + The checksum is then provided on all subsequent downloads but not on the first. .. _ignored-files-label: Ignored Files ------------- -The ownCloud Client supports the ability to exclude or ignore certain files from the synchronization process. -Some system wide file patterns that are used to exclude or ignore files are included with the client by default and the ownCloud Client provides the ability to add custom patterns. +The Nextcloud Client supports the ability to exclude or ignore certain files from the synchronization process. +Some system wide file patterns that are used to exclude or ignore files are included with the client by default and the Nextcloud Client provides the ability to add custom patterns. -By default, the ownCloud Client ignores the following files: +By default, the Nextcloud Client ignores the following files: * Files matched by one of the patterns defined in the Ignored Files Editor * Files containing characters that do not work on certain file systems ``(`\, /, :, ?, *, ", >, <, |`)``. @@ -320,7 +294,7 @@ The client stores the ETag number in a per-directory database, called the *journal*. This database is a hidden file contained in the directory to be synchronized. -If the journal database is removed, the ownCloud Client CSync backend rebuilds +If the journal database is removed, the Nextcloud Client CSync backend rebuilds the database by comparing the files and their modification times. This process ensures that both server and client are synchronized using the appropriate NTP time before restarting the client following a database removal. diff --git a/doc/autoupdate.rst b/doc/autoupdate.rst index e581a70ae..637e738cf 100644 --- a/doc/autoupdate.rst +++ b/doc/autoupdate.rst @@ -3,17 +3,13 @@ The Automatic Updater ===================== The Automatic Updater ensures that you always have the -latest features and bug fixes for your ownCloud synchronization client. +latest features and bug fixes for your Nextcloud synchronization client. The Automatic Updater updates only on Mac OS X and Windows computers; Linux users only need to use their normal package managers. However, on Linux systems the Updater will check for updates and notify you when a new version is available. -.. note:: Because of various technical issues, desktop sync clients older than - 1.7 will not be allowed to connect and sync with the ownCloud 8.1+ server. It - is highly recommended to keep your client updated. - Basic Workflow -------------- @@ -23,11 +19,11 @@ operating systems. Windows ^^^^^^^ -The ownCloud client checks for updates and downloads them when available. You +The Nextcloud client checks for updates and downloads them when available. You can view the update status under ``Settings -> General -> Updates`` in the -ownCloud client. +Nextcloud client. -If an update is available, and has been successfully downloaded, the ownCloud +If an update is available, and has been successfully downloaded, the Nextcloud client starts a silent update prior to its next launch and then restarts itself. Should the silent update fail, the client offers a manual download. @@ -36,7 +32,7 @@ itself. Should the silent update fail, the client offers a manual download. Mac OS X ^^^^^^^^ -If a new update is available, the ownCloud client initializes a pop-up dialog +If a new update is available, the Nextcloud client initializes a pop-up dialog to alert you of the update and requesting that you update to the latest version. Due to their use of the Sparkle frameworks, this is the default process for Mac OS X applications. @@ -44,7 +40,7 @@ process for Mac OS X applications. Linux ^^^^^ -Linux distributions provide their own update tools, so ownCloud clients that use +Linux distributions provide their own update tools, so Nextcloud clients that use the Linux operating system do not perform any updates on their own. The client will inform you (``Settings -> General -> Updates``) when an update is available. @@ -62,7 +58,7 @@ Preventing Automatic Updates in Windows Environments ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Users may disable automatic updates by adding this line to the [General] -section of their ``owncloud.cfg`` files:: +section of their ``nextcloud.cfg`` files:: skipUpdateCheck=true @@ -75,8 +71,8 @@ To prevent automatic updates, but allow manual overrides: 1. Edit these Registry keys: - a. (32-bit-Windows) ``HKEY_LOCAL_MACHINE\Software\ownCloud\ownCloud`` - b. (64-bit-Windows) ``HKEY_LOCAL_MACHINE\Software\Wow6432Node\ownCloud\ownCloud`` + a. (32-bit-Windows) ``HKEY_LOCAL_MACHINE\Software\Nextcloud\Nextcloud`` + b. (64-bit-Windows) ``HKEY_LOCAL_MACHINE\Software\Wow6432Node\Nextcloud\Nextcloud`` 2. Add the key ``skipUpdateCheck`` (of type DWORD). @@ -91,19 +87,13 @@ To prevent automatic updates and disallow manual overrides: 1. Edit this Registry key: - ``HKEY_LOCAL_MACHINE\Software\Policies\ownCloud\ownCloud`` + ``HKEY_LOCAL_MACHINE\Software\Policies\Nextcloud\Nextcloud`` 2. Add the key ``skipUpdateCheck`` (of type DWORD). 3. Specify a value of ``1`` to the machine. -.. note:: Enterprise branded clients - (see `Building Branded ownCloud Clients - `_) have different key names, - which are set in ownBrander using the Application Vendor and Application - Name fields. Your key names look like this:: - - ``HKEY_LOCAL_MACHINE\Software\Policies\myCompanyName\myAppName`` +.. note:: branded clients have different key names Preventing Automatic Updates in Mac OS X Environments @@ -111,15 +101,15 @@ Preventing Automatic Updates in Mac OS X Environments You can disable the automatic update mechanism, in the Mac OS X operating system, by copying the file -``owncloud.app/Contents/Resources/deny_autoupdate_com.owncloud.desktopclient.plist`` -to ``/Library/Preferences/com.owncloud.desktopclient.plist``. +``nextcloud.app/Contents/Resources/deny_autoupdate_com.nextcloud.desktopclient.plist`` +to ``/Library/Preferences/com.nextcloud.desktopclient.plist``. Preventing Automatic Updates in Linux Environments ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Because the Linux client does not provide automatic updating functionality, there is no need to remove the automatic-update check. However, if you want to disable it edit your desktop -client configuration file, ``$HOME/.config/ownCloud/owncloud.cfg``. +client configuration file, ``$HOME/.config/Nextcloud/nextcloud.cfg``. Add this line to the [General] section:: skipUpdateCheck=true diff --git a/doc/building.rst b/doc/building.rst index 5207b45f7..818ccd134 100644 --- a/doc/building.rst +++ b/doc/building.rst @@ -4,14 +4,14 @@ Appendix A: Building the Client =============================== -This section explains how to build the ownCloud Client from source for all +This section explains how to build the Nextcloud Client from source for all major platforms. You should read this section if you want to develop for the desktop client. .. note:: Build instructions are subject to change as development proceeds. Please check the version for which you want to build. -These instructions are updated to work with version |version| of the ownCloud Client. +These instructions are updated to work with version |version| of the Nextcloud Client. Getting Source Code ------------------- @@ -19,38 +19,6 @@ Getting Source Code The :ref:`generic-build-instructions` pull the latest code directly from GitHub, and work on Linux, Mac OS X, and Windows. -See the next section for instructions on getting source code from Linux -packages. - -Linux ------ - -You may wish to use source packages for your Linux distribution, as these give -you the exact sources from which the binary packages are built. These are -hosted on the `ownCloud repository from OBS`_. Go to the `Index of -repositories`_ to see all the Linux client repos. - -1. The source RPMs for CentOS, RHEL, Fedora, SLES, and openSUSE are at the `bottom of the page for each distribution - ` - the sources for DEB and Ubuntu based distributions are at e.g. http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/Ubuntu_16.04/ - - To get the .deb source packages add the source - repo for your Debian or Ubuntu version, like this example for Debian 8 - (run as root):: - - echo 'deb-src - http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/Debian_8.0/ /' >> /etc/apt/sources.list.d/owncloud-client.list - -2. Install the dependencies using the following commands for your specific Linux -distribution. Make sure the repositories for source packages are enabled. - - * Debian/Ubuntu: ``apt-get update; apt-get build-dep owncloud-client`` - * openSUSE/SLES: ``zypper ref; zypper si -d owncloud-client`` - * Fedora/CentOS/RHEL: ``yum install yum-utils; yum-builddep owncloud-client`` - -3. Follow the :ref:`generic-build-instructions`, starting with step 2. - Mac OS X -------- @@ -61,7 +29,7 @@ only on the build machine, because non-standard libs are deployed in the app bundle. The tested and preferred way to develop in this environment is through the use -of HomeBrew_. The ownCloud team has its own repository containing non-standard +of HomeBrew_. The team has its own repository containing non-standard recipes. To set up your build environment for development using HomeBrew_: @@ -73,7 +41,7 @@ To set up your build environment for development using HomeBrew_: 3. Install homebrew:: /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" -4. Add the ownCloud repository using the following command:: +4. Add the Nextcloud repository using the following command:: brew tap owncloud/owncloud @@ -104,7 +72,7 @@ To set up your build environment for development using HomeBrew_: its Common Name as a third parameter (use quotes) to have the package signed automatically. - .. note:: Contrary to earlier versions, ownCloud 1.7 and later are packaged + .. note:: Contrary to earlier versions, Nextcloud 1.7 and later are packaged as a ``pkg`` installer. Do not call "make package" at any time when compiling for OS X, as this will build a disk image, and will not work correctly. @@ -122,17 +90,17 @@ follow `Windows Installer Build (Cross-Compile)`_ instead. * Download the Qt_ MinGW package. You will use the MinGW version bundled with it. * Download an `OpenSSL Windows Build`_ (the non-"Light" version) -2. Get the QtKeychain_ sources as well as the latest versions of the ownCloud client +2. Get the QtKeychain_ sources as well as the latest versions of the Nextcloud client from Git as follows:: git clone https://github.com/frankosterfeld/qtkeychain.git - git clone git://github.com/owncloud/client.git + git clone git://github.com/nextcloud/client.git 3. Open the Qt MinGW shortcut console from the Start Menu 4. Make sure that OpenSSL's ``bin`` directory as well as your qtkeychain source directories are in your PATH. This will allow CMake to find the library and - headers, as well as allow the ownCloud client to find the DLLs at runtime:: + headers, as well as allow the Nextcloud client to find the DLLs at runtime:: set PATH=C:\\bin;%PATH% set PATH=C:\;%PATH% @@ -159,7 +127,7 @@ follow `Windows Installer Build (Cross-Compile)`_ instead. ``cmake -G Ninja ../client`` and ``ninja`` instead. .. note:: Refer to the :ref:`generic-build-instructions` section for additional options. - The ownCloud binary will appear in the ``bin`` directory. + The Nextcloud binary will appear in the ``bin`` directory. Windows Installer Build (Cross-Compile) --------------------------------------- @@ -171,11 +139,11 @@ have it installed already. In order to make setup simple, you can use the provided Dockerfile to build your own image. -1. Assuming you are in the root of the ownCloud Client's source tree, you can +1. Assuming you are in the root of the Nextcloud Client's source tree, you can build an image from this Dockerfile like this:: cd admin/win/docker - docker build . -t owncloud-client-win32: + docker build . -t nextcloud-client-win32: Replace ```` by the version of the client you are building, e.g. |version| for the release of the client that this document describes. @@ -185,11 +153,11 @@ In order to make setup simple, you can use the provided Dockerfile to build your .. note:: Docker images are specific to releases. This one refers to |version|. Newer releases may have different dependencies, and thus require a later version of the docker image! Always pick the docker image fitting your release - of ownCloud client! + of Nextcloud client! 2. From within the source tree Run the docker instance:: - docker run -v "$PWD:/home/user/client" owncloud-client-win32: \ + docker run -v "$PWD:/home/user/client" nextcloud-client-win32: \ /home/user/client/admin/win/docker/build.sh client/ $(id -u) It will run the build, create an NSIS based installer, as well as run tests. @@ -228,7 +196,7 @@ To build the most up-to-date version of the client: 1. Clone the latest versions of the client from Git_ as follows:: - git clone git://github.com/owncloud/client.git + git clone git://github.com/nextcloud/client.git cd client git submodule init git submodule update @@ -255,7 +223,7 @@ To build the most up-to-date version of the client: 4. Call ``make``. - The owncloud binary will appear in the ``bin`` directory. + The Nextcloud binary will appear in the ``bin`` directory. 5. (Optional) Call ``make install`` to install the client to the ``/usr/local/bin`` directory. @@ -271,11 +239,9 @@ The following are known cmake parameters: * ``BUILD_WITH_QT4=ON``: Builds using Qt4 (even if Qt5 is found). * ``CMAKE_INSTALL_PREFIX=path``: Set an install prefix. This is mandatory on Mac OS -.. _ownCloud repository from OBS: http://software.opensuse.org/download/package? - project=isv:ownCloud:desktop&package=owncloud-client .. _CMake: http://www.cmake.org/download .. _CSync: http://www.csync.org -.. _Client Download Page: https://owncloud.org/install/#desktop +.. _Client Download Page: https://nextcloud.com/install/#install-clients .. _Git: http://git-scm.com .. _MacPorts: http://www.macports.org .. _Homebrew: http://mxcl.github.com/homebrew/ @@ -284,4 +250,3 @@ The following are known cmake parameters: .. _Microsoft Authenticode: https://msdn.microsoft.com/en-us/library/ie/ms537361%28v=vs.85%29.aspx .. _QtKeychain: https://github.com/frankosterfeld/qtkeychain .. _Packages: http://s.sudre.free.fr/Software/Packages/about.html -.. _Index of repositories: http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/ diff --git a/doc/conf.py b/doc/conf.py index ce5bf4279..7a009729c 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# ownCloud Documentation documentation build configuration file, created by +# Nextcloud Documentation documentation build configuration file, created by # sphinx-quickstart on Mon Oct 22 23:16:40 2012. # # This file is execfile()d with the current directory set to its containing dir. @@ -28,7 +28,7 @@ import sys, os extensions = ['sphinx.ext.todo'] # Add any paths that contain templates here, relative to this directory. -templates_path = ['@CMAKE_CURRENT_SOURCE_DIR@/ocdoc/_shared_assets/templates'] +templates_path = ['../../documentation/_shared_assets/templates'] # The suffix of source filenames. source_suffix = '.rst' @@ -40,8 +40,8 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'ownCloud Client Manual' -copyright = u'2013-2016, The ownCloud developers' +project = u'Nextcloud Client Manual' +copyright = u'2013-2018, The Nextcloud developers' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -95,7 +95,7 @@ pygments_style = 'sphinx' #html_theme_options = {} # Add any paths that contain custom themes here, relative to this directory. -html_theme_path = ['@CMAKE_CURRENT_SOURCE_DIR@/ocdoc/_shared_assets/themes'] +html_theme_path = ['../../documentation/_shared_assets/themes'] # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. @@ -120,7 +120,7 @@ html_short_title = "Client Manual" # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['@CMAKE_CURRENT_SOURCE_DIR@/ocdoc/_shared_assets/static'] +html_static_path = ['../../documentation/_shared_assets/static'] # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. @@ -164,7 +164,7 @@ html_show_sphinx = False #html_file_suffix = None # Output file base name for HTML help builder. -htmlhelp_basename = 'ownCloudClientManual' +htmlhelp_basename = 'NextcloudClientManual' # -- Options for LaTeX output -------------------------------------------------- @@ -183,8 +183,8 @@ latex_elements = { # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, documentclass [howto/manual]). latex_documents = [ - ('index', 'ownCloudClientManual.tex', u'ownCloud Client Manual', - u'The ownCloud developers', 'manual'), + ('index', 'NextcloudClientManual.tex', u'Nextcloud Client Manual', + u'The Nextcloud developers', 'manual'), ] # The name of an image file (relative to this directory) to place at the top of @@ -213,10 +213,10 @@ latex_logo = 'logo-blue.pdf' # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ('owncloud.1', 'owncloud', u'File synchronisation desktop utility.', - [u'The ownCloud developers'], 1), - ('owncloudcmd.1', 'owncloudcmd', u'Command line ownCloud client tool.', - [u'The ownCloud developers'], 1), + ('nextcloud.1', 'nextcloud', u'File synchronisation desktop utility.', + [u'The Nextcloud developers'], 1), + ('nextcloudcmd.1', 'nextcloudcmd', u'Command line Nextcloud client tool.', + [u'The Nextcloud developers'], 1), ] # If true, show URL addresses after external links. @@ -229,8 +229,8 @@ man_show_urls = True # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('index', 'ownCloudClientManual', u'ownCloud Client Manual', - u'The ownCloud developers', 'ownCloud', 'The ownCloud Client Manual.', + ('index', 'NextcloudClientManual', u'Nextcloud Client Manual', + u'The Nextcloud developers', 'Nextcloud', 'The Nextcloud Client Manual.', 'Miscellaneous'), ] @@ -247,10 +247,10 @@ texinfo_documents = [ # -- Options for Epub output --------------------------------------------------- # Bibliographic Dublin Core info. -epub_title = u'ownCloud Client Manual' -epub_author = u'The ownCloud developers' -epub_publisher = u'The ownCloud developers' -epub_copyright = u'2013-2016, The ownCloud developers' +epub_title = u'Nextcloud Client Manual' +epub_author = u'The Nextcloud developers' +epub_publisher = u'The Nextcloud developers' +epub_copyright = u'2013-2018, The Nextcloud developers' # The language of the text. It defaults to the language option # or en if the language is not set. diff --git a/doc/conf.py.in b/doc/conf.py.in deleted file mode 100644 index f4062ada4..000000000 --- a/doc/conf.py.in +++ /dev/null @@ -1,292 +0,0 @@ -# -*- coding: utf-8 -*- -# -# ownCloud Documentation documentation build configuration file, created by -# sphinx-quickstart on Mon Oct 22 23:16:40 2012. -# -# This file is execfile()d with the current directory set to its containing dir. -# -# Note that not all possible configuration values are present in this -# autogenerated file. -# -# All configuration values have a default; values that are commented out -# serve to show the default. - -import sys, os - -# If extensions (or modules to document with autodoc) are in another directory, -# add these directories to sys.path here. If the directory is relative to the -# documentation root, use os.path.abspath to make it absolute, like shown here. -#sys.path.insert(0, os.path.abspath('.')) - -# -- General configuration ----------------------------------------------------- - -# If your documentation needs a minimal Sphinx version, state it here. -#needs_sphinx = '1.0' - -# Add any Sphinx extension module names here, as strings. They can be extensions -# coming with Sphinx (named 'sphinx.ext.*') or your custom ones. -extensions = ['sphinx.ext.todo'] - -# Add any paths that contain templates here, relative to this directory. -templates_path = ['@CMAKE_CURRENT_SOURCE_DIR@/ocdoc/_shared_assets/templates'] - -# The suffix of source filenames. -source_suffix = '.rst' - -# The encoding of source files. -#source_encoding = 'utf-8-sig' - -# The master toctree document. -master_doc = 'index' - -# General information about the project. -project = u'ownCloud Client Manual' -copyright = u'2013-2016, The ownCloud developers' - -# The version info for the project you're documenting, acts as replacement for -# |version| and |release|, also used in various other places throughout the -# built documents. -# -# The short X.Y version. -version = '@MIRALL_VERSION_MAJOR@.@MIRALL_VERSION_MINOR@' -# The full version, including alpha/beta/rc tags. -release = '@MIRALL_VERSION@' - -# The language for content autogenerated by Sphinx. Refer to documentation -# for a list of supported languages. -#language = None - -# There are two options for replacing |today|: either, you set today to some -# non-false value, then it is used: -#today = '' -# Else, today_fmt is used as the format for a strftime call. -#today_fmt = '%B %d, %Y' - -# List of patterns, relative to source directory, that match files and -# directories to ignore when looking for source files. -exclude_patterns = ['_build','scripts/*'] - -# The reST default role (used for this markup: `text`) to use for all documents. -#default_role = None - -# If true, '()' will be appended to :func: etc. cross-reference text. -#add_function_parentheses = True -2 -# If true, the current module name will be prepended to all description -# unit titles (such as .. function::). -#add_module_names = True - -# If true, sectionauthor and moduleauthor directives will be shown in the -# output. They are ignored by default. -#show_authors = False - -# The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' - -# A list of ignored prefixes for module index sorting. -#modindex_common_prefix = [] - - -# -- Options for HTML output --------------------------------------------------- - -# Theme options are theme-specific and customize the look and feel of a theme -# further. For a list of options available for each theme, see the -# documentation. -#html_theme_options = {} - -# Add any paths that contain custom themes here, relative to this directory. -html_theme_path = ['@CMAKE_CURRENT_SOURCE_DIR@/ocdoc/_shared_assets/themes'] - -# The theme to use for HTML and HTML Help pages. See the documentation for -# a list of builtin themes. -#html_theme = 'bootstrap' -html_theme = 'default' -# The name for this set of Sphinx documents. If None, it defaults to -# " v documentation". -#html_title = None - -# A shorter title for the navigation bar. Default is the same as html_title. -html_short_title = "Client Manual" - -# The name of an image file (relative to this directory) to place at the top -# of the sidebar. -#html_logo = None - -# The name of an image file (within the static path) to use as favicon of the -# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 -# pixels large. -#html_favicon = None - -# Add any paths that contain custom static files (such as style sheets) here, -# relative to this directory. They are copied after the builtin static files, -# so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['@CMAKE_CURRENT_SOURCE_DIR@/ocdoc/_shared_assets/static'] - -# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, -# using the given strftime format. -html_last_updated_fmt = '%b %d, %Y' - -# If true, SmartyPants will be used to convert quotes and dashes to -# typographically correct entities. -#html_use_smartypants = True - -# Custom sidebar templates, maps document names to template names. -#html_sidebars = {} - -# Additional templates that should be rendered to pages, maps page names to -# template names. -#html_additional_pages = {} - -# If false, no module index is generated. -#html_domain_indices = True - -# If false, no index is generated. -#html_use_index = True - -# If true, the index is split into individual pages for each letter. -#html_split_index = False - -# If true, links to the reST sources are added to the pages. -#html_show_sourcelink = True - -# If true, "Created using Sphinx" is shown in the HTML footer. Default is True. -html_show_sphinx = False - -# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. -#html_show_copyright = True - -# If true, an OpenSearch description file will be output, and all pages will -# contain a tag referring to it. The value of this option must be the -# base URL from which the finished HTML is served. -#html_use_opensearch = '' - -# This is the file name suffix for HTML files (e.g. ".xhtml"). -#html_file_suffix = None - -# Output file base name for HTML help builder. -htmlhelp_basename = 'ownCloudClientManual' - - -# -- Options for LaTeX output -------------------------------------------------- - -latex_elements = { -# The paper size ('letterpaper' or 'a4paper'). -#'papersize': 'letterpaper', - -# The font size ('10pt', '11pt' or '12pt'). -#'pointsize': '10pt', - -# Additional stuff for the LaTeX preamble. -#'preamble': '', -} - -# Grouping the document tree into LaTeX files. List of tuples -# (source start file, target name, title, author, documentclass [howto/manual]). -latex_documents = [ - ('index', 'ownCloudClientManual.tex', u'ownCloud Client Manual', - u'The ownCloud developers', 'manual'), -] - -# The name of an image file (relative to this directory) to place at the top of -# the title page. -latex_logo = '@LATEX_LOGO@' - -# For "manual" documents, if this is true, then toplevel headings are parts, -# not chapters. -#latex_use_parts = False - -# If true, show page references after internal links. -#latex_show_pagerefs = False - -# If true, show URL addresses after external links. -#latex_show_urls = False - -# Documents to append as an appendix to all manuals. -#latex_appendices = [] - -# If false, no module index is generated. -#latex_domain_indices = True - - -# -- Options for manual page output -------------------------------------------- - -# One entry per manual page. List of tuples -# (source start file, name, description, authors, manual section). -man_pages = [ - ('owncloud.1', 'owncloud', u'File synchronisation desktop utility.', - [u'The ownCloud developers'], 1), - ('owncloudcmd.1', 'owncloudcmd', u'Command line ownCloud client tool.', - [u'The ownCloud developers'], 1), -] - -# If true, show URL addresses after external links. -man_show_urls = True - - -# -- Options for Texinfo output ------------------------------------------------ - -# Grouping the document tree into Texinfo files. List of tuples -# (source start file, target name, title, author, -# dir menu entry, description, category) -texinfo_documents = [ - ('index', 'ownCloudClientManual', u'ownCloud Client Manual', - u'The ownCloud developers', 'ownCloud', 'The ownCloud Client Manual.', - 'Miscellaneous'), -] - -# Documents to append as an appendix to all manuals. -#texinfo_appendices = [] - -# If false, no module index is generated. -#texinfo_domain_indices = True - -# How to display URL addresses: 'footnote', 'no', or 'inline'. -#texinfo_show_urls = 'footnote' - - -# -- Options for Epub output --------------------------------------------------- - -# Bibliographic Dublin Core info. -epub_title = u'ownCloud Client Manual' -epub_author = u'The ownCloud developers' -epub_publisher = u'The ownCloud developers' -epub_copyright = u'2013-2016, The ownCloud developers' - -# The language of the text. It defaults to the language option -# or en if the language is not set. -#epub_language = '' - -# The scheme of the identifier. Typical schemes are ISBN or URL. -#epub_scheme = '' - -# The unique identifier of the text. This can be a ISBN number -# or the project homepage. -#epub_identifier = '' - -# A unique identification for the text. -#epub_uid = '' - -# A tuple containing the cover image and cover page html template filenames. -#epub_cover = () - -# HTML files that should be inserted before the pages created by sphinx. -# The format is a list of tuples containing the path and title. -#epub_pre_files = [] - -# HTML files shat should be inserted after the pages created by sphinx. -# The format is a list of tuples containing the path and title. -#epub_post_files = [] - -# A list of files that should not be packed into the epub file. -#epub_exclude_files = [] - -# The depth of the table of contents in toc.ncx. -#epub_tocdepth = 3 - -# Allow duplicate toc entries. -#epub_tocdup = True - -# Include todos? -todo_include_todos = True - -rst_epilog = '.. |version| replace:: %s' % version diff --git a/doc/conffile.rst b/doc/conffile.rst index dda2bd68b..7760e5477 100644 --- a/doc/conffile.rst +++ b/doc/conffile.rst @@ -1,25 +1,25 @@ -The ownCloud Client reads a configuration file. You can locate this configuration file as follows: +The Nextcloud Client reads a configuration file. You can locate this configuration file as follows: On Linux distributions: - ``$HOME/.config/ownCloud/owncloud.cfg`` + ``$HOME/.config/Nextcloud/nextcloud.cfg`` On Microsoft Windows systems: - ``%APPDATA%\ownCloud\owncloud.cfg`` + ``%APPDATA%\Nextcloud\nextcloud.cfg`` On MAC OS X systems: - ``$HOME/Library/Preferences/ownCloud/owncloud.cfg`` + ``$HOME/Library/Preferences/Nextcloud/nextcloud.cfg`` The configuration file contains settings using the Microsoft Windows .ini file -format. You can overwrite changes using the ownCloud configuration dialog. +format. You can overwrite changes using the Nextcloud configuration dialog. -.. note:: Use caution when making changes to the ownCloud Client configuration +.. note:: Use caution when making changes to the Nextcloud Client configuration file. Incorrect settings can produce unintended results. Some interesting values that can be set on the configuration file are: +----------------------------------------------------------------------------------------------------------------------------------------------------------+ -| ``[ownCloud]`` section | +| ``[Nextcloud]`` section | +=================================+===============+========================================================================================================+ | Variable | Default | Meaning | +---------------------------------+---------------+--------------------------------------------------------------------------------------------------------+ diff --git a/doc/dev/Doxyfile.in b/doc/dev/Doxyfile.in index 763718817..c56f1a576 100644 --- a/doc/dev/Doxyfile.in +++ b/doc/dev/Doxyfile.in @@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8 # title of most generated pages and in a few other places. # The default value is: My Project. -PROJECT_NAME = "ownCloud Desktop Client Developer Documentation" +PROJECT_NAME = "Nextcloud Desktop Client Developer Documentation" # The PROJECT_NUMBER tag can be used to enter a project or revision number. This # could be handy for archiving the generated documentation or if some version diff --git a/doc/dev/sync-algorithm.md b/doc/dev/sync-algorithm.md index 61e8526a8..2cfc58f38 100644 --- a/doc/dev/sync-algorithm.md +++ b/doc/dev/sync-algorithm.md @@ -4,7 +4,7 @@ Sync Algorithm Overview -------- -This is a technical description of the synchronization (sync) algorithm used by the ownCloud client. +This is a technical description of the synchronization (sync) algorithm used by the Nextcloud client. The sync algorithm is the thing that looks at the local and remote file system trees and the sync journal and decides which steps need to be taken to bring the two trees into synchronization. It's different from the propagator, whose job it is to actually execute these steps. @@ -13,7 +13,7 @@ Definitions ----------- - local tree: The files and directories on the local file system that shall be kept in sync with the remote tree. - - remote tree: The files and directories on the ownCloud server that shall be kept in sync with the local tree. + - remote tree: The files and directories on the Nextcloud server that shall be kept in sync with the local tree. - sync journal (journal): A snapshot of file and directory metadata that the sync algorithm uses as a baseline to detect local or remote changes. Typically stored in a database. - file and directory metadata: - mtimes diff --git a/doc/faq.rst b/doc/faq.rst index af9582def..02f0de811 100644 --- a/doc/faq.rst +++ b/doc/faq.rst @@ -24,7 +24,7 @@ the "Activity" pane. I Want To Move My Local Sync Folder ----------------------------------- -The ownCloud desktop client does not provide a way to change the local sync directory. +The Nextcloud desktop client does not provide a way to change the local sync directory. However, it can be done, though it is a bit unorthodox. Specifically, you have to: @@ -47,12 +47,12 @@ Then, click the Account drop-down menu again, and this time click "**Add new**". .. figure:: images/setup/ownCloud-replacement_connection_wizard.png :alt: Replacement connection wizard -This opens the ownCloud Connection Wizard, which you can see above, *but* with an extra option. +This opens the Nextcloud Connection Wizard, which you can see above, *but* with an extra option. This option provides the ability to either: keep the existing data (synced by the previous connection) or to start a clean sync (erasing the existing data). .. important:: - Be careful before choosing the "Start a clean sync" option. The old sync folder *may* contain a considerable amount of data, ranging into the gigabytes or terabytes. If it does, after the client creates the new connection, it will have to download **all** of that information again. Instead, first move or copy the old local sync folder, containing a copy of the existing files, to the new location. Then, when creating the new connection choose "*keep existing data*" instead. The ownCloud client will check the files in the newly-added sync folder and find that they match what is on the server and not need to download anything. + Be careful before choosing the "Start a clean sync" option. The old sync folder *may* contain a considerable amount of data, ranging into the gigabytes or terabytes. If it does, after the client creates the new connection, it will have to download **all** of that information again. Instead, first move or copy the old local sync folder, containing a copy of the existing files, to the new location. Then, when creating the new connection choose "*keep existing data*" instead. The Nextcloud client will check the files in the newly-added sync folder and find that they match what is on the server and not need to download anything. Make your choice and click "**Connect...**". This will then step you through the Connection Wizard, just as you did when you setup the previous sync connection, but giving you the opportunity to choose a new sync directory. diff --git a/doc/glossary.rst b/doc/glossary.rst index 9c8e2b3b9..a0c7a22f2 100644 --- a/doc/glossary.rst +++ b/doc/glossary.rst @@ -4,26 +4,25 @@ Glossary .. glossary:: :sorted: - ownCloud Sync Client - ownCloud Client - Name of the official ownCloud syncing client for desktop, which runs on + Nextcloud Sync Client + Nextcloud Client + Name of the official Nextcloud syncing client for desktop, which runs on Windows, Mac OS X and Linux. It uses the CSync sync engine for - synchronization with the ownCloud server. + synchronization with the Nextcloud server. - ownCloud Server - The server counter part of ownCloud Client as provided by the ownCloud + Nextcloud Server + The server counter part of Nextcloud Client as provided by the Nextcloud community. mtime modification time file modification time File property used to determine whether the servers' or the clients' file - is more recent. Standard procedure in oCC 1.0.5 and earlier, used by - oCC 1.1 and later only when no sync database exists and files already + is more recent. Used only when no sync database exists and files already exist in the client directory. unique id ETag - ID assigned to every file starting with ownCloud server 4.5 and submitted + ID assigned to every file and submitted via the HTTP ``Etag``. Used to check if files on client and server have changed. diff --git a/doc/index.rst b/doc/index.rst index 90fed6132..cbf98807d 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -1,7 +1,7 @@ .. _contents: -ownCloud Desktop Client Manual -============================== +Nextcloud Desktop Client Manual +=============================== .. toctree:: :maxdepth: 2 diff --git a/doc/installing.rst b/doc/installing.rst index 29aacfebf..e6437192e 100644 --- a/doc/installing.rst +++ b/doc/installing.rst @@ -2,8 +2,8 @@ Installing the Desktop Synchronization Client ============================================= -You can download the latest version of the ownCloud Desktop Synchronization -Client from the `ownCloud download page`_. +You can download the latest version of the Nextcloud Desktop Synchronization +Client from the `Nextcloud download page`_. There are clients for Linux, Mac OS X, and Microsoft Windows. Installation on Mac OS X and Windows is the same as for any software @@ -29,32 +29,24 @@ System Requirements - Windows 7+ - Mac OS X 10.7+ (**64-bit only**) -- CentOS 6 & 7 (64-bit only) -- Debian 7.0 & 8.0 & 9.0 -- Fedora 24 & 25 & 26 -- Ubuntu 16.04 & 16.10 & 17.04 -- openSUSE Leap 42.1 & 42.2 & 42.3 - -.. note:: - For Linux distributions, we support, if technically feasible, the latest 2 versions per platform and the previous `LTS`_. Installation Wizard ------------------- The installation wizard takes you step-by-step through configuration options and -account setup. First you need to enter the URL of your ownCloud server. +account setup. First you need to enter the URL of your Nextcloud server. .. image:: images/client-1.png - :alt: form for entering ownCloud server URL + :alt: form for entering Nextcloud server URL -Enter your ownCloud login on the next screen. +Enter your Nextcloud login on the next screen. .. image:: images/client-2.png - :alt: form for entering your ownCloud login + :alt: form for entering your Nextcloud login On the Local Folder Option screen you may sync -all of your files on the ownCloud server, or select individual folders. The -default local sync folder is ``ownCloud``, in your home directory. You may +all of your files on the Nextcloud server, or select individual folders. The +default local sync folder is ``Nextcloud``, in your home directory. You may change this as well. .. image:: images/client-3.png @@ -62,17 +54,17 @@ change this as well. them in. When you have completed selecting your sync folders, click the Connect button -at the bottom right. The client will attempt to connect to your ownCloud +at the bottom right. The client will attempt to connect to your Nextcloud server, and when it is successful you'll see two buttons: one to connect to -your ownCloud Web GUI, and one to open your local folder. It will also start +your Nextcloud Web GUI, and one to open your local folder. It will also start synchronizing your files. .. image:: images/client-4.png :alt: A successful server connection, showing a button to connect to your - Web GUI, and one to open your local ownCloud folder + Web GUI, and one to open your local Nextcloud folder Click the Finish button, and you're all done. .. Links -.. _ownCloud download page: https://owncloud.com/download/#desktop-clients +.. _Nextcloud download page: https://nextcloud.com/download/#install-clients diff --git a/doc/introduction.rst b/doc/introduction.rst index eb6bfbf56..446b49733 100644 --- a/doc/introduction.rst +++ b/doc/introduction.rst @@ -2,26 +2,21 @@ Introduction ============ -Available for Windows, Mac OS X, and various Linux distributions, the ownCloud +Available for Windows, Mac OS X, and various Linux distributions, the Nextcloud Desktop Sync client enables you to: - Specify one or more directories on your computer that you want to synchronize - to the ownCloud server. + to the Nextcloud server. - Always have the latest files synchronized, wherever they are located. -Your files are always automatically synchronized between your ownCloud server +Your files are always automatically synchronized between your Nextcloud server and local PC. -Because of various technical issues, desktop sync clients older than 2.2.1 will -not allowed to connect and sync with the ownCloud 8.1+ server. It is highly -recommended to keep your client updated. - Improvements and New Features ----------------------------- -The |version| release of the ownCloud desktop sync client has many new features and -improvements. (See the `complete changelog -`_.) +The |version| release of the Nextcloud desktop sync client has many new features and +improvements. * Show server notifications on the client * Improved sync speed diff --git a/doc/lowdiskspace.rst b/doc/lowdiskspace.rst index e0ef63bf1..a32312ddd 100644 --- a/doc/lowdiskspace.rst +++ b/doc/lowdiskspace.rst @@ -1,4 +1,4 @@ -When disk space is low the ownCloud Client will be unable to synchronize all files. This section describes its behavior in a low disk space situation as well as the options that influence it. +When disk space is low the Nextcloud Client will be unable to synchronize all files. This section describes its behavior in a low disk space situation as well as the options that influence it. 1. Synchronization of a folder aborts entirely if the remaining disk space falls below 50 MB. This threshold can be adjusted with the ``OWNCLOUD_CRITICAL_FREE_SPACE_BYTES`` environment variable. diff --git a/doc/make.bat b/doc/make.bat deleted file mode 100644 index 9c761d0b2..000000000 --- a/doc/make.bat +++ /dev/null @@ -1,190 +0,0 @@ -@ECHO OFF - -REM Command file for Sphinx documentation - -if "%SPHINXBUILD%" == "" ( - set SPHINXBUILD=sphinx-build -) -set BUILDDIR=_build -set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% . -set I18NSPHINXOPTS=%SPHINXOPTS% . -if NOT "%PAPER%" == "" ( - set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS% - set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS% -) - -if "%1" == "" goto help - -if "%1" == "help" ( - :help - echo.Please use `make ^` where ^ is one of - echo. html to make standalone HTML files - echo. dirhtml to make HTML files named index.html in directories - echo. singlehtml to make a single large HTML file - echo. pickle to make pickle files - echo. json to make JSON files - echo. htmlhelp to make HTML files and a HTML help project - echo. qthelp to make HTML files and a qthelp project - echo. devhelp to make HTML files and a Devhelp project - echo. epub to make an epub - echo. latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter - echo. text to make text files - echo. man to make manual pages - echo. texinfo to make Texinfo files - echo. gettext to make PO message catalogs - echo. changes to make an overview over all changed/added/deprecated items - echo. linkcheck to check all external links for integrity - echo. doctest to run all doctests embedded in the documentation if enabled - goto end -) - -if "%1" == "clean" ( - for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i - del /q /s %BUILDDIR%\* - goto end -) - -if "%1" == "html" ( - %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The HTML pages are in %BUILDDIR%/html. - goto end -) - -if "%1" == "dirhtml" ( - %SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml. - goto end -) - -if "%1" == "singlehtml" ( - %SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml. - goto end -) - -if "%1" == "pickle" ( - %SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle - if errorlevel 1 exit /b 1 - echo. - echo.Build finished; now you can process the pickle files. - goto end -) - -if "%1" == "json" ( - %SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json - if errorlevel 1 exit /b 1 - echo. - echo.Build finished; now you can process the JSON files. - goto end -) - -if "%1" == "htmlhelp" ( - %SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp - if errorlevel 1 exit /b 1 - echo. - echo.Build finished; now you can run HTML Help Workshop with the ^ -.hhp project file in %BUILDDIR%/htmlhelp. - goto end -) - -if "%1" == "qthelp" ( - %SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp - if errorlevel 1 exit /b 1 - echo. - echo.Build finished; now you can run "qcollectiongenerator" with the ^ -.qhcp project file in %BUILDDIR%/qthelp, like this: - echo.^> qcollectiongenerator %BUILDDIR%\qthelp\OwncloudDocumentation.qhcp - echo.To view the help file: - echo.^> assistant -collectionFile %BUILDDIR%\qthelp\OwncloudDocumentation.ghc - goto end -) - -if "%1" == "devhelp" ( - %SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. - goto end -) - -if "%1" == "epub" ( - %SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The epub file is in %BUILDDIR%/epub. - goto end -) - -if "%1" == "latex" ( - %SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex - if errorlevel 1 exit /b 1 - echo. - echo.Build finished; the LaTeX files are in %BUILDDIR%/latex. - goto end -) - -if "%1" == "text" ( - %SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The text files are in %BUILDDIR%/text. - goto end -) - -if "%1" == "man" ( - %SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The manual pages are in %BUILDDIR%/man. - goto end -) - -if "%1" == "texinfo" ( - %SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo. - goto end -) - -if "%1" == "gettext" ( - %SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The message catalogs are in %BUILDDIR%/locale. - goto end -) - -if "%1" == "changes" ( - %SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes - if errorlevel 1 exit /b 1 - echo. - echo.The overview file is in %BUILDDIR%/changes. - goto end -) - -if "%1" == "linkcheck" ( - %SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck - if errorlevel 1 exit /b 1 - echo. - echo.Link check complete; look for any errors in the above output ^ -or in %BUILDDIR%/linkcheck/output.txt. - goto end -) - -if "%1" == "doctest" ( - %SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest - if errorlevel 1 exit /b 1 - echo. - echo.Testing of doctests in the sources finished, look at the ^ -results in %BUILDDIR%/doctest/output.txt. - goto end -) - -:end diff --git a/doc/navigating.rst b/doc/navigating.rst index 3d119d2eb..bf6a2f9e2 100644 --- a/doc/navigating.rst +++ b/doc/navigating.rst @@ -4,7 +4,7 @@ Using the Synchronization Client .. index:: navigating, usage -The ownCloud Desktop Client remains in the background and is visible as an icon +The Nextcloud Desktop Client remains in the background and is visible as an icon in the system tray (Windows, KDE), status bar (Mac OS X), or notification area (Linux). @@ -13,7 +13,7 @@ in the system tray (Windows, KDE), status bar (Mac OS X), or notification area The status indicator uses icons to indicate the current status of your synchronization. The green circle with the white checkmark tells you that your -synchronization is current and you are connected to your ownCloud server. +synchronization is current and you are connected to your Nextcloud server. .. figure:: images/icon-syncing.png :alt: Status icon, little cloud with blue circle and white semi-circles @@ -32,7 +32,7 @@ has been paused. (Most likely by you.) white dots The gray icon with three white dots means your sync client has lost its -connection with your ownCloud server. +connection with your Nextcloud server. .. figure:: images/icon-information.png :alt: Status icon, little cloud with letter "i" in white circle @@ -64,7 +64,7 @@ This menu provides the following options: * Help menu * Pause synchronizations * An option to log in or log out of all of your accounts at once -* Quit ownCloud, logging out and closing the client +* Quit Nextcloud, logging out and closing the client A left-click on your systray icon opens the desktop client to the account settings window. @@ -72,8 +72,8 @@ settings window. .. figure:: images/client6.png :alt: Account settings window -Configuring ownCloud Account Settings -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Configuring Nextcloud Account Settings +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ .. index:: account settings, user, password, Server URL @@ -81,8 +81,8 @@ At the top of the window are tabs for each configured sync account, and three others for Activity, General and Network settings. On your account tabs you have the following features: -* Connection status, showing which ownCloud server you are connected to, and - your ownCloud username. +* Connection status, showing which Nextcloud server you are connected to, and + your Nextcloud username. * An **Account** button, which contains a dropdown menu with **Add New**, **Log Out**, and **Remove**. * Used and available space on the server. @@ -98,7 +98,7 @@ the sync status bar offers four additional options: * Pause Sync / Resume Sync * Remove folder sync connection -**Open Folder** opens your local ownCloud sync folder. +**Open Folder** opens your local Nextcloud sync folder. **Pause Sync** pauses sync operations without making any changes to your account. It will continue to update file and folder lists, without @@ -108,7 +108,7 @@ Folder Sync Connection**. .. figure:: images/client-7.png :alt: Extra options for sync operations -.. note:: ownCloud does not preserve the mtime (modification time) of +.. note:: Nextcloud does not preserve the mtime (modification time) of directories, though it does update the mtimes on files. See `Wrong folder date when syncing `_ for discussion of this. @@ -116,7 +116,7 @@ Folder Sync Connection**. Adding New Accounts ^^^^^^^^^^^^^^^^^^^ -You may configure multiple ownCloud accounts in your desktop sync client. Simply +You may configure multiple Nextcloud accounts in your desktop sync client. Simply click the **Account** > **Add New** button on any account tab to add a new account, and then follow the account creation wizard. The new account will appear as a new tab in the settings dialog, where you can adjust its settings at @@ -125,9 +125,9 @@ any time. Use **Account** > **Remove** to delete accounts. File Manager Overlay Icons -------------------------- -The ownCloud sync client provides overlay icons, in addition to the normal file +The Nextcloud sync client provides overlay icons, in addition to the normal file type icons, for your system file manager (Explorer on Windows, Finder on Mac and -Nautilus on Linux) to indicate the sync status of your ownCloud files. +Nautilus on Linux) to indicate the sync status of your Nextcloud files. The overlay icons are similar to the systray icons introduced above. They behave differently on files and directories according to sync status @@ -158,28 +158,28 @@ that does not change the status of the parent directories. Sharing From Your Desktop ------------------------- -The ownCloud desktop sync client integrates with your file manager: Finder on +The Nextcloud desktop sync client integrates with your file manager: Finder on Mac OS X, Explorer on Windows, and Nautilus on Linux. (Linux users must install -the ``owncloud-client-nautilus`` plugin.) You can create share links, and share -with internal ownCloud users the same way as in your ownCloud Web interface. +the ``Nextcloud-client-nautilus`` plugin.) You can create share links, and share +with internal Nextcloud users the same way as in your Nextcloud Web interface. .. figure:: images/mac-share.png :alt: Sync client integration in Windows Explorer. Right-click your systray icon, hover over the account you want to use, and -left-click "Open folder [folder name] to quickly enter your local ownCloud +left-click "Open folder [folder name] to quickly enter your local Nextcloud folder. Right-click the file or folder you want to share to expose the share -dialog, and click **Share with ownCloud**. +dialog, and click **Share with Nextcloud**. .. figure:: images/share-1.png :alt: Sharing from Windows Explorer. -The share dialog has all the same options as your ownCloud Web interface. +The share dialog has all the same options as your Nextcloud Web interface. .. figure:: images/share-2.png :alt: Share dialog in Windows Explorer. -Use **Share with ownCloud** to see who you have shared with, and to modify +Use **Share with Nextcloud** to see who you have shared with, and to modify their permissions, or to delete the share. Activity Window @@ -200,8 +200,8 @@ Server Notifications -------------------- Starting with version 2.2.0, the client will display notifications from your -ownCloud server that require manual interaction by you. For example, when a -user on a remote ownCloud creates a new Federated share for you, you can accept +Nextcloud server that require manual interaction by you. For example, when a +user on a remote Nextcloud creates a new Federated share for you, you can accept it from your desktop client. The desktop client automatically checks for available notifications @@ -212,7 +212,7 @@ tab) you'll also see a systray notification. .. figure:: images/client12.png :alt: Activity window with notification. -This also displays notifications sent to users by the ownCloud admin via the +This also displays notifications sent to users by the Nextcloud admin via the Announcements app. General Window @@ -253,7 +253,7 @@ can use the *Ignored Files Editor* (General tab.) For your convenience, the editor is pre-populated with a default list of typical ignore patterns. These patterns are contained in a system file (typically -``sync-exclude.lst``) located in the ownCloud Client application directory. You +``sync-exclude.lst``) located in the Nextcloud Client application directory. You cannot modify these pre-populated patterns directly from the editor. However, if necessary, you can hover over any pattern in the list to show the path and @@ -285,7 +285,7 @@ and removed by the client. In addition to excluding files and directories that use patterns defined in this list: -- The ownCloud Client always excludes files containing characters that cannot +- The Nextcloud Client always excludes files containing characters that cannot be synchronized to other file systems. - Files are removed that cause individual errors three times during a diff --git a/doc/owncloudcmd.rst b/doc/nextcloudcmd.rst similarity index 54% rename from doc/owncloudcmd.rst rename to doc/nextcloudcmd.rst index 79790095d..81d00b2b3 100644 --- a/doc/owncloudcmd.rst +++ b/doc/nextcloudcmd.rst @@ -1,22 +1,22 @@ -The ownCloud Client packages contain a command line client, ``owncloudcmd``, that can -be used to synchronize ownCloud files to client machines. +The Nextcloud Client packages contain a command line client, ``nextcloudcmd``, that can +be used to synchronize Nextcloud files to client machines. -``owncloudcmd`` performs a single *sync run* and then exits the synchronization -process. In this manner, ``owncloudcmd`` processes the differences between +``nextcloudcmd`` performs a single *sync run* and then exits the synchronization +process. In this manner, ``nextcloudcmd`` processes the differences between client and server directories and propagates the files to bring both repositories to the same state. Contrary to the GUI-based client, -``owncloudcmd`` does not repeat synchronizations on its own. It also does not +``nextcloudcmd`` does not repeat synchronizations on its own. It also does not monitor for file system changes. -To invoke ``owncloudcmd``, you must provide the local and the remote repository +To invoke ``nextcloudcmd``, you must provide the local and the remote repository URL using the following command:: - owncloudcmd [OPTIONS...] sourcedir owncloudurl + nextcloudcmd [OPTIONS...] sourcedir nextcloudurl -where ``sourcedir`` is the local directory and ``owncloudurl`` is +where ``sourcedir`` is the local directory and ``nextcloudurl`` is the server URL. -Other command line switches supported by ``owncloudcmd`` include the following: +Other command line switches supported by ``nextcloudcmd`` include the following: ``--user``, ``-u`` ``[user]`` Use ``user`` as the login name. @@ -60,27 +60,27 @@ Other command line switches supported by ``owncloudcmd`` include the following: Credential Handling ~~~~~~~~~~~~~~~~~~~ -``owncloudcmd`` requires the user to specify the username and password using the standard URL pattern, e.g., +``nextcloudcmd`` requires the user to specify the username and password using the standard URL pattern, e.g., :: - $ owncloudcmd /home/user/my_sync_folder https://carla:secret@server/owncloud/remote.php/webdav/ + $ nextcloudcmd /home/user/my_sync_folder https://carla:secret@server/nextcloud/remote.php/webdav/ -To synchronize the ownCloud directory ``Music`` to the local directory +To synchronize the Nextcloud directory ``Music`` to the local directory ``media/music``, through a proxy listening on port ``8080``, and on a gateway machine using IP address ``192.168.178.1``, the command line would be:: - $ owncloudcmd --httpproxy http://192.168.178.1:8080 \ + $ nextcloudcmd --httpproxy http://192.168.178.1:8080 \ $HOME/media/music \ - https://server/owncloud/remote.php/webdav/Music + https://server/nextcloud/remote.php/webdav/Music -``owncloudcmd`` will prompt for the user name and password, unless they have +``nextcloudcmd`` will prompt for the user name and password, unless they have been specified on the command line or ``-n`` has been passed. Exclude List ~~~~~~~~~~~~ -``owncloudcmd`` requires access to an exclude list file. It must either be -installed along with ``owncloudcmd`` and thus be available in a system location, +``nextcloudcmd`` requires access to an exclude list file. It must either be +installed along with ``nextcloudcmd`` and thus be available in a system location, be placed next to the binary as ``sync-exclude.lst`` or be explicitly specified with the ``--exclude`` switch. diff --git a/doc/options.rst b/doc/options.rst index 1aab3d08d..4565c13a9 100644 --- a/doc/options.rst +++ b/doc/options.rst @@ -1,7 +1,7 @@ -You have the option of starting your ownCloud desktop client with the -``owncloud`` command. The following options are supported: +You have the option of starting your Nextcloud desktop client with the +``nextcloud`` command. The following options are supported: -``owncloud -h`` or ``owncloud --help`` +``nextcloud -h`` or ``nextcloud --help`` Displays all command options. The other options are: diff --git a/doc/troubleshooting.rst b/doc/troubleshooting.rst index 860149321..2b9dfbd37 100644 --- a/doc/troubleshooting.rst +++ b/doc/troubleshooting.rst @@ -12,29 +12,29 @@ system is causing the issue. Identifying Basic Functionality Problems ---------------------------------------- -:Performing a general ownCloud Server test: +:Performing a general Nextcloud Server test: The first step in troubleshooting synchronization issues is to verify that - you can log on to the ownCloud web application. To verify connectivity to the - ownCloud server try logging in via your Web browser. + you can log on to the Nextcloud web application. To verify connectivity to the + Nextcloud server try logging in via your Web browser. If you are not prompted for your username and password, or if a red warning box appears on the page, your server setup requires modification. Please verify that your server installation is working correctly. :Ensure the WebDAV API is working: - If all desktop clients fail to connect to the ownCloud Server, but access + If all desktop clients fail to connect to the Nextcloud Server, but access using the Web interface functions properly, the problem is often a misconfiguration of the WebDAV API. - The ownCloud Client uses the built-in WebDAV access of the server content. - Verify that you can log on to ownCloud's WebDAV server. To verify connectivity - with the ownCloud WebDAV server: + The Nextcloud Client uses the built-in WebDAV access of the server content. + Verify that you can log on to Nextcloud's WebDAV server. To verify connectivity + with the Nextcloud WebDAV server: - - Open a browser window and enter the address to the ownCloud WebDAV server. + - Open a browser window and enter the address to the Nextcloud WebDAV server. - For example, if your ownCloud instance is installed at - ``http://yourserver.com/owncloud``, your WebDAV server address is - ``http://yourserver.com/owncloud/remote.php/webdav``. + For example, if your Nextcloud instance is installed at + ``http://yourserver.com/nextcloud``, your WebDAV server address is + ``http://yourserver.com/nextcloud/remote.php/webdav``. If you are prompted for your username and password but, after providing the correct credentials, authentication fails, please ensure that your @@ -42,7 +42,7 @@ Identifying Basic Functionality Problems :Use a WebDAV command line tool to test: A more sophisticated test method for troubleshooting synchronization issues - is to use a WebDAV command line client and log into the ownCloud WebDAV server. + is to use a WebDAV command line client and log into the Nextcloud WebDAV server. One such command line client -- called ``cadaver`` -- is available for Linux distributions. You can use this application to further verify that the WebDAV server is running properly using PROPFIND calls. @@ -70,17 +70,17 @@ issue. Isolating other issues ---------------------- -Other issues can affect synchronization of your ownCloud files: +Other issues can affect synchronization of your Nextcloud files: - If you find that the results of the synchronizations are unreliable, please ensure that the folder to which you are synchronizing is not shared with other synchronization applications. -- Synchronizing the same directory with ownCloud and other synchronization +- Synchronizing the same directory with Nextcloud and other synchronization software such as Unison, rsync, Microsoft Windows Offline Folders, or other cloud services such as Dropbox or Microsoft SkyDrive is not supported and should not be attempted. In the worst case, it is possible that synchronizing - folders or files using ownCloud and other synchronization software or + folders or files using Nextcloud and other synchronization software or services can result in data loss. - If you find that only specific files are not synchronized, the @@ -91,9 +91,9 @@ Other issues can affect synchronization of your ownCloud files: :ref:`ignored-files-label`. - If you are operating your own server, and use the local storage backend (the - default), make sure that ownCloud has exclusive access to the directory. + default), make sure that Nextcloud has exclusive access to the directory. - .. warning:: The data directory on the server is exclusive to ownCloud and must not be modified manually. + .. warning:: The data directory on the server is exclusive to Nextcloud and must not be modified manually. - If you are using a different file backend on the server, you can try to exclude a bug in the backend by reverting to the built-in backend. @@ -106,7 +106,7 @@ Log Files --------- Effectively debugging software requires as much relevant information as can be -obtained. To assist the ownCloud support personnel, please try to provide as +obtained. To assist the Nextcloud support personnel, please try to provide as many relevant logs as possible. Log output can help with tracking down problems and, if you report a bug, log output can help to resolve an issue more quickly. @@ -116,7 +116,7 @@ Obtaining the Client Log File To obtain the client log file: -1. Open the ownCloud Desktop Client. +1. Open the Nextcloud Desktop Client. 2. Press F12 on your keyboard. @@ -136,7 +136,7 @@ To obtain the client log file: The log file is saved in the location specified. -Alternatively, you can launch the ownCloud Log Output window using the +Alternatively, you can launch the Nextcloud Log Output window using the ``--logwindow`` command. After issuing this command, the Log Output window opens to show the current log. You can then follow the same procedures mentioned above to save the log to a file. @@ -144,14 +144,14 @@ mentioned above to save the log to a file. .. note:: You can also open a log window for an already running session, by restarting the client using the following command: - * Windows: ``C:\Program Files (x86)\ownCloud\owncloud.exe --logwindow`` - * Mac OS X: ``/Applications/owncloud.app/Contents/MacOS/owncloud --logwindow`` - * Linux: ``owncloud --logwindow`` + * Windows: ``C:\Program Files (x86)\Nextcloud\nextcloud.exe --logwindow`` + * Mac OS X: ``/Applications/nextcloud.app/Contents/MacOS/nextcloud --logwindow`` + * Linux: ``nextcloud --logwindow`` Saving Files Directly ~~~~~~~~~~~~~~~~~~~~~ -The ownCloud client enables you to save log files directly to a predefined file +The Nextcloud client enables you to save log files directly to a predefined file or directory. This is a useful option for troubleshooting sporadic issues as it enables you to log large amounts of data and bypasses the limited buffer settings associated with the log window. @@ -174,19 +174,19 @@ As an example, to define a test where you keep log data for two days, you can issue the following command: ``` -owncloud --logdir /tmp/owncloud_logs --logexpire 48 +nextcloud --logdir /tmp/nextcloud_logs --logexpire 48 ``` -ownCloud server Log File -~~~~~~~~~~~~~~~~~~~~~~~~ +Nextcloud server Log File +~~~~~~~~~~~~~~~~~~~~~~~~~ -The ownCloud server also maintains an ownCloud specific log file. This log file -must be enabled through the ownCloud Administration page. On that page, you can +The Nextcloud server also maintains an Nextcloud specific log file. This log file +must be enabled through the Nextcloud Administration page. On that page, you can adjust the log level. We recommend that when setting the log file level that you set it to a verbose level like ``Debug`` or ``Info``. You can view the server log file using the web interface or you can open it -directly from the file system in the ownCloud server data directory. +directly from the file system in the Nextcloud server data directory. .. todo:: Need more information on this. How is the log file accessed? Need to explore procedural steps in access and in saving this file ... similar @@ -198,7 +198,7 @@ Webserver Log Files ~~~~~~~~~~~~~~~~~~~ It can be helpful to view your webserver's error log file to isolate any -ownCloud-related problems. For Apache on Linux, the error logs are typically +Nextcloud-related problems. For Apache on Linux, the error logs are typically located in the ``/var/log/apache2`` directory. Some helpful files include the following: @@ -215,7 +215,7 @@ Core Dumps On Mac OS X and Linux systems, and in the unlikely event the client software crashes, the client is able to write a core dump file. Obtaining a core dump -file can assist ownCloud Customer Support tremendously in the debugging +file can assist Nextcloud Customer Support tremendously in the debugging process. To enable the writing of core dump files, you must define the @@ -224,7 +224,7 @@ To enable the writing of core dump files, you must define the For example: ``` -OWNCLOUD_CORE_DUMP=1 owncloud +OWNCLOUD_CORE_DUMP=1 nextcloud ``` This command starts the client with core dumping enabled and saves the files in @@ -233,4 +233,4 @@ the current working directory. .. note:: Core dump files can be fairly large. Before enabling core dumps on your system, ensure that you have enough disk space to accommodate these files. Also, due to their size, we strongly recommend that you properly compress any - core dump files prior to sending them to ownCloud Customer Support. + core dump files prior to sending them to Nextcloud Customer Support. diff --git a/doc/visualtour.rst b/doc/visualtour.rst index 0d2e29ba9..23704a437 100644 --- a/doc/visualtour.rst +++ b/doc/visualtour.rst @@ -6,7 +6,7 @@ Visual Tour Icon ---- -The ownCloud Client remains in the background and is visible +The Nextcloud Client remains in the background and is visible as an icon in the system tray (Windows, KDE), status bar (MAC OS X), or notification area (Ubuntu). @@ -20,19 +20,19 @@ Menu A right click on the icon (left click on Ubuntu and Mac OS X) provides the following menu: -* ``Open ownCloud in browser``: Opens the ownCloud web interface -* ``Open folder 'ownCloud'``: Opens the local folder. If multiple +* ``Open Nextcloud in browser``: Opens the Nextcloud web interface +* ``Open folder 'Nextcloud'``: Opens the local folder. If multiple sync targets have been defined, an entry will exist for each local folder. * **Disk space indicator**: Shows how much space is used on the server. * Operation indicator: Shows the status of the current sync process, or ``Up to date`` if server and client are in sync. * **Recent Changes**: shows the last six files modified by sync operations, and provides access to the Sync status, which lists all changes - since the last restart of ownCloud Client. + since the last restart of Nextcloud Client. * ``Settings...``: provides access to the settings menu. * ``Help``: Opens a browser to display this help. * ``Log out``: Logs the client out of the server. -* ``Quit ownCloud``: Quits ownCloud Client, ending a currently running +* ``Quit Nextcloud``: Quits Nextcloud Client, ending a currently running sync run. Settings @@ -48,7 +48,7 @@ folders in the account and gives the ability to modify them. Where: -* ``Connected to as ``: Indicates the ownCloud server +* ``Connected to as ``: Indicates the Nextcloud server which the client is syncing with and the user account on that server. * ``Add Folder Sync Connection...``: Provides the ability to add another folder to the sync @@ -60,7 +60,7 @@ Where: root. First, remove the root from sync, then add the folders to sync as desired. * ``Storage Usage``: Provides further details on the storage utilization on the - ownCloud server. + Nextcloud server. * ``Edit Ignored Files``: Provides a list of files which will be ignored, i.e., will not sync between the client and server. The ignored files editor allows adding patterns for files or directories that should be excluded from the @@ -68,7 +68,7 @@ Where: ‘*’ indicating multiple characters, or a question mark ‘?’ indicating a single character. -* ``Modify Account``: Allows the user to change the ownCloud server being synced +* ``Modify Account``: Allows the user to change the Nextcloud server being synced to. It brings up the Setting up an Account (see above) windows. .. image:: images/settings_account.png @@ -120,7 +120,7 @@ The tab provides several useful options: * ``Launch on System Startup``: This option is automatically activated once a user has conimaged his account. Un-checking the box will cause - ownCloud client to not launch on startup for a particular user. + Nextcloud client to not launch on startup for a particular user. * ``Show Desktop Nofications``: When checked, bubble notifications when a set of sync operations has been performed are provided. * ``Use Monochrome Icons``: Use less obtrusive icons. Especially useful @@ -141,7 +141,7 @@ This tab consolidates ``Proxy Settings`` and ``Bandwith Limiting``: Proxy Settings ^^^^^^^^^^^^^^ -* ``No Proxy``: Check this if ownCloud Client should circumvent the default +* ``No Proxy``: Check this if Nextcloud Client should circumvent the default proxy conimaged on the system. * ``Use system proxy``: Default, will follow the systems proxy settings. On Linux, this will only pick up the value of the variable ``http_proxy``. @@ -162,14 +162,14 @@ Bandwidth Limiting The Download Bandwidth can be either unlimited (default) or limited to a custom value. This is the bandwidth available for data flowing from the -ownCloud Server to the client. +Nextcloud Server to the client. The Upload Bandwidth, the bandwidth available or data flowing from the -ownCloud client to the server, has an additional option to limit automatically. +Nextcloud client to the server, has an additional option to limit automatically. -When this option is checked, the ownCloud client will surrender available +When this option is checked, the Nextcloud client will surrender available bandwidth to other applications. Use this option if there are issues with -real time communication in conjunction with the ownCloud Client. +real time communication in conjunction with the Nextcloud Client. .. _ignoredFilesEditor-label: @@ -178,7 +178,7 @@ The Ignored Files Editor .. index:: ignored files, exclude files, pattern -ownCloud Client has the ability to exclude files from the sync process. +Nextcloud Client has the ability to exclude files from the sync process. The ignored files editor allows editing of custom patterns for files or directories that should be excluded from the sync process. @@ -205,7 +205,7 @@ which are matched by this pattern are fleeting metadata which the client will .. note:: Custom entries are currently not validated for syntactical correctness by the editor, but might fail to load correctly. -In addition to this list, ownCloud Client always excludes files with +In addition to this list, Nextcloud Client always excludes files with characters that cannot be synced to other file systems. With version 1.5.0 it also ignores files that caused individual errors