Merge branch 'main' into patch-1

Author: guillaumemichel

.github/workflows/deploy.yml

@@ -43,23 +43,12 @@ jobs:
           echo "workflow_run.head_sha:  ${{ github.event.workflow_run.head_sha }}"
 
       - name: Deploy to IPFS
-        uses: ipshipyard/ipfs-deploy-action@v1
+        uses: ipfs/ipfs-deploy-action@1c46c3a36faff36031c94c8e8f4563ee5c38f172
         id: deploy
         with:
           path-to-deploy: ${{ env.BUILD_PATH }}
           storacha-key: ${{ secrets.STORACHA_KEY }}
           storacha-proof: ${{ secrets.STORACHA_PROOF }}
           github-token: ${{ github.token }}
-
-      # TODO: Add DNSLink update when needed
-      #- name: Update DNSLink
-      #  if: github.event.workflow_run.head_branch == 'main'
-      #  uses: ipfs/[email protected]
-      #  with:
-      #    cid: ${{ steps.deploy.outputs.cid }}
-      #    dnslink_domain: 'docs.ipfs.tech'
-      #    cf_record_id: ${{ secrets.CF_RECORD_ID }}
-      #    cf_zone_id: ${{ secrets.CF_ZONE_ID }}
-      #    cf_auth_token: ${{ secrets.CF_AUTH_TOKEN }}
-      #    github_token: ${{ github.token }}
-      #    set_github_status: true
+          retention-count: 10
+          retention-days: 30

docs/community/README.md

@@ -10,7 +10,7 @@ IPFS is home to a vibrant, diverse community of thousands of contributors and pa
 
 
 :::callout
-The IPFS community believes that our mission is best served in an environment that is friendly, safe, and accepting, and free from intimidation or harassment. To that end, we ask that everyone involved in IPFS read and respect our [code of conduct](https://github.com/ipfs/community/blob/master/code-of-conduct.md). Please contact [[email protected]](mailto:[email protected]) if you need to report a problem or address a grievance related to an abuse report.
+The IPFS community believes that our mission is best served in an environment that is friendly, safe, and accepting, and free from intimidation or harassment. To that end, we ask that everyone involved in IPFS read and respect our [code of conduct](https://github.com/ipfs/community/blob/master/code-of-conduct.md). Please contact [[email protected]](mailto:[email protected]) if you need to report a problem or address a grievance related to an abuse report. For reporting abuse at public utilities such as gateways, see the [abuse policy](https://about.ipfs.io/#reporting-abuse).
 :::
 
 - [Get technical support and help in the IPFS forum](#get-technical-support-and-help) as you develop on IPFS.

docs/community/contribute/ways-to-contribute.md

@@ -8,7 +8,7 @@ description: Learn about how to contribute to IPFS, the InterPlanetary File Syst
 So you want to contribute to IPFS and the ecosystem? Here is a quick listing of things we need help with and how you can get started. Even if what you want to do is not listed here, we probably accept contributions for it! If you're unsure, please open an issue.
 
 :::callout
-The IPFS community believes that our mission is best served in an environment that is friendly, safe, and accepting, and free from intimidation or harassment. To that end, we ask that everyone involved in IPFS read and respect our [code of conduct](https://github.com/ipfs/community/blob/master/code-of-conduct.md). Please contact [[email protected]](mailto:[email protected]) if you need to report a problem or address a grievance related to an abuse report.
+The IPFS community believes that our mission is best served in an environment that is friendly, safe, and accepting, and free from intimidation or harassment. To that end, we ask that everyone involved in IPFS read and respect our [code of conduct](https://github.com/ipfs/community/blob/master/code-of-conduct.md). Please contact [[email protected]](mailto:[email protected]) if you need to report a problem or address a grievance related to an abuse report. For reporting abuse at public utilities such as gateways, see the [abuse policy](https://about.ipfs.io/#reporting-abuse).
 :::
 
 ## Code

docs/concepts/public-utilities.md

@@ -22,13 +22,15 @@ The IPFS Foundation provides the following public gateways:
 
 These gateways block abusive content using the [Bad Bits Denylist](https://badbits.dwebops.pub/).
 
-To report abusive content and content breaches of the [IPFS Community Code of Conduct](https://ipfs.fyi/coc), please send an email with the CIDs to [email protected].
+To report abusive content and content breaches of the [IPFS Community Code of Conduct](https://ipfs.fyi/coc), please use the [web form](https://ipfs.fyi/report-abuse). Alternatively, you can send an email with the CIDs to [email protected].
 
 Technical operations are run by the Waterworks Community on behalf of the IPFS Foundation. To report any technical problems with these gateways, you can open an issue in the [Waterworks Community repository](https://github.com/ipshipyard/waterworks-community).
 
 ### Abuse Policy
 
-When a takedown request for the `ipfs.io` and/or `dweb.link` gateway(s) is first received at [email protected], the sender will receive an automated system receipt. Next, someone from the takedown team will vet the request to validate that it is legitimate and should be accepted. Once the validity of the request has been established, it will be submitted for further processing.
+To submit a takedown request for the `ipfs.io` and/or `dweb.link` gateway(s), follow the instructions at [https://about.ipfs.io/#reporting-abuse](https://about.ipfs.io/#reporting-abuse). The recommended method is to use the [web form](https://ipfs.fyi/report-abuse). Alternatively, requests can be sent via email to [email protected].
+
+When a takedown request is received, the sender will receive an automated system receipt. Next, someone from the takedown team will vet the request to validate that it is legitimate and should be accepted. Once the validity of the request has been established, it will be submitted for further processing.
 
 From there, an internal system extracts the relevant information from the request and generates an entry for it in our takedown lists. The list is then published to our gateway nodes, and the content in question will return a 410 status when visited.
 

docs/project/README.md

@@ -10,7 +10,7 @@ Looking to get further involved with the vibrant IPFS community and ecosystem? C
 ## IPFS community and ecosystem
 
 :::callout
-The IPFS community believes that our mission is best served in an environment that is friendly, safe, and accepting, and free from intimidation or harassment. To that end, we ask that everyone involved in IPFS read and respect our [code of conduct](https://github.com/ipfs/community/blob/master/code-of-conduct.md). Please contact [[email protected]](mailto:[email protected]) if you need to report a problem or address a grievance related to an abuse report.
+The IPFS community believes that our mission is best served in an environment that is friendly, safe, and accepting, and free from intimidation or harassment. To that end, we ask that everyone involved in IPFS read and respect our [code of conduct](https://github.com/ipfs/community/blob/master/code-of-conduct.md). Please contact [[email protected]](mailto:[email protected]) if you need to report a problem or address a grievance related to an abuse report. For reporting abuse at public utilities such as gateways, see the [abuse policy](https://about.ipfs.io/#reporting-abuse).
 :::
 
 The community and ecosystem around the IPFS project is large, diverse, and abounds with opportunities for involvement. Learn more in the [Community section](../community/README.md).