From fe84eb38ca80438a5e6d84a7a2f2b5f42466f8ae Mon Sep 17 00:00:00 2001 From: Prokyonn Date: Wed, 11 Dec 2024 16:05:10 +0100 Subject: [PATCH] Adjust webspace naming (#826) * Adjust webspace naming * Rename website to example.org * Change .lo to .localhost --- book/getting-started.rst | 2 +- book/webspaces.rst | 14 +++++++------- bundles/custom_url.rst | 10 +++++----- bundles/markup/index.rst | 2 +- bundles/markup/link.rst | 20 ++++++++++---------- cookbook/caching-with-varnish.rst | 2 +- cookbook/create-new-webspace.rst | 4 ++-- cookbook/custom-error-page.rst | 10 +++++----- cookbook/web-server/apache.rst | 14 +++++++------- cookbook/web-server/nginx.rst | 8 ++++---- 10 files changed, 43 insertions(+), 43 deletions(-) diff --git a/book/getting-started.rst b/book/getting-started.rst index 668aedd3..d3f06c79 100644 --- a/book/getting-started.rst +++ b/book/getting-started.rst @@ -59,7 +59,7 @@ webspaces configures a content tree. Each content tree may contain translations for different locales. The default webspace configuration is located in -``config/webspaces/example.xml``. Rename this file so that it matches +``config/webspaces/website.xml``. Rename this file so that it matches the name of your project. To get started, change the ```` and the ```` of the webspace to the diff --git a/book/webspaces.rst b/book/webspaces.rst index 9d301cca..d3b5e3fe 100644 --- a/book/webspaces.rst +++ b/book/webspaces.rst @@ -24,11 +24,11 @@ following paragraphs. xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.sulu.io/webspace/webspace http://schemas.sulu.io/webspace/webspace-1.1.xsd"> - Example - example + Website + website - example + website @@ -36,7 +36,7 @@ following paragraphs. - example + default default @@ -80,8 +80,8 @@ following paragraphs. - example - example + Website + website @@ -91,7 +91,7 @@ following paragraphs. - example.lo + example.localhost diff --git a/bundles/custom_url.rst b/bundles/custom_url.rst index c0172296..07ea81d4 100644 --- a/bundles/custom_url.rst +++ b/bundles/custom_url.rst @@ -59,14 +59,14 @@ The base-domains (which can be selected) will be configured in the ... - + - sulu.lo/{localization} + example.org/{localization} - sulu.lo/* - *.sulu.lo - *.sulu.lo/* + example.org/* + *.example.org + *.example.org/* diff --git a/bundles/markup/index.rst b/bundles/markup/index.rst index 58f17a13..ea9d1f6f 100644 --- a/bundles/markup/index.rst +++ b/bundles/markup/index.rst @@ -26,7 +26,7 @@ a link to another page. This tag will be replaced via a valid anchor where the - Page Title + Page Title diff --git a/bundles/markup/link.rst b/bundles/markup/link.rst index 7db64de8..07851326 100644 --- a/bundles/markup/link.rst +++ b/bundles/markup/link.rst @@ -27,14 +27,14 @@ Example .. code-block:: html - Page Title - Page Title - Link Text - Anchor Example - Query String Example - Link Text - Media Title - Link Text + Page Title + Page Title + Link Text + Anchor Example + Query String Example + Link Text + Media Title + Link Text Provider Attributes ------------------- @@ -59,8 +59,8 @@ There might be situations where you need to know which provider was used even af .. code-block:: html - Link Text - Media Title + Link Text + Media Title Now you will be able to target the links in CSS and Javascript by using the data attribute as a selector. This allows things such as: diff --git a/cookbook/caching-with-varnish.rst b/cookbook/caching-with-varnish.rst index 41cc21c6..dadd7b9d 100644 --- a/cookbook/caching-with-varnish.rst +++ b/cookbook/caching-with-varnish.rst @@ -198,7 +198,7 @@ And now have a look at the headers on your website: .. code-block:: bash - $ curl -I mywebsite.com + $ curl -I example.org HTTP/1.1 200 OK # ... Via: 1.1 varnish diff --git a/cookbook/create-new-webspace.rst b/cookbook/create-new-webspace.rst index 9e40d6ba..fa36bebe 100644 --- a/cookbook/create-new-webspace.rst +++ b/cookbook/create-new-webspace.rst @@ -3,7 +3,7 @@ Adding new Webspace To create a new webspace you have to create a new file within the `config/webspaces` directory. The content of the file should be quite -similar to the `example.xml`_ file in this folder. +similar to the `website.xml`_ file in this folder. .. note:: @@ -37,4 +37,4 @@ If you have any error you can use the following command to validate your webspac php bin/adminconsole sulu:content:validate:webspaces -.. _example.xml: https://github.com/sulu/skeleton/blob/2.x/config/webspaces/example.xml +.. _website.xml: https://github.com/sulu/skeleton/blob/2.6/config/webspaces/website.xml diff --git a/cookbook/custom-error-page.rst b/cookbook/custom-error-page.rst index 4522397e..0e77569c 100644 --- a/cookbook/custom-error-page.rst +++ b/cookbook/custom-error-page.rst @@ -97,8 +97,8 @@ Examples: .. code-block:: bash - sulu.lo/ch._twig_error_test ANY ANY sulu.lo /ch/_error/{code}.{_format} - sulu.lo/en._twig_error_test ANY ANY sulu.lo /en/_error/{code}.{_format} - sulu.lo/fr._twig_error_test ANY ANY sulu.lo /fr/_error/{code}.{_format} - sulu.lo/de._twig_error_test ANY ANY sulu.lo /de/_error/{code}.{_format} - sulu.lo._twig_error_test ANY ANY sulu.lo /_error/{code}.{_format} + example.org/ch._twig_error_test ANY ANY example.org /ch/_error/{code}.{_format} + example.org/en._twig_error_test ANY ANY example.org /en/_error/{code}.{_format} + example.org/fr._twig_error_test ANY ANY example.org /fr/_error/{code}.{_format} + example.org/de._twig_error_test ANY ANY example.org /de/_error/{code}.{_format} + example.org._twig_error_test ANY ANY example.org /_error/{code}.{_format} diff --git a/cookbook/web-server/apache.rst b/cookbook/web-server/apache.rst index 16d751e9..03f0c387 100644 --- a/cookbook/web-server/apache.rst +++ b/cookbook/web-server/apache.rst @@ -16,16 +16,16 @@ system, this file can be found in different places: * Unix: ``/etc/hosts`` * Windows: ``%SystemRoot%\System32\drivers\etc\hosts`` -On a development machine, we could use the domain `sulu.lo` ("lo" stands for +On a development machine, we could use the domain `sulu.lo` or `sulu.localhost` ("lo" stands for "local"). Add that domain to the end of the `hosts` file: .. code-block:: text # ... - 127.0.0.1 sulu.lo + 127.0.0.1 example.org -When you type the URL http://sulu.lo in your browser, the browser will now +When you type the URL http://example.org in your browser, the browser will now load the page from your computer. .. note:: @@ -37,14 +37,14 @@ But before it works, we need to tell Apache what to do when that URL is loaded. Virtual Host Configuration -------------------------- -Let's add the Apache configuration file for the `sulu.lo` domain. +Let's add the Apache configuration file for the `example.org` domain. .. code-block:: apache - DocumentRoot "/var/www/sulu.lo/public" - ServerName sulu.lo - + DocumentRoot "/var/www/example.org/public" + ServerName example.org + Options Indexes FollowSymLinks AllowOverride All Require all granted diff --git a/cookbook/web-server/nginx.rst b/cookbook/web-server/nginx.rst index 52710973..8120974e 100644 --- a/cookbook/web-server/nginx.rst +++ b/cookbook/web-server/nginx.rst @@ -9,11 +9,11 @@ The Nginx configuration could look something like. listen 80; listen [::]:80; - server_name sulu.lo; - root /var/www/sulu.lo/public; + server_name example.org; + root /var/www/example.org/public; - error_log /var/log/nginx/sulu.lo.error.log; - access_log /var/log/nginx/sulu.lo.at.access.log; + error_log /var/log/nginx/example.org.error.log; + access_log /var/log/nginx/example.org.at.access.log; # recommended security headers add_header X-Frame-Options sameorigin;