Merge pull request #28032 from poettering/mumumµ

deal with µ unicode ambiguities

16 files changed, 25 insertions, 25 deletions

diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml
index 479b482a30..eef6db4a5c 100644
--- a/man/kernel-command-line.xml
+++ b/man/kernel-command-line.xml
@@ -556,7 +556,7 @@
       <varlistentry>
         <term><varname>systemd.clock-usec=</varname></term>
 
-        <listitem><para>Takes a decimal, numeric timestamp in µs since January 1st 1970, 00:00am, to set the
+        <listitem><para>Takes a decimal, numeric timestamp in μs since January 1st 1970, 00:00am, to set the
         system clock to. The system time is set to the specified timestamp early during boot. It is not
         propagated to the hardware clock (RTC).</para></listitem>
       </varlistentry>
diff --git a/man/org.freedesktop.systemd1.xml b/man/org.freedesktop.systemd1.xml
index fc9a79d796..67ccf5f803 100644
--- a/man/org.freedesktop.systemd1.xml
+++ b/man/org.freedesktop.systemd1.xml
@@ -37,7 +37,7 @@
     unit and job objects or directly convert a unit name or job identifier to a bus path of the corresponding
     D-Bus object.</para>
 
-    <para>Properties exposing time values are usually encoded in microseconds (µs) on the bus, even if
+    <para>Properties exposing time values are usually encoded in microseconds (μs) on the bus, even if
     their corresponding settings in the unit files are in seconds.</para>
 
     <para>PID 1 uses <ulink url="https://www.freedesktop.org/software/polkit/docs/latest/">polkit</ulink> to
diff --git a/man/sd_bus_get_fd.xml b/man/sd_bus_get_fd.xml
index a738f85bde..114b920c6c 100644
--- a/man/sd_bus_get_fd.xml
+++ b/man/sd_bus_get_fd.xml
@@ -66,7 +66,7 @@
     <constant>POLLIN</constant>, <constant>POLLOUT</constant>, … events, or negative on error.
     </para>
 
-    <para><function>sd_bus_get_timeout()</function> returns the <emphasis>absolute</emphasis> time-out in µs,
+    <para><function>sd_bus_get_timeout()</function> returns the <emphasis>absolute</emphasis> time-out in μs,
     from which the relative time-out to pass to <function>poll()</function> (or a similar call) can be
     derived, when waiting for events on the specified bus connection. The returned timeout may be zero, in
     which case a subsequent I/O polling call should be invoked in non-blocking mode. The returned timeout may
diff --git a/man/sd_bus_wait.xml b/man/sd_bus_wait.xml
index eaad91f52e..3c24a6f0a9 100644
--- a/man/sd_bus_wait.xml
+++ b/man/sd_bus_wait.xml
@@ -47,7 +47,7 @@
     indicating that no work is pending on the connection. Internally, this call invokes <citerefentry
     project='man-pages'><refentrytitle>ppoll</refentrytitle><manvolnum>2</manvolnum></citerefentry>, to wait for I/O on
     the bus connection. If the <parameter>timeout_usec</parameter> parameter is specified, the call will block at most
-    for the specified amount of time in µs. Pass <constant>UINT64_MAX</constant> to permit it to sleep
+    for the specified amount of time in μs. Pass <constant>UINT64_MAX</constant> to permit it to sleep
     indefinitely.</para>
 
     <para>After each invocation of <function>sd_bus_wait()</function> the <function>sd_bus_process()</function> call
diff --git a/man/sd_event_add_time.xml b/man/sd_event_add_time.xml
index 6031fee1b3..864cf9b268 100644
--- a/man/sd_event_add_time.xml
+++ b/man/sd_event_add_time.xml
@@ -113,14 +113,14 @@
     <constant>CLOCK_REALTIME_ALARM</constant>, or <constant>CLOCK_BOOTTIME_ALARM</constant>. See
     <citerefentry><refentrytitle>timerfd_create</refentrytitle><manvolnum>2</manvolnum></citerefentry> for details
     regarding the various types of clocks. The <parameter>usec</parameter> parameter specifies the earliest time, in
-    microseconds (µs), relative to the clock's epoch, when the timer shall be triggered. If a time already in the past
+    microseconds (μs), relative to the clock's epoch, when the timer shall be triggered. If a time already in the past
     is specified (including <constant>0</constant>), this timer source "fires" immediately and is ready to be
     dispatched. If the parameter is specified as <constant>UINT64_MAX</constant> the timer event will never elapse,
     which may be used as an alternative to explicitly disabling a timer event source with
     <citerefentry><refentrytitle>sd_event_source_set_enabled</refentrytitle><manvolnum>3</manvolnum></citerefentry>. The
-    <parameter>accuracy</parameter> parameter specifies an additional accuracy value in µs specifying how much the
-    timer event may be delayed. Use <constant>0</constant> to select the default accuracy (250ms). Use 1µs for maximum
-    accuracy. Consider specifying 60000000µs (1min) or larger for long-running events that may be delayed
+    <parameter>accuracy</parameter> parameter specifies an additional accuracy value in μs specifying how much the
+    timer event may be delayed. Use <constant>0</constant> to select the default accuracy (250ms). Use 1μs for maximum
+    accuracy. Consider specifying 60000000μs (1min) or larger for long-running events that may be delayed
     substantially. Picking higher accuracy values allows the system to coalesce timer events more aggressively,
     improving power efficiency.</para>
 
