aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJay Weisskopf <jay@jayschwa.net>2018-07-17 21:18:41 -0400
committerAndrew Kelley <superjoe30@gmail.com>2018-07-17 21:18:41 -0400
commit6394f7e9a3f0d6db58287dee96af3cb9fae8ee8a (patch)
tree8ada509800c670796839834d9025e2e6ceeca11a /doc
parenta9ab528e348a3f07dfaffcdcb1031062b1bfe8bb (diff)
downloadzig-6394f7e9a3f0d6db58287dee96af3cb9fae8ee8a.tar.gz
zig-6394f7e9a3f0d6db58287dee96af3cb9fae8ee8a.zip
Fixed minor documentation errors (#1256)
Changed: - "retuns" to "returns" - "null-terminated pointers" to "pointers to null-terminated arrays"
Diffstat (limited to 'doc')
-rw-r--r--doc/langref.html.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/langref.html.in b/doc/langref.html.in
index 46b325832b..60ba09d391 100644
--- a/doc/langref.html.in
+++ b/doc/langref.html.in
@@ -1087,7 +1087,7 @@ unwrapped == 1234</code></pre>
</td>
<td>
If <code>a</code> is <code>false</code>, returns <code>false</code>
- without evaluating <code>b</code>. Otherwise, retuns <code>b</code>.
+ without evaluating <code>b</code>. Otherwise, returns <code>b</code>.
</td>
<td>
<pre><code class="zig">false and true == false</code></pre>
@@ -1102,7 +1102,7 @@ unwrapped == 1234</code></pre>
</td>
<td>
If <code>a</code> is <code>true</code>, returns <code>true</code>
- without evaluating <code>b</code>. Otherwise, retuns <code>b</code>.
+ without evaluating <code>b</code>. Otherwise, returns <code>b</code>.
</td>
<td>
<pre><code class="zig">false or true == true</code></pre>
@@ -1483,7 +1483,7 @@ test "pointer array access" {
}
test "pointer slicing" {
- // In Zig, we prefer using slices over null-terminated pointers.
+ // In Zig, we prefer slices over pointers to null-terminated arrays.
// You can turn an array into a slice using slice syntax:
var array = []u8{ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
const slice = array[2..4];