Skip to content

Commit 26b4c02

Browse files
committed
Add "region(s)" to "country" and "countries"
1 parent 1566797 commit 26b4c02

10 files changed

Lines changed: 10 additions & 10 deletions

File tree

docs/ado/reference/ado-api/filter-and-recordcount-properties-example-vb.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ End Sub
9999
```
100100

101101
> [!NOTE]
102-
> When you know the data you want to select, it's usually more efficient to open a **Recordset** with an SQL statement. This example shows how you can create just one **Recordset** and obtain records from a particular country.
102+
> When you know the data you want to select, it's usually more efficient to open a **Recordset** with an SQL statement. This example shows how you can create just one **Recordset** and obtain records from a particular country/region.
103103
104104
```
105105
Attribute VB_Name = "Filter"

docs/data-quality-services/using-the-dqs-default-knowledge-base.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ms.topic: conceptual
1818

1919
- **Country/Region (three-letter leading)**: Contains the conventional long (official name as designated by the country/region) and short names (common name used in lists, on maps, and so on), two-letter abbreviation, three-letter abbreviation and three-digit code for each location. Leading values is set to County three-letter abbreviation.
2020

21-
- **Country/Region (two-letter leading)**: Contains the conventional long (official name as designated by the country/region ) and short names (common name used in lists, on maps, etc. ), two-letter abbreviation, three-letter abbreviation and three-digit code for each location. Leading value is set to the Country two-letter abbreviation.
21+
- **Country/Region (two-letter leading)**: Contains the conventional long (official name as designated by the country/region ) and short names (common name used in lists, on maps, etc. ), two-letter abbreviation, three-letter abbreviation and three-digit code for each location. Leading value is set to the country/region two-letter abbreviation.
2222

2323
- **US - Counties**: Contains a list of US counties.
2424

docs/machine-learning/r/ref-r-olapr.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ FROM [Analysis Services Tutorial]
105105
WHERE [Sales Territory].[Sales Territory Country].[Australia]
106106
```
107107

108-
Using an AdventureWorks OLAP cube from the [multidimensional cube tutorial](/analysis-services/multidimensional-tutorial/multidimensional-modeling-adventure-works-tutorial), this MDX query selects the internet sales count and sales amount and places them on the Column axis. On the Row axis it places all possible values of the "Product Line" dimension. Then, using the WHERE clause (which is the slicer axis in MDX queries), it filters the query so that only the sales from Australia matter. Without the slicer axis, we would roll up and summarize the sales from all countries.
108+
Using an AdventureWorks OLAP cube from the [multidimensional cube tutorial](/analysis-services/multidimensional-tutorial/multidimensional-modeling-adventure-works-tutorial), this MDX query selects the internet sales count and sales amount and places them on the Column axis. On the Row axis it places all possible values of the "Product Line" dimension. Then, using the WHERE clause (which is the slicer axis in MDX queries), it filters the query so that only the sales from Australia matter. Without the slicer axis, we would roll up and summarize the sales from all countries/regions.
109109

110110
## olapR examples
111111

docs/master-data-services/recursive-hierarchies-master-data-services.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ ms.author: jiwang6
4242

4343
## Rules
4444

45-
- A derived hierarchy cannot contain more than one recursive relationship. It can, however, have other derived relationships (for example, a derived hierarchy that contains a recursive Manager to Employee relationship can also have Country to Manager and Employee to Store relationships).
45+
- A derived hierarchy cannot contain more than one recursive relationship. It can, however, have other derived relationships (for example, a derived hierarchy that contains a recursive Manager to Employee relationship can also have Country/Region to Manager and Employee to Store relationships).
4646

4747
- You cannot assign member permissions (on the **Hierarchy Members** tab) to members in a recursive hierarchy.
4848

docs/mdx/max-mdx.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Max( Set_Expression [ , Numeric_Expression ] )
3636
> [!INCLUDE[ssASnoversion](../includes/ssasnoversion-md.md)] ignores nulls when calculating the maximum value in a set of numbers.
3737
3838
## Example
39-
The following example returns the maximum monthly sales for each quarter, subcategory, and country in the Adventure Works cube.
39+
The following example returns the maximum monthly sales for each quarter, subcategory, and country/region in the Adventure Works cube.
4040

4141
```
4242
WITH MEMBER Measures.x AS Max

