From f37f765ecad9e16ed512b5473b99dd220730b5ab Mon Sep 17 00:00:00 2001
From: Hugo Bernier <hugoabernier@live.ca>
Date: Sun, 7 Nov 2021 01:41:41 -0500
Subject: [PATCH] Moved disclaimer to bottom

---
 samples/README-template.md                          | 10 ++++++----
 samples/aad-api-spo-cookie/README.md                | 10 ++++------
 samples/angular-migration/README.md                 | 12 ++++++------
 samples/angular-multipage/README.md                 | 11 +++++------
 samples/angular-todo/README.md                      |  9 +++++----
 samples/bootstrap-slider/README.md                  |  9 +++++----
 samples/js-propertycontrols-svg/README.md           | 10 ++++++----
 samples/react-3rd-party-api/README.md               | 12 ++++++------
 samples/react-async-await-sp-pnp-js/README.md       |  9 +++++----
 samples/react-bot-framework-secure/README.md        | 10 ++++++----
 samples/react-company-stories/README.md             | 12 ++++++++----
 samples/react-custom-links/README.md                |  8 ++++----
 .../FactoryMethod/README.md                         |  8 ++++----
 samples/react-events-aggregator/README.md           |  9 +++++----
 samples/react-functional-component/README.md        |  9 +++++----
 .../react-functional-stateful-component/README.md   | 11 ++++++-----
 samples/react-global-news-sp2019/README.md          |  8 ++++----
 samples/react-graph-personalemail/README.md         |  9 +++++----
 samples/react-graph-schema-extensions/README.md     |  9 +++++----
 samples/react-members-with-presence/README.md       |  9 +++++----
 samples/react-mobx-multiple-stores/README.md        | 10 +++++-----
 samples/react-myonedrive/README.md                  | 13 +++++--------
 samples/react-organisationchart/README.md           | 10 ++++++----
 tutorials/api-scopes/README.md                      | 12 ++++++------
 tutorials/tutorial-migrate-datatables/README.md     | 12 ++++++------
 25 files changed, 133 insertions(+), 118 deletions(-)

