Skip to content

Commit c16e46a

Browse files
sarah11918sarah11918
authored
Merge branch 'main' into patch-1
2 parents 7ad7079 + e4f40ee commit c16e46a

33 files changed

Lines changed: 638 additions & 171 deletions

‎.github/hacktoberfest.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,4 @@ Reviewed a translation PR? We want you to get credit, too! **Create a PR followi
5252

5353
If you have any questions, just ask, and thank you for helping to translate the Astro Docs!
5454

55-
During Hacktoberfest 2023, we've received 0 translation PR reviews from helpful contributors. Thank you!
55+
During Hacktoberfest 2023, we've received 2 translation PR reviews from helpful contributors. Thank you!

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Did you find a typo, a broken link, or another item with an obvious quick fix?
5353

5454
If you can see what the problem is, and you know how to fix it, then you can make a PR (pull request) with the change and contribute to the docs repo yourself.
5555

56-
> Want to make a larger contribution? Please see [CONTRIBUTING.md](CONTRIBUTING.md) first!
56+
> Want to make a larger contribution? Please see [CONTRIBUTING.md](./CONTRIBUTING.md) first!
5757
5858
## Translate a Page
5959

‎contributor-guides/writing-and-style-guide.md‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,11 @@ This can be easier to follow (and perhaps more reassuring!) than a statement tha
102102
**After: add necessary context to the instruction, followed by opinionated usage**
103103
> Add the `LanguagePicker` component to your site in a component that is shown on every page. The example below adds this to the page footer:
104104
105+
### Third-Party Instructions
106+
When documenting how to use Astro with third-party tools and services, focus on actions that are necessary to integrate with Astro. Do not document usage of products that we do not maintain. For example, do not explain how to set up a new project in a CMS. If you want your reader to do something complex, consider making the entire action a prerequisite. You might also include links to relevant documentation, like an official guide.
107+
108+
Do not include details about another site's navigation. Your instructions should still be helpful even if the layout of the particular tool changes. However, do use the other site's vocabulary for features and settings so that your readers can search the site's own documentation for help if they need it.
109+
105110
<!--
106111
107112
-->
@@ -373,7 +378,7 @@ Here are two examples of what our code snippets look like written in Markdown, j
373378
- highlight any occurrence of `{props.title}` and `{props.social}`
374379
375380
``````markdown
376-
```jsx /{props.(title|socialLinks)}/ ins="<Button />"
381+
```jsx /({props.(title|social)})/ ins="<Button />"
377382
// src/components/MySidebar.jsx
378383
``````
379384
@@ -418,7 +423,13 @@ Regular expressions are supported within slashes `/ /`. See a handy [tool for co
418423

419424
- ins="Astro.props" - All instances of "Astro.props" have a green background color
420425

421-
- /{frontmatter.(title|description)}/ - Highlight all instances of `{frontmatter.title}` and `{frontmatter.description}`
426+
- /({frontmatter.(title|description)})/ - Highlight all instances of `{frontmatter.title}` and `{frontmatter.description}`
427+
428+
You can combine all of these:
429+
430+
``````markdown
431+
```jsx /({frontmatter.(title|description)})/ "{item}" del="My blog title" ins="Astro.props"
432+
``````
422433
423434
> ***Note***
424435
>

‎plugins/rehype-autolink-config.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const AnchorLinkIcon = h(
1414
height: 16,
1515
version: 1.1,
1616
viewBox: '0 0 16 16',
17-
xlmns: 'http://www.w3.org/2000/svg',
17+
xmlns: 'http://www.w3.org/2000/svg',
1818
},
1919
h('path', {
2020
fillRule: 'evenodd',

‎src/content/docs/de/guides/backend.mdx‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
---
2+
title: Verwende einen Backend-Service mit Astro
3+
description: Wie man einen Backend-Service verwendet, um Authentifizierung, Datenspeicher und Daten hinzuzufügen
4+
i18nReady: true
5+
---
6+
import BackendGuidesNav from '~/components/BackendGuidesNav.astro';
7+
8+
**Bereit, Features wie Authentifizierung, Datenspeicher oder Daten zu deinem Astro-Projekt hinzuzufügen?** Folge einem unserer Guides, um einen Backend-Service zu integrieren.
9+
10+
## Guides für Backend-Services
11+
12+
<BackendGuidesNav />
13+
14+
Beachte, dass viele dieser Seiten **Platzhalter** sind: Es handelt sich um Sammlungen von Ressourcen, die auf deinen Beitrag warten!
15+
16+
## Was ist ein Backend-Service?
17+
18+
Ein Backend-Service ist ein cloudbasiertes System, das dir dabei hilft, deine Backend-Infrastruktur zu erstellen und zu verwalten. Es stellt eine Reihe von Tools und Diensten zur Verwaltung von Datenbanken, Benutzerauthentifizierung und anderer serverseitiger Funktionalität zur Verfügung. Dies ermöglicht es dir, dich auf die Entwicklung deiner Anwendungen zu konzentrieren, ohne dir Gedanken über das Management der zugrundeliegenden Infrastruktur machen zu müssen.
19+
20+
## Warum sollte ich einen Backend-Service verwenden?
21+
22+
Du solltest über die Verwendung eines Backend-Services nachdenken, wenn dein Projekt komplexe serverseitige Anforderungen hat, zum Beispiel:
23+
- Benutzerregistrierung und -authentifizierung
24+
- Persistente Datenspeicherung
25+
- Speicherung von Benutzer-hochgeladenen Inhalten oder Dateien
26+
- API-Generierung
27+
- Kommunikation in Echtzeit

‎src/content/docs/de/reference/api-reference.mdx‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -888,14 +888,6 @@ import { Code } from 'astro/components';
888888

889889
Diese Komponente bietet Syntax-Highlighting für Codeblöcke zum Zeitpunkt der Erstellung (kein clientseitiges JavaScript enthalten). Die Komponente wird intern von Shiki betrieben und unterstützt alle gängigen [Themen](https://github.com/shikijs/shiki/blob/main/docs/themes.md) und [Sprachen](https://github.com/shikijs/shiki/blob/main/docs/languages.md). Außerdem kannst du deine eigenen Themes und Sprachen hinzufügen, indem du sie an `theme` bzw. `lang` übergibst.
890890

891-
:::note
892-
Wenn du einen [strict package manager](https://pnpm.io/pnpm-vs-npm#npms-flat-tree) wie `pnpm` verwendest, musst du eventuell auch Shiki installieren, damit es während des Builds funktioniert:
893-
894-
```bash
895-
pnpm install shiki
896-
```
897-
:::
898-
899891
### `<Prism />`
900892

901893
Um die Textmarker-Komponente `Prism` zu verwenden, musst du zuerst das Paket `@astrojs/prism` **installieren**:

‎src/content/docs/en/concepts/islands.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ With Astro Islands, the vast majority of your site remains pure, lightweight HTM
5656

5757
## What are the benefits of Islands?
5858

59-
The most obvious benefit to building with Astro Islands is performance: the majority of your website is converted to fast, static HTML and JavaScript is only loaded for the individual components that need it. JavaScript is one of the slowest assets that you can load per-byte, so every byte counts.
59+
The most obvious benefit of building with Astro Islands is performance: the majority of your website is converted to fast, static HTML and JavaScript is only loaded for the individual components that need it. JavaScript is one of the slowest assets that you can load per-byte, so every byte counts.
6060

6161
Another benefit is parallel loading. In the example illustration above, the low-priority "image carousel" island doesn't need to block the high-priority "header" island. The two load in parallel and hydrate in isolation, meaning that the header becomes interactive immediately without having to wait for the heavier carousel lower down the page.
6262

‎src/content/docs/en/contribute.mdx‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@ title: Contribute to Astro
33
description: How to get involved and contribute to Astro.
44
i18nReady: true
55
---
6-
import Button from '~/components/Button.astro'
76
import ContributorList from '~/components/ContributorList.astro'
8-
import PackageManagerTabs from '~/components/tabs/PackageManagerTabs.astro'
97

10-
11-
We welcome contributions of any size and contributors of any skill level. As an open-source project, we believe in giving back to our contributors. We are happy to help with guidance on PRs, technical writing, and turning any feature idea into a reality.
8+
We welcome contributions of any size and contributors of any skill level. As an open-source project, we believe in giving back to our contributors. We are happy to help with guidance on PRs, technical writing, and turning any feature idea into a reality.
129

1310
Want to get even more involved? See our [Governance doc](https://github.com/withastro/.github/blob/main/GOVERNANCE.md) for detailed descriptions of different roles, maintainer nomination processes, code review processes, and Code of Conduct enforcement.
1411

‎src/content/docs/en/guides/content-collections.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import RecipeLinks from "~/components/RecipeLinks.astro"
2121

2222
A **content collection** is any top-level directory inside the reserved `src/content` project directory, such as `src/content/newsletter` and `src/content/authors`. Only content collections are allowed inside the `src/content` directory. This directory cannot be used for anything else.
2323

24-
A **collection entry** is any piece of content stored inside of your content collection directory. Entries can use content authoring formats including Markdown (`.md`) and MDX (`.mdx` using the [MDX integration](/en/guides/integrations-guide/mdx/)) or as data formats including YAML (`.yaml`) and JSON (`.json`). We recommend using a consistent naming scheme (lower-case, dashes instead of spaces) for your files to make it easier to find and organize your content, but this is not required. You can also [exclude entries from being built](/en/core-concepts/routing/#excluding-pages) by prefixing the filename with an underscore (_).
24+
A **collection entry** is any piece of content stored inside of your content collection directory. Entries can use content authoring formats including Markdown (`.md`) and MDX (`.mdx` using the [MDX integration](/en/guides/integrations-guide/mdx/)) or as one of two supported data formats: YAML (`.yaml`) and JSON (`.json`). We recommend using a consistent naming scheme (lower-case, dashes instead of spaces) for your files to make it easier to find and organize your content, but this is not required. You can also [exclude entries from being built](/en/core-concepts/routing/#excluding-pages) by prefixing the filename with an underscore (_).
2525

2626
<FileTree>
2727
- src/content/

‎src/content/docs/en/guides/deploy/netlify.mdx‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@ description: How to deploy your Astro site to the web on Netlify.
44
type: deploy
55
i18nReady: true
66
---
7-
[Netlify](https://netlify.com) offers hosting and serverless backend services for web applications and static websites. Any Astro site can be hosted on Netlify!
7+
[Netlify](https://netlify.com) offers hosting and serverless backend services for web applications and static websites. Any Astro site can be hosted on Netlify!
88

99
This guide includes instructions for deploying to Netlify through the website UI or Netlify's CLI.
1010

1111
## Project Configuration
1212

13-
Your Astro project can be deployed to Netlify in three different ways: as a static site, a server-rendered site, or an (experimental) edge-rendered site.
13+
Your Astro project can be deployed to Netlify in three different ways: as a static site, a server-rendered site, or an edge-rendered site.
1414

1515
### Static Site
1616

17-
Your Astro project is a static site by default. You don’t need any extra configuration to deploy a static Astro site to Netlify.
17+
Your Astro project is a static site by default. You don’t need any extra configuration to deploy a static Astro site to Netlify.
1818

19-
### Adapter for SSR/Edge
19+
### Adapter for SSR
2020

21-
To enable SSR in your Astro project and deploy on Netlify:
21+
To enable SSR in your Astro project and deploy on Netlify, including using Netlify's edge functions:
2222

2323
Add [the Netlify adapter](/en/guides/integrations-guide/netlify/) to enable SSR in your Astro project with the following `astro add` command. This will install the adapter and make the appropriate changes to your `astro.config.mjs` file in one step.
2424

@@ -45,18 +45,21 @@ If you prefer to install the adapter manually instead, complete the following tw
4545
adapter: netlify(),
4646
});
4747
```
48-
49-
To render your project using [Netlify's experimental Edge Functions](https://docs.netlify.com/netlify-labs/experimental-features/edge-functions/#app) instead, change the `netlify/functions` import in the Astro config file to use `netlify/edge-functions`.
50-
```js title="astro.config.mjs" ins={3} del={2}
48+
49+
You can also deploy your project using Netlify's Edge Functions by adding `edgeMiddleware: true` to the Netlify adatper's configuration:
50+
51+
```diff lang="js"
52+
// astro.config.mjs
5153
import { defineConfig } from 'astro/config';
5254
import netlify from '@astrojs/netlify/functions';
53-
import netlify from '@astrojs/netlify/edge-functions';
5455

5556
export default defineConfig({
5657
output: 'server',
57-
adapter: netlify(),
58+
adapter: netlify({
59+
+ edgeMiddleware: true
60+
}),
5861
});
59-
```
62+
```
6063

6164
## How to deploy
6265

@@ -111,7 +114,7 @@ You can also create a new site on Netlify and link up your Git repository by ins
111114
3. Run `netlify init` and follow the instructions
112115
4. Confirm your build command (`astro build`)
113116

114-
The CLI will automatically detect the build settings (`astro build`) and deploy directory (`dist`), and will offer to automatically generate [a `netlify.toml` file](#netlifytoml-file) with those settings.
117+
The CLI will automatically detect the build settings (`astro build`) and deploy directory (`dist`), and will offer to automatically generate [a `netlify.toml` file](#netlifytoml-file) with those settings.
115118

116119
5. Build and deploy by pushing to Git
117120

0 commit comments

Comments
 (0)