Skip to content

Commit 9f47d0b

Browse files
author
github-actions
committed
Update
1 parent 1188fed commit 9f47d0b

25 files changed

+22
-25
lines changed

Build-options.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ <h2 id="using-build-options">Using build options</h2>
375375
a colon:</p>
376376
<pre><code class="language-console">$ meson configure -Dsubproject:option=newvalue
377377
</code></pre>
378-
<p><strong>NOTE:</strong> If you cannot call <code>meson configure</code> you likely have a old
378+
<p><strong>NOTE:</strong> If you cannot call <code>meson configure</code> you likely have an old
379379
version of Meson. In that case you can call <code>mesonconf</code> instead, but
380380
that is deprecated in newer versions</p>
381381
<h2 id="yielding-to-superproject-option">Yielding to superproject option</h2>

Builtin-options.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ <h3 id="core-options">Core options</h3>
359359
<tr>
360360
<td> genvslite {vs2022}</td>
361361
<td> vs2022</td>
362-
<td> Setup multi-builtype ninja build directories and Visual Studio solution</td>
362+
<td> Setup multi-buildtype ninja build directories and Visual Studio solution</td>
363363
<td> no</td>
364364
<td> no</td>
365365
</tr>
@@ -520,7 +520,7 @@ <h4 id="details-for-genvslite">Details for <code>genvslite</code>
520520
<p>Setup multiple buildtype-suffixed, ninja-backend build directories (e.g.
521521
[builddir]_[debug/release/etc.]) and generate [builddir]_vs containing a Visual
522522
Studio solution with multiple configurations that invoke a meson compile of the
523-
setup build directories, as appropriate for the current configuration (builtype).</p>
523+
setup build directories, as appropriate for the current configuration (buildtype).</p>
524524
<p>This has the effect of a simple setup macro of multiple 'meson setup ...'
525525
invocations with a set of different buildtype values. E.g.
526526
<code>meson setup ... --genvslite vs2022 somebuilddir</code> does the following -</p>
@@ -580,7 +580,7 @@ <h4 id="details-for-buildtype">Details for <code>buildtype</code>
580580
<p>All other combinations of <code>debug</code> and <code>optimization</code> set <code>buildtype</code> to <code>'custom'</code>.</p>
581581
<h4 id="details-for-warning_level">Details for <code>warning_level</code>
582582
</h4>
583-
<p>Exact flags per warning level is compiler specific, but there is an approximative
583+
<p>Exact flags per warning level is compiler specific, but there is an approximate
584584
table for most common compilers.</p>
585585
<table>
586586
<thead>

FAQ.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ <h2 id="does-wrap-download-sources-behind-my-back">Does wrap download sources be
424424
or they are not called (due to e.g. <code>if/else</code>) then nothing is
425425
downloaded.</p>
426426
<p>If this is not sufficient for you, starting from release 0.40.0 Meson
427-
has a option called <code>wrap-mode</code> which can be used to disable wrap
427+
has an option called <code>wrap-mode</code> which can be used to disable wrap
428428
downloads altogether with <code>--wrap-mode=nodownload</code>. You can also
429429
disable dependency fallbacks altogether with <code>--wrap-mode=nofallback</code>,
430430
which also implies the <code>nodownload</code> option.</p>

IDE-integration.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ <h1 id="ide-integration">IDE integration</h1>
217217
this problem, Meson provides an API that makes it easy for any IDE or
218218
build tools to integrate Meson builds and provide an experience
219219
comparable to a solution native to the IDE.</p>
220-
<p>All the resources required for such a IDE integration can be found in
220+
<p>All the resources required for such an IDE integration can be found in
221221
the <code>meson-info</code> directory in the build directory.</p>
222222
<p>The first thing to do when setting up a Meson project in an IDE is to
223223
select the source and build directories. For this example we assume

Include-directories.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ <h1 id="include-directories">Include directories</h1>
215215
<p>Most <code>C</code>/<code>C++</code> projects have headers in different directories than
216216
sources. Thus you need to specify include directories. Let's assume
217217
that we are at some subdirectory and wish to add its <code>include</code>
218-
subdirectory to some target's search path. To create a include
218+
subdirectory to some target's search path. To create an include
219219
directory object we do this:</p>
220220
<pre><code class="language-meson">incdir = include_directories('include')
221221
</code></pre>

Qt6-module.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ <h2 id="compile_moc">compile_moc</h2>
294294
it generates a file <code>{target private directory}/subdir/one.out</code> when <code>true</code>,
295295
and <code>{target private directory}/one.out</code> when <code>false</code> (default).</li>
296296
<li>
297-
<code>output_json</code> bool: <em>New in 1.7.0</em>. If <code>true</code>, generates additionnaly a
297+
<code>output_json</code> bool: <em>New in 1.7.0</em>. If <code>true</code>, generates additionally a
298298
JSON representation which may be used by external tools such as qmltyperegistrar</li>
299299
</ul>
300300
<h2 id="preprocess">preprocess</h2>

Unit-tests.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ <h3 id="other-test-options">Other test options</h3>
411411
<p>For further information see the command line help of Meson by running
412412
<code>meson test -h</code>.</p>
413413
<h2 id="legacy-notes">Legacy notes</h2>
414-
<p>If <code>meson test</code> does not work for you, you likely have a old version
414+
<p>If <code>meson test</code> does not work for you, you likely have an old version
415415
of Meson. In that case you should call <code>mesontest</code> instead. If
416416
<code>mesontest</code> doesn't work either you have a very old version prior to
417417
0.37.0 and should upgrade.</p>

assets/js/search/additionally

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

assets/js/search/additionnaly

Lines changed: 0 additions & 1 deletion
This file was deleted.

assets/js/search/approximate

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
urls_downloaded_cb({"token":"approximate","urls":[{"url":"Builtin-options.html#details-for-warning_level","node_type":"p","page":"Built-in options","sections":["Built-in options","Universal options","Core options","Details for warning_level\n"],"context":{"gi-language":["default"]}}]});

0 commit comments

Comments
 (0)