diff --git a/samples/README-template.md b/samples/README-template.md
index 294d4870c..68146c7ba 100644
--- a/samples/README-template.md
+++ b/samples/README-template.md
@@ -164,10 +164,6 @@ We'll add the video from the community call recording here
 [![YouTube video title](./assets/video-thumbnail.jpg)](https://www.youtube.com/watch?v=XXXXX "YouTube video title")
 -->
 
-## Disclaimer
-
-**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
-
 ## Help
 
 <!--
@@ -204,5 +200,11 @@ For questions regarding this sample, [create a new question](https://github.com/
 
 Finally, if you have an idea for improvement, [make a suggestion](https://github.com/pnp/sp-dev-fx-webparts/issues/new?assignees=&labels=Needs%3A+Triage+%3Amag%3A%2Ctype%3Abug-suspected&template=suggestion.yml&sample=YOUR-SOLUTION-NAME&authors=@YOURGITHUBUSERNAME&title=YOUR-SOLUTION-NAME%20-%20).
 
+
+## Disclaimer
+
+**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
+
+
 <img src="https://telemetry.sharepointpnp.com/sp-dev-fx-webparts/samples/YOUR-SOLUTION-NAME" />
 
diff --git a/samples/aad-api-spo-cookie/README.md b/samples/aad-api-spo-cookie/README.md
index acb9316e4..1d73a14de 100644
--- a/samples/aad-api-spo-cookie/README.md
+++ b/samples/aad-api-spo-cookie/README.md
@@ -46,12 +46,6 @@ Version|Date|Comments
 -------|----|--------
 1.0.0|May 5, 2017|Initial release
 
-## Disclaimer
-
-**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
-
----
-
 ## Minimal Path to Awesome
 
 ### Create custom API secured with AAD
@@ -239,5 +233,9 @@ For questions regarding this sample, [create a new question](https://github.com/
 
 Finally, if you have an idea for improvement, [make a suggestion](https://github.com/pnp/sp-dev-fx-webparts/issues/new?assignees=&labels=Needs%3A+Triage+%3Amag%3A%2Ctype%3Abug-suspected&template=suggestion.yml&sample=aad-api-spo-cookie&authors=@waldekmastykarz&title=aad-api-spo-cookie%20-%20).
 
+## Disclaimer
 
+**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
+
+---
 <img src="https://telemetry.sharepointpnp.com/sp-dev-fx-webparts/samples/aad-api-spo-cookie" />
diff --git a/samples/angular-migration/README.md b/samples/angular-migration/README.md
index 4d6fe2918..63ae03bac 100644
--- a/samples/angular-migration/README.md
+++ b/samples/angular-migration/README.md
@@ -42,12 +42,6 @@ Version|Date|Comments
 -------|----|--------
 1.0.0|October 21, 2016|Initial release
 
-## Disclaimer
-
-**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
-
----
-
 Follow the setup instructions:
 - [Angular application](./angular-todo/README.md)
 - [SharePoint Framework client-side web part](./angular-todo-webpart/README.md)
@@ -62,4 +56,10 @@ For questions regarding this sample, [create a new question](https://github.com/
 
 Finally, if you have an idea for improvement, [make a suggestion](https://github.com/pnp/sp-dev-fx-webparts/issues/new?assignees=&labels=Needs%3A+Triage+%3Amag%3A%2Ctype%3Abug-suspected&template=suggestion.yml&sample=angular-migration&authors=@waldekmastykarz&title=angular-migration%20-%20).
 
+## Disclaimer
+
+**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
+
+---
+
 ![](https://telemetry.sharepointpnp.com/sp-dev-fx-webparts/samples/angular-migration)
diff --git a/samples/angular-multipage/README.md b/samples/angular-multipage/README.md
index 00cfff368..9319160f3 100644
--- a/samples/angular-multipage/README.md
+++ b/samples/angular-multipage/README.md
@@ -53,12 +53,6 @@ Version|Date|Comments
 -------|----|--------
 1.0.0|November 1, 2016|Initial release
 
-## Disclaimer
-
-**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
-
----
-
 ## Prerequisites
 
 - Site Collection created under the **/sites/** Managed Path
@@ -117,4 +111,9 @@ For questions regarding this sample, [create a new question](https://github.com/
 
 Finally, if you have an idea for improvement, [make a suggestion](https://github.com/pnp/sp-dev-fx-webparts/issues/new?assignees=&labels=Needs%3A+Triage+%3Amag%3A%2Ctype%3Abug-suspected&template=suggestion.yml&sample=angular-multipage&authors=@waldekmastykarz&title=angular-multipage%20-%20).
 
+## Disclaimer
+
+**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
+
+---
 <img src="https://telemetry.sharepointpnp.com/sp-dev-fx-webparts/samples/angular-multipage" />
diff --git a/samples/angular-todo/README.md b/samples/angular-todo/README.md
index fa52b8fcc..7267ad2f5 100644
--- a/samples/angular-todo/README.md
+++ b/samples/angular-todo/README.md
@@ -50,11 +50,7 @@ Version|Date|Comments
 -------|----|--------
 1.0|March 10, 2017|Initial release
 
-## Disclaimer
 
-**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
-
----
 
 ## Minimal Path to Awesome
 
@@ -86,4 +82,9 @@ For questions regarding this sample, [create a new question](https://github.com/
 
 Finally, if you have an idea for improvement, [make a suggestion](https://github.com/pnp/sp-dev-fx-webparts/issues/new?assignees=&labels=Needs%3A+Triage+%3Amag%3A%2Ctype%3Abug-suspected&template=suggestion.yml&sample=angular-todo&authors=@waldekmastykarz&title=angular-todo%20-%20).
 
+## Disclaimer
+
+**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
+
+---
 <img src="https://telemetry.sharepointpnp.com/sp-dev-fx-webparts/samples/angular-todo" />
diff --git a/samples/bootstrap-slider/README.md b/samples/bootstrap-slider/README.md
index b3df8b9f5..a47e54577 100644
--- a/samples/bootstrap-slider/README.md
+++ b/samples/bootstrap-slider/README.md
@@ -54,11 +54,7 @@ Version|Date|Comments
 -------|----|--------
 1.0|April 25th, 2017|Initial Release
 
-## Disclaimer
 
-**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
-
----
 
 ## Configuration Bliss
 
@@ -87,5 +83,10 @@ For questions regarding this sample, [create a new question](https://github.com/
 
 Finally, if you have an idea for improvement, [make a suggestion](https://github.com/pnp/sp-dev-fx-webparts/issues/new?assignees=&labels=Needs%3A+Triage+%3Amag%3A%2Ctype%3Abug-suspected&template=suggestion.yml&sample=bootstrap-slider=@davidhartman&title=angular-todo%20-%20).
 
+## Disclaimer
+
+**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
+
+---
 <img src="https://telemetry.sharepointpnp.com/sp-dev-fx-webparts/samples/bootstrap-slider" />
 
diff --git a/samples/js-propertycontrols-svg/README.md b/samples/js-propertycontrols-svg/README.md
index 2c0310e4a..f2d44b7b3 100644
--- a/samples/js-propertycontrols-svg/README.md
+++ b/samples/js-propertycontrols-svg/README.md
@@ -40,11 +40,7 @@ Version|Date|Comments
 -------|----|--------
 1.0|November 12, 2017|Initial release
 
-## Disclaimer
 
-**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
-
----
 
 ## Minimal Path to Awesome
 
@@ -65,4 +61,10 @@ This Web Part illustrates the following concepts on top of the SharePoint Framew
 
 ![Screenshot](./assets/js-propertycontrols-svg.png)
 
+## Disclaimer
+
+**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
+
+---
+
 <img src="https://telemetry.sharepointpnp.com/sp-dev-fx-webparts/samples/js-propertycontrols-svg" />
diff --git a/samples/react-3rd-party-api/README.md b/samples/react-3rd-party-api/README.md
index 5047aca3c..da3bc4705 100644
--- a/samples/react-3rd-party-api/README.md
+++ b/samples/react-3rd-party-api/README.md
@@ -21,12 +21,6 @@ You will need to publish the web application on a hosting environment (for examp
 | ------------- | ------------- | ------------- |
 | 1.0.0  | February 19th 2018   | Initial release |
 
-## Disclaimer
-
-**THIS CODE IS PROVIDED AS IS WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
-
-----------
-
 ## Build and run the sample
 
 To build and run this client-side project, you will need to clone and build the tutorials project.
@@ -69,5 +63,11 @@ Once the npm packages are installed, run the command to preview your web parts i
 ```
 gulp serve
 ```
+## Disclaimer
+
+**THIS CODE IS PROVIDED AS IS WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
+
+----------
+
 
 <img src="https://telemetry.sharepointpnp.com/sp-dev-fx-webparts/react-3rd-party-api" />
diff --git a/samples/react-async-await-sp-pnp-js/README.md b/samples/react-async-await-sp-pnp-js/README.md
index 1043846ee..63157f5bc 100644
--- a/samples/react-async-await-sp-pnp-js/README.md
+++ b/samples/react-async-await-sp-pnp-js/README.md
@@ -52,11 +52,7 @@ Version|Date|Comments
 1.1|Mar 6, 2018|Update to 1.4.1
 1.0|May 1, 2017|Initial release
 
-## Disclaimer
 
-**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
-
----
 
 ## Minimal Path to Awesome
 
@@ -89,4 +85,9 @@ https://your-domain.sharepoint.com/_layouts/15/workbench.aspx
 - [PnP JS and SPFx Logging systems integration](https://blog.josequinto.com/2017/04/30/how-to-integrate-pnp-js-core-and-sharepoint-framework-logging-systems)
 ![React-sp-pnp-js-async-await-code](./assets/pnp-js-logging-spfx.png)
 
+## Disclaimer
+
+**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
+
+---
 <img src="https://telemetry.sharepointpnp.com/sp-dev-fx-webparts/samples/react-async-await-sp-pnp-js" />
diff --git a/samples/react-bot-framework-secure/README.md b/samples/react-bot-framework-secure/README.md
index 16f5f1489..0af15098d 100644
--- a/samples/react-bot-framework-secure/README.md
+++ b/samples/react-bot-framework-secure/README.md
@@ -57,11 +57,7 @@ Version|Date|Comments
 -------|----|--------
 1.0|Nov 10, 2020|Initial release
 
-## Disclaimer
 
-**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
-
----
 
 ## Minimal Path to Awesome
 
@@ -218,4 +214,10 @@ For how to find this option, please refer [connect to direct line](https://docs.
 - [Restify](https://www.npmjs.com/package/restify)
 - [Using WebChat with Azure Bot Service’s Authentication](https://blog.botframework.com/2018/09/01/using-webchat-with-azure-bot-services-authentication/)
 
+## Disclaimer
+
+**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
+
+---
+
 <img src="https://telemetry.sharepointpnp.com/sp-dev-fx-webparts/samples/react-bot-framework-secure" />
diff --git a/samples/react-company-stories/README.md b/samples/react-company-stories/README.md
index e0282dbf7..10c4f8e77 100644
--- a/samples/react-company-stories/README.md
+++ b/samples/react-company-stories/README.md
@@ -45,11 +45,7 @@ Version|Date|Comments
 -------|----|--------
 1.0|March 31, 2021|Initial release
 
-## Disclaimer
 
-**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
-
----
 
 ## Minimal Path to Awesome
 
@@ -79,3 +75,11 @@ About SPFx:
 - [Use Microsoft Graph in your solution](https://docs.microsoft.com/en-us/sharepoint/dev/spfx/web-parts/get-started/using-microsoft-graph-apis)
 - [Publish SharePoint Framework applications to the Marketplace](https://docs.microsoft.com/en-us/sharepoint/dev/spfx/publish-to-marketplace-overview)
 - [Microsoft 365 Patterns and Practices](https://aka.ms/m365pnp) - Guidance, tooling, samples and open-source controls for your Microsoft 365 development
+
+## Disclaimer
+
+**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
+
+---
+
+<img src="https://telemetry.sharepointpnp.com/sp-dev-fx-webparts/samples/react-company-stories" />
diff --git a/samples/react-custom-links/README.md b/samples/react-custom-links/README.md
index 22c76a191..cbdbc025d 100644
--- a/samples/react-custom-links/README.md
+++ b/samples/react-custom-links/README.md
@@ -62,11 +62,7 @@ Version|Date|Comments
 -------|----|--------
 1.0.0| October 5, 2020|Initial release
 
-## Disclaimer
 
-**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
-
----
 
 ## Minimal Path to Awesome
 
@@ -80,6 +76,10 @@ Please follow all the steps:
   - `gulp package-solution --ship`
 - Add and deploy package to your tenant's App Catalog
 
+## Disclaimer
 
+**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
+
+---
 
 <img src="https://telemetry.sharepointpnp.com/sp-dev-fx-webparts/samples/react-custom-links" />
diff --git a/samples/react-designpatterns-typescript/FactoryMethod/README.md b/samples/react-designpatterns-typescript/FactoryMethod/README.md
index e142d99e0..fe872bae9 100644
--- a/samples/react-designpatterns-typescript/FactoryMethod/README.md
+++ b/samples/react-designpatterns-typescript/FactoryMethod/README.md
@@ -41,11 +41,7 @@ Version|Date|Comments
 -------|----|--------
 1.0|May 15, 2018|Initial release
 
-## Disclaimer
 
-**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
-
----
 
 
 ### Factory method pattern
@@ -707,6 +703,10 @@ export default class FactoryMethodWebPart extends BaseClientSideWebPart<IFactory
 
 
 ```
+## Disclaimer
 
+**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
+
+---
 
 <img src="https://telemetry.sharepointpnp.com/sp-dev-fx-webparts/samples/designpatterns-typescript/factorymethod" />
diff --git a/samples/react-events-aggregator/README.md b/samples/react-events-aggregator/README.md
index ada73f4e9..05461c7f6 100644
--- a/samples/react-events-aggregator/README.md
+++ b/samples/react-events-aggregator/README.md
@@ -50,11 +50,7 @@ Version|Date|Comments
 0.0.2|March 20, 2018 | Updated to SPFx v1.4.1
 0.0.3|November 18, 2018 | Sample deprecated 
 
-## Disclaimer
 
-**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
-
----
 
 ## Minimal Path to Awesome
 
@@ -74,4 +70,9 @@ This Web Part illustrates the following concepts on top of the SharePoint Framew
 - The use the SPFx event aggregator to subscribe and receive broadcasted messages (events).
 - Unit tests including spies, mocks and faking class methods and properties.
 
+## Disclaimer
+
+**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
+
+---
 <img src="https://telemetry.sharepointpnp.com/sp-dev-fx-webparts/samples/react-events-aggregator" />
diff --git a/samples/react-functional-component/README.md b/samples/react-functional-component/README.md
index 9265938fe..94f395a6b 100644
--- a/samples/react-functional-component/README.md
+++ b/samples/react-functional-component/README.md
@@ -38,11 +38,7 @@ Version|Date|Comments
 -------|----|--------
 1.0|June 5, 2019|Initial release
 
-## Disclaimer
 
-**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
-
----
 
 ## Minimal Path to Awesome
 
@@ -86,4 +82,9 @@ You may be wondering how maintaining state, side effects or other complexities c
 
 In the react-functional-component directory run **npm install** to resolve all the dependencies. Once this has completed you can run **gulp serve** to test the web part in the local workbench.
 
+## Disclaimer
+
+**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
+
+---
 <img src="https://telemetry.sharepointpnp.com/sp-dev-fx-webparts/samples/react-functional-component" />
diff --git a/samples/react-functional-stateful-component/README.md b/samples/react-functional-stateful-component/README.md
index e2df5c02f..79f7f4ba9 100644
--- a/samples/react-functional-stateful-component/README.md
+++ b/samples/react-functional-stateful-component/README.md
@@ -38,11 +38,6 @@ Version|Date|Comments
 -------|----|--------
 1.0|June 5, 2019|Initial release
 
-## Disclaimer
-
-**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
-
----
 
 ## Minimal Path to Awesome
 
@@ -97,3 +92,9 @@ The *resultCaption* property is also rendered if defined.
 In the react-functional-component directory run **npm install** to resolve all the dependencies. Once this has completed you can run **gulp serve** to test the web part in the local workbench.
 
 
+## Disclaimer
+
+**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
+
+---
+<img src="https://telemetry.sharepointpnp.com/sp-dev-fx-webparts/samples/react-functional-stateful-component" />
diff --git a/samples/react-global-news-sp2019/README.md b/samples/react-global-news-sp2019/README.md
index bfc77fcfd..688961923 100644
--- a/samples/react-global-news-sp2019/README.md
+++ b/samples/react-global-news-sp2019/README.md
@@ -65,11 +65,7 @@ Version|Date|Comments
 -------|----|--------
 1.0|May 22, 2021|Initial release
 
-## Disclaimer
 
-**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
-
----
 
 ## Minimal Path to Awesome
 
@@ -87,5 +83,9 @@ This Web Part illustrates the following concepts on top of the SharePoint Framew
 
 * Office-ui-fabric-react components
  
+## Disclaimer
 
+**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
+
+---
 <img src="https://telemetry.sharepointpnp.com/sp-dev-fx-webparts/samples/react-global-news-sp2019" />
diff --git a/samples/react-graph-personalemail/README.md b/samples/react-graph-personalemail/README.md
index 9d2f14180..0d3b5dd11 100644
--- a/samples/react-graph-personalemail/README.md
+++ b/samples/react-graph-personalemail/README.md
@@ -34,11 +34,7 @@ Version|Date|Comments
 -------|----|--------
 1.0|October 3, 2018|Initial release
 
-## Disclaimer
 
-**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
-
----
 
 ## Minimal Path to Awesome
 
@@ -60,4 +56,9 @@ This sample illustrates the following concepts on top of the SharePoint Framewor
 * retrieving e-mails using the Microsoft Graph
 * using the MSGraphClient in a SharePoint Framework web part
 
+## Disclaimer
+
+**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
+
+---
 <img src="https://telemetry.sharepointpnp.com/sp-dev-fx-webparts/samples/react-graph-personalemail" />
diff --git a/samples/react-graph-schema-extensions/README.md b/samples/react-graph-schema-extensions/README.md
index a7fc5c455..53cf4b5c1 100644
--- a/samples/react-graph-schema-extensions/README.md
+++ b/samples/react-graph-schema-extensions/README.md
@@ -38,11 +38,7 @@ Version|Date|Comments
 -------|----|--------
 1.0.0|Jul 03, 2018|Initial release
 
-## Disclaimer
 
-**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
-
----
 
 ## Prerequisites
 * Create a custom extenion for Groups using Graph API: Currently, spfx has no permissions to create custom extensions
@@ -101,4 +97,9 @@ This sample illustrates the following concepts on top of the SharePoint Framewor
 * Using async / await for the async calls
 * Office UI fabric components
 
+## Disclaimer
+
+**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
+
+---
 <img src="https://telemetry.sharepointpnp.com/sp-dev-fx-webparts/samples/react-graph-schema-extensions" />
diff --git a/samples/react-members-with-presence/README.md b/samples/react-members-with-presence/README.md
index a4bc0919b..803e80091 100644
--- a/samples/react-members-with-presence/README.md
+++ b/samples/react-members-with-presence/README.md
@@ -34,11 +34,7 @@ Version|Date|Comments
 -------|----|--------
 1.0.0|Dec 23, 2019|Initial release
 
-## Disclaimer
 
-**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
-
----
 
 ## Minimal Path to Awesome
 
@@ -61,4 +57,9 @@ This sample illustrates the following concepts on top of the SharePoint Framewor
 * Using async / await for the async calls
 * Office UI fabric components
 
+## Disclaimer
+
+**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
+
+---
 <img src="https://telemetry.sharepointpnp.com/sp-dev-fx-webparts/samples/react-members-with-presence" />
diff --git a/samples/react-mobx-multiple-stores/README.md b/samples/react-mobx-multiple-stores/README.md
index c692fc5a1..4f6b4ebfc 100644
--- a/samples/react-mobx-multiple-stores/README.md
+++ b/samples/react-mobx-multiple-stores/README.md
@@ -35,11 +35,6 @@ Version|Date|Comments
 -------|----|--------
 1.0|May 24, 2019|Initial release
 
-## Disclaimer
-
-**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
-
----
 
 ## Minimal Path to Awesome
 
@@ -59,4 +54,9 @@ $ gulp serve
 * MobX **computed** values
 * **Typescript** version 3.3.4 using <em>@microsoft/rush-stack-compiler-3.3</em> for compatibility with the latest MobX version and typings
 
+## Disclaimer
+
+**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
+
+---
 <img src="https://telemetry.sharepointpnp.com/sp-dev-fx-webparts/samples/react-mobx-multiple-stores" />
diff --git a/samples/react-myonedrive/README.md b/samples/react-myonedrive/README.md
index a70049835..900356454 100644
--- a/samples/react-myonedrive/README.md
+++ b/samples/react-myonedrive/README.md
@@ -65,11 +65,7 @@ Version|Date|Comments
 -------|----|--------
 1.0|Aug 12, 2021|Initial release
 
-## Disclaimer
 
-**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
-
----
 
 ## Minimal Path to Awesome
 
@@ -89,10 +85,6 @@ Version|Date|Comments
 - [Microsoft 365 Patterns and Practices](https://aka.ms/m365pnp) - Guidance, tooling, samples and open-source controls for your Microsoft 365 development
 - [Drive Graph END Point](https://docs.microsoft.com/en-us/graph/api/resources/driveitem?view=graph-rest-1.0)
 
-## Disclaimer
-
-**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
-
 ## Help
 
 We do not support samples, but we this community is always willing to help, and we want to improve these samples. We use GitHub to track issues, which makes it easy for  community members to volunteer their time and help resolve issues.
@@ -105,4 +97,9 @@ For questions regarding this sample, [create a new question](https://github.com/
 
 Finally, if you have an idea for improvement, [make a suggestion](https://github.com/pnp/sp-dev-fx-webparts/issues/new?assignees=&labels=Needs%3A+Triage+%3Amag%3A%2Ctype%3Abug-suspected&template=suggestion.yml&sample=react-myonedrive&authors=@YOURGITHUBUSERNAME&title=react-myonedrive%20-%20).
 
+## Disclaimer
+
+**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
+
+---
 <img src="https://telemetry.sharepointpnp.com/sp-dev-fx-webparts/samples/react-myonedrive" />
diff --git a/samples/react-organisationchart/README.md b/samples/react-organisationchart/README.md
index 53e64ec7e..702100a25 100644
--- a/samples/react-organisationchart/README.md
+++ b/samples/react-organisationchart/README.md
@@ -52,11 +52,7 @@ Version|Date|Comments
 2.0|March 12, 2017|Updated for SPFx 1.0
 2.1|July 19, 2017|Use office-ui-fabric-react and uifabric/styling
 
-## Disclaimer
 
-**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
-
----
 
 ## Minimal Path to Awesome
 
@@ -79,4 +75,10 @@ This Web Part illustrates the following concepts on top of the SharePoint Framew
 - ServiceScope and ServiceKeys
 - Service Locator pattern to register and consume services
 
+## Disclaimer
+
+**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
+
+---
+
 <img src="https://telemetry.sharepointpnp.com/sp-dev-fx-webparts/samples/react-organisationchart" />
diff --git a/tutorials/api-scopes/README.md b/tutorials/api-scopes/README.md
index d02c6d3d3..d575c2b71 100644
--- a/tutorials/api-scopes/README.md
+++ b/tutorials/api-scopes/README.md
@@ -20,12 +20,6 @@ This sub-folder contains a client-side project that is related to the tutorial a
 | 1.0.0  | August 28th, 2018     | Updated sample to SPFx v1.6.0 |
 | 1.0.0  | February 18th, 2018   | Initial release |
 
-## Disclaimer
-
-**THIS CODE IS PROVIDED AS IS WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
-
-----------
-
 ## Build and run the tutorials
 
 To build and run this client-side project, you will need to clone and build the tutorials project.
@@ -68,4 +62,10 @@ Once the npm packages are installed, run the command to preview your web parts i
 ```
 gulp serve
 ```
+
+## Disclaimer
+
+**THIS CODE IS PROVIDED AS IS WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
+
+----------
 <img src="https://telemetry.sharepointpnp.com/sp-dev-fx-webparts/tutorials" />
diff --git a/tutorials/tutorial-migrate-datatables/README.md b/tutorials/tutorial-migrate-datatables/README.md
index 51e2694cc..dfd3c967c 100644
--- a/tutorials/tutorial-migrate-datatables/README.md
+++ b/tutorials/tutorial-migrate-datatables/README.md
@@ -41,12 +41,6 @@ Version | Date            | Comments
 1.0.0   | June 27, 2017   | Initial commit
 1.1.0   | June 28, 2017   | Updated tutorial code for SPFx v1.10
 
-## Disclaimer
-
-**THIS CODE IS PROVIDED AS IS WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
-
-----------
-
 ## Build and run the tutorials
 
 To build and run this client-side project, you will need to clone and build the tutorials project. Because the solution retrieves its data from SharePoint, you will also need a custom list named **IT Requests** with some data in it. To preview the web part use the hosted version of the SharePoint Workbench loaded in the context of the site where the Tasks list is located.
@@ -89,4 +83,10 @@ Once the npm packages are installed, run the command to preview your web parts i
 gulp serve --nobrowser
 ```
 
+## Disclaimer
+
+**THIS CODE IS PROVIDED AS IS WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
+
+----------
+
 <img src="https://telemetry.sharepointpnp.com/sp-dev-fx-webparts/tutorial-migrate-datatables" />