From cdf10e673cf66188e3facae0f458aea71f9ee438 Mon Sep 17 00:00:00 2001
From: Julien Fischer <juliensf@gmail.com>
Date: Tue, 31 Mar 2026 00:00:27 +1100
Subject: [PATCH] More minor fixes for samples.

samples/c_interface/short_example.m:
    Do not output two trailing newlines.

samples/concurrency/midimon/concurrent_stream.m:
    Module qualify some calls.

samples/java_interface/short_example.m:
    s/JAva/Java/

samples/muz/muz.m:
    Fix some spelling errors.
---
 samples/c_interface/short_example.m             | 2 +-
 samples/concurrency/midimon/concurrent_stream.m | 8 ++++----
 samples/java_interface/short_example.m          | 2 +-
 samples/muz/muz.m                               | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/samples/c_interface/short_example.m b/samples/c_interface/short_example.m
index 33150e41f..058b4b95b 100644
--- a/samples/c_interface/short_example.m
+++ b/samples/c_interface/short_example.m
@@ -24,4 +24,4 @@
 ").
 
 main(!IO) :-
-    puts("Hello, world\n", !IO).
+    puts("Hello, world", !IO).
diff --git a/samples/concurrency/midimon/concurrent_stream.m b/samples/concurrency/midimon/concurrent_stream.m
index 3bf16cdc4..4a601940a 100644
--- a/samples/concurrency/midimon/concurrent_stream.m
+++ b/samples/concurrency/midimon/concurrent_stream.m
@@ -2,7 +2,7 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2000, 2006, 2010 The University of Melbourne.
-% Copyright (C) 2016, 2018 The Mercury team.
+% Copyright (C) 2016, 2018, 2026 The Mercury team.
 % This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
@@ -90,12 +90,12 @@ new(Stream, !IO) :-
 
 put(Stream, Thing, !IO) :-
     Stream = concurrent_stream(Lock, QueueRef, Semaphore),
-    wait(Lock, !IO),
+    sempahore.wait(Lock, !IO),
     store.get_mutvar(QueueRef, Queue0, !IO),
     queue.put(ok(Thing), Queue0, Queue),
     store.set_mutvar(QueueRef, Queue, !IO),
-    signal(Lock, !IO),
-    signal(Semaphore, !IO).
+    semaphore.signal(Lock, !IO),
+    semaphore.signal(Semaphore, !IO).
 
 end(Stream, !IO) :-
     Stream = concurrent_stream(Lock, QueueRef, Semaphore),
diff --git a/samples/java_interface/short_example.m b/samples/java_interface/short_example.m
index 825c9a169..80a82b177 100644
--- a/samples/java_interface/short_example.m
+++ b/samples/java_interface/short_example.m
@@ -15,7 +15,7 @@ main(!IO) :-
     java_write_line("Hello, world", !IO).
 
 :- pred java_write_line(string::in, io::di, io::uo) is det.
-:- pragma foreign_proc("JAva",
+:- pragma foreign_proc("Java",
     java_write_line(S::in, _IO0::di, _IO::uo),
     [promise_pure, will_not_call_mercury],
 "
diff --git a/samples/muz/muz.m b/samples/muz/muz.m
index d4e70d8d1..95dfdecaf 100644
--- a/samples/muz/muz.m
+++ b/samples/muz/muz.m
@@ -206,7 +206,7 @@ processFiles([zinput(Stream, Flags0) | Rest], Abbrev, ZPragma0, ZPragma,
 
 :- type zphase0 == pair(zphase, schema_table).
 
-% Used to indicate the earliest phase in which errors have occured.
+% Used to indicate the earliest phase in which errors have occurred.
 :- type zphase
     --->    lexical
     ;       syntax
@@ -296,7 +296,7 @@ usage(!IO) :-
         "-a-, --no-abbreviate",
         "\tTurn off use of type abbreviations.",
         "-t <toolkit>, --toolkit <toolkit>",
-        "\tTypecheck with the specified toolkit, overiding the",
+        "\tTypecheck with the specified toolkit, overriding the",
         "\tbuiltin default and MUZ_TOOLKIT environment variable",
         "\t(-t- for typechecking without a toolkit).",
         "-?, -h, --help",