ChilliCream · michaelstaib · Apr 10, 2026 · Apr 10, 2026
diff --git a/website/src/docs/fusion/v16/authentication-and-authorization.md b/website/src/docs/fusion/v16/authentication-and-authorization.md
@@ -2,8 +2,6 @@
 title: "Authentication and Authorization"
 ---
 
-# Authentication and Authorization
-
 The mental model for auth in Fusion is straightforward: **authentication terminates at the gateway, authorization is a subgraph concern.**
 
 The gateway validates tokens, extracts identity, and forwards the relevant information to subgraphs via HTTP headers. Each subgraph then enforces access control on its own fields using its own authorization framework.

diff --git a/website/src/docs/fusion/v16/migration/migrating-from-schema-stitching.md b/website/src/docs/fusion/v16/migration/migrating-from-schema-stitching.md
@@ -80,8 +80,8 @@ In stitching, your remote schemas are HotChocolate servers that may or may not p
 // Products service - Program.cs
 var builder = WebApplication.CreateBuilder(args);
 
-builder.Services
-    .AddGraphQLServer()
+builder
+    .AddGraphQL()
     .AddQueryType<ProductQueries>();
 
 var app = builder.Build();
@@ -146,7 +146,7 @@ public static partial class ProductQueries
 
 Key changes:
 
-- **`builder.AddGraphQL("products-api")`** replaces `builder.Services.AddGraphQLServer()`. The string argument is the subgraph name used during composition.
+- **`builder.AddGraphQL("products-api")`** replaces `builder.AddGraphQL()`. The string argument is the subgraph name used during composition.
 - **`.AddProductTypes()`** is generated by the `HotChocolate.Types.Analyzers` package. It registers all types marked with `[QueryType]`, `[ObjectType<T>]`, etc.
 - **`.ExportSchemaOnStartup()`** exports the subgraph's schema as a `.graphqls` file when the server starts (used for composition).
 - **`app.RunWithGraphQLCommands(args)`** enables CLI commands like `dotnet run -- schema export`.
@@ -286,8 +286,8 @@ builder.Services
     .AddHttpClient("inventory", c =>
         c.BaseAddress = new Uri("http://localhost:5200/graphql"));
 
-builder.Services
-    .AddGraphQLServer()
+builder
+    .AddGraphQL()
     .AddRemoteSchema("products")
     .AddRemoteSchema("inventory")
     .AddTypeExtensionsFromFile("./Stitching.graphql");

diff --git a/website/src/docs/fusion/v16/request-limits.md b/website/src/docs/fusion/v16/request-limits.md
@@ -163,7 +163,7 @@ builder
 The maximum HTTP request body size defaults to approximately 20 MB:
 
 ```csharp
-services.AddGraphQLGatewayServer(maxAllowedRequestSize: 5 * 1000 * 1024); // 5 MB
+builder.AddGraphQLGateway(maxAllowedRequestSize: 5 * 1000 * 1024); // 5 MB
 ```
 
 ### Server Options

diff --git a/website/src/docs/hotchocolate/v16/api-reference/apollo-federation.md b/website/src/docs/hotchocolate/v16/api-reference/apollo-federation.md
@@ -20,8 +20,8 @@ Install the `HotChocolate.ApolloFederation` package:
 Register the Apollo Federation services:
 
 ```csharp
-builder.Services
-    .AddGraphQLServer()
+builder
+    .AddGraphQL()
     .AddApolloFederation();
 ```
 
@@ -239,8 +239,8 @@ Register the type in the GraphQL schema:
 <Implementation>
 
 ```csharp
-builder.Services
-    .AddGraphQLServer()
+builder
+    .AddGraphQL()
     .AddApolloFederation()
     .AddType<Product>();
 ```
@@ -250,8 +250,8 @@ builder.Services
 <Code>
 
 ```csharp
-builder.Services
-    .AddGraphQLServer()
+builder
+    .AddGraphQL()
     .AddApolloFederation()
     .AddType<ProductType>();
 ```
@@ -300,8 +300,8 @@ public class Product
     public string Id { get; set; }
 }
 
-builder.Services
-    .AddGraphQLServer()
+builder
+    .AddGraphQL()
     .AddApolloFederation()
     .AddType<Product>();
 ```
@@ -321,8 +321,8 @@ public class ProductType : ObjectType<Product>
     }
 }
 
-builder.Services
-    .AddGraphQLServer()
+builder
+    .AddGraphQL()
     .AddApolloFederation()
     .AddType<ProductType>();
 ```

diff --git a/website/src/docs/hotchocolate/v16/api-reference/extending-filtering.md b/website/src/docs/hotchocolate/v16/api-reference/extending-filtering.md
@@ -267,16 +267,16 @@ public class CustomFilteringConvention : FilterConvention
     }
 }
 
-builder.Services
-    .AddGraphQLServer()
+builder
+    .AddGraphQL()
     .AddFiltering<CustomFilteringConvention>();
 ```
 
 You can also use convention and provider extensions instead of creating a custom `FilterConvention`:
 
 ```csharp
-builder.Services
-    .AddGraphQLServer()
+builder
+    .AddGraphQL()
     .AddFiltering()
     .AddConvention<IFilterConvention>(
         new FilterConventionExtension(

diff --git a/website/src/docs/hotchocolate/v16/building-a-schema/directives.md b/website/src/docs/hotchocolate/v16/building-a-schema/directives.md
@@ -40,8 +40,8 @@ public class MyDirectiveType : DirectiveType
 
 ```csharp
 // Program.cs
-builder.Services
-    .AddGraphQLServer()
+builder
+    .AddGraphQL()
     .AddDirectiveType<MyDirectiveType>();
 ```
 

diff --git a/website/src/docs/hotchocolate/v16/building-a-schema/documentation.md b/website/src/docs/hotchocolate/v16/building-a-schema/documentation.md
@@ -155,8 +155,8 @@ If you do not want XML comments to appear in the schema:
 
 ```csharp
 // Program.cs
-builder.Services
-    .AddGraphQLServer()
+builder
+    .AddGraphQL()
     .ModifyOptions(opt => opt.UseXmlDocumentation = false);
 ```
 
@@ -186,8 +186,8 @@ public class CustomNamingConventions : DefaultNamingConventions
 // Program.cs
 IReadOnlySchemaOptions capturedSchemaOptions;
 
-builder.Services
-    .AddGraphQLServer()
+builder
+    .AddGraphQL()
     .ModifyOptions(opt => capturedSchemaOptions = opt)
     .AddConvention<INamingConventions>(sp =>
         new CustomNamingConventions(

diff --git a/website/src/docs/hotchocolate/v16/building-a-schema/dynamic-schemas.md b/website/src/docs/hotchocolate/v16/building-a-schema/dynamic-schemas.md
@@ -15,8 +15,8 @@ When you fire the `TypesChanged` event, Hot Chocolate phases out the old schema
 
 ```csharp
 // Program.cs
-builder.Services
-    .AddGraphQLServer()
+builder
+    .AddGraphQL()
     .AddTypeModule<MyTypeModule>();
 ```
 
@@ -211,8 +211,8 @@ mutationDef.Fields.Add(createProductField);
 
 var mutationType = ObjectType.CreateUnsafe(mutationDef);
 
-builder.Services
-    .AddGraphQLServer()
+builder
+    .AddGraphQL()
     .AddQueryType()
     .AddMutationType(mutationType)
     .AddType(productInputType)

diff --git a/website/src/docs/hotchocolate/v16/building-a-schema/enums.md b/website/src/docs/hotchocolate/v16/building-a-schema/enums.md
@@ -82,8 +82,8 @@ Code-first enum types are not automatically inferred because multiple `EnumType<
 
 ```csharp
 // Program.cs
-builder.Services
-    .AddGraphQLServer()
+builder
+    .AddGraphQL()
     .AddType<UserRoleType>();
 ```
 

diff --git a/website/src/docs/hotchocolate/v16/building-a-schema/extending-types.md b/website/src/docs/hotchocolate/v16/building-a-schema/extending-types.md
@@ -35,8 +35,8 @@ public static partial class BookExtensions
 
 ```csharp
 // Program.cs
-builder.Services
-    .AddGraphQLServer()
+builder
+    .AddGraphQL()
     .AddTypeExtension<BookExtensions>();
 ```
 
@@ -65,8 +65,8 @@ public class BookTypeExtensions : ObjectTypeExtension<Book>
 
 ```csharp
 // Program.cs
-builder.Services
-    .AddGraphQLServer()
+builder
+    .AddGraphQL()
     .AddTypeExtension<BookTypeExtensions>();
 ```
 
@@ -98,8 +98,8 @@ public class BookQueries
 
 ```csharp
 // Program.cs
-builder.Services
-    .AddGraphQLServer()
+builder
+    .AddGraphQL()
     .AddTypeExtension<BookQueries>();
 ```
 
@@ -125,8 +125,8 @@ public class QueryBookResolvers : ObjectTypeExtension<Query>
 
 ```csharp
 // Program.cs
-builder.Services
-    .AddGraphQLServer()
+builder
+    .AddGraphQL()
     .AddTypeExtension<QueryBookResolvers>();
 ```
 
@@ -151,8 +151,8 @@ public class BookExtensions
 
 ```csharp
 // Program.cs
-builder.Services
-    .AddGraphQLServer()
+builder
+    .AddGraphQL()
     .AddTypeExtension<BookExtensions>();
 ```
 
@@ -172,8 +172,8 @@ public class BookTypeExtensions : ObjectTypeExtension<Book>
 
 ```csharp
 // Program.cs
-builder.Services
-    .AddGraphQLServer()
+builder
+    .AddGraphQL()
     .AddTypeExtension<BookTypeExtensions>();
 ```
 

diff --git a/website/src/docs/hotchocolate/v16/building-a-schema/interfaces.md b/website/src/docs/hotchocolate/v16/building-a-schema/interfaces.md
@@ -75,8 +75,8 @@ public static partial class MessageQueries
 
 ```csharp
 // Program.cs
-builder.Services
-    .AddGraphQLServer()
+builder
+    .AddGraphQL()
     .AddType<TextMessage>();
 ```
 
@@ -136,8 +136,8 @@ public class TextMessageType : ObjectType<TextMessage>
 
 ```csharp
 // Program.cs
-builder.Services
-    .AddGraphQLServer()
+builder
+    .AddGraphQL()
     .AddQueryType<QueryType>()
     .AddType<TextMessageType>();
 ```
@@ -272,8 +272,8 @@ public class TextMessage : IDatedMessage
 
 ```csharp
 // Program.cs
-builder.Services
-    .AddGraphQLServer()
+builder
+    .AddGraphQL()
     .AddType<IDatedMessage>()
     .AddType<TextMessage>();
 ```
@@ -306,8 +306,8 @@ public class TextMessageType : ObjectType<TextMessage>
 
 ```csharp
 // Program.cs
-builder.Services
-    .AddGraphQLServer()
+builder
+    .AddGraphQL()
     .AddQueryType<QueryType>()
     .AddType<DatedMessageType>()
     .AddType<TextMessageType>();

diff --git a/website/src/docs/hotchocolate/v16/building-a-schema/mutations.md b/website/src/docs/hotchocolate/v16/building-a-schema/mutations.md
@@ -85,8 +85,8 @@ public class BookMutationsType : ObjectType<BookMutations>
 
 ```csharp
 // Program.cs
-builder.Services
-    .AddGraphQLServer()
+builder
+    .AddGraphQL()
     .AddMutationType<BookMutationsType>();
 ```
 
@@ -137,8 +137,8 @@ Hot Chocolate generates the input and payload types for you when mutation conven
 
 ```csharp
 // Program.cs
-builder.Services
-    .AddGraphQLServer()
+builder
+    .AddGraphQL()
     .AddMutationConventions(applyToAllMutations: true);
 ```
 
@@ -231,8 +231,8 @@ Override the global naming patterns through `MutationConventionOptions`:
 
 ```csharp
 // Program.cs
-builder.Services
-    .AddGraphQLServer()
+builder
+    .AddGraphQL()
     .AddMutationConventions(
         new MutationConventionOptions
         {
@@ -354,8 +354,8 @@ public interface IUserError
 
 ```csharp
 // Program.cs
-builder.Services
-    .AddGraphQLServer()
+builder
+    .AddGraphQL()
     .AddErrorInterfaceType<IUserError>();
 ```
 
@@ -377,8 +377,8 @@ public class CustomErrorInterfaceType : InterfaceType
 
 ```csharp
 // Program.cs
-builder.Services
-    .AddGraphQLServer()
+builder
+    .AddGraphQL()
     .AddErrorInterfaceType<CustomErrorInterfaceType>();
 ```
 
@@ -393,16 +393,16 @@ When a request contains multiple mutations, Hot Chocolate can wrap them in a tra
 
 ```csharp
 // Program.cs
-builder.Services
-    .AddGraphQLServer()
+builder
+    .AddGraphQL()
     .AddDefaultTransactionScopeHandler();
 ```
 
 To customize the transaction behavior, implement `ITransactionScopeHandler` and register it:
 
 ```csharp
-builder.Services
-    .AddGraphQLServer()
+builder
+    .AddGraphQL()
     .AddTransactionScopeHandler<CustomTransactionScopeHandler>();
 ```
 

diff --git a/website/src/docs/hotchocolate/v16/building-a-schema/object-types.md b/website/src/docs/hotchocolate/v16/building-a-schema/object-types.md
@@ -83,8 +83,8 @@ Since multiple classes could inherit from `ObjectType<Author>` with different co
 
 ```csharp
 // Program.cs
-builder.Services
-    .AddGraphQLServer()
+builder
+    .AddGraphQL()
     .AddType<AuthorType>();
 ```
 
@@ -399,8 +399,8 @@ You can also set this globally, which affects all types.
 
 ```csharp
 // Program.cs
-builder.Services
-    .AddGraphQLServer()
+builder
+    .AddGraphQL()
     .ModifyOptions(options =>
     {
         options.DefaultBindingBehavior = BindingBehavior.Explicit;