docs/odbc/reference/appendixes/converting-data-from-c-to-sql-data-types.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ When an application calls **SQLExecute** or **SQLExecDirect**, the driver retrie
2727

2828
The following table shows the supported conversions from ODBC C data types to ODBC SQL data types. A filled circle indicates the default conversion for an SQL data type (the C data type from which the data will be converted when the value of *ValueType* or the SQL_DESC_CONCISE_TYPE descriptor field is SQL_C_DEFAULT). A hollow circle indicates a supported conversion.
2929

30-
The format of the converted data is not affected by the Windows® country setting.
30+
The format of the converted data is not affected by the Windows® country or region setting.
3131

3232
![Supported conversions: ODBC C to SQL data types](../../../odbc/reference/appendixes/media/apd1b.gif "apd1b")
3333

docs/odbc/reference/appendixes/converting-data-from-sql-to-c-data-types.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ When an application calls **SQLFetch**, **SQLFetchScroll**, or **SQLGetData**, t
2929

3030
For an ODBC *3.x* application working with an ODBC *2.x* driver, conversion from driver-specific data types might not be supported.
3131

32-
The format of the converted data is not affected by the Windows® country setting.
32+
The format of the converted data is not affected by the Windows® country/region setting.
3333

3434
The tables in the following sections describe how the driver or data source converts data retrieved from the data source; drivers are required to support conversions to all ODBC C data types from the ODBC SQL data types that they support. For a given ODBC SQL data type, the first column of the table lists the legal input values of the *TargetType* argument in **SQLBindCol** and **SQLGetData**. The second column lists the outcomes of a test, often using the *BufferLength* argument specified in **SQLBindCol** or **SQLGetData**, which the driver performs to determine whether it can convert the data. For each outcome, the third and fourth columns list the values placed in the buffers specified by the *TargetValuePtr* and *StrLen_or_IndPtr* arguments specified in **SQLBindCol** or **SQLGetData** after the driver has attempted to convert the data. (The *StrLen_or_IndPtr* argument corresponds to the SQL_DESC_OCTET_LENGTH_PTR field of the ARD.) The last column lists the SQLSTATE returned for each outcome by **SQLFetch**, **SQLFetchScroll**, or **SQLGetData**.
3535

docs/odbc/reference/appendixes/sql-to-c-date.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ The identifier for the date ODBC SQL data type is:
3737

3838
[c] This is the size of the corresponding C data type.
3939

40-
When date SQL data is converted to character C data, the resulting string is in the "*yyyy*-*mm*-*dd*" format. This format is not affected by the Windows® country setting.
40+
When date SQL data is converted to character C data, the resulting string is in the "*yyyy*-*mm*-*dd*" format. This format is not affected by the Windows® country/region setting.

docs/odbc/reference/appendixes/sql-to-c-time.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ The identifier for the time ODBC SQL data type is:
3939

4040
[d] This is the size of the corresponding C data type.
4141

42-
When time SQL data is converted to character C data, the resulting string is in the "*hh*:*mm*:*ss*" format. This format is not affected by the Windows® country setting.
42+
When time SQL data is converted to character C data, the resulting string is in the "*hh*:*mm*:*ss*" format. This format is not affected by the Windows® country/region setting.

docs/relational-databases/hierarchical-data-sql-server.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ Converted Level Level Location LocationType
244244
/3/1/ 0x7AC0 McMurdo Station City
245245
```
246246
247-
Notice that the hierarchy has a valid structure, even though it isn't internally consistent. Bahia is the only state. It appears in the hierarchy as a peer of the city Brasilia. Similarly, McMurdo Station does not have a parent country. Users must decide if this type of hierarchy is appropriate for their use.
247+
Notice that the hierarchy has a valid structure, even though it isn't internally consistent. Bahia is the only state. It appears in the hierarchy as a peer of the city Brasilia. Similarly, McMurdo Station does not have a parent country or region. Users must decide if this type of hierarchy is appropriate for their use.
248248
249249
Add another row and select the results.
250250

0 commit comments

Comments
 (0)