Skip to content

Commit

Permalink
Merge pull request #15502 from guckool/develop
Browse files Browse the repository at this point in the history
docs: fix several spelling and grammar issues
  • Loading branch information
cameel authored Nov 26, 2024
2 parents 46e1f81 + 79ad961 commit 795a0ba
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions docs/types/value-types.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ are used as function arguments or in assignments.

Unlike :ref:`reference types <reference-types>`, value type declarations do not
specify a data location since they are small enough to be stored on the stack.
The only exception are :ref:`state variables <structure-state-variables>`.
The only exception is :ref:`state variables <structure-state-variables>`.
Those are by default located in storage, but can also be marked as
:ref:`transient <transient-storage>`, :ref:`constant or immutable <constants>`.

Expand Down Expand Up @@ -204,7 +204,7 @@ must be explicit via ``payable(<address>)``.
Explicit conversions to and from ``address`` are allowed for ``uint160``, integer literals,
``bytes20`` and contract types.

Only expressions of type ``address`` and contract-type can be converted to the type ``address
Only expressions of type ``address`` and contract type can be converted to the type ``address
payable`` via the explicit conversion ``payable(...)``. For contract-type, this conversion is only
allowed if the contract can receive Ether, i.e., the contract either has a :ref:`receive
<receive-ether-function>` or a payable fallback function. Note that ``payable(0)`` is valid and is
Expand All @@ -215,7 +215,7 @@ an exception to this rule.
declare its type as ``address payable`` to make this requirement visible. Also,
try to make this distinction or conversion as early as possible.

The distinction between ``address`` and ``address payable`` was introduced with version 0.5.0.
The distinction between ``address`` and ``address payable`` was introduced in version 0.5.0.
Also starting from that version, contracts are not implicitly convertible to the ``address`` type, but can still be explicitly converted to
``address`` or to ``address payable``, if they have a receive or payable fallback function.

Expand Down
2 changes: 1 addition & 1 deletion test/externalTests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,6 @@ branches if they exist. If no changes on our part were necessary, it is complete
e.g. the `master_060` of an external project in Solidity 0.8.x.

Since each project is handled separately, this approach may result in a mix of version-specific branches
between different external projects. For example, in one project we could could have `master_050` on
between different external projects. For example, in one project we could have `master_050` on
both `develop` and `breaking` and in another `breaking` could use `master_080` while `develop` still
uses `master_060`.

0 comments on commit 795a0ba

Please sign in to comment.