Skip to content

Commit

Permalink
fsf, gnu, and cc are all using https
Browse files Browse the repository at this point in the history
  • Loading branch information
dkg committed Jun 14, 2016
1 parent 3ce832c commit a9c913c
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions COPYING-CC-BY-SA-3.0.mdwn
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
considered an Adaptation (as defined below) for the purposes of this
License.
c. "Creative Commons Compatible License" means a license that is listed
at http://creativecommons.org/compatiblelicenses that has been
at https://creativecommons.org/compatiblelicenses that has been
approved by Creative Commons as being essentially equivalent to this
License, including, at a minimum, because that license: (i) contains
terms that have the same purpose, meaning and effect as the License
Expand Down Expand Up @@ -356,5 +356,5 @@
available upon request from time to time. For the avoidance of doubt,
this trademark restriction does not form part of the License.

Creative Commons may be contacted at http://creativecommons.org/.
Creative Commons may be contacted at https://creativecommons.org/.

8 changes: 4 additions & 4 deletions COPYING-GPL-3.mdwn
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007

Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.

Expand Down Expand Up @@ -645,7 +645,7 @@
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.

Expand All @@ -664,11 +664,11 @@
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>.
2 changes: 1 addition & 1 deletion COPYING-GPL-ONLY.mdwn
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
The source fragment linking to this page is (only) licensed under
[The GNU General Public License](http://www.gnu.org/licenses/gpl.txt),
[The GNU General Public License](https://www.gnu.org/licenses/gpl.txt),
either version 3.0 or at your option any later version.
6 changes: 3 additions & 3 deletions COPYING.mdwn
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
The contents of this wiki are (unless otherwise explicitly noted, see below)
dual licensed under:

- [CC-BY-SA-3.0](http://creativecommons.org/licenses/by-sa/3.0/) <img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-sa/3.0/88x31.png" />
- [CC-BY-SA-3.0](https://creativecommons.org/licenses/by-sa/3.0/) <img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-sa/3.0/88x31.png" />

- [The GNU General Public License](http://www.gnu.org/licenses/gpl.txt), either
- [The GNU General Public License](https://www.gnu.org/licenses/gpl.txt), either
version 3.0 or at your option any later version.

The [[Notmuch manual pages|manpages]], copied from the
[Notmuch source tree](https://git.notmuchmail.org/git/notmuch) and
modified for the wiki, *and* any source code fragment specifically
marked by its contributor as [[COPYING-GPL-ONLY]] are licensed under
[the GNU General Public License](http://www.gnu.org/licenses/gpl.txt),
[the GNU General Public License](https://www.gnu.org/licenses/gpl.txt),
either version 3.0 or at your option any later version.

By pushing to the repository you agree that all of your contributions to the
Expand Down
4 changes: 2 additions & 2 deletions index.mdwn
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,9 @@ requests](http://nmbug.notmuchmail.org/status/#Wish-list).
## Development and Contributing

All of the code for Notmuch is available as [free
software](http://www.fsf.org/licensing/essays/free-sw.html) released
software](https://www.fsf.org/licensing/essays/free-sw.html) released
under the GNU [GPL version
3](http://www.fsf.org/licensing/licenses/gpl.html). The latest
3](https://www.fsf.org/licensing/licenses/gpl.html). The latest
versions can be checked out via git with this command:

git clone git://notmuchmail.org/git/notmuch
Expand Down
2 changes: 1 addition & 1 deletion manpages.mdwn
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ Manual page index
* <a href='notmuch-search-terms-7/'>notmuch-search-terms</a>(7) - syntax for notmuch queries

The manual pages are licensed under
[the GNU General Public License](http://www.gnu.org/licenses/gpl.txt),
[the GNU General Public License](https://www.gnu.org/licenses/gpl.txt),
either version 3.0 or at your option any later version.
2 changes: 1 addition & 1 deletion notmuch-emacs.mdwn
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Notmuch Emacs Interface

One of the more popular Notmuch message reading clients is **notmuch.el**, or
`notmuch-emacs`, an [Emacs](http://www.gnu.org/software/emacs/) major mode for
`notmuch-emacs`, an [Emacs](https://www.gnu.org/software/emacs/) major mode for
interacting with Notmuch. It is included in the Notmuch package (`notmuch-emacs`
in Debian). The [[screenshots|screenshots]] give a good overview of the mode.

Expand Down

0 comments on commit a9c913c

Please sign in to comment.