summaryrefslogtreecommitdiff
path: root/docs/user-guide/02-conventional-features.md
diff options
context:
space:
mode:
Diffstat (limited to 'docs/user-guide/02-conventional-features.md')
-rw-r--r--docs/user-guide/02-conventional-features.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/user-guide/02-conventional-features.md b/docs/user-guide/02-conventional-features.md
index 9e2743aa3..6973cbef1 100644
--- a/docs/user-guide/02-conventional-features.md
+++ b/docs/user-guide/02-conventional-features.md
@@ -123,7 +123,7 @@ void f( int b[] )
It is allowed to pass a sized array as argument to an unsized array parameter when calling a function.
-Array types has a `getCount()` memeber function that returns the length of the array.
+Array types has a `getCount()` member function that returns the length of the array.
```hlsl
int f( int b[] )
@@ -976,7 +976,7 @@ int a[2] = {1, 2}
#### Array Of Aggregate's
```csharp
-// Equivlent to `float3 a[2]; a[0] = {1,2,3}; b[1] = {4,5,6};`
+// Equivalent to `float3 a[2]; a[0] = {1,2,3}; b[1] = {4,5,6};`
float3 a[2] = { {1,2,3}, {4,5,6} };
```
#### Flattened Array Initializer
@@ -1050,7 +1050,7 @@ struct GenerateCtor1 : GenerateCtorInner1
GenerateCtor1 val[2] = { { 3 }, { 2 } };
```
-In addition, Slang also provides compatbility support for C-style initializer lists with `struct`s. C-style initializer lists can use [Partial Initializer List's](#Partial-Initializer-List's) and [Flattened Array Initializer With Struct's](#Flattened-Array-Initializer-With-Struct)
+In addition, Slang also provides compatibility support for C-style initializer lists with `struct`s. C-style initializer lists can use [Partial Initializer List's](#Partial-Initializer-List's) and [Flattened Array Initializer With Struct's](#Flattened-Array-Initializer-With-Struct)
A struct is considered a C-style struct if:
1. User never defines a custom constructor with **more than** 0 parameters
@@ -1109,7 +1109,7 @@ float3 val2 = {};
#### Struct Type
-1. Atempt to call default constructor (`__init()`) of a `struct`
+1. Attempt to call default constructor (`__init()`) of a `struct`
```csharp