Merge branch 'master' of https://github.com/stayradiated/Nitro-Sync

Conflicts: sync.js
clooth · Jun 21, 2012 · aaf84e7 · aaf84e7
2 parents f0613d5 + 2727d8a
commit aaf84e7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/site/favicon.ico b/site/favicon.ico
diff --git a/site/nitroicon.png b/site/nitroicon.png
diff --git a/site/privacy.html b/site/privacy.html
@@ -11,15 +11,15 @@ <h1>Privacy Policy</h1>
 <h2>Information we Collect</h2>
 <p>We do not collect any user data but we collect anonymous analytics when Nitro is synced.</p>
 <ul>
-	<li>OS (e.g. windows)</li>
-	<li>Language (e.g english)</li>
-	<li>Nitro version (e.g. 1.2)</li>
+	<li>OS (e.g. Linux)</li>
+	<li>Language (e.g English)</li>
+	<li>Nitro version (e.g. 1.3)</li>
 	<li>Nitro backend (the service you use to store your Nitro information e.g Dropbox, Ubuntu One)</li>
-	<li>User ID (e.g. 1235612756)</li>
+	<li>Email address</li>
 </ul>
 <h2>How we use this information</h2>
 <p>
-	We collect anonymous analytics so we can measure traffic and provide the best possible experience.
+	We collect anonymous analytics so we can measure traffic and provide the best possible experience. We collect email addresses so if someone is abusing the system, we can contact or block them. Your information is safe with us.
 </p>
 <p>
 	Our Nitro sync server does not store data. Your data is in the hands of the service you choose. Before your data can be synced to the storage backend of your choosing, it needs to go through our server to be merged. Our server prevents creation of &ldquo;conflicted copies&rdquo;. If you wish to run this server yourself, the software is avaliable at <a href="http://github.com/Nitro-Sync">http://github.com/stayradiated/Nitro-Sync</a>

diff --git a/site/screenshots/sync.png b/site/screenshots/sync.png