diff --git a/Changelog.md b/Changelog.md index b88e1a971..da977bc28 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2156,7 +2156,7 @@ Features: * Internal: Inline assembly usable by the code generator. * Commandline interface: Using ``-`` as filename allows reading from stdin. * Interface JSON: Fallback function is now part of the ABI. - * Interface: Version string now *semver* compatible. + * Interface: Version string now *SemVer* compatible. * Code generator: Do not provide "new account gas" if we know the called account exists. Bugfixes: diff --git a/docs/installing-solidity.rst b/docs/installing-solidity.rst index dbfa7a4c5..d3f9015a2 100644 --- a/docs/installing-solidity.rst +++ b/docs/installing-solidity.rst @@ -537,8 +537,8 @@ The Solidity version string contains four parts: If there are local modifications, the commit will be postfixed with ``.mod``. -These parts are combined as required by Semver, where the Solidity pre-release tag equals to the Semver pre-release -and the Solidity commit and platform combined make up the Semver build metadata. +These parts are combined as required by SemVer, where the Solidity pre-release tag equals to the SemVer pre-release +and the Solidity commit and platform combined make up the SemVer build metadata. A release example: ``0.4.8+commit.60cc1668.Emscripten.clang``. @@ -549,7 +549,7 @@ Important Information About Versioning After a release is made, the patch version level is bumped, because we assume that only patch level changes follow. When changes are merged, the version should be bumped according -to semver and the severity of the change. Finally, a release is always made with the version +to SemVer and the severity of the change. Finally, a release is always made with the version of the current nightly build, but without the ``prerelease`` specifier. Example: