1 files changed, 22 insertions, 22 deletions
diff --git a/Master/texmf-dist/tex/context/base/m-units.mkiv b/Master/texmf-dist/tex/context/base/m-units.mkiv
index a7653c56677..b0db8d54895 100644
--- a/Master/texmf-dist/tex/context/base/m-units.mkiv
+++ b/Master/texmf-dist/tex/context/base/m-units.mkiv
@@ -5,12 +5,14 @@
 %D       subtitle=Scientific Units,
 %D         author={Hans Hagen \& Ton Otten},
 %D           date=\currentdate,
-%D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
 %C
 %C This module is part of the \CONTEXT\ macro||package and is
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
+%D Best use the built in unit handle!
+
 %D Scientific units can be typeset in math mode pretty well,
 %D but occasionally one has to take care of spacing.
 %D Furthermore, entering these units is not that natural as
@@ -29,8 +31,6 @@
 %D macro defined in the core modules. Let's say that this is
 %D an upward compatibility issue.
 
-% \registerctxluafile{x-units}{}
-
 \startmessages  dutch  library: units
   title: eenheden
       1: gebruik \string\Degrees\space\string\Celsius\space in plaats van \string\Celsius !
@@ -70,6 +70,19 @@
 
 \unprotect
 
+\writestatus{\m!units}{The units module is obsolete because functionality is built into the core.}
+
+\let\unit\undefined
+
+\definesynonyms
+  [\v!unit]
+  [\v!units]
+  [\unitmeaning]
+
+\setupsynonyms
+  [\v!unit]
+  [\c!synonymcommand=\dimension]
+
 \startmodule[units]
 
 %D This runtime loadable module implements a way of defining
@@ -77,15 +90,9 @@
 %D one that is able to cooperate with some other dimension
 %D related macros. As said, this module enables user to enter:
 %D
-%D \startbuffer
+%D \starttyping
 %D some 10 \Square \Meter \Per \Second or more
-%D \stopbuffer
-%D
-%D \getbuffer
-%D
-%D as:
-%D
-%D \typebuffer
+%D \stoptyping
 %D
 %D The units itself are implemented as synonyms.
 %D
@@ -115,7 +122,7 @@
 %D The next useless examples show some of the cases we want
 %D to handle in a proper way.
 %D
-%D \startbuffer
+%D \starttyping
 %D ... 10 \Square \Meter \Per \Volt \
 %D ... 10 \Square \Meter \Volt \
 %D ... 10 \Meter \Volt \
@@ -124,13 +131,7 @@
 %D ... 10 \Meter \Times \Meter \
 %D ... 10 \Square \Meter \Times \Meter \
 %D ... 10 \Square \Milli \Meter \Times \Meter \
-%D \stopbuffer
-%D
-%D \typebuffer
-%D
-%D Becomes:
-%D
-%D \getbuffer
+%D \stoptyping
 
 %D \macros
 %D   {mathematicstypeface, dimensiontypeface,
@@ -169,9 +170,8 @@
 %D
 %D The actual definition of \type {\dimension} overruled the
 %D one in the core modules. The boolean can be used to
-%D force spacing between units. Vergelijk {\Newton \Meter}
-%D eens met {\spaceddimensionstrue \Newton \Meter}. The
-%D rather ugly test prevents problems with nested dimensions.
+%D force spacing between units. The rather ugly test prevents
+%D problems with nested dimensions.
 
 \newif\ifspaceddimensions \spaceddimensionsfalse % user switch
 \newif\iftextdimensions   \textdimensionsfalse   % user switch