Skip to content

Commit

Permalink
Merge pull request #82 from AElfProject/develop
Browse files Browse the repository at this point in the history
production
  • Loading branch information
yongenaelf authored Jun 28, 2024
2 parents e39c891 + 8ee698c commit b146740
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 5 deletions.
1 change: 1 addition & 0 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ aelf is a high-performance, cloud-native, layer-1 blockchain network with its Ma
- [Browser Extension](/resources/browser-extension/) - Explore Portkey wallet and other extensions
- [DevOps](/resources/devops/) - Tools to build and deploy efficiently
- [Protobuf Extension](/resources/protobuf-extension/) - An open-source gRPC
- [Whitepapers](/resources/whitepaper/) - aelf Whitepapers

</article>

Expand Down
2 changes: 1 addition & 1 deletion docs/legal/privacy-policy/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ This privacy policy ("Privacy Policy") elucidates the procedures by which Aelf P

We reserve the right to modify this Privacy Policy periodically. Should alterations occur, we will notify you by amending the date at the top of this policy. Additionally, in certain instances, we may provide further notification, such as appending a statement to our Website or dispatching a notification to you. We encourage you to regularly review this Privacy Policy to remain informed about our information procedures and the choices at your disposal.

We are committed to protecting your personal information and your right to privacy. If you have any questions or concerns about this privacy policy or our practices with regard to your personal information, please contact us at \[insert general Aelf email].
We are committed to protecting your personal information and your right to privacy. If you have any questions or concerns about this privacy policy or our practices with regard to your personal information, please contact us [here](https://form.aelf.com/contact).

**1. Our Role In Your Privacy**

Expand Down
8 changes: 4 additions & 4 deletions docs/legal/terms-of-use/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ If you do not understand and accept all these Terms and Conditions, then you sho

**1.11. Incorporation of Other Terms.** As between you and aelf, all other terms, conditions, policies, or notices to which you may agree, including but not limited to each of the following, are expressly incorporated into these Terms and Conditions by reference:

a. Our Privacy Policy, available at \[to be inserted when the link is available], which governs our use of any personal data we collect about you or you provide to us, and, under which you consent to our use of your personal information and warrant that all data you provide is accurate (our “Privacy Policy”);
a. Our Privacy Policy, available [here](https://docs.aelf.com/legal/privacy-policy/), which governs our use of any personal data we collect about you or you provide to us, and, under which you consent to our use of your personal information and warrant that all data you provide is accurate (our “Privacy Policy”);

b. Our Cookie Policy available at \[to be inserted when the link is available] , which sets out how aelf uses cookies and similar technologies to recognize you when you visit our Website.
b. Our Cookie Policy available [here](https://docs.aelf.com/legal/cookie-policy/), which sets out how aelf uses cookies and similar technologies to recognize you when you visit our Website.

c. Any applicable terms, disclosures, and other documents that may be posted on the Site from time to time; and

Expand Down Expand Up @@ -140,7 +140,7 @@ If you do not understand and accept all these Terms and Conditions, then you sho

**5. Your Content**

**5.1. Our Use of Your Content.** The Site may provide you with opportunities to upload, display, or transmit data or other content (together, “User Content”). As part of these Terms and Conditions and subject to our Privacy Policy (available at \[to be inserted when the link is available]), you grant us a perpetual, irrevocable, worldwide, fully paid, non-exclusive, and non-sublicensable right and license to use and exploit any User Content in any form. We retain the unlimited right and exclusive discretion to copy, reproduce, fix, modify, adapt, translate, reformat, prepare derivatives of, manufacture, publish, distribute, sell, licence, transfer, lease, or transmit any User Content. We also reserve the right to incorporate any User Content as part of the Site or any Site Content, or into any other material.
**5.1. Our Use of Your Content.** The Site may provide you with opportunities to upload, display, or transmit data or other content (together, “User Content”). As part of these Terms and Conditions and subject to our [Privacy Policy](https://docs.aelf.com/legal/privacy-policy/), you grant us a perpetual, irrevocable, worldwide, fully paid, non-exclusive, and non-sublicensable right and license to use and exploit any User Content in any form. We retain the unlimited right and exclusive discretion to copy, reproduce, fix, modify, adapt, translate, reformat, prepare derivatives of, manufacture, publish, distribute, sell, licence, transfer, lease, or transmit any User Content. We also reserve the right to incorporate any User Content as part of the Site or any Site Content, or into any other material.

**5.2. Your Feedback.** No User Content you submit will be deemed to establish any additional or separate contractual relationship between you and us outside the provisions of these Terms and Conditions.

Expand Down Expand Up @@ -168,7 +168,7 @@ If you do not understand and accept all these Terms and Conditions, then you sho

**7. Information Collection**

**7.1. Privacy of Your Information.** To use certain features of the Site, you may be required to provide us with your personal information, including but not limited to your name, address, and contact details. Our use of your personal information is subject to the terms of our Privacy Policy (available at \[to be inserted when the link is available]), which is incorporated in these Terms of Use. Any data collected about you or from you by third parties on our behalf is also subject to our Privacy Policy.
**7.1. Privacy of Your Information.** To use certain features of the Site, you may be required to provide us with your personal information, including but not limited to your name, address, and contact details. Our use of your personal information is subject to the terms of our [Privacy Policy ](https://docs.aelf.com/legal/privacy-policy/)which is incorporated in these Terms of Use. Any data collected about you or from you by third parties on our behalf is also subject to our Privacy Policy.

**7.2. Collecting Anonymised Data.** When you use the Site, we may monitor your computer or mobile device’s memory to ensure the Site is performing properly. During this process, we may collect anonymised data from you or your device and use it to inform our Site’s continued development.

Expand Down
15 changes: 15 additions & 0 deletions docs/resources/whitepaper/index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
sidebar_position: 8
title: Whitepapers
description: aelf Whitepapers
---

# Whitepapers

## Infrastructure

To learn more about aelf infrastructure, please refer to [aelf Whitepaper](https://aelf.com/gridcn/aelf_whitepaper_v1.7_en.pdf).

## Governance

To learn more about aelf governance, please refer to [aelf Economic and Governance Whitepaper](https://aelf.com/gridcn/aelf_Economic_and_Governance_Whitepaper_v1.2_en.pdf).

0 comments on commit b146740

Please sign in to comment.