Skip to content

Commit e1a31d9

Browse files
committed
Merge pull request #212 from alexwlchan/master
Spelling fixes
2 parents 249f1b8 + 4051280 commit e1a31d9

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

Docs/Basics.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ The object returned from `GetDatabase` is a cheap pass-thru object, and does not
3535
object asyncState = ...
3636
IDatabase db = redis.GetDatabase(databaseNumber, asyncState);
3737

38-
Once you have the `IDatabase`, it is simply a case of using the [redis API](http://redis.io/commands). Note that all methods have both synchronous and asynchronous implementaions. In line with Microsoft's naming guidance, the asynchronous methods all end `...Async(...)`, and are fully `await`-able etc.
38+
Once you have the `IDatabase`, it is simply a case of using the [redis API](http://redis.io/commands). Note that all methods have both synchronous and asynchronous implementations. In line with Microsoft's naming guidance, the asynchronous methods all end `...Async(...)`, and are fully `await`-able etc.
3939

4040
The simplest operation would be to store and retrieve a value:
4141

@@ -100,12 +100,12 @@ There are 3 primary usage mechanisms with StackExchange.Redis:
100100
- Asynchronous - where the operation completes some time in the future, and a `Task` or `Task<T>` is returned immediately, which can later:
101101
- be `.Wait()`ed (blocking the current thread until the response is available)
102102
- have a continuation callback added ([`ContinueWith`](http://msdn.microsoft.com/en-us/library/system.threading.tasks.task.continuewith(v=vs.110).aspx) in the TPL)
103-
- be *awaited* (which is a language-level feature that simplfies the latter, while also continuing immediately if the reply is already known)
103+
- be *awaited* (which is a language-level feature that simplifies the latter, while also continuing immediately if the reply is already known)
104104
- Fire-and-Forget - where you really aren't interested in the reply, and are happy to continue irrespective of the response
105105

106106
The synchronous usage is already shown in the examples above. This is the simplest usage, and does not involve the [TPL][1].
107107

108-
For asynchronous uage, the key difference is the `Async` suffix on methods, and (typically) the use of the `await` language feature. For example:
108+
For asynchronous usage, the key difference is the `Async` suffix on methods, and (typically) the use of the `await` language feature. For example:
109109

110110
string value = "abcdefg";
111111
await db.StringSetAsync("mykey", value);

Docs/Configuration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ The `configuration` here can be either:
1010
- a `ConfigurationOptions` instance
1111
- a `string` representing the configuration
1212

13-
The latter is *basically* a tokenized form of the former.
13+
The latter is *basically* a tokenized form of the former.
1414

1515
Basic Configuration Strings
1616
-
@@ -56,7 +56,7 @@ The `ConfigurationOptions` object has a wide range of properties, all of which a
5656
| name={string} | `ClientName` | Identification for the connection within redis |
5757
| password={string} | `Password` | Password for the redis server |
5858
| proxy={proxy type} | `Proxy` | Type of proxy in use (if any); for example "twemproxy" |
59-
| resolveDns={bool} | `ResolveDns` | Specifies that DNS resolution should be explict and eager, rather than implicit |
59+
| resolveDns={bool} | `ResolveDns` | Specifies that DNS resolution should be explicit and eager, rather than implicit |
6060
| serviceName={string} | `ServiceName` | Not currently implemented (intended for use with sentinel) |
6161
| ssl={bool} | `Ssl` | Specifies that SSL encryption should be used |
6262
| sslHost={string} | `SslHost` | Enforces a particular SSL host identity on the server's certificate |

Docs/KeysValues.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,4 @@ The response uses the `RedisResult` type (this is unique to scripting; usually t
9393
Conclusion
9494
---
9595

96-
The types used in the API are very deliberately chosen to distinguish redis *keys* from *values*. However, in virtually all cases you will not need to directly refer to the unerlying types involved, as conversion operations are provided.
96+
The types used in the API are very deliberately chosen to distinguish redis *keys* from *values*. However, in virtually all cases you will not need to directly refer to the underlying types involved, as conversion operations are provided.

Docs/PipelinesMultiplexers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ For this reason, the only redis features that StackExchange.Redis does not offer
7676
This achieves the same intent without requiring blocking operations. Notes:
7777

7878
- the *data* is not sent via pub/sub; the pub/sub API is only used to notify workers to check for more work
79-
- if there are no workers, the new items remain buffered in the lsit; work does not fall on the floor
79+
- if there are no workers, the new items remain buffered in the list; work does not fall on the floor
8080
- only one worker can pop a single value; when there are more consumers than producers, some consumers will be notified and then find there is nothing to do
8181
- when you restart a worker, you should *assume* there is work so that you process any backlog
8282
- but other than that, the semantic is identical to blocking pops

Docs/Profiling.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Due to StackExchange.Redis's asynchronous interface, profiling requires outside
4343
by providing context objects when you start and end profiling (via the `BeginProfiling(object)` & `FinishProfiling(object)` methods), and when a
4444
command is sent (via the `IProfiler` interface's `GetContext()` method).
4545

46-
A toy example of assocating commands issued from many different threads together
46+
A toy example of associating commands issued from many different threads together
4747

4848
```
4949
class ToyProfiler : IProfiler

Docs/Transactions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
=====================
33

44
Transactions in Redis are not like transactions in, say a SQL database. The [full documentation is here](http://redis.io/topics/transactions),
5-
but to paraphraise:
5+
but to paraphrase:
66

77
A transaction in redis consists of a block of commands placed between `MULTI` and `EXEC` (or `DISCARD` for rollback). Once a `MULTI`
88
has been encountered, the commands on that connection *are not executed* - they are queued (and the caller gets the reply `QUEUED`
99
to each). When an `EXEC` is encountered, they are
10-
all applied in a single unit (i.e. without other connections getting time betweeen operations). If a `DISCARD` is seen instead of
10+
all applied in a single unit (i.e. without other connections getting time between operations). If a `DISCARD` is seen instead of
1111
a `EXEC`, everything is thrown away. Because the commands inside the transaction are queued, you can't make decisions *inside*
1212
the transaction. For example, in a SQL database you might do the following (pseudo-code - illustrative only):
1313

0 commit comments

Comments
 (0)