From 58a62dceab4d85653334a43bf589d8965883245a Mon Sep 17 00:00:00 2001 From: Martin Hujer Date: Fri, 29 Dec 2017 11:33:19 +0100 Subject: [PATCH 1/2] Change http to https where possible --- doc/00-intro.md | 4 ++-- doc/01-basic-usage.md | 2 +- doc/03-cli.md | 2 +- doc/04-schema.md | 4 ++-- doc/05-repositories.md | 4 ++-- doc/articles/handling-private-packages-with-satis.md | 2 +- doc/articles/plugins.md | 2 +- doc/articles/versions.md | 2 +- doc/faqs/why-are-unbound-version-constraints-a-bad-idea.md | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/00-intro.md b/doc/00-intro.md index 0399ae51a..efc5c4c00 100644 --- a/doc/00-intro.md +++ b/doc/00-intro.md @@ -14,7 +14,7 @@ manager. It does however support a "global" project for convenience via the [global](03-cli.md#global) command. This idea is not new and Composer is strongly inspired by node's -[npm](https://npmjs.org/) and ruby's [bundler](http://bundler.io/). +[npm](https://npmjs.org/) and ruby's [bundler](https://bundler.io/). Suppose: @@ -135,7 +135,7 @@ C:\bin>echo @php "%~dp0composer.phar" %*>composer.bat Add the directory to your PATH environment variable if it isn't already. For information on changing your PATH variable, please see -[this article](http://www.computerhope.com/issues/ch000549.htm) and/or +[this article](https://www.computerhope.com/issues/ch000549.htm) and/or use Google. Close your current terminal. Test usage with a new terminal: diff --git a/doc/01-basic-usage.md b/doc/01-basic-usage.md index de5c85f43..8740c59db 100644 --- a/doc/01-basic-usage.md +++ b/doc/01-basic-usage.md @@ -56,7 +56,7 @@ you to require certain versions of server software. See ### Package Version Constraints In our example, we are requesting the Monolog package with the version constraint -[`1.0.*`](http://semver.mwl.be/#?package=monolog%2Fmonolog&version=1.0.*). +[`1.0.*`](https://semver.mwl.be/#?package=monolog%2Fmonolog&version=1.0.*). This means any version in the `1.0` development branch, or any version that is greater than or equal to 1.0 and less than 1.1 (`>=1.0 <1.1`). diff --git a/doc/03-cli.md b/doc/03-cli.md index 3d279242f..e0b60da30 100644 --- a/doc/03-cli.md +++ b/doc/03-cli.md @@ -854,7 +854,7 @@ all projects. By default it points to `C:\Users\\AppData\Roaming\Composer` on Windows and `/Users//.composer` on OSX. On *nix systems that follow the [XDG Base -Directory Specifications](http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html), +Directory Specifications](https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html), it points to `$XDG_CONFIG_HOME/composer`. On other *nix systems, it points to `/home//.composer`. diff --git a/doc/04-schema.md b/doc/04-schema.md index 0f01f684d..8e9b55e49 100644 --- a/doc/04-schema.md +++ b/doc/04-schema.md @@ -214,7 +214,7 @@ An example: { "name": "Jordi Boggiano", "email": "j.boggiano@seld.be", - "homepage": "http://seld.be", + "homepage": "https://seld.be", "role": "Developer" } ] @@ -768,7 +768,7 @@ Example: "name": "smarty/smarty", "version": "3.1.7", "dist": { - "url": "http://www.smarty.net/files/Smarty-3.1.7.zip", + "url": "https://www.smarty.net/files/Smarty-3.1.7.zip", "type": "zip" }, "source": { diff --git a/doc/05-repositories.md b/doc/05-repositories.md index 1aaadf4c8..39a1a490b 100644 --- a/doc/05-repositories.md +++ b/doc/05-repositories.md @@ -93,7 +93,7 @@ Here is a minimal package definition: "name": "smarty/smarty", "version": "3.1.7", "dist": { - "url": "http://www.smarty.net/files/Smarty-3.1.7.zip", + "url": "https://www.smarty.net/files/Smarty-3.1.7.zip", "type": "zip" } } @@ -488,7 +488,7 @@ Here is an example for the smarty template engine: "name": "smarty/smarty", "version": "3.1.7", "dist": { - "url": "http://www.smarty.net/files/Smarty-3.1.7.zip", + "url": "https://www.smarty.net/files/Smarty-3.1.7.zip", "type": "zip" }, "source": { diff --git a/doc/articles/handling-private-packages-with-satis.md b/doc/articles/handling-private-packages-with-satis.md index 7307c02bf..c875edbc4 100644 --- a/doc/articles/handling-private-packages-with-satis.md +++ b/doc/articles/handling-private-packages-with-satis.md @@ -339,6 +339,6 @@ is set to true. [ssh2 context options]: https://secure.php.net/manual/en/wrappers.ssh2.php#refsect1-wrappers.ssh2-options [ssl context options]: https://secure.php.net/manual/en/context.ssl.php -[Twig]: http://twig.sensiolabs.org/ +[Twig]: https://twig.sensiolabs.org/ [config schema]: https://getcomposer.org/doc/04-schema.md#config [notify-batch]: https://getcomposer.org/doc/05-repositories.md#notify-batch diff --git a/doc/articles/plugins.md b/doc/articles/plugins.md index 83f9994c8..ab54015c9 100644 --- a/doc/articles/plugins.md +++ b/doc/articles/plugins.md @@ -282,4 +282,4 @@ local project plugins are loaded. [7]: ../01-basic-usage.md#package-versions [8]: https://github.com/composer/composer/blob/master/src/Composer/Plugin/Capable.php [9]: https://github.com/composer/composer/blob/master/src/Composer/Plugin/Capability/CommandProvider.php -[10]: http://symfony.com/doc/current/components/console/introduction.html +[10]: https://symfony.com/doc/current/components/console.html diff --git a/doc/articles/versions.md b/doc/articles/versions.md index 5cf02f940..7ed725d7f 100644 --- a/doc/articles/versions.md +++ b/doc/articles/versions.md @@ -140,7 +140,7 @@ Example: `1.0.*` The `~` operator is best explained by example: `~1.2` is equivalent to `>=1.2 <2.0.0`, while `~1.2.3` is equivalent to `>=1.2.3 <1.3.0`. As you can see it is mostly useful for projects respecting [semantic -versioning](http://semver.org/). A common usage would be to mark the minimum +versioning](https://semver.org/). A common usage would be to mark the minimum minor version you depend on, like `~1.2` (which allows anything up to, but not including, 2.0). Since in theory there should be no backwards compatibility breaks until 2.0, that works well. Another way of looking at it is that using diff --git a/doc/faqs/why-are-unbound-version-constraints-a-bad-idea.md b/doc/faqs/why-are-unbound-version-constraints-a-bad-idea.md index 015ac92da..9aef970f9 100644 --- a/doc/faqs/why-are-unbound-version-constraints-a-bad-idea.md +++ b/doc/faqs/why-are-unbound-version-constraints-a-bad-idea.md @@ -14,7 +14,7 @@ compatible with the new major version of your dependency. For example instead of using `>=3.4` you should use `~3.4` which allows all versions up to `3.999` but does not include `4.0` and above. The `^` operator -works very well with libraries following [semantic versioning](http://semver.org). +works very well with libraries following [semantic versioning](https://semver.org). **Note:** As a package maintainer, you can make the life of your users easier by providing an [alias version](../articles/aliases.md) for your development From 149a5e9401f4afcdc9d0b190a318d8668373ee6c Mon Sep 17 00:00:00 2001 From: Martin Hujer Date: Fri, 29 Dec 2017 11:37:42 +0100 Subject: [PATCH 2/2] Change links to prevent unnecessary redirect --- CHANGELOG.md | 2 +- doc/00-intro.md | 2 +- doc/04-schema.md | 2 +- doc/07-community.md | 2 +- doc/articles/troubleshooting.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c34ad2ef..c853340ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -578,7 +578,7 @@ * Added autoloading support for root packages that use target-dir * Added awareness of the root package presence and support for it's provide/replace/conflict keys * Added IOInterface::isDecorated to test for colored output support - * Added validation of licenses based on the [SPDX registry](http://www.spdx.org/licenses/) + * Added validation of licenses based on the [SPDX registry](https://spdx.org/licenses/) * Improved repository protocol to have large cacheable parts * Fixed various bugs relating to package aliasing, proxy configuration, binaries * Various bug fixes and docs improvements diff --git a/doc/00-intro.md b/doc/00-intro.md index efc5c4c00..e0a81b05b 100644 --- a/doc/00-intro.md +++ b/doc/00-intro.md @@ -14,7 +14,7 @@ manager. It does however support a "global" project for convenience via the [global](03-cli.md#global) command. This idea is not new and Composer is strongly inspired by node's -[npm](https://npmjs.org/) and ruby's [bundler](https://bundler.io/). +[npm](https://www.npmjs.com/) and ruby's [bundler](https://bundler.io/). Suppose: diff --git a/doc/04-schema.md b/doc/04-schema.md index 8e9b55e49..0dc1c0f30 100644 --- a/doc/04-schema.md +++ b/doc/04-schema.md @@ -152,7 +152,7 @@ The recommended notation for the most common licenses is (alphabetical): - MIT Optional, but it is highly recommended to supply this. More identifiers are -listed at the [SPDX Open Source License Registry](https://www.spdx.org/licenses/). +listed at the [SPDX Open Source License Registry](https://spdx.org/licenses/). For closed-source software, you may use `"proprietary"` as the license identifier. diff --git a/doc/07-community.md b/doc/07-community.md index b79515d8c..4296f90cd 100644 --- a/doc/07-community.md +++ b/doc/07-community.md @@ -7,7 +7,7 @@ contributing. If you would like to contribute to Composer, please read the [README](https://github.com/composer/composer) and -[CONTRIBUTING](https://github.com//composer/composer/blob/master/.github/CONTRIBUTING.md) +[CONTRIBUTING](https://github.com/composer/composer/blob/master/.github/CONTRIBUTING.md) documents. The most important guidelines are described as follows: diff --git a/doc/articles/troubleshooting.md b/doc/articles/troubleshooting.md index 7bce67d29..9142f33c6 100644 --- a/doc/articles/troubleshooting.md +++ b/doc/articles/troubleshooting.md @@ -146,7 +146,7 @@ Or, you can increase the limit with a command-line argument: php -d memory_limit=-1 composer.phar <...> ``` -This issue can also happen on cPanel instances, when the shell fork bomb protection is activated. For more information, see the [documentation](https://documentation.cpanel.net/display/ALD/Shell+Fork+Bomb+Protection) of the fork bomb feature on the cPanel site. +This issue can also happen on cPanel instances, when the shell fork bomb protection is activated. For more information, see the [documentation](https://documentation.cpanel.net/display/68Docs/Shell+Fork+Bomb+Protection) of the fork bomb feature on the cPanel site. ## Xdebug impact on Composer