Merge remote-tracking branch 'origin/master' into HEAD

docs/content/config.md

@@ -27,15 +27,15 @@ exec:
   filename: graph/generated/generated.go
   package: generated
 
-# Let gqlgen know where to the generated models (if any)
+# Let gqlgen know where to put the generated models (if any)
 model:
   filename: models/generated.go
   package: models
 
 # Optional, turns on resolver stub generation
 resolver:
   filename: resolver.go # where to write them
-  type: Resolver  # whats the resolver root implementation type called?
+  type: Resolver  # what's the resolver root implementation type called?
 
 # Optional, turns on binding to field names by tag provided
 struct_tag: json

docs/content/getting-started.md

@@ -286,3 +286,7 @@ This magic comment tells `go generate` what command to run when we want to regen
 ```go
 go generate ./...
 ```
+
+> Note
+>
+> Ensure that the path to your `gqlgen` binary is relative to the file the generate command is added to.

docs/content/reference/errors.md

@@ -7,8 +7,8 @@ menu: { main: { parent: 'reference' } }
 
 ## Returning errors
 
-All resolvers simply return an error to send it to the user. Its assumed that any error message returned
-here is safe for users, if certain messages arent safe, customize the error presenter.
+All resolvers simply return an error to be sent to the user. It's assumed that any error message returned
+here is safe for users. If certain messages aren't safe, customise the error presenter.
 
 ### Multiple errors
 
@@ -63,8 +63,8 @@ They will be returned in the same order in the response, eg:
 
 ### The error presenter
 
-All `errors` returned by resolvers, or from validation pass through a hook before being displayed to the user.
-This hook gives you the ability to customize errors however makes sense in your app.
+All `errors` returned by resolvers, or from validation, pass through a hook before being displayed to the user.
+This hook gives you the ability to customise errors however makes sense in your app.
 
 The default error presenter will capture the resolver path and use the Error() message in the response. It will
 also call an Extensions() method if one is present to return graphql extensions.
@@ -85,7 +85,7 @@ server := handler.GraphQL(MakeExecutableSchema(resolvers),
 )
 ```
 
-This function will be called with the the same resolver context that threw generated it, so you can extract the
+This function will be called with the the same resolver context that generated it, so you can extract the
 current resolver path and whatever other state you might want to notify the client about.
 
 

docs/layouts/_default/single.html

@@ -1,13 +1,13 @@
 {{ define "main" }}
     <header>
         <div class="content">
+            <h1>{{ .LinkTitle }}</h1>
+            <div class="description">{{ .Title }}</div>
             <a class="header-link"
                target="_blank"
                href="https://github.com/99designs/gqlgen/blob/master/docs/content/{{.File.Path }}">
                 [edit]
             </a>
-            <h1>{{ .LinkTitle }}</h1>
-            <div class="description">{{ .Title }}</div>
         </div>
     </header>
 

docs/static/main.css

@@ -107,6 +107,7 @@ main {
 }
 
 .content {
+    position: relative;
     grid-area: content;
     max-width: 920px;
     margin: auto;
@@ -149,7 +150,9 @@ h1 {
 }
 
 .header-link {
-    float: right;
+    position: absolute;
+    top: 0;
+    right: 0;
 }
 
 h2 {