Resolved conflict with master

docs/index.md

@@ -20,3 +20,4 @@ The Sprig library provides over 70 template functions for Go's template language
   - [Version Comparison Functions](semver.md): `semver`, `semverCompare`
   - [Reflection](reflection.md): `typeOf`, `kindIs`, `typeIsLike`, etc.
   - [Cryptographic and Security Functions](crypto.md): `derivePassword`, `sha256sum`, `genPrivateKey`, etc.
+  - [Network](network.md): `getHostByName`

docs/reflection.md

@@ -18,7 +18,7 @@ kindOf "hello"
 ```
 
 The above would return `string`. For simple tests (like in `if` blocks), the
-`isKind` function will let you verify that a value is a particular kind:
+`kindIs` function will let you verify that a value is a particular kind:
 
 ```
 kindIs "int" 123