Merge branch 'upstream'

hugo.toml.example

 baseurl = "https://flear.org/"
 languageCode = "en-us"
+<<<<<<< HEAD
 title = "Free and Libre Engineers for Amateur Radio"
+=======
+title = "Hugo based static page generator and blog with ActivityPub support"
+>>>>>>> upstream
 
 paginate = 20
 pygmentsCodeFences = true
@@ -19,10 +23,22 @@ email = "flear@flear.org"
 siteName="FLEAR"
 siteTagLine="Free & Libre Engineers for Amateur Radio"
 # Do not include the @
+<<<<<<< HEAD
 twitterUser="FLEAR_radio"
 siteDescription="FLEAR is an open-source and open-standards incubator for Ham Radio"
 # this is the user name of the ActivityPub account. It will be the first part of your handle as @apUSer@domain
 apUser="FLEAR"
+=======
+twitterUser="fedipage"
+siteDescription="Fedipage is a Hugo based static page generator and blog with ActivityPub support"
+# this is the user name of the ActivityPub account. It will be the first part of
+# your handle as @apUser@domain. Please use whatever capitalization styling you
+# want. It will be changed to lowercase for your handle itself. Only include
+# letters.
+apUser="Fedipage"
+# This is where you run an alternative mastodon based account. This will be
+# setup to be an alias for this account.
+>>>>>>> upstream
 secondaryApHost="https://qoto.org"
 secondaryApUser="FLEAR"
 repoUrl="https://git.qoto.org/flear"