Skip to content

Commit 3388449

Browse files
authored
e.g. to for example (#46316)
1 parent 5a61c45 commit 3388449

21 files changed

+48
-48
lines changed

docs/core/deploying/native-aot/cross-compile.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.custom: linux-related-content
99

1010
# Cross-compilation
1111

12-
Cross-compilation is a process of creating executable code for a platform other than the one on which the compiler is running. The platform difference might be a different OS or a different architecture. For instance, compiling for Windows from Linux, or for Arm64 from x64. On Linux, the difference can also be between the standard C library implementations - glibc (e.g. Ubuntu Linux) or musl (e.g. Alpine Linux).
12+
Cross-compilation is a process of creating executable code for a platform other than the one on which the compiler is running. The platform difference might be a different OS or a different architecture. For instance, compiling for Windows from Linux, or for Arm64 from x64. On Linux, the difference can also be between the standard C library implementations - glibc (for example, Ubuntu Linux) or musl (for example, Alpine Linux).
1313

1414
Native AOT uses platform tools (linkers) to link platform libraries (static and dynamic) together with AOT-compiled managed code into the final executable file. The availability of cross-linkers and static/dynamic libraries for the target system limits the OS/architecture pairs that can cross-compile.
1515

docs/core/diagnostics/dotnet-trace.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ The `dotnet-trace` tool:
5353
- **`--version`**
5454

5555
Displays the version of the dotnet-trace utility.
56-
56+
5757
- **`--duration`**
5858

5959
How long to run the trace. `--duration 00:00:00:05` will run it for 5 seconds.
@@ -100,7 +100,7 @@ dotnet-trace collect [--buffersize <size>] [--clreventlevel <clreventlevel>] [--
100100

101101
Verbosity of CLR events to be emitted.
102102
The following table shows the available event levels.
103-
103+
104104
| String value | Numeric value |
105105
| --------------- | :-----------: |
106106
| `logalways` | `0` |
@@ -179,18 +179,18 @@ dotnet-trace collect [--buffersize <size>] [--clreventlevel <clreventlevel>] [--
179179
- Linux and macOS - a path to a Unix domain socket such as `/foo/tool1.socket`.
180180
- Windows - a path to a named pipe such as `\\.\pipe\my_diag_port1`.
181181
- Android, iOS, and tvOS - an IP:port such as `127.0.0.1:9000`.
182-
182+
183183
By default, `dotnet-trace` listens at the specified address. You can request `dotnet-trace` to connect instead by appending `,connect` after the address. For example, `--diagnostic-port /foo/tool1.socket,connect` will connect to a .NET runtime process that is listening to the `/foo/tool1.socket` Unix domain socket.
184-
184+
185185
To learn how to use this option to collect a trace from app startup, see [Use diagnostic port to collect a trace from app startup](#use-diagnostic-port-to-collect-a-trace-from-app-startup).
186-
186+
187187
- **`--duration <time-to-run>`**
188188

189189
The time for the trace to run. Use the `dd:hh:mm:ss` format. For example `00:00:00:05` will run it for 5 seconds.
190190

191191
- **`-o|--output <trace-file-path>`**
192192

193-
The output path for the collected trace data. If not specified it defaults to `<appname>_<yyyyMMdd>_<HHmmss>.nettrace`, e.g., `myapp_20210315_111514.nettrace``.
193+
The output path for the collected trace data. If not specified it defaults to `<appname>_<yyyyMMdd>_<HHmmss>.nettrace`, for example, `myapp_20210315_111514.nettrace``.
194194

195195
- **`-p|--process-id <PID>`**
196196

@@ -238,15 +238,15 @@ dotnet-trace collect [--buffersize <size>] [--clreventlevel <clreventlevel>] [--
238238

239239
- **`--stopping-event-provider-name`**
240240

241-
A string, parsed as-is, that will stop the trace upon hitting an event with the matching provider name. For a more specific stopping event, additionally provide `--stopping-event-event-name` and/or `--stopping-event-payload-filter`. e.g. `--stopping-event-provider-name Microsoft-Windows-DotNETRuntime` to stop the trace upon hitting the first event emitted by the `Microsoft-Windows-DotNETRuntime` event provider.
241+
A string, parsed as-is, that will stop the trace upon hitting an event with the matching provider name. For a more specific stopping event, additionally provide `--stopping-event-event-name` and/or `--stopping-event-payload-filter`. for example, `--stopping-event-provider-name Microsoft-Windows-DotNETRuntime` to stop the trace upon hitting the first event emitted by the `Microsoft-Windows-DotNETRuntime` event provider.
242242

243243
- **`--stopping-event-event-name`**
244244

245-
A string, parsed as-is, that will stop the trace upon hitting an event with the matching event name. Requires `--stopping-event-provider-name` to be set. For a more specific stopping event, additionally provide `--stopping-event-payload-filter`. e.g. `--stopping-event-provider-name Microsoft-Windows-DotNETRuntime --stopping-event-event-name Method/JittingStarted` to stop the trace upon hitting the first `Method/JittingStarted` event emitted by the `Microsoft-Windows-DotNETRuntime` event provider.
245+
A string, parsed as-is, that will stop the trace upon hitting an event with the matching event name. Requires `--stopping-event-provider-name` to be set. For a more specific stopping event, additionally provide `--stopping-event-payload-filter`. for example, `--stopping-event-provider-name Microsoft-Windows-DotNETRuntime --stopping-event-event-name Method/JittingStarted` to stop the trace upon hitting the first `Method/JittingStarted` event emitted by the `Microsoft-Windows-DotNETRuntime` event provider.
246246

247247
- **`--stopping-event-payload-filter`**
248248

249-
A string, parsed as [payload_field_name]:[payload_field_value] pairs separated by commas, that will stop the trace upon hitting an event containing all specified payload pairs. Requires `--stopping-event-provider-name` and `--stopping-event-event-name` to be set. e.g. `--stopping-event-provider-name Microsoft-Windows-DotNETRuntime --stopping-event-event-name Method/JittingStarted --stopping-event-payload-filter MethodNameSpace:Program,MethodName:OnButtonClick` to stop the trace upon the first `Method/JittingStarted` event for the method `OnButtonClick` in the `Program` namespace emitted by the `Microsoft-Windows-DotNETRuntime` event provider.
249+
A string, parsed as [payload_field_name]:[payload_field_value] pairs separated by commas, that will stop the trace upon hitting an event containing all specified payload pairs. Requires `--stopping-event-provider-name` and `--stopping-event-event-name` to be set. for example, `--stopping-event-provider-name Microsoft-Windows-DotNETRuntime --stopping-event-event-name Method/JittingStarted --stopping-event-payload-filter MethodNameSpace:Program,MethodName:OnButtonClick` to stop the trace upon the first `Method/JittingStarted` event for the method `OnButtonClick` in the `Program` namespace emitted by the `Microsoft-Windows-DotNETRuntime` event provider.
250250

251251
> [!NOTE]
252252
@@ -307,7 +307,7 @@ Suppose you start a long-running app using the command ```dotnet run --configura
307307

308308
```dotnetcli
309309
> dotnet-trace ps
310-
310+
311311
21932 dotnet C:\Program Files\dotnet\dotnet.exe run --configuration Release
312312
36656 dotnet C:\Program Files\dotnet\dotnet.exe
313313
```

docs/core/install/linux-ubuntu-decision.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ If you want to source the .NET packages from an Ubuntu feed, you need to deprior
9393

9494
### I want to create a .NET app
9595

96-
Use the same package sources for the SDK as you use for the runtime. It is recommended that you install .NET through an Ubuntu feed. If, however you want to install .NET from another source (e.g. the [Microsoft package repository](#register-the-microsoft-package-repository) to access higher SDK feature bands), you should uninstall .NET, configure your package manager to ignore .NET packages from the Ubuntu feed and reinstall it from the other source.
96+
Use the same package sources for the SDK as you use for the runtime. It is recommended that you install .NET through an Ubuntu feed. If, however you want to install .NET from another source (for example, the [Microsoft package repository](#register-the-microsoft-package-repository) to access higher SDK feature bands), you should uninstall .NET, configure your package manager to ignore .NET packages from the Ubuntu feed and reinstall it from the other source.
9797

9898
Review the other suggestions in the [Decide how to install .NET](#decide-how-to-install-net) section.
9999

@@ -228,7 +228,7 @@ sudo apt update
228228
```
229229

230230
> [!TIP]
231-
> The previous script was written for Ubuntu and might not work if you're using a derived distribution, such as Linux Mint. It's likely that the `$ID` and `$VERSION_ID` variables won't be assigned the correct values, making the URI for the `wget` command invalid. The `$ID` corresponds to the distribution (e.g., `ubuntu`), while `$VERSION_ID` maps to the specific version of Ubuntu you want to get packages for, such as 22.04 or 23.10.
231+
> The previous script was written for Ubuntu and might not work if you're using a derived distribution, such as Linux Mint. It's likely that the `$ID` and `$VERSION_ID` variables won't be assigned the correct values, making the URI for the `wget` command invalid. The `$ID` corresponds to the distribution (for example, `ubuntu`), while `$VERSION_ID` maps to the specific version of Ubuntu you want to get packages for, such as 22.04 or 23.10.
232232
>
233233
> For example, on Ubuntu 22.04 `$ID` would be `ubuntu` and `$VERSION_ID` would be `22.04`. The URL would look like:
234234
> `https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb`.

docs/machine-learning/reference/ml-net-cli-reference.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ The `mlnet` ML task commands (`classification`, `regression`, `recommendation`,
5656

5757
### Classification options
5858

59-
Running `mlnet classification` will train a classification model. Choose this command if you want an ML Model to categorize data into 2 or more classes (e.g. sentiment analysis).
59+
Running `mlnet classification` will train a classification model. Choose this command if you want an ML Model to categorize data into 2 or more classes (for example, sentiment analysis).
6060

6161
```console
6262
mlnet classification
@@ -90,7 +90,7 @@ mlnet classification
9090

9191
### Regression options
9292

93-
Running `mlnet regression` will train a regression model. Choose this command if you want an ML Model to predict a numeric value (e.g. price prediction).
93+
Running `mlnet regression` will train a regression model. Choose this command if you want an ML Model to predict a numeric value (for example, price prediction).
9494

9595
```console
9696
mlnet regression
@@ -125,7 +125,7 @@ mlnet regression
125125

126126
### Recommendation options
127127

128-
Running `mlnet recommendation` will train a recommendation model. Choose this command if you want an ML Model to recommend items to users based on ratings (e.g. product recommendation).
128+
Running `mlnet recommendation` will train a recommendation model. Choose this command if you want an ML Model to recommend items to users based on ratings (for example, product recommendation).
129129

130130
```console
131131
mlnet recommendation
@@ -291,7 +291,7 @@ This argument is used only for the *recommendation* task.
291291

292292
With this argument, you can ignore existing columns in the dataset file so they are not loaded and used by the training processes.
293293

294-
Specify the columns names that you want to ignore. Use ', ' (comma with space) or ' ' (space) to separate multiple column names. You can use quotes for column names containing whitespace (e.g. "logged in").
294+
Specify the columns names that you want to ignore. Use ', ' (comma with space) or ' ' (space) to separate multiple column names. You can use quotes for column names containing whitespace (for example, "logged in").
295295

296296
Example:
297297

docs/orleans/deployment/multi-cluster-support/gossip-channels.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Gossip is a mechanism for clusters to share configuration and status information
3434
- The current time-stamped [multi-cluster configuration](multi-cluster-configuration.md).
3535
- A dictionary that contains information about cluster gateways. The key is the silo address, and the value contains (1) a timestamp, (2) the cluster id, and (3) a status, which is either active or inactive.
3636

37-
**Fast & Slow Propagation**. When a gateway changes its status, or when an operator injects a new configuration, this gossip information is immediately sent to all silos, clusters, and gossip channels. This happens fast but is not reliable. Should the message be lost due to any reasons (e.g. races, broken sockets, silo failures), our periodic background gossip ensures that the information eventually spreads, albeit more slowly. All information is eventually propagated everywhere and is highly resilient to occasional message loss and failures.
37+
**Fast & Slow Propagation**. When a gateway changes its status, or when an operator injects a new configuration, this gossip information is immediately sent to all silos, clusters, and gossip channels. This happens fast but is not reliable. Should the message be lost due to any reasons (for example, races, broken sockets, silo failures), our periodic background gossip ensures that the information eventually spreads, albeit more slowly. All information is eventually propagated everywhere and is highly resilient to occasional message loss and failures.
3838

3939
All gossip data is timestamped, which ensures that newer information replaces older information regardless of the relative timing of messages. For example, newer multi-cluster configurations replace older ones, and newer information about a gateway replaces older information about that gateway. For more details on the representation of gossip data, see the `MultiClusterData` class. It has a `Merge` method that combines gossip data, resolving conflicts using timestamps.
4040

docs/orleans/deployment/multi-cluster-support/multi-cluster-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ If using the Azure table-based gossip channel, operators can inject a new config
7676
|-----------------|----------|---------------------------------------------------------|
7777
| PartitionKey | String | the ServiceId |
7878
| RowKey | String | "CONFIG" |
79-
| Clusters | String | comma-separated list of cluster IDs, e.g. "us1,eu1,us2" |
79+
| Clusters | String | comma-separated list of cluster IDs, for example, "us1,eu1,us2" |
8080
| Comment | String | optional comment |
8181
| GossipTimestamp | DateTime | UTC timestamp for the configuration |
8282

docs/orleans/grains/event-sourcing/log-consistency-providers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@ The consistency provider expects these to behave a certain way. Programmers shou
5151

5252
* <xref:Orleans.EventSourcing.CustomStorage.ICustomStorageInterface%602.ApplyUpdatesToStorage%2A> must return false if the expected version does not match the actual version (this is analogous to an e-tag check).
5353

54-
* If `ApplyUpdatesToStorage` fails with an exception, the consistency provider retries. This means some events could be duplicated if such an exception is thrown, but the event was persisted. The developer is responsible to make sure this is safe: e.g. either avoid this case by not throwing an exception, or ensure duplicated events are harmless for the application logic, or add some extra mechanism to filter duplicates.
54+
* If `ApplyUpdatesToStorage` fails with an exception, the consistency provider retries. This means some events could be duplicated if such an exception is thrown, but the event was persisted. The developer is responsible to make sure this is safe: for example, either avoid this case by not throwing an exception, or ensure duplicated events are harmless for the application logic, or add some extra mechanism to filter duplicates.
5555

5656
This provider does not support `RetrieveConfirmedEvents`. Of course, since the developer controls the storage interface anyway, they don't need to call this in the first place, but can implement their event retrieval.

0 commit comments

Comments
 (0)