Merge pull request #109 from okTurtles/minorEdits

undefined

src/pages/privacy-policy.astro

@@ -24,7 +24,7 @@ import Layout from '../layouts/DefaultLayout.astro'
         Group Income does not have a traditional database to speak of. We do not use <a class="is-link" href="https://en.wikipedia.org/wiki/HTTP_cookie" target="_blank">cookies</a>. In Group Income, most of the activity that traditionally occurs on the backend instead occurs on the frontend, and everything is end-to-end encrypted by default.
       </p>
       <p>
-        Your data is encrypted on your device with a key that doesn't leave your device. It's stored encrypted on our servers. We do not have access to your keys. Data is decrypted locally, by your device. This means we cannot read your encrypted data.
+        Your data is encrypted on your device with a key that doesn't leave your device. This encrypted data is stored encrypted on our servers. We do not have access to your keys. Data is decrypted locally, by your device. This means we cannot read your encrypted data.
       </p>
       <p>
         To do this, we created a brand new end-to-end encrypted, federated protocol called <a class="is-link" href="https://shelterprotocol.net" target="_blank">Shelter Protocol</a>.* 
@@ -46,7 +46,7 @@ import Layout from '../layouts/DefaultLayout.astro'
           <li>In geek terms: your data is end-to-end encrypted using keys derived from your password, a hardening algorithm (scrypt), and a random salt. See the <a class="is-link" href="https://shelterprotocol.net" target="_blank">Shelter Protocol</a> for details. Note that although we do take steps to strengthen your password, using a weak password can still undermine your security, so pick a strong, unique password.</li>
         </ul>
       </p>
-      <p>Every part of Group Income, not just the frontend, is open-source. Because the protocol is a <a class='is-link' href="https://gist.github.com/taoeffect/43455a09bb2ba3d5becda9f7441894df" target="_blank">federated protocol</a>, anyone can run a Group Income server if they do not trust ours (and still interact with users on other servers).</p>
+      <p>Every part of Group Income, not just the frontend, is open-source. Because the protocol is a <a class='is-link' href="https://gist.github.com/taoeffect/43455a09bb2ba3d5becda9f7441894df" target="_blank">federated protocol</a>, anyone can run a Group Income server if they do not trust ours (and can still interact with users on other servers).</p>
       <p>In addition to the end-to-end encryption offered by the Shelter Protocol, our server for Group Income uses full-disk encryption. Please note, full-disk encryption may not exist on other community-run servers.</p>
       <p>By default, all chatrooms in Group Income are end-to-end encrypted. However, we provide the option for users to create public chatrooms to give communities options when it comes to building open and inclusive communities. As their name suggests, public chatrooms are not end-to-end encrypted to make it easy for users of Group Income to bridge them with other services, should they choose to do so. Please see the section titled "Note On Public Chatrooms" below for more details.</p>
 
@@ -69,7 +69,7 @@ import Layout from '../layouts/DefaultLayout.astro'
         <li>IP addresses (useful in case our servers come under DoS attack)</li>
         <li>How many groups are on a server</li>
         <li>Server log information such as the URL requested, time of request, and user agent</li>
-        <li>Any billing relevant information</li>
+        <li>Any billing-relevant information</li>
       </ul>
       <p>The following metadata is public:</p>
       <p>

src/pages/terms-and-conditions.astro

@@ -19,7 +19,7 @@ import { resolvePath } from '@/utils/helpers.js'
         Acceptance of Terms
       </h3>
       <p>
-        The Group Income website and app ("Services") are a project of okTurtles Foundation Inc. ("okTurtles"), a 501(c)(3) non-profit registered in the state of Florida, USA.
+        The Group Income website and app ("Services") are a project of okTurtles Foundation Inc. ("okTurtles"), a 501(c)(3) non-profit registered in the State of Florida, USA.
       </p>
       <p>
         By accessing and using Services, you agree to be bound by these Terms and Conditions ("Terms"), and our <a href={resolvePath('/privacy-policy')} class="is-link">Privacy Policy</a>. If you do not agree with any part of these Terms, you must not use our Services.
@@ -28,7 +28,7 @@ import { resolvePath } from '@/utils/helpers.js'
       <p>Your use of the Services is at your sole risk. The Services are provided on an "AS IS" and "AS AVAILABLE" basis. okTurtles expressly disclaims all warranties of any kind, whether express or implied, including but not limited to the implied warranties of merchantability, fitness for a particular purpose, and non-infringement.</p>
       <p>okTurtles and its affiliates, officers, directors, employees, and agents shall not be liable for any direct, indirect, incidental, special, or consequential damages, including but not limited to, damages for loss of profits, goodwill, use, data or other intangible losses resulting from the use or inability to use the Services, or any unauthorized access to or alteration of your data.</p>
       <p>
-        TO THE EXTENT WHICH IS PERMITTED BY APPLICABLE LAW IN YOUR JURISDICTION, OKTURTLES EXPRESSLY DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY, NON-INFRINGEMENT OF THIRD PARTY RIGHTS, AND FITNESS FOR A PARTICULAR PURPOSE. NO INFORMATION OR ADVICE PROVIDED BY OKTURTLES OR A OKTURTLES REPRESENTATIVE SHALL CREATE A WARRANTY OR IN ANY WAY CHANGE THE TERMS OF THIS WARRANTY. SHOULD THE SOFTWARE PROVE DEFECTIVE, YOU ASSUME THE ENTIRE COST OF ALL NECESSARY SERVICING, REPAIRS, OR CORRECTIONS. 
+        TO THE EXTENT WHICH IS PERMITTED BY APPLICABLE LAW IN YOUR JURISDICTION, OKTURTLES EXPRESSLY DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY, NON-INFRINGEMENT OF THIRD PARTY RIGHTS, AND FITNESS FOR A PARTICULAR PURPOSE. NO INFORMATION OR ADVICE PROVIDED BY OKTURTLES OR AN OKTURTLES REPRESENTATIVE SHALL CREATE A WARRANTY OR IN ANY WAY CHANGE THE TERMS OF THIS WARRANTY. SHOULD THE SOFTWARE PROVE DEFECTIVE, YOU ASSUME THE ENTIRE COST OF ALL NECESSARY SERVICING, REPAIRS, OR CORRECTIONS. 
       </p>
       <p>TO THE EXTENT WHICH IS PERMITTED BY APPLICABLE LAW IN YOUR JURISDICTION, IN NO EVENT, INCLUDING NEGLIGENCE, SHALL OKTURTLES BE LIABLE FOR PERSONAL INJURY OR ANY INCIDENTAL, SPECIAL, INDIRECT, DIRECT, OR CONSEQUENTIAL DAMAGES, COSTS, OR LOSSES, EVEN IF OKTURTLES HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. IN NO EVENT SHALL OKTURTLES'S TOTAL LIABILITY TO YOU FOR ALL DAMAGES EXCEED THE AMOUNT, IF ANY, PAID BY YOU FOR THE SOFTWARE, EXCEPT AS MAY BE REQUIRED BY APPLICABLE LAW IN CASES INVOLVING PERSONAL INJURY.</p>