@@ -203,14 +203,14 @@
     <para><function>sd_event_source_get_time()</function> retrieves the configured time value of an event
     source created previously with <function>sd_event_add_time()</function> or
     <function>sd_event_add_time_relative()</function>. It takes the event source object and a pointer to a
-    variable to store the time in, relative to the selected clock's epoch, in µs. The returned value is
+    variable to store the time in, relative to the selected clock's epoch, in μs. The returned value is
     relative to the epoch, even if the event source was created with a relative time via
     <function>sd_event_add_time_relative()</function>.</para>
 
     <para><function>sd_event_source_set_time()</function> changes the time of an event source created
     previously with <function>sd_event_add_time()</function> or
     <function>sd_event_add_time_relative()</function>. It takes the event source object and a time relative
-    to the selected clock's epoch, in µs.</para>
+    to the selected clock's epoch, in μs.</para>
 
     <para><function>sd_event_source_set_time_relative()</function> is similar to
     <function>sd_event_source_set_time()</function>, but takes a time relative to the current time of the
@@ -220,12 +220,12 @@
     retrieves the configured accuracy value of an event source
     created previously with <function>sd_event_add_time()</function>. It
     takes the event source object and a pointer to a variable to store
-    the accuracy in. The accuracy is specified in µs.</para>
+    the accuracy in. The accuracy is specified in μs.</para>
 
     <para><function>sd_event_source_set_time_accuracy()</function>
     changes the configured accuracy of a timer event source created
     previously with <function>sd_event_add_time()</function>. It takes
-    the event source object and accuracy, in µs.</para>
+    the event source object and accuracy, in μs.</para>
 
     <para><function>sd_event_source_get_time_clock()</function>
     retrieves the configured clock of an event source created
diff --git a/man/sd_event_now.xml b/man/sd_event_now.xml
index 70e980ab7b..45037d13b2 100644
--- a/man/sd_event_now.xml
+++ b/man/sd_event_now.xml
@@ -53,7 +53,7 @@
     <citerefentry project='man-pages'><refentrytitle>clock_gettime</refentrytitle><manvolnum>2</manvolnum></citerefentry>
     for more information on the various clocks. The retrieved
     timestamp is stored in the <parameter>usec</parameter> parameter,
-    in µs since the clock's epoch. If this function is invoked before
+    in μs since the clock's epoch. If this function is invoked before
     the first event loop iteration, the current time is returned, as
     reported by <function>clock_gettime()</function>. To distinguish
     this case from a regular invocation the return value will be
diff --git a/man/sd_login_monitor_new.xml b/man/sd_login_monitor_new.xml
index 8118121281..3fbda1c93e 100644
--- a/man/sd_login_monitor_new.xml
+++ b/man/sd_login_monitor_new.xml
@@ -168,7 +168,7 @@
     is no timeout to wait for this will fill in <constant>(uint64_t)
     -1</constant> instead. Note that <function>poll()</function> takes
     a relative timeout in milliseconds rather than an absolute timeout
-    in microseconds. To convert the absolute 'µs' timeout into
+    in microseconds. To convert the absolute 'μs' timeout into
     relative 'ms', use code like the following:</para>
 
     <programlisting>uint64_t t;
diff --git a/man/sd_notify.xml b/man/sd_notify.xml
index 89f1729b13..a286beaf45 100644
--- a/man/sd_notify.xml
+++ b/man/sd_notify.xml
@@ -140,7 +140,7 @@
         <term>MONOTONIC_USEC=…</term>
 
         <listitem><para>A field carrying the monotonic timestamp (as per
-        <constant>CLOCK_MONOTONIC</constant>) formatted in decimal in µs, when the notification message was
+        <constant>CLOCK_MONOTONIC</constant>) formatted in decimal in μs, when the notification message was
         generated by the client. This is typically used in combination with <literal>RELOADING=1</literal>,
         to allow the service manager to properly synchronize reload cycles. See
         <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
diff --git a/man/sd_watchdog_enabled.xml b/man/sd_watchdog_enabled.xml
index b4a59f2ad1..352b3606d7 100644
--- a/man/sd_watchdog_enabled.xml
+++ b/man/sd_watchdog_enabled.xml
@@ -65,7 +65,7 @@
 
     <para>If the <parameter>usec</parameter> parameter is non-<constant>NULL</constant>,
     <function>sd_watchdog_enabled()</function> will write the timeout
-    in µs for the watchdog logic to it.</para>
+    in μs for the watchdog logic to it.</para>
 
     <para>To enable service supervision with the watchdog logic, use
     <varname>WatchdogSec=</varname> in service files. See
@@ -122,7 +122,7 @@
 
         <listitem><para>Set by the system manager for supervised
         process for which watchdog support is enabled, and contains
