Merge branch 'master' into set-img-size

config.toml

@@ -77,7 +77,6 @@ section = ["HTML", "print", "RSS"]
 
 [params]
 copyright = "SelfPrivacy"
-privacy_policy = "https://selfprivacy.org/privacy-policy/"
 
 # First one is picked as the Twitter card image if not set on page.
 # images = ["images/project-illustration.png"]

content/en/docs/Theory/SelfPrivacy automation.md

@@ -102,4 +102,4 @@ We are working to ensure that the general configuration of SelfPrivacy can be ex
 
 All transactions take place between your application, your server, and your service providers without SelfPrivacy being involved. Your copy of SelfPrivacy App is completely autonomous and independent in managing your infrastructure. No information about your interactions with your infrastructure reaches SelfPrivacy. All backups of your services leave your server in a fully encrypted form.
 
-You can read more about this in our [privacy policy]({{< ref "policy.md" >}}).
+You can read more about this in our [privacy policy]({{< ref "/privacy-policy/" >}}).

content/en/privacy-policy/_index.md

@@ -1,13 +1,7 @@
 ---
 title: "Privacy Policy"
 date: 2023-05-15
-weight: 4
----
-
-{{< blocks/section color="white" type="section" >}}
-
-# Privacy policy
-
+type: "docs"
 ---
 
 **Last updated: May 15, 2023**
@@ -60,6 +54,4 @@ If you have any questions or concerns about our Privacy Policy or the collection
 
 *We are pleased to offer this Privacy Policy under Creative Commons Zero license as a template that can be used by anyone in the open-source community. We hope that this contribution will help to support the development of privacy policies that promote transparency, accountability, and respect for the privacy of individuals. As part of our commitment to open-source values, we believe in sharing knowledge and resources to foster innovation and collaboration. Therefore, we encourage others to adapt and modify our privacy policy to meet their specific needs, while ensuring that they comply with applicable laws and regulations.*
 
-![Licensed under CC0](/images/icons/cc-zero.svg)
-
-{{< /blocks/section >}}
+![Licensed under CC0](/images/icons/cc-zero.svg)

content/ru/docs/Theory/SelfPrivacy automation.md

@@ -89,4 +89,4 @@ __*Ручные операции*__
 ## Система очень сложная, почему она приватная?
 В отличие от Cloudron, наших коммерческих единомышленников, все операции происходят между вашим приложением, вашим сервером и вашими сервис-провадерами без участия SelfPrivacy. Ваша копия SelfPrivacy App полностью автономна и независима в управлении вашей инфраструктурой. Никакая информация о вашем взаимодействии с вашей инфраструктурой не попадает к SelfPrivacy. Все резервные копии ваших сервисов покидают ваш сервер в полностью зашифрованном виде.
 
-Подробнее об этом, вы можете прочитать в [политике приватности]({{< ref "policy.md" >}}).
+Подробнее об этом, вы можете прочитать в [политике приватности]({{< ref "/privacy-policy/" >}}).

content/ru/privacy-policy/_index.md

@@ -1,7 +1,7 @@
 ---
 title: "Политика"
 date: 2023-04-23
-weight: 5
+type: "docs"
 description: >
   Наши принципы и политика
 ---

layouts/partials/footer.html

@@ -19,7 +19,7 @@
           <li><a href="{{ ref . "/docs/services/" }}" class="nav-link">{{ T "footer_available_services"}}</a></li>
           <li><a href="{{ ref . "/docs/" }}" class="nav-link">{{ T "footer_user_guide" }}</a></li>
           <li><a href="{{ ref . "/blog/" }}" class="nav-link">{{ T "footer_blog" }}</a></li>
-           {{ with .Site.Params.privacy_policy }}<li><a href="{{ . }}" class="nav-link">{{ T "footer_privacy_policy" }}</a></li>{{ end }}
+          <li><a href="{{ ref . "/privacy-policy/" }}" class="nav-link">{{ T "footer_privacy_policy" }}</a></li>
 
         </ul>
         <h3 class="text-secondary">{{ T "footer_get_help" }}</h3>