Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x

Conflicts:

	lib/util.php

1 files changed, 45 insertions, 0 deletions

diff --git a/doc-src/privacy b/doc-src/privacy
new file mode 100644
index 000000000..90c7b3c7f
--- /dev/null
+++ b/doc-src/privacy
@@ -0,0 +1,45 @@
+This document outlines this service's respect for your personal
+privacy as a user of the service.
+
+- Almost all the text and files that users upload to this site is
+  available under the site license (see the license block at the bottom
+  of this page). Users agree to the license when they register to use
+  the site for the first time. Typically that means that the data can
+  be copied far and wide, for commercial and non-commercial purposes,
+  and in modified or unmodified form. If you're not OK with that,
+  don't use the service.
+- The following data items are considered *private data* that won't be
+  shared with other users, business partners, or the public at large:
+  * your password
+  * your email address
+  * your IM address (AIM, Jabber, or other instant messaging address)
+  * your phone number
+  * your "private messages"
+  * your login credentials (username and password) for other services (Twitter, Facebook, etc.)
+- Some private data may be published in aggregate, e.g. "30% of our
+  users are registered with Hotmail addresses."
+- Your notices (including files) can be downloaded and re-used by
+  other services, either one-by-one or in bulk as
+  [RSS](http://en.wikipedia.org/wiki/RSS) files.
+- Your profile information (including subscriptions and avatars) can be
+  downloaded and re-used by other services, either scraped from the HTML
+  interface or in bulk as [FOAF](http://en.wikipedia.org/wiki/FOAF) files.
+- Your notices will be forwarded to users who subscribe to them,
+  including users on another microblogging service.
+- Your profile information will be sent to microblogging services for
+  users who subscribe to you or to whom you subscribe.
+- Based on your email preferences, you may receive automated email
+  messages for important system events, such as when others subscribe
+  to your notices.
+- Based on your email preferences, you may receive an email
+  newsletter. You can opt out of the newsletter if you don't want to
+  receive it.
+- In urgent situations, administrators may send you email directly to
+  your registered email address, even if you've requested no notices
+  or newsletter. *Administrators will use digitally-signed email.*
+- This service will comply with court orders to turn over your private
+  information.
+  
+  
+  
+