Merge branch 'master' into acquire_by_hash

.travis.yml

@@ -1,7 +1,7 @@
 language: go
 
 go:
-  - 1.7
+  - 1.9
 
 before_script:
   - make prepare

content/doc/aptly/mirror/edit.md

@@ -25,11 +25,16 @@ Params are:
 
 Flags:
 
+-   `-archive-url=`: flag to change archive url
 -   `-filter=`: [package query](/doc/feature/query/) which is applied to
     packages in the mirror, set to empty to disable filtering
 -   `-filter-with-deps`: when filtering, include [dependencies](/doc/feature/dependencies) of
     matching packages as well
 -   `-architectures=`: global flag to change architectures list.
+-   `-ignore-signatures`: disable verification of `Release` file
+    signatures
+-   `-keyring=trustedkeys.gpg`: gpg keyring to use when verifying
+    Release file (could be specified multiple times)
 -   `-with-sources`: download source packages in addition to
     binary packages
 -   `-with-udebs`: download .udeb packages (Debian installer

content/doc/feature/query.md

@@ -14,7 +14,7 @@ Some commands accept package queries to identify list of packages to
 process. Package query syntax almost matches `reprepro` query language.
 Query consists of the following simple terms:
 
--   **direct package reference**: reference to exaclty one package.
+-   **direct package reference**: reference to exactly one package.
     Format is identical to the way aptly lists packages in show commands
     with `-with-packages` flag: `name_version_arch`, e.g.:
     `libmysqlclient18_5.5.35-rel33.0-611.squeeze_amd64`