Skip to content

Commit 6394f7e

Browse files
jayschwaandrewrk
authored andcommittedJul 18, 2018
Fixed minor documentation errors (#1256)
Changed: - "retuns" to "returns" - "null-terminated pointers" to "pointers to null-terminated arrays"
·
0.15.10.3.0
1 parent a9ab528 commit 6394f7e

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed
 

‎doc/langref.html.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1087,7 +1087,7 @@ unwrapped == 1234</code></pre>
10871087
</td>
10881088
<td>
10891089
If <code>a</code> is <code>false</code>, returns <code>false</code>
1090-
without evaluating <code>b</code>. Otherwise, retuns <code>b</code>.
1090+
without evaluating <code>b</code>. Otherwise, returns <code>b</code>.
10911091
</td>
10921092
<td>
10931093
<pre><code class="zig">false and true == false</code></pre>
@@ -1102,7 +1102,7 @@ unwrapped == 1234</code></pre>
11021102
</td>
11031103
<td>
11041104
If <code>a</code> is <code>true</code>, returns <code>true</code>
1105-
without evaluating <code>b</code>. Otherwise, retuns <code>b</code>.
1105+
without evaluating <code>b</code>. Otherwise, returns <code>b</code>.
11061106
</td>
11071107
<td>
11081108
<pre><code class="zig">false or true == true</code></pre>
@@ -1483,7 +1483,7 @@ test "pointer array access" {
14831483
}
14841484

14851485
test "pointer slicing" {
1486-
// In Zig, we prefer using slices over null-terminated pointers.
1486+
// In Zig, we prefer slices over pointers to null-terminated arrays.
14871487
// You can turn an array into a slice using slice syntax:
14881488
var array = []u8{ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
14891489
const slice = array[2..4];

0 commit comments

Comments
 (0)
Please sign in to comment.