Skip to content

Commit

Permalink
Merge branch 'canary' into update-intro
Browse files Browse the repository at this point in the history
  • Loading branch information
delbaoliveira committed Nov 2, 2022
2 parents 18d1569 + 9f97833 commit c83b410
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion docs/api-reference/next/font.md
Expand Up @@ -295,7 +295,7 @@ import { greatVibes, sourceCodePro400 } from '@/fonts';

<div class="card">
<a href="/docs/basic-features/font-optimization.md">
<b>Font Optmization</b>
<b>Font Optimization</b>
<small>Learn how to optimize fonts with the Font module.</small>
</a>
</div>
2 changes: 1 addition & 1 deletion docs/upgrading.md
Expand Up @@ -28,7 +28,7 @@ pnpm up next react react-dom eslint-config-next --latest

## Migrating shared features

Next.js 13 introduces a new [`app` directory](https://beta.nextjs.org/docs/routing/fundamentals) with new features and conventions. However, upgrading to Next.js 13 does **not** require using the new [`app` directory](https://beta.nextjs.org/docs/routing/fundamentals.md#the-app-directory).
Next.js 13 introduces a new [`app` directory](https://beta.nextjs.org/docs/routing/fundamentals) with new features and conventions. However, upgrading to Next.js 13 does **not** require using the new [`app` directory](https://beta.nextjs.org/docs/routing/fundamentals#the-app-directory).

You can continue using `pages` with new features that work in both directories, such as the updated [Image component](#image-component), [Link component](#link-component), [Script component](#script-component), and [Font optimization](#font-optimization).

Expand Down

0 comments on commit c83b410

Please sign in to comment.