Skip to content

Commit

Permalink
Merge branch 'public' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
shenanigansd authored Mar 1, 2024
2 parents 4f741d1 + e2d49a2 commit c367336
Show file tree
Hide file tree
Showing 381 changed files with 6,027 additions and 4,607 deletions.
58 changes: 54 additions & 4 deletions .openpublishing.redirection.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"redirections": [
{
"source_path": "Teams/Office-365-custom-connectors.md",
"redirect_url": "/microsoftteams/m365-custom-connectors",
"redirect_document_id": false
},
{
"source_path": "Teams/app-permissions-admin-center.md",
"redirect_url": "/microsoftteams/manage-consent-app-permissions",
Expand Down Expand Up @@ -2682,8 +2687,8 @@
},
{
"source_path": "Teams/data-collection-practices.md",
"redirect_url": "/microsoftteams/teams-privacy",
"redirect_document_id": true
"redirect_url": "/microsoftteams/privacy/teams-privacy",
"redirect_document_id": false
},
{
"source_path": "Teams/upgrade-automated.md",
Expand Down Expand Up @@ -4729,6 +4734,51 @@
"source_path": "Teams/teams-add-on-licensing/advanced-communications.md",
"redirect_url": "/microsoftteams/teams-add-on-licensing/microsoft-teams-add-on-licensing",
"redirect_document_id": false
}
]
},
{
"source_path": "teams/teams-privacy.md",
"redirect_url": "/microsoftteams/privacy/teams-privacy",
"redirect_document_id": true
},
{
"source_path": "teams/location-of-data-in-teams.md",
"redirect_url": "/microsoftteams/privacy/location-of-data-in-teams",
"redirect_document_id": true
},
{
"source_path": "teams/teams-privacy-feedback.md",
"redirect_url": "/microsoftteams/privacy/teams-privacy-feedback",
"redirect_document_id": true
},
{
"source_path": "teams/policy-control-overview.md",
"redirect_url": "/microsoftteams/privacy/policy-control-overview",
"redirect_document_id": true
},
{
"source_path": "teams/policy-control-diagnostic-data-desktop.md",
"redirect_url": "/microsoftteams/privacy/policy-control-diagnostic-data-desktop",
"redirect_document_id": true
},
{
"source_path": "teams/policy-control-diagnostic-data-mobile.md",
"redirect_url": "/microsoftteams/privacy/policy-control-diagnostic-data-mobile",
"redirect_document_id": true
},
{
"source_path": "teams/teams-privacy-oce-overview.md",
"redirect_url": "/microsoftteams/privacy/teams-privacy-oce-overview",
"redirect_document_id": true
},
{
"source_path": "teams/operator-connect-data-transfer.md",
"redirect_url": "/microsoftteams/privacy/operator-connect-data-transfer",
"redirect_document_id": true
},
{
"source_path": "teams/privacy/index.md",
"redirect_url": "/microsoftteams/privacy/teams-privacy",
"redirect_document_id": false
}
]
}
219 changes: 109 additions & 110 deletions Lync/docfx.json
Original file line number Diff line number Diff line change
@@ -1,113 +1,112 @@
{
"build": {
"content": [
{
"files": [
"**/*.md",
"**/*.yml"
"build": {
"content": [
{
"files": [
"**/*.md",
"**/*.yml"
],
"src": "Hub",
"dest": ".",
"exclude": [
"**/obj/**",
"**/includes/**",
"_themes/**",
"_themes.pdf/**",
"README.md",
"LICENSE",
"LICENSE-CODE",
"ThirdPartyNotices"
]
},
{
"files": [
"**/*.md",
"**/*.yml"
],
"src": "LyncServer",
"dest": ".",
"exclude": [
"**/obj/**",
"**/includes/**",
"_themes/**",
"_themes.pdf/**",
"README.md",
"LICENSE",
"LICENSE-CODE",
"ThirdPartyNotices"
]
},
{
"files": [
"**/*.md",
"**/*.yml"
],
"src": "LyncTools",
"dest": ".",
"exclude": [
"**/obj/**",
"**/includes/**",
"_themes/**",
"_themes.pdf/**",
"README.md",
"LICENSE",
"LICENSE-CODE",
"ThirdPartyNotices"
]
}
],
"src": "Hub",
"dest": ".",
"exclude": [
"**/obj/**",
"**/includes/**",
"_themes/**",
"_themes.pdf/**",
"README.md",
"LICENSE",
"LICENSE-CODE",
"ThirdPartyNotices"
]
},
{
"files": [
"**/*.md",
"**/*.yml"
"resource": [
{
"files": [
"**/*.png",
"**/*.jpg",
"**/*.gif",
"**/*.svg",
"**/*.csv"
],
"exclude": [
"**/obj/**",
"**/includes/**",
"_themes/**",
"_themes.pdf/**"
]
}
],
"src": "LyncServer",
"dest": ".",
"exclude": [
"**/obj/**",
"**/includes/**",
"_themes/**",
"_themes.pdf/**",
"README.md",
"LICENSE",
"LICENSE-CODE",
"ThirdPartyNotices"
]
},
{
"files": [
"**/*.md",
"**/*.yml"
],
"src": "LyncTools",
"dest": ".",
"exclude": [
"**/obj/**",
"**/includes/**",
"_themes/**",
"_themes.pdf/**",
"README.md",
"LICENSE",
"LICENSE-CODE",
"ThirdPartyNotices"
]
}
],
"resource": [
{
"files": [
"**/*.png",
"**/*.jpg",
"**/*.gif",
"**/*.svg",
"**/*.csv"
],
"exclude": [
"**/obj/**",
"**/includes/**",
"_themes/**",
"_themes.pdf/**"
]
}
],
"overwrite": [],
"externalReference": [],
"globalMetadata": {
"ms.service": "lync-server-2013",
"breadcrumb_path": "/LyncServer/breadcrumb/toc.json",
"extendBreadcrumb": true,
"uhfHeaderId": "MSDocsHeader-M365-IT",
"searchScope": [
"Lync Server"
],
"contributors_to_exclude": [
"dstrome",
"rjagiewich",
"traya1",
"rmca14",
"claydetels19",
"jborsecnik",
"tiburd",
"garycentric",
"beccarobins",
"Stacyrch140",
"v-stsavell",
"American-Dipper"
],
"feedback_system": "None",
"hideEdit": true,
"ms.topic": "conceptual",
"audience": "ITPro",
"ms.collection": "LyncServer",
"ms.manager": "serdars",
"titleSuffix": "Lync Server"
},
"fileMetadata": {},
"template": [],
"dest": "OfficeDocs-LyncServer",
"markdownEngineName": "markdig"
}
}
"overwrite": [],
"externalReference": [],
"globalMetadata": {
"ms.service": "lync-server-2013",
"breadcrumb_path": "/LyncServer/breadcrumb/toc.json",
"extendBreadcrumb": true,
"uhfHeaderId": "MSDocsHeader-M365-IT",
"searchScope": [
"Lync Server"
],
"contributors_to_exclude": [
"dstrome2",
"rjagiewich",
"American-Dipper",
"claydetels19",
"jborsecnik",
"v-stchambers",
"shdyas",
"Stacyrch140",
"garycentric",
"dstrome",
"beccarobins"
],
"feedback_system": "None",
"hideEdit": true,
"ms.topic": "conceptual",
"audience": "ITPro",
"ms.collection": "LyncServer",
"ms.manager": "serdars",
"titleSuffix": "Lync Server"
},
"fileMetadata": {},
"template": [],
"dest": "OfficeDocs-LyncServer",
"markdownEngineName": "markdig"
}
}
70 changes: 61 additions & 9 deletions Skype/Hub/includes/skype-content-updates.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,67 @@


## Week of February 05, 2024


| Published On |Topic title | Change |
|------|------------|--------|
| 2/5/2024 | [Skype for Business Server Feature Overview planning tool](/SkypeForBusiness/help-topics/help-planning/feature-overview) | modified |
| 2/5/2024 | [Add Edge Server IP Options](/SkypeForBusiness/help-topics/help-topobld/add-edge-server-ip-options) | modified |
| 2/5/2024 | [Add SQL Store](/SkypeForBusiness/help-topics/help-topobld/add-sql-store) | modified |
| 2/5/2024 | [Associate Front End With Office Web Apps Server Page](/SkypeForBusiness/help-topics/help-topobld/associate-front-end-with-office-web-apps-server-page) | modified |
| 2/5/2024 | [Branch Office Appliance General Settings Expander](/SkypeForBusiness/help-topics/help-topobld/branch-office-appliance-general-settings-expander) | modified |
| 2/5/2024 | [Edge Settings Expander](/SkypeForBusiness/help-topics/help-topobld/edge-settings-expander) | modified |
| 2/5/2024 | [Install and Create Databases](/SkypeForBusiness/help-topics/help-topobld/install-and-create-databases) | modified |
| 2/5/2024 | [Mediation Server General Settings Expander](/SkypeForBusiness/help-topics/help-topobld/mediation-server-general-settings-expander) | modified |
| 2/5/2024 | [Mediation Service Settings Expander](/SkypeForBusiness/help-topics/help-topobld/mediation-service-settings-expander) | modified |
| 2/5/2024 | [Registrar Settings Expander](/SkypeForBusiness/help-topics/help-topobld/registrar-settings-expander) | modified |
| 2/5/2024 | [SQL Store Settings Expander](/SkypeForBusiness/help-topics/help-topobld/sql-store-settings-expander) | modified |
| 2/5/2024 | [Enabling and disabling media bypass](/SkypeForBusiness/manage/network-management/call-admission-control/enabling-and-disabling-media-bypass) | modified |
| 2/5/2024 | [Configuring port ranges and a Quality of Service policy for your Conferencing, Application, and Mediation servers](/SkypeForBusiness/manage/network-management/qos/configuring-port-ranges-for-your-conferencing-application-and-mediation-servers) | modified |
| 2/5/2024 | [Configuring port ranges and a Quality of Service policy for your clients](/SkypeForBusiness/manage/network-management/qos/configuring-port-ranges-for-your-skype-clients) | modified |
| 2/5/2024 | [Deploy Call Quality Dashboard for Skype for Business Server](/SkypeForBusiness/management-tools/call-quality-dashboard/deploy-0) | modified |
| 2/5/2024 | [Skype for Business Server: Plan for Call Quality Dashboard](/SkypeForBusiness/management-tools/call-quality-dashboard/plan) | modified |
| 2/5/2024 | [Run Query](/SkypeForBusiness/management-tools/call-quality-dashboard/run-query) | modified |
| 2/5/2024 | [Skype for Business Server Capacity Planning Calculator](/SkypeForBusiness/management-tools/capacity-planning-calculator) | modified |
| 2/5/2024 | [Configure providers for Centralized Logging Service in Skype for Business Server 2015](/SkypeForBusiness/management-tools/centralized-logging-service/configure-providers) | modified |
| 2/5/2024 | [Manage Centralized Logging Service configuration settings in Skype for Business Server 2015](/SkypeForBusiness/management-tools/centralized-logging-service/manage-configuration-settings) | modified |
| 2/5/2024 | [Skype for Business Server 2015 Management Tools](/SkypeForBusiness/management-tools/management-tools) | modified |
| 2/5/2024 | [Feature Overview planning tool](/SkypeForBusiness/management-tools/planning-tool/feature-overview) | modified |
| 2/5/2024 | [Deploy Statistics Manager for Skype for Business Server](/SkypeForBusiness/management-tools/statistics-manager/deploy) | modified |
| 2/5/2024 | [Plan for Statistics Manager for Skype for Business Server](/SkypeForBusiness/management-tools/statistics-manager/plan) | modified |
| 2/5/2024 | [Troubleshoot Statistics Manager for Skype for Business Server](/SkypeForBusiness/management-tools/statistics-manager/troubleshoot) | modified |
| 2/5/2024 | [Upgrade Statistics Manager for Skype for Business Server](/SkypeForBusiness/management-tools/statistics-manager/upgrade) | modified |
| 2/5/2024 | [Prerequisites and setup for the Skype for Business Stress and Performance Tool](/SkypeForBusiness/management-tools/stress-and-performance-tool/prerequisites-and-setup) | modified |
| 2/5/2024 | [How to configure watcher node test users and settings](/SkypeForBusiness/management-tools/use-scom-management-pack/test-users-and-settings) | modified |
| 2/8/2024 | [Install and configure watcher nodes](/SkypeForBusiness/tools/watcher-nodes-2019) | modified |
| 2/8/2024 | [Mobile Client Push Notification Configuration](/SkypeForBusiness/help-topics/2019/lscp/ms.lync.lscp.clientpushnotificationcfgmain) | modified |
| 2/8/2024 | [Archiving Policy Create New or Edit Existing](/SkypeForBusiness/help-topics/2019/lscp/ms.lync.lscp.monarchpolicyedit) | modified |
| 2/8/2024 | [Location Policy Create New or Edit Existing](/SkypeForBusiness/help-topics/2019/lscp/ms.lync.lscp.ncslocedit) | modified |
| 2/8/2024 | [Call Park Create New or Edit Existing](/SkypeForBusiness/help-topics/2019/lscp/ms.lync.lscp.voicefeacallparkedit) | modified |
| 2/8/2024 | [Add Edge Server IP Options](/SkypeForBusiness/help-topics/2019/topobld/ms.lync.tb.addedgeserveripoptionspage) | modified |
| 2/8/2024 | [Add SQL Store](/SkypeForBusiness/help-topics/2019/topobld/ms.lync.tb.addsqlstorepage) | modified |
| 2/8/2024 | [Associate Front End With Office Web Apps Server Page](/SkypeForBusiness/help-topics/2019/topobld/ms.lync.tb.associatefrontendwithwacpage) | modified |
| 2/8/2024 | [Branch Office Appliance General Settings Expander](/SkypeForBusiness/help-topics/2019/topobld/ms.lync.tb.branchofficeappliancegeneralsettingsexpander) | modified |
| 2/8/2024 | [Mediation Server General Settings Expander](/SkypeForBusiness/help-topics/2019/topobld/ms.lync.tb.mediationservergeneralsettingsexpander) | modified |
| 2/8/2024 | [Registrar Settings Expander](/SkypeForBusiness/help-topics/2019/topobld/ms.lync.tb.registrarsettingsexpander) | modified |
| 2/8/2024 | [SQL Store Settings Expander](/SkypeForBusiness/help-topics/2019/topobld/ms.lync.tb.sqlstoresettingsexpander) | modified |
| 2/8/2024 | [Certificate Wizard](/SkypeForBusiness/help-topics/help-depwiz/certificate-wizard) | modified |
| 2/8/2024 | [Pending Certificate (Returned)](/SkypeForBusiness/help-topics/help-depwiz/pending-certificate-returned) | modified |
| 2/8/2024 | [Verify Replication of Schema Partition](/SkypeForBusiness/help-topics/help-depwiz/verify-replication-of-schema-partition) | modified |
| 2/8/2024 | [Archiving Policy Create New or Edit Existing](/SkypeForBusiness/help-topics/help-lscp/archiving-policy-create-new-or-edit-existing) | modified |
| 2/8/2024 | [Call Park Create New or Edit Existing](/SkypeForBusiness/help-topics/help-lscp/call-park-create-new-or-edit-existing) | modified |
| 2/8/2024 | [Location Policy Create New or Edit Existing](/SkypeForBusiness/help-topics/help-lscp/location-policy-create-new-or-edit-existing) | modified |


## Week of January 29, 2024


| Published On |Topic title | Change |
|------|------------|--------|
| 1/30/2024 | [Using the Meeting Migration Service (MMS)](/SkypeForBusiness/audio-conferencing-in-office-365/setting-up-the-meeting-migration-service-mms) | modified |


## Week of January 15, 2024


Expand All @@ -19,12 +80,3 @@
| 1/19/2024 | [Register-CcAppliance](/SkypeForBusiness/skype-for-business-hybrid-solutions/plan-your-phone-system-cloud-pbx-solution/register-ccappliance) | modified |
| 1/19/2024 | [Troubleshoot your Cloud Connector deployment](/SkypeForBusiness/skype-for-business-hybrid-solutions/plan-your-phone-system-cloud-pbx-solution/troubleshoot-your-cloud-connector-deployment) | modified |
| 1/19/2024 | [Upgrade to a new version of Cloud Connector](/SkypeForBusiness/skype-for-business-hybrid-solutions/plan-your-phone-system-cloud-pbx-solution/upgrade-to-a-new-version-of-cloud-connector) | modified |


## Week of January 01, 2024


| Published On |Topic title | Change |
|------|------------|--------|
| 1/2/2024 | [Skype Room System room setup scripts](/SkypeForBusiness/deploy/deploy-clients/room-setup-scripts) | modified |
| 1/5/2024 | [Configure Cloud Connector integration with your Microsoft 365 or Office 365 organization](/SkypeForBusiness/skype-for-business-hybrid-solutions/plan-your-phone-system-cloud-pbx-solution/configure-cloud-connector-integration-with-your-office-365-tenant) | modified |
Expand Down
Loading

0 comments on commit c367336

Please sign in to comment.