From: Michael Prokop <mika@grml.org>
Date: Thu, 14 Sep 2023 15:26:19 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/github/pr/5'
X-Git-Tag: v0.10.1~1
X-Git-Url: http://git.grml.org/?p=zsh-lovers.git;a=commitdiff_plain;h=34db1863cf96da215e363c0d0acd774196120d59

Merge remote-tracking branch 'origin/github/pr/5'
---

34db1863cf96da215e363c0d0acd774196120d59
diff --cc zsh-lovers.1.txt
index c14b545,9ce8e0b..f17f28b
--- a/zsh-lovers.1.txt
+++ b/zsh-lovers.1.txt
@@@ -1444,17 -1444,27 +1444,19 @@@ From Bash to Z Shell: Conquering the Co
  Mailinglistarchive::
      *http://www.zsh.org/mla/[]*
  ZSH-FAQ::
 -    *http://zsh.dotsrc.org/FAQ/[]*
 +    *https://zsh.sourceforge.io/FAQ/zshfaq.html[]*
  Userguide::
 -    *http://zsh.sunsite.dk/Guide/[]*
 +    *https://zsh.sourceforge.io/Guide/[]*
  ZSH-Wiki::
      *http://zshwiki.org/home/[]*
 -A short introduction from BYU::
 -    *http://docs.cs.byu.edu/linux/advanced/zsh.html[]*
  Mouse-Support ;)::
      *http://stchaz.free.fr/mouse.zsh[]*
 -Curtains up: introducing the Z shell::
 -    *http://www-128.ibm.com/developerworks/linux/library/l-z.html?dwzone=linux[]*
 -ZSH-Liebhaberseite (german)::
 -    *http://michael-prokop.at/computer/tools_zsh_liebhaber.html[]*
 -ZSH-Seite von Michael Prokop (german)::
 -    *http://michael-prokop.at/computer/tools_zsh.html[]*
  ZSH Prompt introduction::
      *http://aperiodic.net/phil/prompt/[]*
+ ft's blog posts around zsh::
+     *http://bewatermyfriend.org/tag/zsh/[]*
  ft's zsh configuration::
-     *http://ft.bewatermyfriend.org/computer/zsh.html[]*
+     *https://gitlab.com/ft/etc-zsh[]*
  Adam's ZSH page::
      *http://www.adamspiers.org/computing/zsh/[]*
  Zzappers Best of ZSH Tips::