Skip to content

Commit 171c08f

Browse files
authored
Fix some typos (#2964)
* Fix a typo in OCaml 5.3's release notes * Fix occurence -> occurrence This is probably the number 1 typo in the repo.
1 parent 3f54b80 commit 171c08f

17 files changed

+473
-485
lines changed

data/changelog/merlin/2014-08-23-merlin-2.0.0.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ changelog: |
1212
* locate now works on MLI files
1313
* automatic reloading of .merlin files (when they are update or created), it
1414
is no longer necessary to restart Merlin
15-
* introduced a small refactoring command: rename, who renames all occurences
15+
* introduced a small refactoring command: rename, who renames all occurrences
1616
of an identifier.
1717
1818
This release also contains contributions from: Yotam Barnoy, Jacques-Pascal
@@ -23,7 +23,7 @@ changelog: |
2323

2424
After a few months of development, we are pleased to announce the
2525
[stable release](https://github.com/ocaml/merlin/blob/v2.0/CHANGELOG) of
26-
[Merlin 2.0](https://github.com/the-lambda-church/merlin).
26+
[Merlin 2.0](https://github.com/the-lambda-church/merlin).
2727
Supported OCaml versions range from 4.00.1 to 4.02.1.
2828

2929
### Overview
@@ -41,12 +41,12 @@ available for [Sublime Text](https://github.com/def-lkb/sublime-text-merlin).
4141
### What's new
4242

4343
This release provides great improvements in robustness and quality of analysis.
44-
Files that changed on disk are now automatically reloaded.
44+
Files that changed on disk are now automatically reloaded.
4545
The parsing process is finer grained to provide more accurate recovery and error
4646
messages.
4747
Integration with Jane Street Core and js\_of\_ocaml has also improved.
4848

49-
Vim & Emacs are still the main targeted editors.
49+
Vim & Emacs are still the main targeted editors.
5050
Thanks to [Luc Rocher](https://github.com/Cynddl), preliminary support for
5151
Sublime Text is also available, see
5252
[Sublime-text-merlin](https://github.com/def-lkb/sublime-text-merlin).

data/changelog/merlin/2021-11-23-merlin-4.4.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ changelog: |
77
- stopped actively supporting version older than 4.12
88
+ merlin binary
99
- Mbrowse.select_leaf: correctly ignore merlin.hide (#1376)
10-
- enable `occurences` to work when looking for locally abstract types
10+
- enable `occurrences` to work when looking for locally abstract types
1111
(#1382)
1212
- handle `-alert` compiler flag (#1401)
1313
- avoid a race condition when the process started to read a configuration

data/changelog/ocaml/2024-05-13-ocaml-5.2.0.md

+225-225
Large diffs are not rendered by default.

data/changelog/ocaml/2025-01-08-ocaml-5.3.0.md

+177-177
Large diffs are not rendered by default.

data/news/platform/platform-2023-10.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ In this October edition, we bring you the latest on the OCaml Platform, continui
9797

9898
**Why:** Project-wide reference as an editor feature is a great way for developers to navigate their codebase and understand it better. It's also a feature that users expect to have coming from other ecosystems, so having support for it in Merlin and OCaml LSP will both improve OCaml editor experience and make it on par with other languages.
9999

100-
**What:** We're adding a new `merlin single occurrences` command and support for the LSP `textDocument/references` request. To do that, we're extending the compiler's Shapes to support global occurences, building a tool that generates an index of identifiers in a codebase and adding support for it in Dune, Merlin, and OCaml LSP.
100+
**What:** We're adding a new `merlin single occurrences` command and support for the LSP `textDocument/references` request. To do that, we're extending the compiler's Shapes to support global occurrences, building a tool that generates an index of identifiers in a codebase and adding support for it in Dune, Merlin, and OCaml LSP.
101101

102102
**Activities:**
103103
- We continued working on the compiler PR for project-wide occurrences, notably adding support for inline records' labels. The PR is now ready for the next round of reviews. -- [ocaml/ocaml#12508](https://github.com/ocaml/ocaml/pull/12508)

data/news/platform/platform-2023-12.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ In this November and December edition, we are excited to bring you the latest on
8585
**Activities:**
8686
<!--FROM EMILE-->
8787
- After merging [the PR that added support for search to `odoc`](https://github.com/ocaml/odoc/pull/972) in October, we continued work on building an `odoc`-compatible search engine based on [Sherlodoc](https://doc.sherlocode.com/). This will give a search engine with type-based search for every package that uses `odoc`. The plan is to make Sherlodoc the search engine in Dune's documentation generation. You can try an early demo on [Varray's doc](https://art-w.github.io/varray/varray/Varray) -- [art-w/sherlodoc#4](https://github.com/art-w/sherlodoc/pull/4)
88-
- Buiding on `odoc`'s support for search, we merged a PR that adds occurrences information to the search index. This will allows `odoc` search engines to improve the order of search results by using the number of occurences. -- [ocaml/odoc#976](https://github.com/ocaml/odoc/pull/976)
88+
- Buiding on `odoc`'s support for search, we merged a PR that adds occurrences information to the search index. This will allows `odoc` search engines to improve the order of search results by using the number of occurrences. -- [ocaml/odoc#976](https://github.com/ocaml/odoc/pull/976)
8989

9090
## **[`odoc`]** Syntax for Images and Assets in `odoc` ([W25](https://ocaml.org/docs/platform-roadmap#w25-generate-documentation))
9191

@@ -152,4 +152,4 @@ In this November and December edition, we are excited to bring you the latest on
152152
- We've added information about the size of the major heap at the end of an `ocamlmerlin` query - [#1717](https://github.com/ocaml/merlin/pull/1717)
153153
- We've finished up Merlin's new Fuzzy CI, a by-product of the performance work.
154154
- We've opened the PRs - [#1716](https://github.com/ocaml/merlin/pull/1716) (and [#1719](https://github.com/ocaml/merlin/pull/1719))
155-
- We've written a GitHub wiki entry with a high-level description about it. - [Merlin Fuzzy CI](https://github.com/ocaml/merlin/wiki/Merlin-Fuzzy-CI)
155+
- We've written a GitHub wiki entry with a high-level description about it. - [Merlin Fuzzy CI](https://github.com/ocaml/merlin/wiki/Merlin-Fuzzy-CI)

data/planet/gallium/florian-compiler-weekly-11-december-2023.md

+3-6
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ release of OCaml 5.1.1, some review work on occurrences analysis for
1717
OCaml projects and a bit of on-going work on structured logs.</p>
1818

1919

20-
2120

22-
21+
22+
2323
<h3>OCaml 5.1.1</h3>
2424
<p>OCaml 5.1.0 has been released nearly three months ago, in those
2525
months we have discovered a few significant bugs that were impeding the
@@ -179,7 +179,7 @@ increase to a less dramatic factor 6.</p>
179179
experimental runtime. And while waiting for a better solution, the
180180
collection of bug fixes integrated in OCaml 5.1.1 should made it
181181
possible to use numerical code in OCaml.</p>
182-
<h3>Project-wide occurence index</h3>
182+
<h3>Project-wide occurrence index</h3>
183183
<p>Beyond the release of OCaml 5.1.1, I have been working on reviewing
184184
PRs.</p>
185185
<p>With Gabriel Scherer and Ulysse G&eacute;rard, we spend an afternoon reading
@@ -248,6 +248,3 @@ identifiers are as fresh as we need them to be:</p>
248248
<span class="k">module</span> <span class="nc">New_record</span><span class="o">(</span><span class="nc">Root</span><span class="o">:</span><span class="nc">Def</span><span class="o">)</span><span class="bp">()</span><span class="o">:</span> <span class="nc">Record</span> <span class="k">with</span> <span class="k">type</span> <span class="n">root</span> <span class="o">:=</span> <span class="nn">Root</span><span class="p">.</span><span class="n">id</span>
249249
<span class="k">module</span> <span class="nc">New_sum</span><span class="o">(</span><span class="nc">Root</span><span class="o">:</span><span class="nc">Def</span><span class="o">)</span><span class="bp">()</span><span class="o">:</span> <span class="nc">Sum</span> <span class="k">with</span> <span class="k">type</span> <span class="n">root</span> <span class="o">:=</span> <span class="nn">Root</span><span class="p">.</span><span class="n">id</span>
250250
</pre></div>
251-
252-
253-

data/planet/mirage/easy-distributed-analytics-with-irmin-10.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ operations that are available and how to define atomic operations; and
4545
<p>Irmin now exposes <code>Irmin.Type</code> to create new mergeable contents more
4646
easily. For instance, the following type defines the property of
4747
simple metrics, where <code>name</code> is a human-readable name and <code>gauge</code> is a
48-
metric counting the number of occurences for some kind of event:</p>
48+
metric counting the number of occurrences for some kind of event:</p>
4949
<pre><code class="language-ocaml">type metric = {
5050
name : string;
5151
gauge: int64;
@@ -232,5 +232,3 @@ operations to read and write atomically. Finally, flexible first-class
232232
support for immutable trees has also been added.</p>
233233
<p>Send us feedback on the <a href="https://lists.xenproject.org/cgi-bin/mailman/listinfo/mirageos-devel">MirageOS mailing-list</a> or on the <a href="https://github.com/mirage/irmin">Irmin
234234
issue tracker on GitHub</a>.</p>
235-
236-

data/planet/ocamlpro/2022-at-ocamlpro.md

+17-18
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ source:
2222
</p><div class="caption">
2323
Clear skies on OCamlPro's way of life.
2424
</div>
25-
25+
2626
</div>
2727

2828
<p>For 12 years now, OCamlPro has been empowering a large range of customers,
@@ -155,7 +155,7 @@ application (<a href="https://ocamlpro.com/blog/feed#cobol">COBOL</a>).</p>
155155
</p><div class="caption">
156156
The M language, designed in the 80s to compute the French Income Tax, is still being rewritten in OCaml!
157157
</div>
158-
158+
159159
</div>
160160

161161
<p>In 2022, our work on MLANG has passed a significant milestone: our work may no
@@ -188,7 +188,7 @@ post</a> on the matter.</p>
188188
</p><div class="caption">
189189
Cobol is ran in gargantuan infrastructures of many an insurance companies and banks across the globe.
190190
</div>
191-
191+
192192
</div>
193193

194194
<p>In 2022, we started contributing to <a href="https://github.com/ocamlpro/gnucobol">the GnuCOBOL
@@ -229,7 +229,7 @@ standard. More on this next year, hopefully !</p>
229229
</p><div class="caption">
230230
Kind words sent our way by Florian Gilcher (skade), managing director at Ferrous Systems!
231231
</div>
232-
232+
233233
</div>
234234

235235
<p>OCamlPro's culture is one of human values and appeal for everything scientific.</p>
@@ -257,7 +257,7 @@ contributions and missions, some of which we will share with you right now.</p>
257257
</p><div class="caption">
258258
Ecore is the code generator at the heart of the EMF Architecture.
259259
</div>
260-
260+
261261
</div>
262262

263263
<p>In 2022, we have seized the opportunity to work at the threshold between Java
@@ -296,7 +296,7 @@ future iterations of their internal projects.</p>
296296
</p><div class="caption">
297297
Ferris the Crab is the mascot of the Rust Language. No wonder why we converged as well!
298298
</div>
299-
299+
300300
</div>
301301

302302
<p>As we continue scouring the market for more and more Rust projects, and whenever
@@ -373,7 +373,7 @@ DNS provider, and strives to offer a user-friendly and easy configuration.</p>
373373
</p><div class="caption">
374374
WebAssembly is used to compile many languages to an efficient portable code for web-browsers.
375375
</div>
376-
376+
377377
</div>
378378

379379
<p>Late 2022 was finally time for us to put into practice the knowledge we have
@@ -444,7 +444,7 @@ of Paris-Saclay</a>.</p>
444444
</p><div class="caption">
445445
Alt-Ergo proves mathematical formulas corresponding to software program properties.
446446
</div>
447-
447+
448448
</div>
449449

450450
<h4>
@@ -469,7 +469,7 @@ full-time R&amp;D engineer.</p>
469469
</p><div class="caption">
470470
The dedicated members of the Club!
471471
</div>
472-
472+
473473
</div>
474474

475475
<p>This is the reason why we would like to thank our partners from the <a href="https://alt-ergo.ocamlpro.com/#club">Alt-Ergo
@@ -527,7 +527,7 @@ the Formal Methods Lab (LMF) and the ProofinUse consortium members. Stay tuned!<
527527
</p><div class="caption">
528528
Dolmens are Neolithic megalithic structures composed of menhirs and they can range from a few centimeters to several meters high!
529529
</div>
530-
530+
531531
</div>
532532

533533
<p><a href="https://github.com/Gbury/dolmen">Dolmen</a> is an OCaml Library developed by
@@ -568,7 +568,7 @@ scientists.</p>
568568
</p><div class="caption">
569569
opam, the OCaml Package Manager, remains one of OCamlPro's greatest achievements!
570570
</div>
571-
571+
572572
</div>
573573

574574
<p>2022 has been the theatre of a sustained and continuous effort from the opam
@@ -616,7 +616,7 @@ repository, OCaml tooling) and the public's feedback and vision.</p>
616616
</p><div class="caption">
617617
Flambda2 is a powerful code optimizer for the OCaml compiler strong of many years of R&amp;D.
618618
</div>
619-
619+
620620
</div>
621621

622622
<p>OCamlPro is proud to be working on Flambda2, an ambitious OCaml
@@ -667,7 +667,7 @@ OCaml distribution!</p>
667667
</p><div class="caption">
668668
Camels going to their pluri-annual OUPS Meet-up.
669669
</div>
670-
670+
671671
</div>
672672

673673
<p>Just under 10 years ago, Fabrice Le Fessant initiated the <a href="https://www.meetup.com/fr-FR/ocaml-paris/events/99222322/">very first OCaml
@@ -709,14 +709,14 @@ Foundation</a> who graciously pays for the pizzas.</p>
709709
</p><div class="caption">
710710
Toulouse also has its set of enthousiastic OCaml supporters.
711711
</div>
712-
712+
713713
</div>
714714

715715
<p>Fortunately for OCaml Users that live in the French South-West, <a href="https://www.meetup.com/ocaml-toulouse/events/288464047/">a new Meet-up
716716
is now available</a> to
717717
them. On the 11th of October 2022, the first OCaml meet-up in
718718
<a href="https://en.wikipedia.org/wiki/Toulouse">Toulouse</a> happened.</p>
719-
<p>The first occurence of the OCaml Users in Toulouse Meetup kicked off with Erik
719+
<p>The first occurrence of the OCaml Users in Toulouse Meetup kicked off with Erik
720720
Martin-Dorel (OCaml Software Foundation) presenting
721721
<a href="https://ocaml-sf.org/learn-ocaml/"><code>Learn-OCaml</code></a> who was then followed by
722722
David Declerck (OCamlPro) presenting his
@@ -742,7 +742,7 @@ OCaml.</p>
742742
</p><div class="caption">
743743
ICFP 2022 took place in the beautiful town of Ljubjana, Slovenia.
744744
</div>
745-
745+
746746
</div>
747747

748748
<p>The OCaml Workshop is an international conference that focuses on everything
@@ -771,7 +771,7 @@ editions of the conference!</p>
771771
</p><div class="caption">
772772
the JFLA'2022 took place in the beautiful Domaine d'Essendi&eacute;ras in P&eacute;rigord, France.
773773
</div>
774-
774+
775775
</div>
776776

777777
<p>Among the many scientific conferences we attend on an annual basis, the
@@ -803,4 +803,3 @@ support and collaboration throughout the year,</p>
803803
<p>And to you, dear reader, thank you for tagging along,</p>
804804
<p>Since 2011 with love,</p>
805805
<p>The OCamlPro Team</p>
806-

data/planet/ocamlpro/better-inlining-progress-report.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ and b = (a.v, a.v)
7474
</code></pre>
7575
<p>I have a few solutions, but not sure yet which one is best. This probably won't appear in any normal test. This bug manifests through a segmentation fault (<code>cmmgen</code> fails to compile that recursive value reasonably).</p>
7676
<h3>Pattern-Matching</h3>
77-
<p>The new passes assume that every identifier is declared only once in a given module, but this assumption can be broken on some rare pattern matching cases. I will have to dig through <code>matching.ml</code> to add a substitution in these cases. (the only non hand-built occurence that I found is in <code>ocamlnet</code>)</p>
77+
<p>The new passes assume that every identifier is declared only once in a given module, but this assumption can be broken on some rare pattern matching cases. I will have to dig through <code>matching.ml</code> to add a substitution in these cases. (the only non hand-built occurrence that I found is in <code>ocamlnet</code>)</p>
7878
<h2>Known Mis-compilations</h2>
7979
<ul>
8080
<li>since there is no cross-module information at the moment, calls to functions from other modules are always slow.
@@ -84,4 +84,3 @@ and b = (a.v, a.v)
8484
</ul>
8585
<h2>What's next ?</h2>
8686
<p>I would now like to add back cross-module information, and after a bit of cleanup the first series of patches should be ready to propose upstream.</p>
87-

data/planet/sfletcher/conversion-operations-of-the-lambda-calculus-.md

+12-13
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ source:
1313

1414
<html>
1515
<head>
16-
17-
16+
17+
1818
<title>Conversion</title>
1919
</head>
2020
<body>
@@ -40,9 +40,9 @@ source:
4040
\end{eqnarray}
4141
\]
4242
The $\textbf{semantics}$ of the the $\lambda$-calculus is defined
43-
by three $\textit{conversion rules}$. To understand them
43+
by three $\textit{conversion rules}$. To understand them
4444
requires the terminology of $\textit{free}$ and
45-
$\textit{bound}$ variables. An occurence of a variable in a
45+
$\textit{bound}$ variables. An occurrence of a variable in a
4646
$\lambda$-expression is bound if there is an enclosing abstraction
4747
that binds it, and is free otherwise. For example, in $\lambda x.+\;
4848
((\lambda y. +\;y\; z)\;7)\;x$, $x$ and $y$ appear bound whereas $z$
@@ -56,10 +56,10 @@ source:
5656
denotes the application of a particular $\lambda$-abstraction to
5757
the argument $4$. The result of applying a $\lambda$-abstraction
5858
to an argument is an instance of the body of the
59-
$\lambda$-abstraction in which (free) occurences of the formal
59+
$\lambda$-abstraction in which (free) occurrences of the formal
6060
parameter in the body are replaced with (copies of) the
6161
argument. Thus, $\left(\lambda x.+\;x\;1\right)\; 4 \rightarrow
62-
+\;4\;1 \rightarrow 5$. In the event there are no occurences of
62+
+\;4\;1 \rightarrow 5$. In the event there are no occurrences of
6363
the formal parameter in the abstraction body, the argument is
6464
discarded unused so, $(\lambda x.\;3)\;4 \rightarrow 3$. Care is
6565
needed when formal parameter names are not unique. For example,
@@ -86,10 +86,10 @@ source:
8686
<pre>
8787
auto add = [](int x) { return [=](int y) { return x + y; }; };
8888
auto sub = [](int x) { return [=](int y) { return x - y; }; };
89-
[=](int x) {
89+
[=](int x) {
9090
return [=](int x) {
91-
return add (sub (x) (1));
92-
} (x) (3);
91+
return add (sub (x) (1));
92+
} (x) (3);
9393
} (9) ; //is the value '11'
9494
</pre>
9595

@@ -103,7 +103,7 @@ source:
103103
way to look at $\beta$ conversion is that it is saying something
104104
about $\lambda$-expressions that look different but mean the same
105105
thing.
106-
106+
107107

108108
<h4>$\alpha$-conversion</h4>
109109
<p>
@@ -124,7 +124,7 @@ source:
124124
does not occur free in $f$, then $\lambda x.f\;x
125125
\underset{\eta}{\leftrightarrow} f$. For example, in OCaml if we
126126
define <code>f</code> by
127-
<code>let f x = x + 1</code> then clearly
127+
<code>let f x = x + 1</code> then clearly
128128
<code>fun x -&gt; f x</code> produces the same results for
129129
all values <code>x</code> in the domain of <code>f</code>.
130130
</p>
@@ -153,7 +153,6 @@ source:
153153
<p>
154154
References:<br/>
155155
[1] <cite>The Implementation of Functional Programming Languages</cite> by Simon L. Peyton Jones. 1987.</p>
156-
156+
157157
</body>
158158
</html>
159-

0 commit comments

Comments
 (0)