more use of ReST substitutions