Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Legal, monero compile link and grammar #2333

Merged
merged 1 commit into from
Aug 27, 2024
Merged

Update Legal, monero compile link and grammar #2333

merged 1 commit into from
Aug 27, 2024

Conversation

jermanuts
Copy link
Contributor

Should we also remove "Password Protected Areas" as it is irrelevant because the forum is now inaccessible?

Also please revise the grammar changes I made.

Copy link

netlify bot commented Jul 31, 2024

Deploy Preview for barolo-time-757cf9 ready!

Built without sensitive environment variables

Name Link
🔨 Latest commit 288dae4
🔍 Latest deploy log https://app.netlify.com/sites/barolo-time-757cf9/deploys/66af96c3ef7fa100086a0e7b
😎 Deploy Preview https://deploy-preview-2333--barolo-time-757cf9.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

legal/index.md Outdated Show resolved Hide resolved
legal/index.md Outdated Show resolved Hide resolved
legal/index.md Outdated
@@ -53,15 +53,15 @@ By posting or submitting any material to this website, including on the forum, y

### Viruses and Malware

The Monero Project takes many precautions to ensure the files available for downloading through this website are not tampered with, and where appropriate SHA hashes are provided for end users to confirm they have downloaded the correct file. Nonetheless, The Monero Project does not guarantee that files available for downloading through this website will be free of infection or viruses or other code that may have contaminating or destructive properties. You are responsible for implementing sufficient procedures and checkpoints to satisfy your particular requirements for integrity, security and accuracy of data input and output, and for maintaining a means external to the site for the reconstruction of any lost data. It is almost always advisable to check the SHA hashes of the files you have downloaded, and if in any doubt consider [compiling Monero from the source code](https://github.com/monero-project/bitmonero).
The Monero Project takes many precautions to ensure the files available for downloading through this website are not tampered with, and where appropriate, SHA hashes are provided for end users to confirm they have downloaded the correct file. Nonetheless, The Monero Project does not guarantee that files available for downloading through this website will be free of infection, viruses or other code that may have contaminating or destructive properties. You are responsible for implementing sufficient procedures and checkpoints to satisfy your particular requirements for integrity, security and accuracy of data input and output, and for maintaining a means external to the site for the reconstruction of any lost data. It is almost always advisable to check the SHA hashes of the files you have downloaded, and if in any doubt, consider [compiling Monero from the source code](https://github.com/monero-project/monero#compiling-monero-from-source).
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
The Monero Project takes many precautions to ensure the files available for downloading through this website are not tampered with, and where appropriate, SHA hashes are provided for end users to confirm they have downloaded the correct file. Nonetheless, The Monero Project does not guarantee that files available for downloading through this website will be free of infection, viruses or other code that may have contaminating or destructive properties. You are responsible for implementing sufficient procedures and checkpoints to satisfy your particular requirements for integrity, security and accuracy of data input and output, and for maintaining a means external to the site for the reconstruction of any lost data. It is almost always advisable to check the SHA hashes of the files you have downloaded, and if in any doubt, consider [compiling Monero from the source code](https://github.com/monero-project/monero#compiling-monero-from-source).
The Monero Project takes many precautions to ensure the files available for downloading through this website are not tampered with and, where appropriate, SHA hashes are provided for end users to confirm they have downloaded the correct file(s). Nonetheless, The Monero Project does not guarantee that files available for downloading through this website will be free of infection, viruses or other code that may have contaminating or destructive properties. You are responsible for implementing sufficient procedures and checkpoints to satisfy your particular requirements for integrity, security and accuracy of data input and output, and for maintaining a means external to the site for the reconstruction of any lost data. It is almost always advisable to check the SHA hashes of the files you have downloaded, and if in any doubt, consider [compiling Monero from the source code](https://github.com/monero-project/monero#compiling-monero-from-source).

legal/index.md Outdated Show resolved Hide resolved
legal/index.md Outdated Show resolved Hide resolved
legal/index.md Outdated Show resolved Hide resolved
legal/index.md Outdated Show resolved Hide resolved
@jermanuts
Copy link
Contributor Author

LGTM, thanks for all the reviews!

@plowsof
Copy link
Collaborator

plowsof commented Aug 2, 2024

while we wait for the legal department to approve the changes, i notice this is your 2nd pull request from master branch and you where reluctant to squash/edit the previous one, have times changed?

@nahuhh
Copy link
Contributor

nahuhh commented Aug 2, 2024

what plowsof is trying to say:

  1. Please squash commits into 1
  2. (for next time) please always create a new branch on your repo and push pr from there

and i'll add
3. Please name pr and commits like sourcefolder: change made so, legal: update index.md

I can leave my approval (pending 1, 2 and preferably 3)

@nahuhh
Copy link
Contributor

nahuhh commented Aug 3, 2024

To squash

  1. Update your local branch. Replace with the name of your remote. If you only have 1 repo cloned, should be "origin"
    git pull <remote> master
  2. git rebase -i HEAD~7
    this will show a list of the 7 commits. They will say pick <commit msg>. For the bottom 6, replace pick with squash and then save the file
  3. it will show a new file, and ask you to edit the commit msg. it will display all 7 messages. Delete them and replace with legal: update index.md, then save the file
  4. git push -f to push the changes

@jermanuts
Copy link
Contributor Author

jermanuts commented Aug 4, 2024

@nahuhh please tell me it worked (and didn't miss any commit), had to use Vim 😭 and oh I hate Git.

I might close this PR and open a new one with all edits instead of suffering

@nahuhh
Copy link
Contributor

nahuhh commented Aug 4, 2024

Looks like it went well 🙏
thank you


### Sponsors and Advertisers are Not Endorsed

Though we seek to partner with quality companies, we are not responsible for the claims or representations made by sponsors and advertisers. The Monero Project does not review, endorse or recommend the products or services of any company mentioned on our site. We will not be liable in any way for damages of any kind resulting out of the misuse of any personal information or data submitted by you to a sponsor or advertiser.

### Offsite Links

As a convenience to Users, the The Monero Project website and services may provide links to other sites or resources. Because we do not review or have no control over such sites and resources, The Monero Project shall not be responsible or liable for use of or reliance on any content, products, services or information at such sites or resources. Inclusion of any links does not imply any endorsement, affiliation, approval, association or sponsorship by The Monero Project of the linked websites, resources, their operators or owners. When you select a link, you may be leaving our website. The information available on Third Parties' websites may have certain restrictions on its use or distribution which differ from these TOU.
As a convenience to Users, the The Monero Project website and services may provide links to other sites or resources. Because we do not review or have no control over such sites and resources, The Monero Project shall not be responsible or liable for the use of, or reliance on any content, products, services or information at such sites or resources. Inclusion of any links does not imply any endorsement, affiliation, approval, association or sponsorship by The Monero Project of the linked websites, resources, their operators or owners. When you select a link, you may be leaving our website. The information available on Third Parties' websites may have certain restrictions on its use or distribution which differ from these TOU.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
As a convenience to Users, the The Monero Project website and services may provide links to other sites or resources. Because we do not review or have no control over such sites and resources, The Monero Project shall not be responsible or liable for the use of, or reliance on any content, products, services or information at such sites or resources. Inclusion of any links does not imply any endorsement, affiliation, approval, association or sponsorship by The Monero Project of the linked websites, resources, their operators or owners. When you select a link, you may be leaving our website. The information available on Third Parties' websites may have certain restrictions on its use or distribution which differ from these TOU.
As a convenience to Users, The Monero Project website and services may provide links to other sites or resources. Because we do not review or have no control over such sites and resources, The Monero Project shall not be responsible or liable for the use of, or reliance on any content, products, services or information at such sites or resources. Inclusion of any links does not imply any endorsement, affiliation, approval, association or sponsorship by The Monero Project of the linked websites, resources, their operators or owners. When you select a link, you may be leaving our website. The information available on Third Parties' websites may have certain restrictions on its use or distribution which differ from these TOU.

Same on L68

@nahuhh
Copy link
Contributor

nahuhh commented Aug 8, 2024

If you make the latest changes locally, you can edit the original commit

git add index.md
git commit --amend --no-edit
git push <youruser> -f

@luigi1111 luigi1111 merged commit b3de9fd into monero-project:master Aug 27, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants