diff --git a/docs/config.json b/docs/config.json
index 8d14e3c7da..f9b327eaf4 100644
--- a/docs/config.json
+++ b/docs/config.json
@@ -141,6 +141,10 @@
               "label": "Quick Start",
               "to": "framework/angular/quick-start"
             },
+            {
+              "label": "Angular HttpClient and other data fetching clients",
+              "to": "framework/angular/angular-httpclient-and-other-data-fetching-clients"
+            },
             {
               "label": "Devtools",
               "to": "framework/angular/devtools"
diff --git a/docs/framework/angular/angular-httpclient-and-other-data-fetching-clients.md b/docs/framework/angular/angular-httpclient-and-other-data-fetching-clients.md
new file mode 100644
index 0000000000..115e697feb
--- /dev/null
+++ b/docs/framework/angular/angular-httpclient-and-other-data-fetching-clients.md
@@ -0,0 +1,48 @@
+---
+id: Angular-HttpClient-and-other-data-fetching-clients
+title: Angular HttpClient and other data fetching clients
+---
+
+Because TanStack Query's fetching mechanisms are agnostically built on Promises, you can use literally any asynchronous data fetching client, including the browser native `fetch` API, `graphql-request`, and more.
+
+## Using Angular's `HttpClient` for data fetching
+
+`HttpClient` is a powerful and integrated part of Angular, which gives the following benefits:
+
+- Mock responses in unit tests using [provideHttpClientTesting](https://angular.dev/guide/http/testing).
+- [Interceptors](https://angular.dev/guide/http/interceptors) can be used for a wide range of functionality including adding authentication headers, performing logging, etc. While some data fetching libraries have their own interceptor system, `HttpClient` interceptors are integrated with Angular's dependency injection system.
+- `HttpClient` automatically informs [`PendingTasks`](https://angular.dev/api/core/PendingTasks#), which enables Angular to be aware of pending requests. Unit tests and SSR can use the resulting application _stableness_ information to wait for pending requests to finish. This makes unit testing much easier for [Zoneless](https://angular.dev/guide/experimental/zoneless) applications.
+- When using SSR, `HttpClient` will [cache requests](https://angular.dev/guide/ssr#caching-data-when-using-HttpClient) performed on the server. This will prevent unneeded requests on the client. `HttpClient` SSR caching works out of the box. TanStack Query has its own hydration functionality which may be more powerful but requires some setup. Which one fits your needs best depends on your use case.
+
+### Using observables in `queryFn`
+
+As TanStack Query is a promise based library, observables from `HttpClient` need to be converted to promises. This can be done with the `lastValueFrom` or `firstValueFrom` functions from `rxjs`.
+
+```ts
+@Component({
+  // ...
+})
+class ExampleComponent {
+  private readonly http = inject(HttpClient)
+
+  readonly query = injectQuery(() => ({
+    queryKey: ['repoData'],
+    queryFn: () =>
+      lastValueFrom(
+        this.http.get('https://api.github.com/repos/tanstack/query'),
+      ),
+  }))
+}
+```
+
+> Since Angular is moving towards RxJS as an optional dependency, it's expected that `HttpClient` will also support promises in the future.
+>
+> Support for observables in TanStack Query for Angular is planned.
+
+## Comparison table
+
+| Data fetching client                                | Pros                                                | Cons                                                                       |
+| --------------------------------------------------- | --------------------------------------------------- | -------------------------------------------------------------------------- |
+| **Angular HttpClient**                              | Featureful and very well integrated with Angular.   | Observables need to be converted to Promises.                              |
+| **Fetch**                                           | Browser native API, so adds nothing to bundle size. | Barebones API which lacks many features.                                   |
+| **Specialized libraries such as `graphql-request`** | Specialized features for specific use cases.        | If it's not an Angular library it won't integrate well with the framework. |
diff --git a/docs/framework/angular/guides/background-fetching-indicators.md b/docs/framework/angular/guides/background-fetching-indicators.md
index 5ad6ee3ef4..3eeafa2858 100644
--- a/docs/framework/angular/guides/background-fetching-indicators.md
+++ b/docs/framework/angular/guides/background-fetching-indicators.md
@@ -8,27 +8,23 @@ ref: docs/framework/react/guides/background-fetching-indicators.md
 
 ```angular-ts
 @Component({
-  selector: 'posts',
+  selector: 'todos',
   template: `
-    @switch (query.status()) {
-      @case ('pending') {
-        Loading...
+    @if (todosQuery.isPending()) {
+      Loading...
+    } @else if (todosQuery.isError()) {
+      An error has occurred: {{ todosQuery.error().message }}
+    } @else if (todosQuery.isSuccess()) {
+      @if (todosQuery.isFetching()) {
+        Refreshing...
       }
-      @case ('error') {
-        An error has occurred: {{ query.error()?.message }}
-      }
-      @default {
-        @if (query.isFetching()) {
-          Refreshing...
-        }
-        @for (todo of query.data()) {
-          <todo [todo]="todo" />
-        }
+      @for (todos of todosQuery.data(); track todo.id) {
+        <todo [todo]="todo" />
       }
     }
   `,
 })
-export class TodosComponent {
+class TodosComponent {
   todosQuery = injectQuery(() => ({
     queryKey: ['todos'],
     queryFn: fetchTodos,
diff --git a/docs/framework/angular/guides/disabling-queries.md b/docs/framework/angular/guides/disabling-queries.md
index a57ac39728..35da0225de 100644
--- a/docs/framework/angular/guides/disabling-queries.md
+++ b/docs/framework/angular/guides/disabling-queries.md
@@ -70,6 +70,8 @@ export class TodosComponent {
 [//]: # 'Example3'
 
 ```angular-ts
+import { skipToken, injectQuery } from '@tanstack/query-angular'
+
 @Component({
   selector: 'todos',
   template: `
diff --git a/docs/framework/angular/guides/queries.md b/docs/framework/angular/guides/queries.md
index 3aa9b75853..2d1f6c522e 100644
--- a/docs/framework/angular/guides/queries.md
+++ b/docs/framework/angular/guides/queries.md
@@ -10,6 +10,7 @@ replace:
     'custom hooks': 'services',
     'the `useQuery` hook': '`injectQuery`',
     '`useQuery`': '`injectQuery`',
+    "TypeScript will also narrow the type of data correctly if you've checked for pending and error before accessing it.": 'TypeScript will only narrow the type when checking boolean signals such as `isPending` and `isError`.',
   }
 ---
 
diff --git a/docs/framework/angular/guides/window-focus-refetching.md b/docs/framework/angular/guides/window-focus-refetching.md
index e19eda921c..14490ba07c 100644
--- a/docs/framework/angular/guides/window-focus-refetching.md
+++ b/docs/framework/angular/guides/window-focus-refetching.md
@@ -8,7 +8,7 @@ replace: { '@tanstack/react-query': '@tanstack/angular-query-experimental' }
 [//]: # 'Example'
 
 ```ts
-bootstrapApplication(AppComponent, {
+export const appConfig: ApplicationConfig = {
   providers: [
     provideTanStackQuery(
       new QueryClient({
@@ -20,7 +20,7 @@ bootstrapApplication(AppComponent, {
       }),
     ),
   ],
-})
+}
 ```
 
 [//]: # 'Example'
diff --git a/examples/angular/query-options-from-a-service/src/assets/.gitkeep b/examples/angular/query-options-from-a-service/src/assets/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/examples/angular/router/src/assets/.gitkeep b/examples/angular/router/src/assets/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/examples/angular/simple/src/assets/.gitkeep b/examples/angular/simple/src/assets/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000