Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Typo / cleanup

This commit is contained in:
Jakob Borg 2013-12-29 10:23:43 -05:00
parent 454e672d42
commit c70fef1208
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -47,7 +47,7 @@ The following features are _currently implemented and working_:
* Handling of deleted files. Deletes can be propagated or ignored per
client.
* Synchronizing multiple unrelated directory tries by following
* Synchronizing multiple unrelated directory trees by following
symlinks directly below the repository level.
The following features are _not yet implemented but planned_:
@ -62,8 +62,7 @@ the future:
* Syncing multiple directories from the same syncthing instance.
* Automatic NAT handling via UPNP. Required for the above, not very
useful without it.
* Automatic NAT handling via UPNP.
* Conflict resolution. Currently whichever file has the newest
modification time "wins". The correct behavior in the face of