From 4e0314d633c6867fc9bdeccc8488ea4147cab55d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Colomb?= Date: Thu, 30 Nov 2023 20:58:09 +0100 Subject: Fixup merge error duplicating lines, wrapping & whitespace. --- users/ignoring.rst | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/users/ignoring.rst b/users/ignoring.rst index 8412f71..ca21bb4 100644 --- a/users/ignoring.rst +++ b/users/ignoring.rst @@ -15,7 +15,6 @@ Synopsis Description ----------- -If some files should not be synchronized to (or from) other devices, a file called If some files should not be synchronized to (or from) other devices, a file called ``.stignore`` can be created containing file patterns to ignore. The ``.stignore`` file must be placed in the root of the synced folder (files in other locations are @@ -23,7 +22,6 @@ not applied). The ``.stignore`` file itself will never be synced to other devic although it can ``#include`` files that *are* synchronized between devices. All patterns are relative to the synced folder root. The contents of the ``.stignore`` file must be UTF-8 encoded. -The contents of the ``.stignore`` file must be UTF-8 encoded. .. note:: @@ -82,8 +80,9 @@ The ``.stignore`` file contains a list of file or path patterns. The still relative to the synced folder *root*. Example: ``#include more-patterns.txt``. - Any ``#include`` directives inside a file loaded by ``#include`` require paths specified relative - to the directory containing the loaded file, rather than the synchronised root directory. + Any ``#include`` directives inside a file loaded by ``#include`` require paths + specified relative to the directory containing the loaded file, rather than the + synchronised root directory. - A pattern beginning with a ``!`` prefix negates the pattern: matching files are *included* (that is, *not* ignored). This can be used to override @@ -99,7 +98,7 @@ The ``.stignore`` file contains a list of file or path patterns. The they are preventing directory deletion. This prefix should be used by any OS generated files which you are happy to be removed. -- A line beginning with ``//`` is a comment and has no effect. The same double +- A line beginning with ``//`` is a comment and has no effect. The same double slashes in any other place are interpreted literally, e.g. trying to do ``file // comment`` will make Syncthing look for a file called ``file // comment``. -- cgit v1.2.3