Merge primitives/scalars

Author: 1st1

docs/datamodel/constraints.rst

@@ -739,8 +739,8 @@ Description
 ^^^^^^^^^^^
 
 The command ``create constraint`` defines a new concrete constraint. It can
-only be used in the context of :eql:stmt:`create scalar type`,
-:eql:stmt:`alter scalar type`, :eql:stmt:`create property`,
+only be used in the context of :eql:stmt:`create scalar`,
+:eql:stmt:`alter scalar`, :eql:stmt:`create property`,
 :eql:stmt:`alter property`, :eql:stmt:`create link`, or :eql:stmt:`alter link`.
 
 *name* must be a name (optionally module-qualified) of a previously defined

docs/datamodel/future.rst

@@ -26,8 +26,10 @@ a ``future`` from your schema if absolutely necessary, but doing so is
 discouraged. Existing projects are unaffected by default, so you must manually
 add the ``future`` specification to gain early access.
 
-At the moment there are three ``future`` flags available:
+Flags
+=====
 
+At the moment there are three ``future`` flags available:
 
 - ``simple_scoping``