Use https where possible

Conflicts:
	docs/content/2.download/default.yml
	docs/content/index/index.yml
	docs/default_manpage.md
	docs/templates/index.liquid
	docs/templates/shared/_header.liquid

16 files changed, 42 insertions, 37 deletions

diff --git a/COPYING b/COPYING
index 03b0f56f..272659a3 100644
--- a/COPYING
+++ b/COPYING
@@ -25,7 +25,7 @@ jq's documentation (everything found under the docs/ subdirectory in
 the source tree) is licensed under the Creative Commons CC BY 3.0
 license, which can be found at:
 
-         http://creativecommons.org/licenses/by/3.0/
+         https://creativecommons.org/licenses/by/3.0/
 
 The documentation website includes a copy of Twitter's Boostrap and
 relies on Bonsai, Liquid templates and various other projects, look
diff --git a/README.md b/README.md
index 37df7a41..cb0bbfa1 100644
--- a/README.md
+++ b/README.md
@@ -4,13 +4,13 @@ jq
 jq is a command-line JSON processor.
 
 If you want to learn to use jq, read the documentation at
-[http://stedolan.github.io/jq](http://stedolan.github.io/jq).  This
+[https://stedolan.github.io/jq](https://stedolan.github.io/jq).  This
 documentation is generated from the docs/ folder of this repository.
-You can also try it online at [jqplay.org](http://jqplay.org).
+You can also try it online at [jqplay.org](https://jqplay.org).
 
 If you want to hack on jq, feel free, but be warned that its internals
 are not well-documented at the moment. Bring a hard hat and a
-shovel.  Also, read the wiki: http://github.com/stedolan/jq/wiki
+shovel.  Also, read the wiki: https://github.com/stedolan/jq/wiki
 
 Source tarball and built executable releases can be found on the
 homepage and on the github release page, https://github.com/stedolan/jq/releases
@@ -61,4 +61,4 @@ Cross-compilation requires a clean workspace, then:
 Use the --host= and --target= ./configure options to select a
 cross-compilation environment.  See also the wiki.
 
-Send questions to http://stackoverflow.com/questions/tagged/jq or to the #jq channel (http://irc.lc/freenode/%23jq/) on Freenode (https://webchat.freenode.net/).
+Send questions to https://stackoverflow.com/questions/tagged/jq or to the #jq channel (http://irc.lc/freenode/%23jq/) on Freenode (https://webchat.freenode.net/).
diff --git a/configure.ac b/configure.ac
index d9057e39..4bb436ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 m4_define([jq_version], m4_esyscmd_s([git describe --tags --dirty --match 'jq-*'|sed 's/^jq-//']))
 
 AC_INIT([jq], [jq_version], [https://github.com/stedolan/jq/issues],
-             [jq], [http://stedolan.github.io/jq])
+             [jq], [https://stedolan.github.io/jq])
 
 m4_include([m4/ax_compare_version.m4])
 m4_include([m4/ax_prog_bison_version.m4])
diff --git a/docs/README.md b/docs/README.md
index 58e7dca7..a09779b9 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -13,7 +13,7 @@ RVM and Ruby 1.9.3 like so:
 
 After that finishes installing, you'll need to make sure RVM is on
 your path by doing `source $HOME/.rvm/scripts/rvm`, or just opening a
-new shell. See <http://rvm.io> for more info on RVM.
+new shell. See <https://rvm.io> for more info on RVM.
 
 Once RVM is installed, you can install all the dependencies for jq's
 documentation build by running this from the `docs` directory:
diff --git a/docs/content/2.download/default.yml b/docs/content/2.download/default.yml
index fc8e1182..c3b9efac 100644
--- a/docs/content/2.download/default.yml
+++ b/docs/content/2.download/default.yml
@@ -28,6 +28,10 @@ body:
          manually by following instructions on [Arch Linux's
          Wiki](https://wiki.archlinux.org/index.php/Arch_UseRepository).
 
+       * jq 1.4 is in the official [Debian](https://packages.debian.org/jq) and
+         [Ubuntu](http://packages.ubuntu.com/jq) repositories. Install using
+         `sudo apt-get install jq`.
+
        * jq 1.4 is [in Debian](http://packages.debian.org/jq)
 
        * jq 1.3.2 is in the official Fedora repository. You can install using
@@ -76,21 +80,21 @@ body:
       To build it from a git clone, you'll need to install a few
       packages first:
 
-       * [Flex](http://www.gnu.org/software/flex/)
-       * [Bison](http://www.gnu.org/software/bison/)
-       * [GCC](http://gcc.gnu.org)
-       * [Make](http://www.gnu.org/software/make)
-       * [Autotools](http://www.gnu.org/software/automake)
+       * [Flex](http://flex.sourceforge.net/)
+       * [Bison](https://www.gnu.org/software/bison/)
+       * [GCC](https://gcc.gnu.org)
+       * [Make](https://www.gnu.org/software/make/)
+       * [Autotools](https://www.gnu.org/software/automake/)
 
       For Linux systems, these will all be in your system's package
       manager, and if you do development on the machine they're most
       likely already installed.
 
-      On OS X, these are all included in Apple's command line tools, which
-      can be installed from [Xcode](http://developer.apple.com/technologies/tools/).
-      However, you may find that you need a newer version of Bison than the one provided
-      by Apple. This can be found in [Homebrew](http://mxcl.github.com/homebrew/)
-      or [MacPorts](http://macports.org/).
+      On OS X, these are all included in Apple's command line tools, which can
+      be installed from [Xcode](https://developer.apple.com/xcode/). However,
+      you may find that you need a newer version of Bison than the one provided
+      by Apple. This can be found in [Homebrew](http://brew.sh) or
+      [MacPorts](https://macports.org/).
 
       `flex` and `bison` are used to generate the lexer and parser for
       jq. For jq 1.5, neither is required if you use `./configure
diff --git a/docs/content/3.manual/manual.yml b/docs/content/3.manual/manual.yml
index 3af61e65..7fd88f51 100644
--- a/docs/content/3.manual/manual.yml
+++ b/docs/content/3.manual/manual.yml
@@ -1670,12 +1670,12 @@ sections:
           escaped. However, all interpolations made inside that string
           literal will be escaped. For instance,
 
-              @uri "http://www.google.com/search?q=\(.search)"
+              @uri "https://www.google.com/search?q=\(.search)"
 
           will produce the following output for the input
           `{"search":"what is jq?"}`:
 
-              "http://www.google.com/search?q=what%20is%20jq%3F"
+              "https://www.google.com/search?q=what%20is%20jq%3F"
 
           Note that the slashes, question mark, etc. in the URL are
           not escaped, as they were part of the string literal.
diff --git a/docs/content/3.manual/v1.3/manual.yml b/docs/content/3.manual/v1.3/manual.yml
index 0f481451..df7b7552 100644
--- a/docs/content/3.manual/v1.3/manual.yml
+++ b/docs/content/3.manual/v1.3/manual.yml
@@ -857,12 +857,12 @@ sections:
           escaped. However, all interpolations made inside that string
           literal will be escaped. For instance,
 
-              @uri "http://www.google.com/search?q=\(.search)"
+              @uri "https://www.google.com/search?q=\(.search)"
 
           will produce the following output for the input
           `{"search":"jq!"}`:
 
-              http://www.google.com/search?q=jq%21
+              https://www.google.com/search?q=jq%21
 
           Note that the slashes, question mark, etc. in the URL are
           not escaped, as they were part of the string literal.
diff --git a/docs/content/3.manual/v1.4/manual.yml b/docs/content/3.manual/v1.4/manual.yml
index 3933b4d5..edad0fc6 100644
--- a/docs/content/3.manual/v1.4/manual.yml
+++ b/docs/content/3.manual/v1.4/manual.yml
@@ -1259,12 +1259,12 @@ sections:
           escaped. However, all interpolations made inside that string
           literal will be escaped. For instance,
 
-              @uri "http://www.google.com/search?q=\(.search)"
+              @uri "https://www.google.com/search?q=\(.search)"
 
           will produce the following output for the input
           `{"search":"what is jq?"}`:
 
-              "http://www.google.com/search?q=what%20is%20jq%3f"
+              "https://www.google.com/search?q=what%20is%20jq%3f"
 
           Note that the slashes, question mark, etc. in the URL are
           not escaped, as they were part of the string literal.
diff --git a/docs/content/index/index.yml b/docs/content/index/index.yml
index 241eb91f..6871e1a6 100644
--- a/docs/content/index/index.yml
+++ b/docs/content/index/index.yml
@@ -25,10 +25,11 @@ body3: |
 tail: |
 
   Go read the [tutorial](tutorial/) for more, or the [manual](manual/)
-  for *way* more. Ask questions over on
-  [stackoverflow](http://stackoverflow.com/) using the [jq
-  tag](http://stackoverflow.com/questions/tagged/jq), or on the
-  [#jq](http://irc.lc/freenode/%23jq/) channel over on
+  for *way* more.
+
+  Ask questions on [stackoverflow](https://stackoverflow.com/) using the [jq
+  tag](https://stackoverflow.com/questions/tagged/jq), or on the
+  [#jq](http://irc.lc/freenode/%23jq/) channel on
   [Freenode](https://webchat.freenode.net/).
 
 news:
diff --git a/docs/default_manpage.md b/docs/default_manpage.md
index 878b8366..7373b0ce 100644
--- a/docs/default_manpage.md
+++ b/docs/default_manpage.md
@@ -9,8 +9,8 @@ reducing and otherwise mangling JSON documents.
 This version of `jq` was built without a manual, so this manpage is a
 stub. For full documentation of the `jq` language, see:
 
-    http://stedolan.github.io/jq
-    
+    https://stedolan.github.io/jq
+
 ## BUGS
 
 Presumably. Report them or discuss them at:
diff --git a/docs/templates/index.liquid b/docs/templates/index.liquid
index 17b77b70..94db1c36 100644
--- a/docs/templates/index.liquid
+++ b/docs/templates/index.liquid
@@ -26,7 +26,7 @@
             </div>
 
             <div class="btn-group" style="float:right">
-              <a class="btn btn-primary" href="http://jqplay.org">
+              <a class="btn btn-primary" href="https://jqplay.org">
                 Try online at jqplay.org!
               </a>
             </div>
diff --git a/docs/templates/shared/_header.liquid b/docs/templates/shared/_header.liquid
index 33a430ce..d30ba5fe 100644
--- a/docs/templates/shared/_header.liquid
+++ b/docs/templates/shared/_header.liquid
@@ -17,7 +17,7 @@
           {% endfor %}
           <li><a href="https://github.com/stedolan/jq/issues">Issues</a></li>
           <li><a href="https://github.com/stedolan/jq">Source</a></li>
-          <li><a href="http://jqplay.org">Try online!</a></li>
+          <li><a href="https://jqplay.org">Try online!</a></li>
           <li><a href="https://raw.githubusercontent.com/stedolan/jq/master/NEWS">News</a></li>
         </ul>
       </div>
diff --git a/jq.1.default b/jq.1.default
index c556f794..d02466af 100644
--- a/jq.1.default
+++ b/jq.1.default
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "JQ" "1" "May 2013" "" ""
+.TH "JQ" "1" "August 2015" "" ""
 .
 .SH "NAME"
 \fBjq\fR \- Command\-line JSON processor
@@ -16,7 +16,7 @@ This version of \fBjq\fR was built without a manual, so this manpage is a stub\.
 .
 .nf
 
-http://stedolan\.github\.com/jq
+https://stedolan\.github\.io/jq
 .
 .fi
 .
diff --git a/jq.spec b/jq.spec
index 5731ec47..ffc9ef36 100644
--- a/jq.spec
+++ b/jq.spec
@@ -5,7 +5,7 @@ Name: jq
 Version: %{myver}
 Release: %{myrel}%{?dist}
 Source0: jq-%{myver}.tar.gz
-URL: http://stedolan.github.io/jq
+URL: https://stedolan.github.io/jq
 License: BSD
 AutoReqProv: no
 #BuildPrereq: autoconf, libtool, automake, flex, bison, python
diff --git a/jv_print.c b/jv_print.c
index b16bf269..567c737a 100644
--- a/jv_print.c
+++ b/jv_print.c
@@ -17,7 +17,7 @@
 #define COL(c) (ESC "[" c "m")
 #define COLRESET (ESC "[0m")
 
-// Colour table. See http://en.wikipedia.org/wiki/ANSI_escape_code#Colors
+// Colour table. See https://en.wikipedia.org/wiki/ANSI_escape_code#Colors
 // for how to choose these.
 static const jv_kind colour_kinds[] =
   {JV_KIND_NULL,   JV_KIND_FALSE, JV_KIND_TRUE, JV_KIND_NUMBER,
diff --git a/main.c b/main.c
index a257b9ff..af162e03 100644
--- a/main.c
+++ b/main.c
@@ -48,7 +48,7 @@ static void usage(int code) {
     "\tcopying jq's input to its output unmodified (except for\n"
     "\tformatting).\n"
     "\tFor more advanced filters see the jq(1) manpage (\"man jq\")\n"
-    "\tand/or http://stedolan.github.io/jq\n\n"
+    "\tand/or https://stedolan.github.io/jq\n\n"
     "\tSome of the options include:\n"
     "\t -c\t\tcompact instead of pretty-printed output;\n"
     "\t -n\t\tuse `null` as the single input value;\n"
@@ -69,7 +69,7 @@ static void usage(int code) {
 
 static void die() {
   fprintf(stderr, "Use %s --help for help with command-line options,\n", progname);
-  fprintf(stderr, "or see the jq manpage, or online docs  at http://stedolan.github.io/jq\n");
+  fprintf(stderr, "or see the jq manpage, or online docs  at https://stedolan.github.io/jq\n");
   exit(2);
 }