Skip to content

Commit

Permalink
Move content/sites.yaml to resources/settings/sites.yaml.
Browse files Browse the repository at this point in the history
  • Loading branch information
jesseleite committed Apr 10, 2024
1 parent a971299 commit 651cbd4
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions content/collections/docs/4-to-5.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ We highly recommend upgrading all the way to Laravel 11 and PHP 8.3.

_Note that Statamic will attempt to migrate this for you automatically during the upgrade._

The site config has been moved from `config/statamic/sites.php` into `content/sites.yaml`. This allows you to manage your sites from the Control Panel.
The site config has been moved from `config/statamic/sites.php` into `resources/settings/sites.yaml`. This allows you to manage your sites from the Control Panel.

```php
// config/statamic/sites.php
Expand All @@ -60,7 +60,7 @@ return [ // [tl! --:start]
```

```yaml
# content/sites.yaml
# resources/settings/sites.yaml
default: # [tl! ++:start]
name: First Site
url: '{{ config:app:url }}'
Expand All @@ -71,7 +71,7 @@ two:
locale: fr_FR # [tl! ++:end]
```
_**Note:** Text direction is now also automatic, [based on each site's language](/multi-site#text-direction). You do not need to migrate `direction` values to your `content/sites.yaml`._
_**Note:** Text direction is now also automatic, [based on each site's language](/multi-site#text-direction). You do not need to migrate `direction` values to your `resources/settings/sites.yaml`._

There is now also a new `multisite` boolean in `config/statamic/system.php`. Previously, the multi-site feature would be considered "enabled" as soon as you configured a second site. Now there is an explicit option to enable it.

Expand Down
6 changes: 3 additions & 3 deletions content/collections/docs/multi-site.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Next, you can add new sites through the control panel:
<img src="/img/configure-sites.png" alt="Configure sites page in control panel">
</figure>

Or directly in your `content/sites.yaml` file:
Or directly in your `resources/settings/sites.yaml` file:

``` yaml
default:
Expand All @@ -67,7 +67,7 @@ second:
Let's look at a full site configuration and then we'll explore all of its options.
``` yaml
# content/sites.yaml
# resources/settings/sites.yaml

en:
name: English
Expand Down Expand Up @@ -233,7 +233,7 @@ permissions:
If a requested view exists in a subdirectory with the same name as your site [handle](#handle), it will load it instead. This allows you have site-specific views without any extra configuration.
``` yaml
# content/sites.yaml
# resources/settings/sites.yaml

site_one:
# ...
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ First, enable `multisite` in your `config/statamic/system.php`:

### Adding New Sites

Next, you can add new sites through the control panel at `/cp/sites`, or directly in your `content/sites.yaml` file:
Next, you can add new sites through the control panel at `/cp/sites`, or directly in your `resources/settings/sites.yaml` file:

``` yaml
default:
Expand Down

0 comments on commit 651cbd4

Please sign in to comment.