Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions source/concepts.tex
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@

\pnum
Expressions declared in a \grammarterm{requires-expression} in the library clauses are
required to be equality-preserving, except for those annotated with the comment
``not required to be equality-preserving.'' An expression so annotated
required to be equality-preserving, except for those marked with the comment
``not required to be equality-preserving.'' An expression marked with such a comment
may be equality-preserving, but is not required to be so.

\pnum
Expand Down Expand Up @@ -1261,7 +1261,7 @@
equality-preserving\iref{concepts.equality} and
shall not modify the function object or the arguments.
\begin{note}
This requirement supersedes the annotation in the definition of
This requirement supersedes the comment in the definition of
\libconcept{invocable}.
\end{note}

Expand Down
2 changes: 1 addition & 1 deletion source/iterators.tex
Original file line number Diff line number Diff line change
Expand Up @@ -1588,7 +1588,7 @@
and post-increment operators. The increment operations are required to be equality-preserving,
and the type is required to be \libconcept{equality_comparable}.
\begin{note}
This supersedes the annotations on the increment expressions
These requirements supersede the comments on the increment expressions
in the definition of \libconcept{weakly_incrementable}.
\end{note}

Expand Down
20 changes: 10 additions & 10 deletions source/lib-intro.tex
Original file line number Diff line number Diff line change
Expand Up @@ -991,10 +991,10 @@
\pnum
Function declarations and function template declarations
followed by a comment that include \textit{freestanding-deleted} are
\defnadjx{freestanding deleted}{functions}{function}.
\defnadjx{freestanding-deleted}{functions}{function}.
On freestanding implementations,
it is \impldef{whether a freestanding deleted function is a deleted function}
whether each entity introduced by a freestanding deleted function
it is \impldef{whether a freestanding-deleted function is a deleted function}
whether each entity introduced by a freestanding-deleted function
is a deleted function\iref{dcl.fct.def.delete} or
whether the requirements are the same as
the corresponding requirements for a hosted implementation.
Expand Down Expand Up @@ -1067,15 +1067,15 @@

\pnum
\begin{note}
Freestanding annotations follow some additional exposition conventions
Such comments follow some additional exposition conventions
that do not impose any additional normative requirements.
Header synopses that begin with a comment containing "all freestanding"
contain no hosted items and no freestanding deleted functions.
Header synopses that begin with a comment containing "mostly freestanding"
contain at least one hosted item or freestanding deleted function.
Header synopses that begin with a comment containing ``all freestanding''
contain no hosted items and no freestanding-deleted functions.
Header synopses that begin with a comment containing ``mostly freestanding''
contain at least one hosted item or freestanding-deleted function.
Classes and class templates followed by a comment
containing "partially freestanding"
contain at least one hosted item or freestanding deleted function.
containing ``partially freestanding''
contain at least one hosted item or freestanding-deleted function.
\end{note}
\begin{example}
\begin{codeblock}
Expand Down
2 changes: 1 addition & 1 deletion source/preface.tex
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ \chapter{Foreword}

\chapter{Introduction}

Clauses and subclauses in this document are annotated
Clauses and subclauses in this document are marked
with a so-called stable name,
presented in square brackets next to the (sub)clause heading
(such as ``[lex.token]'' for \ref{lex.token}, ``Tokens'').
Expand Down