From Jason Turner

[temp.constr.constr.general]

Diff to HTML by rtfpessoa

tmp/tmprn07x7x7/{from.md → to.md} RENAMED
@@ -1,15 +1,17 @@
1
  #### General <a id="temp.constr.constr.general">[[temp.constr.constr.general]]</a>
2
 
3
  A *constraint* is a sequence of logical operations and operands that
4
  specifies requirements on template arguments. The operands of a logical
5
- operation are constraints. There are three different kinds of
6
  constraints:
7
 
8
  - conjunctions [[temp.constr.op]],
9
- - disjunctions [[temp.constr.op]], and
10
- - atomic constraints [[temp.constr.atomic]].
 
 
11
 
12
  In order for a constrained template to be instantiated [[temp.spec]],
13
  its associated constraints [[temp.constr.decl]] shall be satisfied as
14
  described in the following subclauses.
15
 
 
1
  #### General <a id="temp.constr.constr.general">[[temp.constr.constr.general]]</a>
2
 
3
  A *constraint* is a sequence of logical operations and operands that
4
  specifies requirements on template arguments. The operands of a logical
5
+ operation are constraints. There are five different kinds of
6
  constraints:
7
 
8
  - conjunctions [[temp.constr.op]],
9
+ - disjunctions [[temp.constr.op]],
10
+ - atomic constraints [[temp.constr.atomic]],
11
+ - concept-dependent constraints [[temp.constr.concept]], and
12
+ - fold expanded constraints [[temp.constr.fold]].
13
 
14
  In order for a constrained template to be instantiated [[temp.spec]],
15
  its associated constraints [[temp.constr.decl]] shall be satisfied as
16
  described in the following subclauses.
17