Skip to content

Commit 75b8d7a

Browse files
authored
Merge branch 'main' into fr_editor_setup_mdx
2 parents 48d95af + df0076d commit 75b8d7a

5 files changed

Lines changed: 18 additions & 18 deletions

File tree

src/content/docs/en/guides/cms/tina-cms.mdx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import PackageManagerTabs from '~/components/tabs/PackageManagerTabs.astro'
1212

1313
## Integrating with Astro
1414

15-
To get started, you'll need an existing Astro project.
15+
To get started, you'll need an existing Astro project.
1616

1717
1. Run the following command to install Tina into your Astro project.
1818

@@ -38,8 +38,8 @@ To get started, you'll need an existing Astro project.
3838
- When prompted "What framework are you using", choose **Other**.
3939
- When asked where public assets are stored, press <kbd>Enter</kbd>.
4040

41-
After this has finished, you should now have a `.tina` folder in the root of your project and an `admin` folder in your public directory. It will also create a Markdown file at `content/posts/hello-world.md`.
42-
41+
After this has finished, you should now have a `.tina` folder in the root of your project and a generated `hello-world.md` file at `content/posts`.
42+
4343
2. Change the `dev` script in `package.json`:
4444

4545
<PackageManagerTabs>
@@ -132,7 +132,7 @@ To get started, you'll need an existing Astro project.
132132
name: "body",
133133
label: "Body",
134134
isBody: true,
135-
},
135+
},
136136
],
137137
},
138138
],
@@ -148,7 +148,7 @@ To get started, you'll need an existing Astro project.
148148

149149
- [TinaCMS Astro integration guide](https://tina.io/docs/frameworks/astro/).
150150

151-
## Community Resources
151+
## Community Resources
152152

153153
- [Astro Tina Starter with visual editing](https://github.com/dawaltconley/tina-astro) by Jeff See + Dylan Awalt-Conley
154154
- [Astro Tina Starter with basic editing](https://github.com/tombennet/astro-tina-starter/tree/main) by Tom Bennet

src/content/docs/en/guides/markdown-content.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ export default defineConfig({
570570

571571
### Syntax Highlighting
572572

573-
Astro comes with built-in support for [Shiki](https://shiki.matsu.io/) and [Prism](https://prismjs.com/). This provides syntax highlighting for:
573+
Astro comes with built-in support for [Shiki](https://shiki.matsu.io/) (via [Shikiji](https://github.com/antfu/shikiji)) and [Prism](https://prismjs.com/). This provides syntax highlighting for:
574574

575575
- all code fences (\`\`\`) used in a Markdown or MDX file.
576576
- content within the [built-in `<Code />` component](/en/reference/api-reference/#code-) (powered by Shiki).

src/content/docs/fr/guides/backend/xata.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ const { records } = await xata.db.Posts.getPaginated({
9797
---
9898
9999
<ul>
100-
{records.map(post) => (
100+
{records.map((post) => (
101101
<li>{post.title}</li>
102-
)}
102+
))}
103103
</ul>
104104
```
105105
Il est important de noter que le SDK nécessite d'être régénéré à chaque fois que votre schéma change. Donc évitez de faire des modifications sur les fichiers générés par le CLI Xata, car une fois le schéma mis à jour, vos modifications seront écrasées.

src/content/docs/fr/guides/cms/wordpress.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,8 @@ Pour déployer votre site web, consultez nos [guides de déploiement](/fr/guides
175175

176176
- [Construire un site Astro avec WordPress comme CMS sans tête](https://blog.openreplay.com/building-an-astro-website-with-wordpress-as-a-headless-cms/) par Chris Bongers.
177177
- [Construire avec Astro x WordPress](https://www.youtube.com/watch?v=Jstqgklvfnc) sur le flux de Ben Holmes.
178-
- [Construire un site WordPress sans tête avec Astro](https://developers.wpengine.com/blog/building-a-headless-wordpress-site-with-astro) par Jeff Everhart
179-
- [Astro et WordPress en tant qu'API](https://darko.io/posts/wp-as-an-api/)
178+
- [Construire un site WordPress sans tête avec Astro](https://developers.wpengine.com/blog/building-a-headless-wordpress-site-with-astro) par Jeff Everhart.
179+
- [Astro et WordPress en tant qu'API](https://darko.io/posts/wp-as-an-api/) par Darko Bozhinovski.
180180

181181
## Sites web en production
182182

src/content/docs/fr/guides/middleware.mdx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ Le middleware est disponible dans les projets SSG et SSR Astro.
3030

3131
3. Dans n'importe quel fichier `.astro`, accédez aux données de réponse en utilisant `Astro.locals`.
3232

33-
```astro title="src/components/Component.astro"
34-
---
35-
const data = Astro.locals;
36-
---
37-
<h1>{data.title}</h1>
38-
<p>Cette {data.property} provient du middleware.</p>
39-
```
33+
```astro title="src/components/Component.astro"
34+
---
35+
const data = Astro.locals;
36+
---
37+
<h1>{data.title}</h1>
38+
<p>This {data.property} provient du middleware.</p>
39+
```
4040

4141
### Types de middleware
4242

@@ -53,7 +53,7 @@ export const onRequest = defineMiddleware((context, next) => {
5353
});
5454
```
5555

56-
A la place, si vous utilisez JsDoc pour profiter de la sécurité des types, vous pouvez utiliser `MiddlewareRequestHandler` :
56+
A la place, si vous utilisez JsDoc pour profiter de la sécurité des types, vous pouvez utiliser `MiddlewareResponseHandler`:
5757

5858
```js
5959
// src/middleware.js

0 commit comments

Comments
 (0)