.gitignore

 *.py[cod]
-output
+public

.gitlab-ci.yml

@@ -10,6 +10,6 @@ pages:
   - make html
   artifacts:
     paths:
-    - output
+    - public
   only:
   - master

Makefile

@@ -4,7 +4,7 @@ PELICANOPTS=--ignore-cache
 
 BASEDIR=$(CURDIR)
 INPUTDIR=$(BASEDIR)/content
-OUTPUTDIR=$(BASEDIR)/output
+OUTPUTDIR=$(BASEDIR)/public
 CONFFILE=$(BASEDIR)/pelicanconf.py
 PUBLISHCONF=$(BASEDIR)/publishconf.py
 

README.txt

@@ -21,8 +21,6 @@ Updating the blog
 
 5. Change the status of the article from 'draft' to 'published'
 
-6. Run 'make html' to generate the pages
+6. Commit and push the final changes to Salsa
 
-7. Commit and push the final changes to Salsa
-
-8. Wait for the Gitlab job to regenerate the site
+7. Wait for the Gitlab job to regenerate the site

develop_server.sh

@@ -8,7 +8,7 @@ PELICANOPTS=
 
 BASEDIR=$(pwd)
 INPUTDIR=$BASEDIR/content
-OUTPUTDIR=$BASEDIR/output
+OUTPUTDIR=$BASEDIR/public
 CONFFILE=$BASEDIR/pelicanconf.py
 
 ###