From d8d0b8fabe62cc52749cd01242d1730a43c4802e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Tamarelle?= <jerome@tamarelle.net>
Date: Wed, 20 Apr 2022 06:52:32 +0200
Subject: [PATCH] Update combinator function names in docs (#389)

---
 docs/futures/README.md      |  2 +-
 docs/futures/combinators.md | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/docs/futures/README.md b/docs/futures/README.md
index 46e6c3ac..9ac71adb 100644
--- a/docs/futures/README.md
+++ b/docs/futures/README.md
@@ -45,7 +45,7 @@ try {
 }
 ```
 
-We can now write helper functions like [`Amp\Promise\all()`](https://amphp.org/amp/promises/combinators#all) which
+We can now write helper functions like `Amp\Future\await()` which
 subscribe to several of those placeholders and combine them. We don't have to write any complicated code to combine the
 results of several operations.
 
diff --git a/docs/futures/combinators.md b/docs/futures/combinators.md
index 9248646a..184b9bb7 100644
--- a/docs/futures/combinators.md
+++ b/docs/futures/combinators.md
@@ -5,13 +5,13 @@ permalink: "/futures/combinators"
 ---
 Amp provides a set of helper functions to deal with multiple futures and combining them.
 
-## `all()`
+## `await()`
 
-`Amp\Future\all()` awaits all `Future` objects of an `iterable`. If one of the `Future` instances errors, the operation
+`Amp\Future\await()` awaits all `Future` objects of an `iterable`. If one of the `Future` instances errors, the operation
 will be aborted with that exception. Otherwise, the result is an array matching keys from the input `iterable` to their
 resolved values.
 
-The `all()` combinator is extremely powerful because it allows us to concurrently execute many asynchronous operations
+The `await()` combinator is extremely powerful because it allows us to concurrently execute many asynchronous operations
 at the same time. Let's look at a simple example using [`amphp/http-client`](https://github.com/amphp/http-client) to
 retrieve multiple HTTP resources concurrently:
 
@@ -29,7 +29,7 @@ $uris = [
 ];
 
 try {
-    $responses = Future\all(array_map(function ($uri) use ($httpClient) {
+    $responses = Future\await(array_map(function ($uri) use ($httpClient) {
         return $httpClient->request(new Request($uri, 'HEAD'));
     }, $uris));
 
@@ -48,20 +48,20 @@ try {
 }
 ```
 
-## `some()`
+## `awaitAnyN()`
 
-`Amp\Future\some()` is the same as `all()` except that it tolerates individual failures. A result is returned once
+`Amp\Future\awaitAnyN()` is the same as `await()` except that it tolerates individual failures. A result is returned once
 exactly `$count` instances in the `iterable` complete successfully. The return value is an array of values. The
 individual keys in the component array are preserved from the `iterable` passed to the function for evaluation.
 
-## `settle()`
+## `awaitAll()`
 
-`Amp\Promise\settle()` awaits all futures and returns their results as `[$errors, $values]` array.
+`Amp\Promise\awaitAll()` awaits all futures and returns their results as `[$errors, $values]` array.
 
-## `race()`
+## `awaitFirst()`
 
-`Amp\Promise\race()` unwraps the first completed `Future`, whether successfully completed or errored.
+`Amp\Promise\awaitFirst()` unwraps the first completed `Future`, whether successfully completed or errored.
 
-## `any()`
+## `awaitAny()`
 
-`Amp\Promise\any()` unwraps the first successfully completed `Future`.
+`Amp\Promise\awaitAny()` unwraps the first successfully completed `Future`.