@@ -194,7 +194,7 @@ timeline is ``macro`` and its component timeline is ``macro:meso``. Likewise,
194194`` micro`` has parent timeline `` macro:meso`` and component timeline
195195`` macro:meso:micro`` .
196196
197- The conduit from `` macro.bc_out`` to `` meso.init_in`` isvalid because `` bc_out`` is an
197+ The conduit from `` macro.bc_out`` to `` meso.init_in`` is valid because `` bc_out`` is an
198198`` o_i`` port on `` macro`` ' s component timeline ``macro``, and the messages received by
199199the `` f_init`` port `` init_in`` are on `` meso`` ' s parent timeline, which is also
200200`` macro`` . The same reasoning applies to the other three conduits.
@@ -347,8 +347,10 @@ But each side of the bridge does step through the same time points as the compon
347347that side, and the two entries under `` matching_timelines`` declare exactly that:
348348`` bridge.a_side`` is equivalent to `` a`` , and `` bridge.b_side`` to `` b`` .
349349
350- Deeper timelines are matched by writing out their full path, e.g.
351- `` macro1:micro1: macro2:micro2`` . Matching timelines are taken into account after
350+ Deeper timelines are matched by writing out their full path, relative to the model that
351+ contains the `` matching_timelines`` declaration. In the two- subtimelines example above,
352+ for instance, `` micro1`` and `` micro2`` could be declared equivalent from within
353+ `` two_subtimelines_model`` with `` macro.tl1:micro1: macro.tl2:micro2`` . Matching timelines are taken into account after
352354applying any conduit filters, so a conduit with a `` repeat`` or `` last`` filter can also
353355connect to a timeline that matches the one it is filtered to.
354356
0 commit comments