Merge branch 'canary' into shu/6514

.github/ISSUE_TEMPLATE/1.bug_report.yml

@@ -1,10 +1,10 @@
 name: Bug Report
 description: Create a bug report for the Next.js core
-labels: 'template: bug'
+labels: ['template: bug']
 body:
   - type: markdown
     attributes:
-      value: Thanks for taking the time to file a bug report! Please fill out this form as completely as possible.
+      value: 'NOTE: [examples](https://github.com/vercel/next.js/tree/canary/examples) related issue should be reported using [this](https://github.com/vercel/next.js/issues/new?assignees=&labels=type%3A+example%2Ctemplate%3A+bug&template=2.example_bug_report.yml) issue template instead.'
   - type: markdown
     attributes:
       value: If you leave out sections there is a high likelihood it will be moved to the GitHub Discussions ["Help" section](https://github.com/vercel/next.js/discussions/categories/help).

.github/ISSUE_TEMPLATE/2.example_bug_report.yml

@@ -1,6 +1,6 @@
-name: Example Bug Report
+name: Bug Report for Examples
 description: Create a bug report for one of the Next.js examples
-labels: 'type: example,template: bug'
+labels: ['area: examples']
 body:
   - type: markdown
     attributes:

.github/workflows/build_test_deploy.yml

@@ -243,7 +243,7 @@ jobs:
     name: Test Development
     runs-on: ubuntu-latest
     needs: [build, build-native-test]
-    timeout-minutes: 30
+    timeout-minutes: 35
     env:
       NEXT_TELEMETRY_DISABLED: 1
       NEXT_TEST_JOB: 1
@@ -396,7 +396,7 @@ jobs:
     name: Test Development (E2E)
     runs-on: ubuntu-latest
     needs: [build, build-native-test]
-    timeout-minutes: 30
+    timeout-minutes: 35
     env:
       NEXT_TELEMETRY_DISABLED: 1
       NEXT_TEST_JOB: 1
@@ -686,7 +686,7 @@ jobs:
     name: Test Production (E2E)
     runs-on: ubuntu-latest
     needs: [build, build-native-test]
-    timeout-minutes: 30
+    timeout-minutes: 35
     env:
       NEXT_TELEMETRY_DISABLED: 1
       NEXT_TEST_JOB: 1
@@ -823,7 +823,7 @@ jobs:
     name: Test Integration
     runs-on: ubuntu-latest
     needs: [build, build-native-test]
-    timeout-minutes: 30
+    timeout-minutes: 35
     env:
       NEXT_TELEMETRY_DISABLED: 1
       NEXT_TEST_JOB: 1

docs/routing/introduction.md

@@ -68,7 +68,7 @@ The example above uses multiple links. Each one maps a path (`href`) to a known
 - `/about` → `pages/about.js`
 - `/blog/hello-world` → `pages/blog/[slug].js`
 
-Any `<Link />` in the viewport (initially or through scroll) will be prefetched by default (including the corresponding data) for pages using [Static Generation](/docs/basic-features/data-fetching/get-static-props.md). The corresponding data for [server-rendered](/docs/basic-features/data-fetching/get-server-side-props.md) routes is _not_ prefetched.
+Any `<Link />` in the viewport (initially or through scroll) will be prefetched by default (including the corresponding data) for pages using [Static Generation](/docs/basic-features/data-fetching/get-static-props.md). The corresponding data for [server-rendered](/docs/basic-features/data-fetching/get-server-side-props.md) routes is fetched _only when_ the <Link /> is clicked.
 
 ### Linking to dynamic paths