From e7738895ceb0840a6eaad6ef501bbc57f62efd03 Mon Sep 17 00:00:00 2001
From: Diogo Cordeiro <diogo@fc.up.pt>
Date: Mon, 23 Dec 2019 15:36:49 +0000
Subject: [PATCH] [DOCUMENTATION] Updated TODO and branches info

---
 CHANGELOG.md |  4 ++--
 CREDITS.md   |  3 +--
 README.md    |  8 +++++---
 TODO.md      | 29 ++++++++++-------------------
 4 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9a6cb84b0..a6e774a76a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,11 +16,11 @@ Load and Storage:
 - Improved memcached support
 
 Federation:
-- Add ActivityPub support
+- Added ActivityPub support
 - RemoteFollow: Remote follow ActivityPub and OStatus remote actors via the click of a button
 - ActorLists: Allow to create collections of Actors and to interact with them - supports both OStatus and ActivityPub
 - The Free Network: Automagically migrate internal remote profiles between Free Network protocols
-- Enable the search box to import remote notices and profiles
+- Enabled the search box to import remote notices and profiles
 - Improvements on Nodeinfo (and new route)
 
 General:
diff --git a/CREDITS.md b/CREDITS.md
index 79651fbbf4..4a7d2bb5cc 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -46,7 +46,7 @@ Additional Contributors
 * Blaine Cook
 * Henry Story
 * Melvin Carvalho
-* chimo
+* Stéphane Bérubé
 * Akio
 * Maiyannah Bishop
 * Bob Mottram
@@ -55,7 +55,6 @@ Additional Contributors
 * Moonman
 * Normandy
 * Verius
-* Alexei Sorokin
 * Daniel Supernault
 
 Credits for StatusNet
diff --git a/README.md b/README.md
index 6dacd2ee79..2780857c78 100644
--- a/README.md
+++ b/README.md
@@ -121,9 +121,11 @@ 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.20.x    "oldstable", few updates, well tested coded
-* master    "stable", usually working well
-* nightly   "testing", most updates, not always working as expected
+* 1.20.x    "oldstable", few updates, well tested coded ( **recommended** )
+* master    "stable", usually working well (should be safe)
+* nightly   "testing", most updates, not always working as expected (can be dangerous)
+
+**IMPORTANT: We force push to the nightly branch, the nightly branch is intended for GNU social developers only.**
 
 To keep it up-to-date, use `git pull`. Watch for conflicts!
 
diff --git a/TODO.md b/TODO.md
index df897d8ebf..dda2622d07 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,24 +1,15 @@
 # TODO
 
-Load and Storage:
-- Upgrade STOMP queue
-- Port PEAR DB_DataObject to PDO_DataObject
+Hi! Thank you for your interest in contributing, please refer to
+[DOCUMENTATION/DEVELOPERS](https://notabug.org/diogo/gnu-social/src/nightly/DOCUMENTATION/DEVELOPERS)
+to learn how you can contribute.
 
-Network:
-- Port PEAR HTTP to Guzzle
-- Port PEAR Mail to PHPSendMail
-- Add OAuth2 support (deprecate OAuth1?)
+Our roadmap is available in the following Kanban board:
+[Kanban Board](https://kanban.diogo.site/?controller=BoardViewController&action=readonly&token=03795efb8138c4e7661a900c234c0df1bc3fc03cdfcda8619cd5d0e666de).
 
-General:
-- Fix failling unit tests
-- Improve Cronish
-  - Run session garbage collection
-  - Cleanup Email Registration
-- Refactoring of confirmation codes
-- Refactoring of Exceptions
+There are more pending tasks/ideas to implement in this
+[repo's issues](https://notabug.org/diogo/gnu-social/issues).
 
-Modules:
-- Introduce new metadata for plugins (category and thumb)
-- Add plugin management tool as a install step
-- Allow to install remote plugins and suggest popular trusted ones
-- Replace SimpleCaptcha by FacileCaptcha once the latter is ready
+So consider the issue tracker to be the full backlog, in the kanban board it's just what the
+[development team](https://notabug.org/diogo/gnu-social/src/nightly/CREDITS.md)
+is working on.