Skip to content

Commit 52d23a0

Browse files
authored
Merge pull request #1149 from Thorium/fix-doc
Minor corrections to the documentation wording
2 parents d0b8844 + 088e9f8 commit 52d23a0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+162
-162
lines changed

docs/content/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Farmer is an easy-to-learn library for rapidly authoring and deploying entire Az
2020
Farmer has you covered.
2121

2222
* **Farmer is completely backwards compatible with ARM templates**. Farmer generates standard ARM templates so you can continue to use existing deployment processes.
23-
* **Safely create dependencies between resources**. Uses static typing to give confidence that your templates will work first time.
23+
* **Safely create dependencies between resources**. Uses static typing to give confidence that your templates will work the first time.
2424
* **Easily access common properties of resources**. No more fighting to concatenate cryptic strings!
2525
* **Extensible API**. Add new helpers and members as needed.
2626
* **Open source and free**. Farmer is free to use and modify. We welcome contributions to the project!

docs/content/api-overview/basic-types.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ let mySubnet = {
3939
}
4040
```
4141

42-
These resource can be used i.e. in referencing a `web app { }` to a subnet.
42+
These resources can be used i.e. in referencing a `web app { }` to a subnet.
4343

4444
```fsharp
4545
let webApp = webApp {
@@ -48,4 +48,4 @@ let webApp = webApp {
4848
sku WebApp.Sku.B1
4949
link_to_unmanaged_vnet mySubnet
5050
}
51-
```
51+
```

docs/content/api-overview/dependencies.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ let myApp = webApp {
6565
}
6666
```
6767

68-
Notice the extra type hint, `: IBuilder list`. This is required because F# does not, by default, allow you to implicitly treat a list of values as a supertype. In this case, a `StorageAccountConfig list` is not considered implicitly convertable to `: IBuilder list` (which is an interface that `StorageAccountConfig` implements). Therefore, we have to do it ourselves using the extra type declaration.
68+
Notice the extra type hint, `: IBuilder list`. This is required because F# does not, by default, allow you to implicitly treat a list of values as a supertype. In this case, a `StorageAccountConfig list` is not considered implicitly convertible to `: IBuilder list` (which is an interface that `StorageAccountConfig` implements). Therefore, we have to do it ourselves using the extra type declaration.
6969

7070
You can also use the `:>` (safe upcast) operator when declaring the StorageAccount:
7171

@@ -84,4 +84,4 @@ All builders that support dependencies support a number of `depends_on` overload
8484

8585
* A single, or a list of, Builders (as shown above)
8686
* A single, or a list of, resources by their Name
87-
* A single, or a list of, [IArmResources](../../contributing/adding-resources/2-iarm-resource/)
87+
* A single, or a list of, [IArmResources](../../contributing/adding-resources/2-iarm-resource/)

docs/content/api-overview/expressions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Farmer understands how to use ARM expressions and provides functionality to corr
1111
> For manipulation of literal values that are known in your Farmer applications, you will not need to use ARM expressions. To manipulate such values, you can use standard F# and .NET capabilities.
1212
1313
#### How do I use ARM expressions?
14-
Many Farmer builders contain pre-defined ARM expression that can be used for common tasks, such as passing a connection string from a storage account as a KeyVault secret, or a web application setting.
14+
Many Farmer builders contain pre-defined ARM expressions that can be used for common tasks, such as passing a connection string from a storage account as a KeyVault secret, or a web application setting.
1515

1616
As an example, a Storage Account config contains a `Key` member that you can supply to a web app as a setting:
1717

@@ -36,7 +36,7 @@ This will be written to the ARM template file as follows:
3636
}
3737
```
3838

39-
Using ARM expressions means that you can deploy an application which is automatically configured at deployment time. This means that you never need to store an application secret such as a storage account key in source control, or even e.g. as a secret variable in your build / deployment process.
39+
Using ARM expressions means that you can deploy an application which is automatically configured at deployment time. This means that you never need to store an application secret, such as a storage account key in source control, or even e.g. as a secret variable in your build / deployment process.
4040

4141
#### Returning the value of ARM Expressions as outputs.
4242
ARM Expressions can also be passed back as *outputs* and used further downstream once your deployment is complete:

docs/content/api-overview/parameters.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ let db = sql {
2929
}
3030
```
3131

32-
This will generate an ARM template which looks as follows (irrelevant content is elided for clarity):
32+
This will generate an ARM template which looks as follows (irrelevant content is omitted for clarity):
3333

3434
```json
3535
{
@@ -54,7 +54,7 @@ This will generate an ARM template which looks as follows (irrelevant content is
5454
```
5555

5656
#### Working with variables
57-
ARM templates allow you to declare [variables](https://docs.microsoft.com/en-us/azure/azure-resource-manager/templates/template-variables) inside a template to reuse a value across a template. ARM templates also allow the use of a custom set of a commands which are embedded within strings to generate program logic, using *expressions* which contain [*template functions*](https://docs.microsoft.com/en-us/azure/azure-resource-manager/templates/template-functions). For example, to concatenate a string inside a ARM template made up of two variables and put into a third variable, you might use something like the following:
57+
ARM templates allow you to declare [variables](https://docs.microsoft.com/en-us/azure/azure-resource-manager/templates/template-variables) inside a template to reuse a value across a template. ARM templates also allow the use of a custom set of commands which are embedded within strings to generate program logic, using *expressions* which contain [*template functions*](https://docs.microsoft.com/en-us/azure/azure-resource-manager/templates/template-functions). For example, to concatenate a string inside an ARM template made up of two variables and put into a third variable, you might use something like the following:
5858

5959
```json
6060
{
@@ -100,4 +100,4 @@ let deployment = arm {
100100
location Location.NorthEurope
101101
add_resources myDatabases
102102
}
103-
```
103+
```

docs/content/api-overview/resources/aks-cluster.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ let myAks = aks {
109109
)
110110
}
111111
```
112-
#### Using user asssigned identities and connecting to container registry
112+
#### Using user assigned identities and connecting to the container registry
113113
```fsharp
114114
// Create an identity for kubelet (used to connect to container registry)
115115
let kubeletMsi = createUserAssignedIdentity "kubeletIdentity"
@@ -160,4 +160,4 @@ let template =
160160
add_resource assignMsiRole
161161
add_resource acrPullRole
162162
}
163-
```
163+
```

docs/content/api-overview/resources/alert.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ Azure Application Insights allows you to monitor your application and send you a
2020
| frequency | How often the metric alert is evaluated |
2121
| window | The period of time that is used to monitor alert activity based on the threshold. |
2222
| severity | Alert severity |
23-
| add_linked_resource | Add target resource on which the alert is created/updated. |
23+
| add_linked_resource | Add the target resource on which the alert is created/updated. |
2424
| add_linked_resources | Add the target resources on which the alert is created/updated. |
2525
| single_resource_multiple_metric_criteria | The rule criteria that defines the conditions of the alert rule. |
26-
| single_resource_multiple_custom_metric_criteria | The rule criteria that defines the conditions of the alert rule based on Application Insights custom metric or metric with custom namespace. Metric validation is disabled for such criteria, so it is possible to create an alert that watches metrics not yet emitted. More details are available [here](https://docs.microsoft.com/azure/azure-monitor/platform/alerts-troubleshoot-metric#define-an-alert-rule-on-a-custom-metric-that-isnt-emitted-yet). |
26+
| single_resource_multiple_custom_metric_criteria | The rule criteria that defines the conditions of the alert rule based on Application Insights custom metric or metric with a custom namespace. Metric validation is disabled for such criteria, so it is possible to create an alert that watches metrics not yet emitted. More details are available [here](https://docs.microsoft.com/azure/azure-monitor/platform/alerts-troubleshoot-metric#define-an-alert-rule-on-a-custom-metric-that-isnt-emitted-yet). |
2727
| multiple_resource_multiple_metric_criteria | The rule criterias that defines the conditions of the alert rule. |
2828
| webtest_location_availability_criteria | The rule criteria that defines the conditions of the alert rule. AppInsightsId * WebTestId * FailedLocationCount |
29-
| add_action | Add an action that are performed when the alert rule becomes active. |
29+
| add_action | Add an action that is performed when the alert rule becomes active. |
3030

3131
More detailed documentation: https://docs.microsoft.com/en-us/azure/templates/microsoft.insights/metricalerts?tabs=json#metricalertproperties
3232

docs/content/api-overview/resources/app-insights.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The App Insights builder is used to create Application Insights accounts. Use th
1919
| name | Sets the name of the App Insights instance. |
2020
| disable_ip_masking | Disable IP masking. |
2121
| sampling_percentage | Define sampling percentage (0-100) |
22-
| log_analytics_workspace | Use a Log Analytics workspace as the backing store for this AI instance. You can supply either a Farmer-generate Log Analytics`WorkspaceConfig` instance that exists in the same resource group, or a fully-qualified Resource ID path to that instance. This will also switch the AI instance over to creating a "workspace enabled" AI instance. |
22+
| log_analytics_workspace | Use a Log Analytics workspace as the backing store for this AI instance. You can supply either a Farmer-generate Log Analytics`WorkspaceConfig` instance that exists in the same resource group, or a fully-qualified Resource ID path to that instance. This will also switch the AI instance over to create a "workspace enabled" AI instance. |
2323

2424
#### Configuration Members
2525

@@ -38,4 +38,4 @@ let ai = appInsights {
3838
name "myAI"
3939
log_analytics_workspace myWorkspace // use to activate workspace-enabled AI instances.
4040
}
41-
```
41+
```

docs/content/api-overview/resources/availability-tests.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ chapter: false
77

88
#### Overview
99
The App Insights - Availability Tests builder is used to create Application Insights Availability Tests. You will need an Application Insights instance to run the tests.
10-
The tests can be just pinging the website and expecting response code of 200, or they can be recored Visual Studio WebTests as custom XML strings.
10+
The tests can be just pinging the website and expecting a response code of 200, or they can be recorded Visual Studio WebTests as custom XML strings.
1111

1212
* Application Insights (`Microsoft.Insights/webtests`)
1313

@@ -46,4 +46,4 @@ let myAvailabilityTest =
4646
|> System.Uri
4747
|> AvailabilityTest.WebsiteUrl)
4848
}
49-
```
49+
```

docs/content/api-overview/resources/azure-firewall.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ The Azure Firewall builder (`azureFirewall`) is used to create Azure Firewall in
1616
| Resource | Keyword | Purpose |
1717
| -------------- | -------------------- | -----------------------------------------------------------------------|
1818
| azureFirewall | name | Sets the name of the azure firewall |
19-
| azureFirewall | sku | Sets the name and tier of the azure firewall sku |
19+
| azureFirewall | sku | Sets the name and tier of the Azure firewall sku |
2020
| azureFirewall | link_to_unmanaged_firewall_policy | Configure the azure firewall to use an existing firewall policy |
21-
| azureFirewall | link_to_firewall_policy | Configure the azure firewall to use a firewall policy deployed by Farmer |
21+
| azureFirewall | link_to_firewall_policy | Configure the Azure firewall to use a firewall policy deployed by Farmer |
2222
| azureFirewall | link_to_unmanaged_vhub | Specify the existing virtual hub to which the azure firewall belongs |
23-
| azureFirewall | link_to_vhub | Specify the virtual hub deployed by farmer to which the azure firewall belongs |
23+
| azureFirewall | link_to_vhub | Specify the virtual hub deployed by Farmer to which the azure firewall belongs |
2424
| azureFirewall | public_ip_reservation_count | Specify the number of Public IP addresses associated with the azure firewall |
25-
| azureFirewall | depends_on | Specify resources deployed by farmer the azure firewall depends on |
25+
| azureFirewall | depends_on | Specify resources deployed by Farmer the azure firewall depends on |
2626

2727
### Example
2828

@@ -41,4 +41,4 @@ let deployment = arm {
4141
location Location.NorthEurope
4242
add_resource firewall
4343
}
44-
```
44+
```

0 commit comments

Comments
 (0)