Move English site to dedicated subdir

.github/workflows/deployment.yml

@@ -23,9 +23,10 @@ jobs:
       - run: mkdir -p output
       - name: Setup Pages
         uses: actions/configure-pages@v3
-      - name: Build
+      - name: Build English site
         uses: actions/jekyll-build-pages@v1
         with:
+          source: "./en"
           destination: "./output/en"
       - name: Copy static assets
         run: |

.gitignore

@@ -1,4 +1,4 @@
-.bundle
-vendor
-.jekyll-cache
-_site
+*/.bundle
+*/vendor
+*/.jekyll-cache
+*/_site

Gemfile → en/Gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
-gem "github-pages", "= 226", :group => :jekyll_plugins
+gem "github-pages", "= 231", :group => :jekyll_plugins
 gem "kramdown-parser-gfm", "= 1.1"
 
 # Work around https://github.com/jekyll/jekyll/issues/8523
-gem "webrick", "~> 1.7"
+gem "webrick", "~> 1.8.1"

Gemfile.lock → en/Gemfile.lock

@@ -1,47 +1,56 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.5)
+    activesupport (7.1.3.4)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      mutex_m
+      tzinfo (~> 2.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.11.1)
+    coffee-script-source (1.12.2)
     colorator (1.1.0)
-    commonmarker (0.23.5)
-    concurrent-ruby (1.1.10)
-    dnsruby (1.61.9)
-      simpleidn (~> 0.1)
+    commonmarker (0.23.10)
+    concurrent-ruby (1.3.3)
+    connection_pool (2.4.1)
+    dnsruby (1.72.2)
+      simpleidn (~> 0.2.1)
+    drb (2.2.1)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
-    ethon (0.15.0)
+    ethon (0.16.0)
       ffi (>= 1.15.0)
     eventmachine (1.2.7)
-    execjs (2.8.1)
-    faraday (2.3.0)
-      faraday-net_http (~> 2.0)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (2.0.3)
-    ffi (1.15.5)
+    execjs (2.9.1)
+    faraday (2.10.0)
+      faraday-net_http (>= 2.0, < 3.2)
+      logger
+    faraday-net_http (3.1.1)
+      net-http
+    ffi (1.17.0-x86_64-linux-gnu)
     forwardable-extended (2.6.0)
-    gemoji (3.0.1)
-    github-pages (226)
-      github-pages-health-check (= 1.17.9)
-      jekyll (= 3.9.2)
-      jekyll-avatar (= 0.7.0)
-      jekyll-coffeescript (= 1.1.1)
-      jekyll-commonmark-ghpages (= 0.2.0)
-      jekyll-default-layout (= 0.1.4)
-      jekyll-feed (= 0.15.1)
+    gemoji (4.1.0)
+    github-pages (231)
+      github-pages-health-check (= 1.18.2)
+      jekyll (= 3.9.5)
+      jekyll-avatar (= 0.8.0)
+      jekyll-coffeescript (= 1.2.2)
+      jekyll-commonmark-ghpages (= 0.4.0)
+      jekyll-default-layout (= 0.1.5)
+      jekyll-feed (= 0.17.0)
       jekyll-gist (= 1.5.0)
-      jekyll-github-metadata (= 2.13.0)
+      jekyll-github-metadata (= 2.16.1)
       jekyll-include-cache (= 0.2.1)
       jekyll-mentions (= 1.6.0)
       jekyll-optional-front-matter (= 0.3.2)
@@ -68,32 +77,32 @@ GEM
       jekyll-theme-tactile (= 0.2.0)
       jekyll-theme-time-machine (= 0.2.0)
       jekyll-titles-from-headings (= 0.5.3)
-      jemoji (= 0.12.0)
-      kramdown (= 2.3.2)
+      jemoji (= 0.13.0)
+      kramdown (= 2.4.0)
       kramdown-parser-gfm (= 1.1.0)
-      liquid (= 4.0.3)
+      liquid (= 4.0.4)
       mercenary (~> 0.3)
       minima (= 2.5.1)
