diff options
Diffstat (limited to '')
| -rw-r--r-- | stdlib/source/documentation/lux/data/collection/dictionary.lux | 12 | ||||
| -rw-r--r-- | stdlib/source/documentation/lux/time/duration.lux | 28 |
2 files changed, 20 insertions, 20 deletions
diff --git a/stdlib/source/documentation/lux/data/collection/dictionary.lux b/stdlib/source/documentation/lux/data/collection/dictionary.lux index 72bbc43a8..80e23fc70 100644 --- a/stdlib/source/documentation/lux/data/collection/dictionary.lux +++ b/stdlib/source/documentation/lux/data/collection/dictionary.lux @@ -58,15 +58,15 @@ "" [(of_list key_hash kvs)]) -(documentation: /.merged +(documentation: /.composite (format "Merges 2 dictionaries." \n "If any collisions with keys occur, the values of dict2 will overwrite those of dict1.") - [(merged dict2 dict1)]) + [(composite dict2 dict1)]) -(documentation: /.merged_with +(documentation: /.composite_with (format "Merges 2 dictionaries." \n "If any collisions with keys occur, a new value will be computed by applying 'f' to the values of dict2 and dict1.") - [(merged_with f dict2 dict1)]) + [(composite_with f dict2 dict1)]) (documentation: /.re_bound "If there is a value under 'from_key', remove 'from_key' and store the value under 'to_key'." @@ -90,8 +90,8 @@ ..revised ..revised' ..of_list - ..merged - ..merged_with + ..composite + ..composite_with ..re_bound ..sub ($.default /.key_hash) diff --git a/stdlib/source/documentation/lux/time/duration.lux b/stdlib/source/documentation/lux/time/duration.lux index 3eed756a9..fcd2a6706 100644 --- a/stdlib/source/documentation/lux/time/duration.lux +++ b/stdlib/source/documentation/lux/time/duration.lux @@ -1,17 +1,17 @@ (.using - [library - [lux {"-" and} - ["$" documentation {"+" documentation:}] - [control - ["<>" parser - ["<[0]>" code]]] - [data - ["[0]" text {"+" \n} - ["%" format {"+" format}]]] - [macro - ["[0]" template]]]] - [\\library - ["[0]" /]]) + [library + [lux {"-" and} + ["$" documentation {"+" documentation:}] + [control + ["<>" parser + ["<[0]>" code]]] + [data + ["[0]" text {"+" \n} + ["%" format {"+" format}]]] + [macro + ["[0]" template]]]] + [\\library + ["[0]" /]]) (documentation: /.Duration "Durations have a resolution of milli-seconds.") @@ -28,7 +28,7 @@ ..difference ($.default /.of_millis) ($.default /.millis) - ($.default /.merged) + ($.default /.composite) ($.default /.framed) ($.default /.up) ($.default /.down) |