-        the watchdog timeout in µs. See above for
+        the watchdog timeout in μs. See above for
         details.</para></listitem>
       </varlistentry>
     </variablelist>
diff --git a/man/systemctl.xml b/man/systemctl.xml
index 537d0aa157..2d2434bbd0 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -2464,7 +2464,7 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err
           <variablelist>
             <varlistentry>
               <term><option>us</option></term>
-              <term><option>µs</option></term>
+              <term><option>μs</option></term>
               <listitem><para><literal>Day YYYY-MM-DD HH:MM:SS.UUUUUU TZ</literal></para></listitem>
             </varlistentry>
           </variablelist>
@@ -2479,7 +2479,7 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err
           <variablelist>
             <varlistentry>
               <term><option>us+utc</option></term>
-              <term><option>µs+utc</option></term>
+              <term><option>μs+utc</option></term>
               <listitem><para><literal>Day YYYY-MM-DD HH:MM:SS.UUUUUU UTC</literal></para></listitem>
             </varlistentry>
           </variablelist>
diff --git a/man/systemd-coredump.xml b/man/systemd-coredump.xml
index c92a250ca2..4c98c6771a 100644
--- a/man/systemd-coredump.xml
+++ b/man/systemd-coredump.xml
@@ -192,7 +192,7 @@ COREDUMP_FILENAME=/var/lib/systemd/coredump/core.Web….552351.….zst
 
       <varlistentry>
         <term><varname>COREDUMP_TIMESTAMP=</varname></term>
-        <listitem><para>The time of the crash as reported by the kernel (in µs since the epoch).</para>
+        <listitem><para>The time of the crash as reported by the kernel (in μs since the epoch).</para>
         </listitem>
       </varlistentry>
 
diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml
index 610c11feb3..7836834efe 100644
--- a/man/systemd.resource-control.xml
+++ b/man/systemd.resource-control.xml
@@ -1362,7 +1362,7 @@ DeviceAllow=/dev/loop-control
         <varname>DefaultMemoryPressureThresholdSec=</varname> setting in
         <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
         (which in turn defaults to 200ms). The specified value expects a time unit such as
-        <literal>ms</literal> or <literal>µs</literal>, see
+        <literal>ms</literal> or <literal>μs</literal>, see
         <citerefentry><refentrytitle>systemd.time</refentrytitle><manvolnum>7</manvolnum></citerefentry> for
         details on the permitted syntax.</para></listitem>
       </varlistentry>
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 646e1f21f0..a183a9eedf 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -236,7 +236,7 @@
             <literal>MONOTONIC_USEC=</literal> set to the current monotonic time
             (i.e. <constant>CLOCK_MONOTONIC</constant> in
             <citerefentry><refentrytitle>clock_gettime</refentrytitle><manvolnum>2</manvolnum></citerefentry>)
-            in µs, formatted as decimal string. Once reloading is complete another notification message must
+            in μs, formatted as decimal string. Once reloading is complete another notification message must
             be sent, containing <literal>READY=1</literal>. Using this service type and implementing this
             reload protocol is an efficient alternative to providing an <varname>ExecReload=</varname>
             command for reloading of the service's configuration.</para></listitem>
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index ec145c3710..7716e2898c 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -715,7 +715,7 @@
       <varlistentry>
         <term><varname>Timestamping=</varname></term>
         <listitem><para>Takes one of <literal>off</literal>, <literal>us</literal> (alias:
-        <literal>usec</literal>, <literal>µs</literal>) or <literal>ns</literal> (alias:
+        <literal>usec</literal>, <literal>μs</literal>) or <literal>ns</literal> (alias:
         <literal>nsec</literal>). This controls the <constant>SO_TIMESTAMP</constant> or
         <constant>SO_TIMESTAMPNS</constant> socket options, and enables whether ingress network traffic shall
         carry timestamping metadata. Defaults to <option>off</option>.</para></listitem>
diff --git a/man/systemd.time.xml b/man/systemd.time.xml
index 07100b12b7..6888f2226f 100644
--- a/man/systemd.time.xml
+++ b/man/systemd.time.xml
@@ -47,7 +47,7 @@
     understood:</para>
 
     <itemizedlist>
-      <listitem><para>usec, us, µs</para></listitem>
+      <listitem><para>usec, us, μs</para></listitem>
       <listitem><para>msec, ms</para></listitem>
       <listitem><para>seconds, second, sec, s</para></listitem>
       <listitem><para>minutes, minute, min, m</para></listitem>
diff --git a/man/sysupdate.d.xml b/man/sysupdate.d.xml
index 260c260f98..1987e649ae 100644
--- a/man/sysupdate.d.xml
+++ b/man/sysupdate.d.xml
@@ -375,7 +375,7 @@
           <row>
             <entry><literal>@t</literal></entry>
             <entry>File modification time</entry>
-            <entry>Formatted decimal integer, µs since UNIX epoch Jan 1st 1970</entry>
+            <entry>Formatted decimal integer, μs since UNIX epoch Jan 1st 1970</entry>
             <entry>Only relevant if target resource type chosen as <constant>regular-file</constant></entry>
           </row>