Skip to content

Commit 5349312

Browse files
authored
Merge pull request #14463 from nextcloud/jtr/admin-to-user-desktop-moves
docs(desktop-client): re-org between Admin -> User Manual
2 parents b8efb25 + c6ad1d5 commit 5349312

7 files changed

Lines changed: 21 additions & 12 deletions

File tree

admin_manual/desktop/index.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,7 @@ Your files are always automatically synchronized between your Nextcloud server,
1414
.. toctree::
1515
:maxdepth: 1
1616

17-
options
1817
massdeployment
19-
configfile
20-
envvars
21-
commandline
2218
troubleshooting
2319

2420
You can find additional information here:
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
===================
2-
Command Line Client
3-
===================
1+
=============================
2+
Using the Command-Line Client
3+
=============================
44

55
The Nextcloud Client packages contain a command line client, ``nextcloudcmd``, that can
66
be used to synchronize Nextcloud files to client machines.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,4 @@ Some interesting values that can be set on the configuration file are:
9090
| | | ``2`` for No Proxy. |
9191
+ + +--------------------------------------------------------------------------------------------------------+
9292
| | | ``3`` for HTTP(S) Proxy. |
93-
+---------------------------------+---------------+--------------------------------------------------------------------------------------------------------+
93+
+---------------------------------+---------------+--------------------------------------------------------------------------------------------------------+
File renamed without changes.

user_manual/desktop/index.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ synchronized between your computer and your Nextcloud server.
1111
installation
1212
uninstallation
1313
usage
14-
macosvfs
14+
commandline
15+
options
16+
configfile
17+
envvars
1518
autoupdate
1619
updatechannel
1720
conflicts
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
=======
2-
Options
3-
=======
1+
====================
2+
Command-Line Options
3+
====================
44

55
You have the option of starting your Nextcloud desktop client with the
66
``nextcloud`` command. The following options are supported:

user_manual/desktop/usage.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,3 +281,13 @@ this list:
281281
- Files are removed that cause individual errors three times during a
282282
synchronization. However, the client provides the option of retrying a
283283
synchronization three additional times on files that produce errors.
284+
285+
Virtual Files on macOS
286+
----------------------
287+
288+
For information about using virtual files integration on macOS, see:
289+
290+
.. toctree::
291+
:maxdepth: 1
292+
293+
macosvfs

0 commit comments

Comments
 (0)