From b02a1592301e4d4ab85fac04c7512abfa831948e Mon Sep 17 00:00:00 2001 From: Alexandre Lafaye Date: Thu, 2 Jul 2015 17:26:57 +0200 Subject: [PATCH] fixes in doc --- CONTRIBUTING.rst | 2 +- LICENSE.txt | 2 +- README.rst | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 8f3a0f42..d010eddc 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -99,7 +99,7 @@ Before you submit a pull request, check that it meets these guidelines: 2. If the pull request adds functionality, the docs should be updated. Put your new functionality into a function with a docstring, and add the feature to the list in README.rst. -3. The pull request should work for Python 2.6, 2.7, and 3.3, and for PyPy. Check +3. The pull request should work for Python 2.7, 3.2, and 3.4, and for PyPy. Check https://travis-ci.org/epfl-lts2/pygsp/pull_requests and make sure that the tests pass for all supported Python versions. diff --git a/LICENSE.txt b/LICENSE.txt index 5e94b6d1..77b5b51b 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -11,7 +11,7 @@ modification, are permitted provided that the following conditions are met: this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -* Neither the name of PyUNLocBoX nor the names of its contributors may be used +* Neither the name of PyGSP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/README.rst b/README.rst index 0481367c..b0039c9d 100644 --- a/README.rst +++ b/README.rst @@ -82,7 +82,3 @@ Authors * Basile Châtillon , * Alexandre Lafaye , * Nicolas Rod - -License -------- -* Free software: GPL v3 license