From e6c228707407a129bea57c8cf804295288254b47 Mon Sep 17 00:00:00 2001 From: charlottejmc <143802849+charlottejmc@users.noreply.github.com> Date: Fri, 12 Apr 2024 15:12:54 +0100 Subject: [PATCH 1/3] Update building-static-sites-with-jekyll-github-pages.md Add warnings about Mac with M chips --- .../building-static-sites-with-jekyll-github-pages.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/en/lessons/building-static-sites-with-jekyll-github-pages.md b/en/lessons/building-static-sites-with-jekyll-github-pages.md index 1351b34433..7f035cc5ea 100755 --- a/en/lessons/building-static-sites-with-jekyll-github-pages.md +++ b/en/lessons/building-static-sites-with-jekyll-github-pages.md @@ -23,7 +23,7 @@ doi: 10.46430/phen0048 **At the end of this lesson**, you'll have a basic live website where you can publish content that other people can visit—it will look like [this](http://amandavisconti.github.io/JekyllDemo/)!—and you'll also have some resources to explore if you want to further customize the site. -**Requirements:** A computer (Mac/Windows/Linux are all okay, but this lesson doesn't cover some aspects of Linux use), the ability to download and install software on the computer, an internet connection that can support downloading software. Users have reported needing between 1-3 hours to complete the entire lesson. +**Requirements:** A computer (Mac/Windows/Linux are all okay, but this lesson doesn't cover some aspects of Linux use, and you may encounter some issues if you are using a Mac with an M-series (silicone) chip), the ability to download and install software on the computer, an internet connection that can support downloading software. Users have reported needing between 1-3 hours to complete the entire lesson. {% include toc.html %} @@ -152,6 +152,10 @@ Starting with macOS Catalina, zsh has replaced bash as the default shell for Mac *If you're using a Mac computer, follow the instructions below until you hit a line that says the Windows-specific instructions are beginning.* +
+Please note that if you are using a Mac with an M-series (silicone) chip, you may encounter some compatibility issues when installing Jekyll or its dependencies. If that’s the case, we advise you to follow additional installation instructions for the relevant package, either from the official documentation, or online help forums. +
+ Open a command line window (Applications > Utilities > Terminal) and enter the code shown in the steps below (*`code is formatted like this`*), keeping [the command line tips from above](#section1-4) in mind. ### Command line tools suite From 51a3d28c0a2778f2ec733a129b12fde1b341ca92 Mon Sep 17 00:00:00 2001 From: Jennifer Isasi Date: Thu, 18 Apr 2024 15:20:37 -0400 Subject: [PATCH 2/3] Update sitios-estaticos-con-jekyll-y-github-pages.md Translated the new notes re Mac series-M chip in ES version --- es/lecciones/sitios-estaticos-con-jekyll-y-github-pages.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/es/lecciones/sitios-estaticos-con-jekyll-y-github-pages.md b/es/lecciones/sitios-estaticos-con-jekyll-y-github-pages.md index 23a26adcb2..125bc57c87 100644 --- a/es/lecciones/sitios-estaticos-con-jekyll-y-github-pages.md +++ b/es/lecciones/sitios-estaticos-con-jekyll-y-github-pages.md @@ -40,7 +40,7 @@ doi: 10.46430/phes0050 **Al final de esta lección**, tendrás un sitio web básico en funcionamiento donde podrás publicar contenido que otras personas podrán visitar -¡se verá [así](https://amandavisconti.github.io/JekyllDemo/)!- y también tendrás algunos recursos para explorar, si deseas personalizar aún más el sitio. -**Requisitos:** una computadora (Mac/Windows/Linux funcionan, aunque esta lección no cubre algunos aspectos del uso de Linux), que permita la descarga e instalación de software y conexión a Internet que soporte la descarga de software. Según los usuarios, se necesitan entre 1 y 3 horas para completar toda la lección. +**Requisitos:** una computadora (Mac/Windows/Linux funcionan, aunque esta lección no cubre algunos aspectos del uso de Linux y puede que tengas algunos problemas si estás utilizando una Mac con un chip de la serie-M), que permita la descarga e instalación de software y conexión a Internet que soporte la descarga de software. Según los usuarios, se necesitan entre 1 y 3 horas para completar toda la lección. **Nivel de dificultad:** Intermedio (esta lección no incluye el uso de línea de comandos y git, pero te ofrece todo lo necesario para que la completes). @@ -192,6 +192,10 @@ A continuación, vamos a instalar algunas dependencias de software (es decir, pr Si estás utilizando una computadora Mac, sigue las instrucciones que se encuentran a continuación. +
+Ten en cuenta que si estás utilizando una Mac con un chip de la serie M puede que encuentres problemas de compatibilidad al instalar Jekyll o sus dependencias. Si ese es el caso, te recomendamos que sigas las instrucciones de instalación adicionales para el paquete correspondiente, tanto de la documentación original como de foros online. +
+ Abre una ventana de línea de comandos (*Aplicaciones > Utilidades > Terminal*) e ingresa el código que se muestra en los pasos a continuación (`el código es el texto que aparece formateado así`) siguiendo [las sugerencias de uso de la línea de comandos detalladas más arriba](#section1-4). ### Herramientas de línea de comandos From 281094d1a5d6b91c4ceba45690c905bba60f3a4e Mon Sep 17 00:00:00 2001 From: Anisa Hawes <87070441+anisa-hawes@users.noreply.github.com> Date: Fri, 19 Apr 2024 09:36:01 +0100 Subject: [PATCH 3/3] Update building-static-sites-with-jekyll-github-pages.md silicone > silicon --- en/lessons/building-static-sites-with-jekyll-github-pages.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/en/lessons/building-static-sites-with-jekyll-github-pages.md b/en/lessons/building-static-sites-with-jekyll-github-pages.md index 7f035cc5ea..b75eb17399 100755 --- a/en/lessons/building-static-sites-with-jekyll-github-pages.md +++ b/en/lessons/building-static-sites-with-jekyll-github-pages.md @@ -23,7 +23,7 @@ doi: 10.46430/phen0048 **At the end of this lesson**, you'll have a basic live website where you can publish content that other people can visit—it will look like [this](http://amandavisconti.github.io/JekyllDemo/)!—and you'll also have some resources to explore if you want to further customize the site. -**Requirements:** A computer (Mac/Windows/Linux are all okay, but this lesson doesn't cover some aspects of Linux use, and you may encounter some issues if you are using a Mac with an M-series (silicone) chip), the ability to download and install software on the computer, an internet connection that can support downloading software. Users have reported needing between 1-3 hours to complete the entire lesson. +**Requirements:** A computer (Mac/Windows/Linux are all okay, but this lesson doesn't cover some aspects of Linux use, and you may encounter some issues if you are using a Mac with an M-series (silicon) chip), the ability to download and install software on the computer, an internet connection that can support downloading software. Users have reported needing between 1-3 hours to complete the entire lesson. {% include toc.html %} @@ -153,7 +153,7 @@ Starting with macOS Catalina, zsh has replaced bash as the default shell for Mac *If you're using a Mac computer, follow the instructions below until you hit a line that says the Windows-specific instructions are beginning.*
-Please note that if you are using a Mac with an M-series (silicone) chip, you may encounter some compatibility issues when installing Jekyll or its dependencies. If that’s the case, we advise you to follow additional installation instructions for the relevant package, either from the official documentation, or online help forums. +Please note that if you are using a Mac with an M-series (silicon) chip, you may encounter some compatibility issues when installing Jekyll or its dependencies. If that’s the case, we advise you to follow additional installation instructions for the relevant package, either from the official documentation, or online help forums.
Open a command line window (Applications > Utilities > Terminal) and enter the code shown in the steps below (*`code is formatted like this`*), keeping [the command line tips from above](#section1-4) in mind.