Merge branch 'dev' of github.com:laurent22/joplin into dev

packages/server/src/routes/index/privacy.ts

@@ -12,7 +12,7 @@ router.get('privacy', async (_path: SubPath, _ctx: AppContext) => {
 	return markdownIt.render(`# Joplin Cloud Privacy Policy
 
 ## Who are we?
-	
+
 The Joplin Cloud web service is owned by Cozid Ltd, registered in England and Wales.
 
 ## What information do we collect?
@@ -25,11 +25,11 @@ In order to operate this service, the following user data is stored:
 - Stripe user ID
 - Stripe subscription ID
 
-Financial information is processed by a Stripe. We do not store financial information.
+Financial information is processed by Stripe. We do not store financial information.
 
 ## How do we use personal information?
 
-We use the email to authentify the user and allow them to login to the service and synchronise data with it. We also use it to send important emails, such as email verification or to recover a lost password. Occasionally, we may send important notifications to our users.
+We use the email to authenticate the user and allow them to login to the service and synchronise data with it. We also use it to send important emails, such as email verification or to recover a lost password. Occasionally, we may send important notifications to our users.
 
 ## What legal basis do we have for processing your personal data?
 

packages/server/src/routes/index/terms.ts

@@ -18,21 +18,21 @@ The term ‘Joplin Cloud’ or ‘us’ or ‘we’ refers to the owner of the w
 The use of this website is subject to the following terms of use:
 
 - The content of the pages of this website is for your general information and use only. It is subject to change without notice.
-	
-- This website uses cookies to save login session. If you do allow cookies to be used, you will not be able to login to the website.
-	
+
+- This website uses cookies to save login session. If you do not allow cookies to be used, you will not be able to login to the website.
+
 - Neither we nor any third parties provide any warranty or guarantee as to the accuracy, timeliness, performance, completeness or suitability of the information and materials found or offered on this website for any particular purpose. You acknowledge that such information and materials may contain inaccuracies or errors and we expressly exclude liability for any such inaccuracies or errors to the fullest extent permitted by law.
-	
+
 - Your use of any information or materials on this website is entirely at your own risk, for which we shall not be liable. It shall be your own responsibility to ensure that any products, services or information available through this website meet your specific requirements.
-	
+
 - This website contains material which is owned by or licensed to us. This material includes, but is not limited to, the design, layout, look, appearance and graphics. Reproduction is prohibited other than in accordance with the copyright notice, which forms part of these terms and conditions.
-	
+
 - All trademarks reproduced in this website, which are not the property of, or licensed to the operator, are acknowledged on the website.
-	
+
 - Unauthorised use of this website may give rise to a claim for damages and/or be a criminal offence.
-	
+
 - From time to time, this website may also include links to other websites. These links are provided for your convenience to provide further information. They do not signify that we endorse the website(s). We have no responsibility for the content of the linked website(s).
-	
+
 - Your use of this website and any dispute arising out of such use of the website is subject to the laws of England, Northern Ireland, Scotland and Wales.
 
 - Please contact us at [team@joplincloud.com](mailto:team@joplincloud.com) for any question.`);