diff options
| author | Jakob Borg <jakob@nym.se> | 2013-12-29 10:23:43 -0500 |
|---|---|---|
| committer | Jakob Borg <jakob@nym.se> | 2013-12-29 10:23:43 -0500 |
| commit | c70fef1208335795b9218b6beb0c0e277cb2947f (patch) | |
| tree | 241b60ee48ab5d39fe0f001b1d1aba01a4ec96e4 /README.md | |
| parent | 454e672d427a59d203acba581a2380948bb281e7 (diff) | |
Typo / cleanup
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -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 |