octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-11-09 23:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1625 from Moter8/patch-1

Browse Source 
Reword and clarify some sentences.
This commit is contained in:
Jakob Borg 2015-04-10 13:48:14 +02:00
commit 270649535e
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
README.md
View File

@ -5,18 +5,17 @@ syncthing
[![API Documentation](http://img.shields.io/badge/api-Godoc-blue.svg?style=flat-square)](http://godoc.org/github.com/syncthing/syncthing) [![API Documentation](http://img.shields.io/badge/api-Godoc-blue.svg?style=flat-square)](http://godoc.org/github.com/syncthing/syncthing)
[![MPLv2 License](http://img.shields.io/badge/license-MPLv2-blue.svg?style=flat-square)](https://www.mozilla.org/MPL/2.0/) [![MPLv2 License](http://img.shields.io/badge/license-MPLv2-blue.svg?style=flat-square)](https://www.mozilla.org/MPL/2.0/)
This is the `syncthing` project. The following are the project goals: This is the `syncthing` project which pursues the following goals:
1. Define a protocol for synchronization of a folder between a number of 1. Define a protocol for synchronization of a folder between a number of
collaborating devices. The protocol should be well defined, unambiguous, collaborating devices. This protocol should be well defined, unambiguous,
easily understood, free to use, efficient, secure and language neutral. easily understood, free to use, efficient, secure and language neutral.
This is the [Block Exchange This is called the [Block Exchange
Protocol](https://github.com/syncthing/specs/blob/master/BEPv1.md). Protocol](https://github.com/syncthing/specs/blob/master/BEPv1.md).
2. Provide the reference implementation to demonstrate the usability of 2. Provide the reference implementation to demonstrate the usability of
said protocol. This is the `syncthing` utility. It is the hope that said protocol. This is the `syncthing` utility. We hope that
alternative, compatible implementations of the protocol will come to alternative, compatible implementations of the protocol will arrise.
exist.
The two are evolving together; the protocol is not to be considered The two are evolving together; the protocol is not to be considered
stable until syncthing 1.0 is released, at which point it is locked down stable until syncthing 1.0 is released, at which point it is locked down
@ -32,20 +31,20 @@ There are a few examples for keeping syncthing running in the background
on your system in [the etc directory](https://github.com/syncthing/syncthing/blob/master/etc). on your system in [the etc directory](https://github.com/syncthing/syncthing/blob/master/etc).
There is an IRC channel, `#syncthing` on Freenode, for talking directly There is an IRC channel, `#syncthing` on Freenode, for talking directly
to developers and users (when awake and present, etc.). to developers and users.
Building Building
-------- --------
Building Syncthing from source is easy, and there's a Building Syncthing from source is easy, and there's a
[guide](https://github.com/syncthing/syncthing/wiki/Building). [guide](https://github.com/syncthing/syncthing/wiki/Building).
that describes it for both Unix and Windows. that describes it for both Unix and Windows systems.
Signed Releases Signed Releases
--------------- ---------------
As of v0.10.15 and onwards, git tags and release binaries are GPG signed As of v0.10.15 and onwards, git tags and release binaries are GPG signed
with the key D26E6ED000654A3E (see http://syncthing.net/security.html). with the key D26E6ED000654A3E (see https://syncthing.net/security.html).
For release binaries, MD5 and SHA1 checksums are calculated and signed, For release binaries, MD5 and SHA1 checksums are calculated and signed,
available in the md5sum.txt.asc and sha1sum.txt.asc files. available in the md5sum.txt.asc and sha1sum.txt.asc files.
@ -57,4 +56,4 @@ documentation](https://github.com/syncthing/syncthing/wiki/) is on the
Github wiki. Github wiki.
All code is licensed under the All code is licensed under the
[MPLv2](https://github.com/syncthing/syncthing/blob/master/LICENSE). [MPLv2 License](https://github.com/syncthing/syncthing/blob/master/LICENSE).