-      nokogiri (>= 1.13.4, < 2.0)
-      rouge (= 3.26.0)
+      nokogiri (>= 1.13.6, < 2.0)
+      rouge (= 3.30.0)
       terminal-table (~> 1.4)
-    github-pages-health-check (1.17.9)
+    github-pages-health-check (1.18.2)
       addressable (~> 2.3)
       dnsruby (~> 1.60)
-      octokit (~> 4.0)
-      public_suffix (>= 3.0, < 5.0)
+      octokit (>= 4, < 8)
+      public_suffix (>= 3.0, < 6.0)
       typhoeus (~> 1.3)
-    html-pipeline (2.14.2)
+    html-pipeline (2.14.3)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.8.0)
-    i18n (0.9.5)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.9.2)
+    jekyll (3.9.5)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 2.0)
       kramdown (>= 1.17, < 3)
@@ -102,27 +111,27 @@ GEM
       pathutil (~> 0.9)
       rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
-    jekyll-avatar (0.7.0)
+    jekyll-avatar (0.8.0)
       jekyll (>= 3.0, < 5.0)
-    jekyll-coffeescript (1.1.1)
+    jekyll-coffeescript (1.2.2)
       coffee-script (~> 2.2)
-      coffee-script-source (~> 1.11.1)
+      coffee-script-source (~> 1.12)
     jekyll-commonmark (1.4.0)
       commonmarker (~> 0.22)
-    jekyll-commonmark-ghpages (0.2.0)
-      commonmarker (~> 0.23.4)
+    jekyll-commonmark-ghpages (0.4.0)
+      commonmarker (~> 0.23.7)
       jekyll (~> 3.9.0)
       jekyll-commonmark (~> 1.4.0)
-      rouge (>= 2.0, < 4.0)
-    jekyll-default-layout (0.1.4)
-      jekyll (~> 3.0)
-    jekyll-feed (0.15.1)
+      rouge (>= 2.0, < 5.0)
+    jekyll-default-layout (0.1.5)
+      jekyll (>= 3.0, < 5.0)
+    jekyll-feed (0.17.0)
       jekyll (>= 3.7, < 5.0)
     jekyll-gist (1.5.0)
       octokit (~> 4.2)
-    jekyll-github-metadata (2.13.0)
+    jekyll-github-metadata (2.16.1)
       jekyll (>= 3.4, < 5.0)
-      octokit (~> 4.0, != 4.4.0)
+      octokit (>= 4, < 7, != 4.4.0)
     jekyll-include-cache (0.2.1)
       jekyll (>= 3.7, < 5.0)
     jekyll-mentions (1.6.0)
@@ -193,39 +202,43 @@ GEM
       jekyll (>= 3.3, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    jemoji (0.12.0)
-      gemoji (~> 3.0)
+    jemoji (0.13.0)
+      gemoji (>= 3, < 5)
       html-pipeline (~> 2.2)
       jekyll (>= 3.0, < 5.0)
-    kramdown (2.3.2)
+    kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    liquid (4.0.3)
-    listen (3.7.1)
+    liquid (4.0.4)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
+    logger (1.6.0)
     mercenary (0.3.6)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.16.2)
-    nokogiri (1.13.6-x86_64-linux)
+    minitest (5.24.1)
+    mutex_m (0.2.0)
+    net-http (0.4.1)
+      uri
+    nokogiri (1.16.6-x86_64-linux)
       racc (~> 1.4)
     octokit (4.25.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.7)
-    racc (1.6.0)
-    rb-fsevent (0.11.1)
-    rb-inotify (0.10.1)
+    public_suffix (5.1.1)
+    racc (1.8.0)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rexml (3.2.5)
-    rouge (3.26.0)
-    ruby2_keywords (0.0.5)
+    rexml (3.3.2)
+      strscan
+    rouge (3.30.0)
     rubyzip (2.3.2)
     safe_yaml (1.0.5)
     sass (3.7.4)
