Merge branch 'master' into base-tag-option

This commit is contained in:
Sunshine 2020-12-25 12:10:54 -10:00 committed by GitHub
commit e145df372f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -63,7 +63,7 @@ The guide can be found [here](docs/containers.md)
- `-I`: Isolate the document
- `-j`: Exclude JavaScript
- `-k`: Accept invalid X.509 (TLS) certificates
- `-M`: Dont add timestamp and source information
- `-M`: Don't add timestamp and URL information
- `-o`: Write output to file
- `-s`: Be quiet
- `-t`: Adjust network request timeout
@ -71,7 +71,7 @@ The guide can be found [here](docs/containers.md)
---------------------------------------------------
## HTTPS and HTTP proxies
## Proxies
Please set `https_proxy`, `http_proxy`, and `no_proxy` environment variables.
---------------------------------------------------
@ -85,6 +85,7 @@ Please open an issue if something is wrong, that helps make this project better.
- `Monolith Chrome Extension`: https://github.com/rhysd/monolith-of-web
- `Pagesaver`: https://github.com/distributed-mind/pagesaver
- `Personal WayBack Machine`: https://github.com/popey/pwbm
- `Hako`: https://github.com/dmpop/hako
---------------------------------------------------