Merge branch 'main' into use-redirects-file-instead-of-stubbed-archived-redirects

Author: sarahs

content/github/developing-online-with-codespaces/about-codespaces.md

@@ -56,4 +56,4 @@ A limited number of people will be invited to join the beta. To join the waitlis
 
 If you encounter problems using {% data variables.product.prodname_codespaces %}, see "[Troubleshooting your codespace](/github/developing-online-with-codespaces/troubleshooting-your-codespace)."
 
-If you still need help or have feedback about {% data variables.product.prodname_codespaces %}, use the [Community Forum](https://github.community/c/codespaces-beta/45).
+If you still need help or have feedback about {% data variables.product.prodname_codespaces %}, use the [Codespaces Feedback](https://github.com/github/feedback/discussions/categories/codespaces-feedback) discussion.

content/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests.md

@@ -25,7 +25,17 @@ To attach a file to an issue or pull request conversation, drag and drop it into
 
 {% endtip %}
 
-The maximum size for files is 25MB and the maximum size for images is 10MB.
+The maximum size for files is 25MB and the maximum size for images is 10MB.  
+{% if currentVersion == "free-pro-team@latest" %}
+Videos can be up to 100 MB in size if the repository is owned by a user or organization on a paid GitHub plan.
+
+{% note %}
+
+**Note:** Support for video attachments is currently in beta and subject to change. 
+
+{% endnote %}
+
+{% endif %}
 
 We support these files:
 
@@ -36,6 +46,7 @@ We support these files:
 * Microsoft Word (*.docx*), Powerpoint (*.pptx*), and Excel (*.xlsx*) documents
 * Text files (*.txt*)
 * PDFs (*.pdf*)
-* ZIP (*.zip*, *.gz*)
+* ZIP (*.zip*, *.gz*){% if currentVersion == "free-pro-team@latest" %}
+* Video (*.mp4*, *.mov*){% endif %}
 
 ![Attachments animated GIF](/assets/images/help/pull_requests/dragging_images.gif)