Remove merge conflict markers in the troubleshooting appendix

This fixes https://github.com/owncloud/docs/issues/603 and also cleans
up the file so that it renders correctly.

1 files changed, 38 insertions, 109 deletions

diff --git a/docs/modules/ROOT/pages/troubleshooting.adoc b/docs/modules/ROOT/pages/troubleshooting.adoc
index 99b44f699..64f38ff05 100644
--- a/docs/modules/ROOT/pages/troubleshooting.adoc
+++ b/docs/modules/ROOT/pages/troubleshooting.adoc
@@ -1,107 +1,33 @@
 = Appendix C: Troubleshooting
+:experimental:
+:files-antivirus-app-url: https://github.com/owncloud/files_antivirus
 
 The following two general issues can result in failed synchronization:
 
 * The server setup is incorrect.
 * The client contains a bug.
 
-<<<<<<< HEAD
-When reporting bugs, it is helpful if you first determine what part of
-the system is causing the issue.
-
-Identifying Basic Functionality Problems
-----------------------------------------
-
-Performing a general ownCloud 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.
-  +
-  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 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:
-  +
-  * Open a browser window and enter the address to the ownCloud 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`.
-  +
-  If you are prompted for your username and password but, after
-  providing the correct credentials, authentication fails, please ensure
-  that your authentication backend is configured properly.
-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. 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.
-  +
-  As an example, after installing the `cadaver` app, you can issue the
-  `propget` command to obtain various properties pertaining to the
-  current directory and also verify WebDAV server connection.
-
-"CSync unknown error"
----------------------
-
-If you see this error message stop your client, delete the
-`.sync_xxxxxxx.db` file, and then restart your client. There is a
-hidden `.sync_xxxxxxx.db` file inside the folder of every account
-configured on your client.
-
-Note
-
-Please note that this will also erase some of your settings about which
-files to download.
-
-See https://github.com/owncloud/client/issues/5226 for more discussion
-of this issue.
-
-Isolating other issues
-----------------------
-=======
 When reporting bugs, it is helpful if you first determine what part of the system is causing the issue.
 
 == Identifying Basic Functionality Problems
 
-=== Performing a general ownCloud 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.
-
-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 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:
-
-* Open a browser window and enter the address to the ownCloud WebDAV server.
-  For example, if your ownCloud instance is installed at `http://yourserver.com/owncloud`, your WebDAV server address isi `http://yourserver.com/owncloud/remote.php/webdav`. If you are prompted for your username and password but, after.
-  providing the correct credentials, authentication fails, please ensure that your authentication backend is configured properly.
+Performing a general ownCloud 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.
+  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.
 
-=== Use a WebDAV command line tool to test
+Ensure the WebDAV API is working::
+  If all desktop clients fail to connect to the ownCloud 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, open a browser window and enter the address to the ownCloud WebDAV server. For example, if your ownCloud instance is installed at `http://yourserver.com/owncloud`, your WebDAV server address isi `http://yourserver.com/owncloud/remote.php/webdav`. If you are prompted for your username and password but, after providing the correct credentials, authentication fails, please ensure that your authentication backend is configured properly.
 
-A more sophisticated test method for troubleshooting synchronization issues is to use a WebDAV command line client and log into the ownCloud 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.
-As an example, after installing the `cadaver` app, you can issue the `propget` command to obtain various properties pertaining to the current directory and also verify WebDAV server connection.
+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.
+  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.
+  As an example, after installing the `cadaver` app, you can issue the `propget` command to obtain various properties pertaining to the current directory and also verify WebDAV server connection.
 
 == "CSync unknown error"
 
@@ -112,8 +38,7 @@ NOTE: Please note that this will also erase some of your settings about which fi
 
 See https://github.com/owncloud/client/issues/5226 for more discussion of this issue.
 
-== Isolating other issues
->>>>>>> Replace reStructuredText formatting with AsciiDoc and reflow text
+== Isolating Other Issues
 
 Other issues can affect synchronization of your ownCloud files:
 
@@ -129,7 +54,7 @@ For more information about ignored files, see `ignored-files-label`.
 The data directory on the server is exclusive to ownCloud 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.
-* If you are experiencing slow upload/download speed or similar performance issues be aware that those could be caused by on-access virus scanning solutions, either on the server (like the files_antivirus app) or the client.
+* If you are experiencing slow upload/download speed or similar performance issues be aware that those could be caused by on-access virus scanning solutions, either on the server (like {files-antivirus-app-url}[the files_antivirus app]) or the client.
 ====
 
 == Log Files
@@ -145,27 +70,28 @@ The client log file is often the most helpful log to provide.
 There are several ways to produce log files.
 The most commonly useful is enabling logging to a temporary directory, described first.
 
-[NOTE] Client log files contain file and folder names, metadata, server urls and other private information.
+[NOTE]
+====
+Client log files contain file and folder names, metadata, server URLs and other private information.
 Only upload them if you are comfortable sharing the information.
 Logs are often essential for tracking down a problem though, so please consider providing them to developers privately.
+====
 
 ==== Logging to a Temporary Directory
 
-1.  Open the ownCloud Desktop Client.
-2.  Press F12 or Ctrl-L or Cmd+L on your keyboard.
-
-----
+.  Open the ownCloud Desktop Client.
+.  Press btn:[F12] or btn:[Ctrl-L] or btn:[Cmd+L] on your keyboard.
++
 The Log Output window opens.
-
++
 image:log_output_window.png[image]
-----
-
-1.  Enable the 'Permanently save logs' checkbox.
-2.  Look at its tooltip and take note of the directory the logs will be saved to.
-3.  Navigate to this directory.
-4.  Select the logs for the time frame in which the issue occurred.
++
+.  Enable the btn:[Permanently save logs] checkbox.
+.  Look at its tooltip and take note of the directory the logs will be saved to.
+.  Navigate to this directory.
+.  Select the logs for the time frame in which the issue occurred.
 
-NOTE: that the choice to enable logging will be persist across client restarts.
+NOTE: That the choice to enable logging will be persist across client restarts.
 
 ==== Saving Files Directly
 
@@ -214,7 +140,7 @@ You can find more information about Apache logging at `http://httpd.apache.org/d
 
 == 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.
+On macOS 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 process.
 
 To enable the writing of core dump files, you must define the `OWNCLOUD_CORE_DUMP` environment variable on the system.
@@ -225,4 +151,7 @@ For example:
 
 This command starts the client with core dumping enabled and saves the files in 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.
+[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.
+====