diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2017-12-14 12:27:11 +0300 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2017-12-14 12:27:11 +0300 |
| commit | fe4bb52a6d5f46259deb2e230cccb4ed61822826 (patch) | |
| tree | 56883af15ee071b20ceaea634eaa3373e3a4d3e3 /doc | |
| parent | 042816bd0d6421f14da2cc1370252ed5230c406c (diff) | |
| parent | f40cceaf04e8ca8f7b2f1eb4ec23c3d043a8951c (diff) | |
Merge remote-tracking branch 'oc/master' into oc_up
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | doc/autoupdate.rst | 2 | ||||
| -rw-r--r-- | doc/conffile.rst | 6 |
3 files changed, 5 insertions, 13 deletions
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index f706a701c..762a42830 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -4,7 +4,6 @@ if(SPHINX_FOUND) set(SPHINX_CACHE_DIR "${CMAKE_CURRENT_BINARY_DIR}/_doctrees") # HTML output directory set(SPHINX_HTML_DIR "${CMAKE_CURRENT_BINARY_DIR}/html") - set(SPHINX_MAN_DIR "${CMAKE_CURRENT_BINARY_DIR}/man1") 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") @@ -17,8 +16,6 @@ if(SPHINX_FOUND) install(DIRECTORY ${SPHINX_PDF_DIR} DESTINATION ${APPLICATION_DOC_DIR} OPTIONAL) install(DIRECTORY ${SPHINX_QCH_DIR} DESTINATION ${APPLICATION_DOC_DIR} OPTIONAL) - install(DIRECTORY ${SPHINX_MAN_DIR} DESTINATION ${CMAKE_INSTALL_MANDIR} OPTIONAL) - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in" conf.py @ONLY) if(WITH_DOC) @@ -79,11 +76,6 @@ if(SPHINX_FOUND) -D html_theme=owncloud_com ${CMAKE_CURRENT_SOURCE_DIR} ${SPHINX_HTML_DIR}/com ) - add_custom_target( doc-man ${SPHINX_EXECUTABLE} - -q -c . -b man - -d ${SPHINX_CACHE_DIR}/man - ${CMAKE_CURRENT_SOURCE_DIR} - ${SPHINX_MAN_DIR} ) ## Building CHM files requires HTML Help Workshop. Since it requires wine ## with special dependencies, it's impossible to write a cmake check for it. @@ -98,4 +90,4 @@ if(SPHINX_FOUND) ${SPHINX_HTMLHELP_DIR} ) add_custom_target( doc-chm pushd ${SPHINX_HTMLHELP_DIR}; ${MSHTML_COMPILER} *.hhp; popd DEPENDS doc-chm-sphinx ) -endif(SPHINX_FOUND) +endif(SPHINX_FOUND)
\ No newline at end of file diff --git a/doc/autoupdate.rst b/doc/autoupdate.rst index ad0ff0340..e581a70ae 100644 --- a/doc/autoupdate.rst +++ b/doc/autoupdate.rst @@ -119,7 +119,7 @@ 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/.local/share/data/ownCloud/owncloud.cfg``. +client configuration file, ``$HOME/.config/ownCloud/owncloud.cfg``. Add this line to the [General] section:: skipUpdateCheck=true diff --git a/doc/conffile.rst b/doc/conffile.rst index 3fdcc179b..dda2bd68b 100644 --- a/doc/conffile.rst +++ b/doc/conffile.rst @@ -1,13 +1,13 @@ The ownCloud Client reads a configuration file. You can locate this configuration file as follows: On Linux distributions: - ``$HOME/.local/share/data/ownCloud/owncloud.cfg`` + ``$HOME/.config/ownCloud/owncloud.cfg`` On Microsoft Windows systems: - ``%LOCALAPPDATA%\ownCloud\owncloud.cfg`` + ``%APPDATA%\ownCloud\owncloud.cfg`` On MAC OS X systems: - ``$HOME/Library/Application Support/ownCloud/owncloud.cfg`` + ``$HOME/Library/Preferences/ownCloud/owncloud.cfg`` The configuration file contains settings using the Microsoft Windows .ini file |