diff options
| author | David Bremner <david@tethera.net> | 2016-11-02 08:09:24 -0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2016-11-02 08:09:24 -0300 |
| commit | 39b6080f590d4dad29c4fb941258085c30d9fe01 (patch) | |
| tree | c60ee73e341509783ecb018c873d29a3e1ba0a08 /bindings/python/docs | |
| parent | 79b3ba1b80fe20572144d1afd754f7c48d12d86e (diff) | |
| parent | ad517e9195a29b26955999c6e11fc37c73dbc01e (diff) | |
Merge tag 'debian/0.23.1-1' into jessie-backports
notmuch Debian 0.23.1-1 upload (same as 0.23.1)
Diffstat (limited to 'bindings/python/docs')
| -rw-r--r-- | bindings/python/docs/COPYING | 6 | ||||
| -rw-r--r-- | bindings/python/docs/source/index.rst | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bindings/python/docs/COPYING b/bindings/python/docs/COPYING index 94a9ed02..2a000655 100644 --- a/bindings/python/docs/COPYING +++ b/bindings/python/docs/COPYING @@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found. GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. Also add information on how to contact you by electronic and paper mail. @@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box". You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see -<http://www.gnu.org/licenses/>. +<https://www.gnu.org/licenses/>. The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read -<http://www.gnu.org/philosophy/why-not-lgpl.html>. +<https://www.gnu.org/philosophy/why-not-lgpl.html>. diff --git a/bindings/python/docs/source/index.rst b/bindings/python/docs/source/index.rst index 1cece5f7..bef7e60d 100644 --- a/bindings/python/docs/source/index.rst +++ b/bindings/python/docs/source/index.rst @@ -4,7 +4,7 @@ Welcome to :mod:`notmuch`'s documentation .. currentmodule:: notmuch The :mod:`notmuch` module provides an interface to the `notmuch -<http://notmuchmail.org>`_ functionality, directly interfacing to a +<https://notmuchmail.org>`_ functionality, directly interfacing to a shared notmuch library. Within :mod:`notmuch`, the classes :class:`Database`, :class:`Query` provide most of the core functionality, returning :class:`Threads`, :class:`Messages` and |