Split up source and source_link. Never trust HTML!

[quix0rs-gnu-social.git] / README.md

diff --git a/README.md b/README.md
index 806ab5f7bc3ebb5c53993933218ec7b7064a4753..7dfe8ae05c0001b7d0660abd3f3bf89231c9440f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-# GNU social 1.1.2 (alpha)
-August 2014
+# GNU social 1.2.x
+2015

 
 (c) Free Software Foundation, Inc
 (c) StatusNet, Inc
 
 (c) Free Software Foundation, Inc
 (c) StatusNet, Inc


@@ -32,8 +32,8 @@ polls, announce events, or other social activities
 (and you can add more!). Users can choose which
 people to "follow" and receive only their friends'
 or colleagues' status messages. It provides a
 (and you can add more!). Users can choose which
 people to "follow" and receive only their friends'
 or colleagues' status messages. It provides a

-similar service to sites like Twitter, Google+ or
-Facebook, but is much more awesome.
+similar service to proprietary social network sites,
+but is much more awesome.

 
 With a little work, status messages can be sent to
 mobile phones, instant messenger programs (using
 
 With a little work, status messages can be sent to
 mobile phones, instant messenger programs (using


@@ -41,13 +41,13 @@ XMPP), and specially-designed desktop clients that
 support the Twitter API.
 
 GNU social supports an open standard called
 support the Twitter API.
 
 GNU social supports an open standard called

-OStatus <http://ostatus.org/> that lets users in
+OStatus <https://www.w3.org/community/ostatus/> that lets users in

 different networks follow each other. It enables a
 distributed social network spread all across the
 Web.
 
 different networks follow each other. It enables a
 distributed social network spread all across the
 Web.
 

-GNU social was originally developed for the
-service, Identi.ca <http://identi.ca/>.
+GNU social was originally developed as "StatusNet" by
+StatusNet, Inc. with Evan Prodromou as lead developer.

 
 It is shared with you in hope that you too make an
 service available to your users. To learn more,
 
 It is shared with you in hope that you too make an
 service available to your users. To learn more,


@@ -100,13 +100,19 @@ for additional terms.
 
 ## New this version
 
 
 ## New this version
 

-This is a security fix and bug fix release since 1.1.1-alpha2.
-The current release base version, 1.1.2, began work on 2014-10-25.
-All 1.1.1 sites should upgrade to this version.
+This is the development branch for the 1.2.x version of GNU social.
+All daring 1.1.x admins should upgrade to this version.

 
 So far it includes the following changes:
 
 
 So far it includes the following changes:
 

-- XSS security fix (thanks Simon Waters, <https://www.surevine.com/> )
+- Backing up a user's account is more and more complete.
+- Emojis 😸 (utf8mb4 support)
+
+The last release, 1.1.3, gave us these improvements:
+
+- XSS security fix (thanks Simon Waters, <https://www.surevine.com/>)
+- Many improvements to ease adoption of the Qvitter front-end <https://github.com/hannesmannerheim/qvitter>
+- Protocol adaptions for improved performance and stability

 
 Upgrades from _StatusNet_ 1.1.1 will also experience these improvements:
 
 
 Upgrades from _StatusNet_ 1.1.1 will also experience these improvements:
 


@@ -138,13 +144,13 @@ to install the development version of GNU social.
 To get it, use the git version control tool
 <http://git-scm.com/> like so:
 
 To get it, use the git version control tool
 <http://git-scm.com/> like so:
 

-    git clone git@gitorious.org:social/mainline.git
+    git clone git@git.gnu.io:gnu/gnu-social.git

 
 In the current phase of development it is probably
 recommended to use git as a means to stay up to date
 with the source code. You can choose between these
 branches:
 
 In the current phase of development it is probably
 recommended to use git as a means to stay up to date
 with the source code. You can choose between these
 branches:

-- 1.1.x     "stable", few updates, well tested code
+- 1.2.x     "stable", few updates, well tested code

 - master    "testing", more updates, usually working well
 - nightly   "unstable", most updates, not always working
 
 - master    "testing", more updates, usually working well
 - nightly   "unstable", most updates, not always working
 


@@ -154,14 +160,14 @@ To keep it up-to-date, use 'git pull'. Watch for conflicts!
 
 There are several ways to get more information about GNU social.
 
 
 There are several ways to get more information about GNU social.
 

-* The #social IRC channel on freenode.net <http://www.freenode.net/>.
-* The GNU social website <http://gnu.io/social/>
-* Following us on GNU social -- <http://quitter.se/gnusocial>
+* The #social IRC channel on freenode.net <https://www.freenode.net/>.
+* The unofficial XMPP room linked to IRC on <xmpp:gnusocial@conference.bka.li>
+* The GNU social website <https://gnu.io/social/>
+* Following us on GNU social -- <https://quitter.se/gnusocial>

 
 * GNU social has a bug tracker for any defects you may find, or ideas for
 
 * GNU social has a bug tracker for any defects you may find, or ideas for

-  making things better. <http://bugz.foocorp.net/>
-* Patches are welcome, either on the bug tracker or our repository at
-  Gitorious. <https://gitorious.org/social/mainline>
+  making things better. <https://git.gnu.io/gnu/gnu-social/issues/>
+* Patches are welcome, preferrably to our repository on git.gnu.io. <https://git.gnu.io/gnu/gnu-social>

 
 Credits
 =======
 
 Credits
 =======


@@ -221,6 +227,7 @@ Thanks to all of the StatusNet developers:
 * James Walker, StatusNet, Inc.
 * Samantha Doherty, designer, StatusNet, Inc.
 * Simon Waters, Surevine
 * James Walker, StatusNet, Inc.
 * Samantha Doherty, designer, StatusNet, Inc.
 * Simon Waters, Surevine

+* Joshua Judson Rosen (rozzin)

 
 ### Extra special thanks to the GNU socialites
 
 
 ### Extra special thanks to the GNU socialites
 


@@ -241,4 +248,3 @@ built the fediverse network to what it is today.
 ### License help from
 
 * Bradley M. Kuhn
 ### License help from
 
 * Bradley M. Kuhn

-