@@ -236,29 +249,25 @@ GEM
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
-    simpleidn (0.2.1)
-      unf (~> 0.1.4)
+    simpleidn (0.2.3)
+    strscan (3.1.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    thread_safe (0.3.6)
-    typhoeus (1.4.0)
+    typhoeus (1.4.1)
       ethon (>= 0.9.0)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     unicode-display_width (1.8.0)
-    webrick (1.7.0)
-    zeitwerk (2.6.0)
+    uri (0.13.0)
+    webrick (1.8.1)
 
 PLATFORMS
-  x86_64-linux
+  x86_64-linux-gnu
 
 DEPENDENCIES
-  github-pages (= 226)
+  github-pages (= 231)
   kramdown-parser-gfm (= 1.1)
-  webrick (~> 1.7)
+  webrick (~> 1.8.1)
 
 BUNDLED WITH
-   2.3.10
+   2.4.20

_config.yml → en/_config.yml

@@ -12,21 +12,13 @@ defaults:
       type: pages
     values:
       layout: page
-include:
-  - ".well-known"
-  - "es"
 exclude:
   - Gemfile
   - Gemfile.lock
   - vendor
-  - .idea
-  - README.md
-  - es
-  - .well-known
-  - index.html
 
 # Theme settings
-remote_theme: "pmarsceill/just-the-docs@v0.7.0"
+remote_theme: "pmarsceill/just-the-docs@v0.8.2"
 logo: "/assets/logo.png"
 search_enabled: false
 aux_links:

en/_includes/nav_footer_custom.html

@@ -0,0 +1,3 @@
+<p class="fs-3 text-center mx-5">
+    <a href="/es" lang="es">Versión en castellano</a>.
+</p>

beta.md → en/beta.md

@@ -33,7 +33,7 @@ We need to be upfront about the risks of using it at this point:
 - **You may lose your data at any time**, due to either a bug or a breaking change in a newer version of the app. If you share anything important, make a copy outside Letro.
 - **We've requested an independent security audit from a reputable team**. We've taken every reasonable measure to ensure that Letro is secure, but you shouldn't take our word for it until the report is published. So, please don't use Letro for anything sensitive yet.
 
-Also, please make sure to read our [Terms of Service](./legal/tos.md) and [Privacy Policy](./legal/privacy-policy.md).
+Also, please make sure to read our [Terms of Service](legalos.md) and [Privacy Policy](legalrivacy-policy.md).
 
 ## Important limitations
 

en/legal/index.md

@@ -0,0 +1,10 @@
+---
+permalink: /legal
+nav_order: 3
+has_children: true
+---
+
+# Legal
+
+- [Terms of Service](tos.md).
+- [Privacy policy](privacy-policy.md).

legal/privacy-policy.md → en/legal/privacy-policy.md

@@ -35,7 +35,7 @@ We will update this privacy policy as needed so that it is current, accurate, an
 
 ## Terms
 
-Please also read our [Terms](./tos.md) which also governs the terms of this Privacy Policy.
+Please also read our [Terms](tos.md) which also governs the terms of this Privacy Policy.
 
 ## Contact Us
 

legal/tos.md → en/legal/tos.md

@@ -20,7 +20,7 @@ For ease of reference, when referring to Letro in these terms of service, we are
 
 **Privacy of user data**. Letro does not sell, rent or monetize your personal data or content in any way -- ever.
 
-Please read our [Privacy Policy](./privacy-policy.md) to understand how we safeguard the information you provide when using our Services. For the purpose of operating our Services, you agree to our data practices as described in our Privacy Policy, as well as the transfer of your encrypted information and metadata to the United States and other countries where we have or use facilities, service providers or partners. Examples would be Third Party Providers processing your support tickets.
+Please read our [Privacy Policy](privacy-policy.md) to understand how we safeguard the information you provide when using our Services. For the purpose of operating our Services, you agree to our data practices as described in our Privacy Policy, as well as the transfer of your encrypted information and metadata to the United States and other countries where we have or use facilities, service providers or partners. Examples would be Third Party Providers processing your support tickets.
 
 **Software**. In order to enable new features and enhanced functionality, you consent to downloading and installing updates to our Services.