Skip to content

Commit 0a8f7c7

Browse files
authored
Merge pull request #24494 from jaszymas/pass
Pass
2 parents 95a1d88 + 13d5891 commit 0a8f7c7

39 files changed

Lines changed: 699 additions & 1453 deletions

File tree

.openpublishing.redirection.azure-sql.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,16 @@
485485
"redirect_url": "/sql/machine-learning/package-management/install-additional-r-packages-on-sql-server?context=/azure/azure-sql/managed-instance/context/ml-context&view=azuresqldb-mi-current",
486486
"redirect_document_id": false
487487
},
488+
{
489+
"source_path_from_root": "/azure-sql/database/always-encrypted-azure-key-vault-configure.md",
490+
"redirect_url": "/sql/relational-databases/security/encryption/always-encrypted-tutorial-getting-started",
491+
"redirect_document_id": false
492+
},
493+
{
494+
"source_path_from_root": "/azure-sql/database/always-encrypted-certificate-store-configure.md",
495+
"redirect_url": "/sql/relational-databases/security/encryption/always-encrypted-tutorial-getting-started",
496+
"redirect_document_id": false
497+
},
488498
{
489499
"source_path_from_root": "/azure-sql/database/connect-query-r.md",
490500
"redirect_url": "/sql/machine-learning/tutorials/quickstart-r-create-script?context=/azure/azure-sql/managed-instance/context/ml-context&view=azuresqldb-mi-current",

azure-sql/database/always-encrypted-azure-key-vault-configure.md

Lines changed: 0 additions & 610 deletions
This file was deleted.

azure-sql/database/always-encrypted-certificate-store-configure.md

Lines changed: 0 additions & 547 deletions
This file was deleted.

azure-sql/database/always-encrypted-enclaves-configure-attestation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ authorizationrules
5252
{
5353
[ type=="x-ms-sgx-is-debuggable", value==false ]
5454
&& [ type=="x-ms-sgx-product-id", value==4639 ]
55-
&& [ type=="x-ms-sgx-svn", value>= 0 ]
55+
&& [ type=="x-ms-sgx-svn", value>= 2 ]
5656
&& [ type=="x-ms-sgx-mrsigner", value=="e31c9e505f37a58de09335075fc8591254313eb20bb1a27e5443cc450b6e33e5"]
5757
=> permit();
5858
};

azure-sql/database/always-encrypted-enclaves-getting-started.md

Lines changed: 40 additions & 37 deletions
Large diffs are not rendered by default.

azure-sql/database/always-encrypted-landing.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,8 @@ landingContent:
4848
linkLists:
4949
- linkListType: tutorial
5050
links:
51-
- text: Configure Always Encrypted by using Azure Key Vault
52-
url: always-encrypted-azure-key-vault-configure.md
53-
- text: Configure Always Encrypted by using the Windows certificate store
54-
url: always-encrypted-certificate-store-configure.md
51+
- text: Getting started with Always Encrypted
52+
url: /sql/relational-databases/security/encryption/always-encrypted-tutorial-getting-started
5553

5654

5755
# Card
Binary file not shown.
Binary file not shown.
Binary file not shown.
486 KB
Loading

0 commit comments

Comments
 (0)