some cleanup

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 58bc7134545a15b10f765e033320b83216c35c7d..027a5a04780163e24631f8cd2f4ef8669491ce82 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,7 +6,7 @@ Please [open a new issue](https://github.com/wallabag/wallabag/issues/new).
 To fix the bug quickly, we need some infos:
 * your wallabag version (on top of the ./index.php file, and also on config page)
 * your webserver installation :
-  * type of hosting (shared or dedicaced)
+  * type of hosting (shared or dedicated)
   * in case of a dedicaced server, the server and OS used
   * the php version used, eventually `phpinfo()`
 * which storage system you choose at install (SQLite, MySQL/MariaDB or PostgreSQL)
@@ -27,4 +27,4 @@ Note : If you have large portions of text, use [Github's Gist service](https://g
 ## You want to fix a bug or to add a feature
 Please fork wallabag and work with **the dev branch** only. **Do not work on master branch**.
 
-[Don't forget to read our guidelines](https://github.com/wallabag/wallabag/blob/dev/GUIDELINES.md).
\ No newline at end of file
+[Don't forget to read our guidelines](https://github.com/wallabag/wallabag/blob/dev/GUIDELINES.md).

diff --git a/COPYING.md b/COPYING.md
index c43f619a3a99389db14326c4a3f14f0d34e6270d..b30299fe441928c81c9d475b1f58d7e1298035c8 100644 (file)
--- a/COPYING.md
+++ b/COPYING.md
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2014 Nicolas Lœuillet\r
+Copyright (c) 2013-2015 Nicolas Lœuillet\r
 \r
 Permission is hereby granted, free of charge, to any person obtaining a copy\r
 of this software and associated documentation files (the "Software"), to deal\r
@@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\r
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\r
-THE SOFTWARE.
\ No newline at end of file
+THE SOFTWARE.\r

diff --git a/CREDITS.md b/CREDITS.md
index e76c580d38bd8060fdef8fd55a0e186617f4deb4..e3916170f1200d25aca5864d3ae3f53eeb97fab2 100644 (file)
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -1,17 +1,6 @@
-wallabag is based on :
-* PHP Readability https://bitbucket.org/fivefilters/php-readability
-* Full Text RSS http://code.fivefilters.org/full-text-rss/src
-* logo by Maylis Agniel https://github.com/wallabag/logo
-* icons http://icomoon.io
-* PHP Simple HTML DOM Parser (for Pocket import) http://simplehtmldom.sourceforge.net/
-* Session https://github.com/tontof/kriss_feed/blob/master/src/class/Session.php
-* Twig http://twig.sensiolabs.org
-* Flash messages https://github.com/plasticbrain/PHP-Flash-Messages
-* Pagination https://github.com/daveismyname/pagination
-* PHPePub https://github.com/Grandt/PHPePub/
+wallabag is mainly developed by [Nicolas Lœuillet](https://github.com/nicosomb) under the MIT License.
 
-wallabag is mainly developed by Nicolas Lœuillet under the MIT License
+Thank you so much to [@tcitworld](https://github.com/tcitworld) and [@j0k3r](https://github.com/j0k3r).
 
-Thank you so much to @tcitworld and @mariroz.
-
-Contributors : https://github.com/wallabag/wallabag/graphs/contributors
+Thank you [to others contributors](https://github.com/wallabag/wallabag/graphs/contributors
+).

diff --git a/composer.json b/composer.json
index 5c093257e3e355896ea13e3fe0700cc2d87cfad6..19db9814a2ee5d4f06f15e3f3b6a9f574a7ef8ef 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -16,6 +16,10 @@
             "name": "Thomas Citharel",
             "homepage": "http://tcit.fr",
             "role": "Developer"
+        },
+        {
+            "name": "Jérémy Benoist",
+            "role": "Developer"
         }
     ],
     "support": {