Switched from JBake to Pelican
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..18175d7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+__pycache__
+output
+cache
+.DS_Store
+.history
+.idea
+*~
\ No newline at end of file
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..79d4f2f
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,73 @@
+PY?=python3
+PELICAN?=pelican
+PELICANOPTS=
+
+BASEDIR=$(CURDIR)
+INPUTDIR=$(BASEDIR)/content
+OUTPUTDIR=$(BASEDIR)/output
+CONFFILE=$(BASEDIR)/pelicanconf.py
+PUBLISHCONF=$(BASEDIR)/publishconf.py
+
+
+DEBUG ?= 0
+ifeq ($(DEBUG), 1)
+	PELICANOPTS += -D
+endif
+
+RELATIVE ?= 0
+ifeq ($(RELATIVE), 1)
+	PELICANOPTS += --relative-urls
+endif
+
+SERVER ?= "0.0.0.0"
+
+PORT ?= 0
+ifneq ($(PORT), 0)
+	PELICANOPTS += -p $(PORT)
+endif
+
+
+help:
+	@echo 'Makefile for a pelican Web site                                           '
+	@echo '                                                                          '
+	@echo 'Usage:                                                                    '
+	@echo '   make html                           (re)generate the web site          '
+	@echo '   make clean                          remove the generated files         '
+	@echo '   make regenerate                     regenerate files upon modification '
+	@echo '   make publish                        generate using production settings '
+	@echo '   make serve [PORT=8000]              serve site at http://localhost:8000'
+	@echo '   make serve-global [SERVER=0.0.0.0]  serve (as root) to $(SERVER):80    '
+	@echo '   make devserver [PORT=8000]          serve and regenerate together      '
+	@echo '   make ssh_upload                     upload the web site via SSH        '
+	@echo '   make rsync_upload                   upload the web site via rsync+ssh  '
+	@echo '                                                                          '
+	@echo 'Set the DEBUG variable to 1 to enable debugging, e.g. make DEBUG=1 html   '
+	@echo 'Set the RELATIVE variable to 1 to enable relative urls                    '
+	@echo '                                                                          '
+
+html:
+	"$(PELICAN)" "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(CONFFILE)" $(PELICANOPTS)
+
+clean:
+	[ ! -d "$(OUTPUTDIR)" ] || rm -rf "$(OUTPUTDIR)"
+
+regenerate:
+	"$(PELICAN)" -r "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(CONFFILE)" $(PELICANOPTS)
+
+serve:
+	"$(PELICAN)" -l "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(CONFFILE)" $(PELICANOPTS)
+
+serve-global:
+	"$(PELICAN)" -l "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(CONFFILE)" $(PELICANOPTS) -b $(SERVER)
+
+devserver:
+	"$(PELICAN)" -lr "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(CONFFILE)" $(PELICANOPTS)
+
+devserver-global:
+	$(PELICAN) -lr $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -b 0.0.0.0
+
+publish:
+	"$(PELICAN)" "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(PUBLISHCONF)" $(PELICANOPTS)
+
+
+.PHONY: html help clean regenerate serve serve-global devserver publish 
\ No newline at end of file
diff --git a/assets/.htaccess b/assets/.htaccess
deleted file mode 100644
index fa6337a..0000000
--- a/assets/.htaccess
+++ /dev/null
@@ -1,3 +0,0 @@
-RewriteEngine On
-RewriteCond %{HTTPS} off
-RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
diff --git a/bake.sh b/bake.sh
deleted file mode 100755
index b781bc6..0000000
--- a/bake.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if [ -z ${JBAKE_HOME} ]
-then
-  echo "Missing JBAKE_HOME variable" >&2
-  exit 1
-fi
-
-export JBAKE_OPTS="-Djavax.xml.accessExternalDTD=http"
-${JBAKE_HOME}/bin/jbake $@
diff --git a/build_local.sh b/build_local.sh
deleted file mode 100755
index 06e80a2..0000000
--- a/build_local.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-CURRENTDIR=`pwd`
-WORKDIR=/tmp/ooo-site
-
-rm -rf $WORKDIR
-mkdir -p $WORKDIR
-cp assets/.htaccess $WORKDIR
-
-# just bake and serve the site
-./bake.sh -b -s . $WORKDIR
diff --git a/build_site.sh b/build_site.sh
deleted file mode 100755
index 5b1d8db..0000000
--- a/build_site.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-CURRENTDIR=`pwd`
-WORKDIR=/tmp/ooo-site
-ME=`basename $0`
-
-rm -rf $WORKDIR
-mkdir -p $WORKDIR
-cp assets/.htaccess $WORKDIR
-
-# we twice bake because we have more files to precess than 16384
-# bake part2 content first.
-cd part2
-../bake.sh -b . $WORKDIR
-cd ..
-
-# now bake the site
-./bake.sh -b . $WORKDIR
-
-# push all of the results to asf-site
-git checkout asf-site
-git clean -f -d
-git pull origin asf-site
-rm -rf content
-mkdir content
-cp -a $WORKDIR/* content
-cp -a $WORKDIR/.htaccess content
-git add -f content
-git commit -m "git-site-role commit from $ME"
-git push -f origin asf-site
diff --git a/build_staging.sh b/build_staging.sh
deleted file mode 100755
index d6b03df..0000000
--- a/build_staging.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-CURRENTDIR=`pwd`
-WORKDIR=/tmp/ooo-site
-ME=`basename $0`
-
-rm -rf $WORKDIR
-mkdir -p $WORKDIR
-
-# we twice bake because we have more files to precess than 16384
-# bake part2 content first.
-cd part2
-../bake.sh -b . $WORKDIR
-cd ..
-
-# now bake the site
-./bake.sh -b . $WORKDIR
-cp assets/.htaccess $WORKDIR
-
-# push all of the results to asf-site
-git checkout asf-staging
-git clean -f -d
-git pull origin asf-staging
-rm -rf content
-mkdir content
-cp -a $WORKDIR/* content
-cp -a $WORKDIR/.htaccess content
-git add -f content
-git commit -m "git-site-role commit from $ME"
-git push -f origin asf-staging
diff --git a/content/bug-tracking.md b/content/bug-tracking.md
index 161fe00..5eed49d 100644
--- a/content/bug-tracking.md
+++ b/content/bug-tracking.md
@@ -1,7 +1,21 @@
-type=page
-title=Bug Tracking
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:  Bug Tracking
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 ## Overview
 The project uses [Bugzilla][1] to track and manage issues. It's hosted at Apache:
 
diff --git a/content/community-faqs.md b/content/community-faqs.md
index 9948b5d..0a6f748 100644
--- a/content/community-faqs.md
+++ b/content/community-faqs.md
@@ -1,7 +1,21 @@
-type=page
-title=Community FAQs
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title: Community FAQs
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 ## How are decisions made in the project?
 
 The most important thing about engaging with any Apache project is that everyone
diff --git a/content/contact.md b/content/contact.md
index 58d6b89..b98b391 100644
--- a/content/contact.md
+++ b/content/contact.md
@@ -1,7 +1,21 @@
-type=page
-title=Contact Us
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title: Contact Us
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 Any questions dealing with the use of Apache OpenOffice maybe directed to either the user web forums at:
 
   - [https://forum.openoffice.org][1]
diff --git a/content/contributing-code.md b/content/contributing-code.md
index d167f18..ea1b69d 100644
--- a/content/contributing-code.md
+++ b/content/contributing-code.md
@@ -1,7 +1,21 @@
-type=page
-title=Contributing Code to Apache OpenOffice
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     Contributing Code to Apache OpenOffice
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 If you have code that you want to contribute to the Apache OpenOffice project, then we would [love to talk to you](mailto:dev@openoffice.apache.org) about this.
 
 Apache projects put a strong emphasis on code pedigree and reviewing and documenting licenses and notices, more so than many other open source projects. This is done to make our
diff --git a/content/developer-faqs.md b/content/developer-faqs.md
index e751495..7788e2d 100644
--- a/content/developer-faqs.md
+++ b/content/developer-faqs.md
@@ -1,7 +1,21 @@
-type=page
-title=Developer FAQs
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title: Developer FAQs
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 Welcome to OpenOffice development! 
 
 [TOC]
diff --git a/assets/doap_openoffice.rdf b/content/doap_openoffice.rdf
similarity index 100%
rename from assets/doap_openoffice.rdf
rename to content/doap_openoffice.rdf
diff --git a/content/docs/download_process.md b/content/docs/download_process.md
deleted file mode 100644
index f88ed55..0000000
--- a/content/docs/download_process.md
+++ /dev/null
@@ -1,2 +0,0 @@
-type=page
-~~~~~~
diff --git a/assets/docs/download_process.png b/content/docs/download_process.png
similarity index 100%
rename from assets/docs/download_process.png
rename to content/docs/download_process.png
Binary files differ
diff --git a/content/docs/edit-cms.md b/content/docs/edit-cms.md
index 4b83ad5..923c0d7 100644
--- a/content/docs/edit-cms.md
+++ b/content/docs/edit-cms.md
@@ -1,7 +1,21 @@
-type=page
-title=How to edit the Apache OpenOffice website
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     How to edit the Apache OpenOffice website
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 This documentation shows how to edit the Apache OpenOffice
 website. This includes creation of new pages, modification, and deletion - for files
 and sub-directories.
diff --git a/content/docs/governance/consensusBuilding.md b/content/docs/governance/consensusBuilding.md
index 1f0fd30..8bc4341 100644
--- a/content/docs/governance/consensusBuilding.md
+++ b/content/docs/governance/consensusBuilding.md
@@ -1,7 +1,21 @@
-type=page
-title=Consensus Building
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     Consensus Building
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 In some cases there is no obvious path to take, or you might be a new community, 
 or a new member of an existing community. In these cases people will often 
 need to build consensus by making proposals and eliciting responses.
@@ -49,4 +63,4 @@
 Once there is a clear consensus members of the community can proceed with 
 the work under the [lazy consensus][1] model.
 
-  [1]: /docs/governance/lazyConsensus.html
+  [1]: /docs/governance/lazyConsensus.html
\ No newline at end of file
diff --git a/content/docs/governance/lazyConsensus.md b/content/docs/governance/lazyConsensus.md
index a7a5dad..56c7e91 100644
--- a/content/docs/governance/lazyConsensus.md
+++ b/content/docs/governance/lazyConsensus.md
@@ -1,7 +1,21 @@
-type=page
-title=Lazy Consensus
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     Lazy Consensus
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 The concept of "Lazy Consensus" is very important in our project. Lazy
 Consensus means that when you are convinced that you know what the community
 would like to see happen you can simply assume that you already have consensus
diff --git a/content/docs/governance/voting.md b/content/docs/governance/voting.md
index d4d27ce..05d4b27 100644
--- a/content/docs/governance/voting.md
+++ b/content/docs/governance/voting.md
@@ -1,7 +1,21 @@
-type=page
-title=Voting
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     Voting
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 Occasionally a "feel" for consensus is not enough. Sometimes we need to have a
 measurable consensus. For example, when voting in new committers or to approve a
 release. 
diff --git a/content/downloads.md b/content/downloads.md
index c025c45..cb52e69 100644
--- a/content/downloads.md
+++ b/content/downloads.md
@@ -1,7 +1,21 @@
-type=page
-title=Apache OpenOffice - Downloads
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     Apache OpenOffice - Downloads
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 The Apache OpenOffice source release files are listed below.
 Pre-built versions of Apache OpenOffice are available
 via the global [download page](https://www.openoffice.org/download/).
diff --git a/content/events.md b/content/events.md
index 7c69974..5bf26ae 100644
--- a/content/events.md
+++ b/content/events.md
@@ -1,7 +1,21 @@
-type=page
-title=Events
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     Events
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 ## Apache OpenOffice Events
 
 Some useful links for conference planning:
diff --git a/assets/favicon.ico b/content/favicon.ico
similarity index 100%
rename from assets/favicon.ico
rename to content/favicon.ico
Binary files differ
diff --git a/content/get-involved-de.md b/content/get-involved-de.md
index ae9cac2..af5cbe8 100644
--- a/content/get-involved-de.md
+++ b/content/get-involved-de.md
@@ -1,7 +1,21 @@
-type=page
-title=Mitarbeit
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     Mitarbeit
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 ## Werde Teil des Apache OpenOffice Projekts!
 
 Viele beschränken sich darauf, eine kleine [Spende](https://www.openoffice.org/donations.html) für Apache OpenOffice und die
diff --git a/content/get-involved.md b/content/get-involved.md
index 6595a14..ca4fc80 100644
--- a/content/get-involved.md
+++ b/content/get-involved.md
@@ -1,7 +1,21 @@
-type=page
-title=Get Involved in Apache OpenOffice
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     Get Involved in Apache OpenOffice
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 [Diese Seite in Deutsch](https://openoffice.apache.org/get-involved-de.html)
 
 ## Help Needed
diff --git a/content/get-it-here.md b/content/get-it-here.md
index fef05c2..c206188 100644
--- a/content/get-it-here.md
+++ b/content/get-it-here.md
@@ -1,7 +1,21 @@
-type=page
-title=Use of the "Get it here!" logo
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     Use of the "Get it here!" logo
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 Anyone, without additional permission from this project, may use the
 following logo subject to the following conditions:
 
diff --git a/assets/images/AOO4_website_logo.png b/content/images/AOO4_website_logo.png
similarity index 100%
rename from assets/images/AOO4_website_logo.png
rename to content/images/AOO4_website_logo.png
Binary files differ
diff --git a/assets/images/action-bg.png b/content/images/action-bg.png
similarity index 100%
rename from assets/images/action-bg.png
rename to content/images/action-bg.png
Binary files differ
diff --git a/assets/images/action-clipart.png b/content/images/action-clipart.png
similarity index 100%
rename from assets/images/action-clipart.png
rename to content/images/action-clipart.png
Binary files differ
diff --git a/assets/images/action-contract.png b/content/images/action-contract.png
similarity index 100%
rename from assets/images/action-contract.png
rename to content/images/action-contract.png
Binary files differ
diff --git a/assets/images/action-dictionaries.png b/content/images/action-dictionaries.png
similarity index 100%
rename from assets/images/action-dictionaries.png
rename to content/images/action-dictionaries.png
Binary files differ
diff --git a/assets/images/action-download.png b/content/images/action-download.png
similarity index 100%
rename from assets/images/action-download.png
rename to content/images/action-download.png
Binary files differ
diff --git a/assets/images/action-expand.png b/content/images/action-expand.png
similarity index 100%
rename from assets/images/action-expand.png
rename to content/images/action-expand.png
Binary files differ
diff --git a/assets/images/action-extend.png b/content/images/action-extend.png
similarity index 100%
rename from assets/images/action-extend.png
rename to content/images/action-extend.png
Binary files differ
diff --git a/assets/images/action-help.png b/content/images/action-help.png
similarity index 100%
rename from assets/images/action-help.png
rename to content/images/action-help.png
Binary files differ
diff --git a/assets/images/action-info.png b/content/images/action-info.png
similarity index 100%
rename from assets/images/action-info.png
rename to content/images/action-info.png
Binary files differ
diff --git a/assets/images/action-link.png b/content/images/action-link.png
similarity index 100%
rename from assets/images/action-link.png
rename to content/images/action-link.png
Binary files differ
diff --git a/assets/images/action-participate.png b/content/images/action-participate.png
similarity index 100%
rename from assets/images/action-participate.png
rename to content/images/action-participate.png
Binary files differ
diff --git a/assets/images/action-templates.png b/content/images/action-templates.png
similarity index 100%
rename from assets/images/action-templates.png
rename to content/images/action-templates.png
Binary files differ
diff --git a/assets/images/action.png b/content/images/action.png
similarity index 100%
rename from assets/images/action.png
rename to content/images/action.png
Binary files differ
diff --git a/assets/images/asf_logo_small.png b/content/images/asf_logo_small.png
similarity index 100%
rename from assets/images/asf_logo_small.png
rename to content/images/asf_logo_small.png
Binary files differ
diff --git a/assets/images/campaign-divider.png b/content/images/campaign-divider.png
similarity index 100%
rename from assets/images/campaign-divider.png
rename to content/images/campaign-divider.png
Binary files differ
diff --git a/assets/images/download-bg.png b/content/images/download-bg.png
similarity index 100%
rename from assets/images/download-bg.png
rename to content/images/download-bg.png
Binary files differ
diff --git a/assets/images/get-it-here/en.png b/content/images/get-it-here/en.png
similarity index 100%
rename from assets/images/get-it-here/en.png
rename to content/images/get-it-here/en.png
Binary files differ
diff --git a/assets/images/licensing.png b/content/images/licensing.png
similarity index 100%
rename from assets/images/licensing.png
rename to content/images/licensing.png
Binary files differ
diff --git a/content/index.md b/content/index.md
index 2690053..8acdecc 100644
--- a/content/index.md
+++ b/content/index.md
@@ -1,7 +1,21 @@
-type=page
-title=Apache OpenOffice - Project Website
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     Apache OpenOffice - Project Website
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 Apache OpenOffice® is the free and open productivity suite from the [Apache Software Foundation][0].
 
 [Apache OpenOffice][1] features six personal productivity applications: a word processor (and its web-authoring component),
diff --git a/content/license.md b/content/license.md
index a547e3e..7736eb9 100644
--- a/content/license.md
+++ b/content/license.md
@@ -1,7 +1,21 @@
-type=page
-title=Apache License
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title: Apache License
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 Apache License<br></br>Version 2.0, January 2004<br></br>
 [http://www.apache.org/licenses/](http://www.apache.org/licenses/) 
 
diff --git a/content/list-conduct.md b/content/list-conduct.md
index 645e3e9..2ed1c52 100644
--- a/content/list-conduct.md
+++ b/content/list-conduct.md
@@ -1,7 +1,21 @@
-type=page
-title=List Conduct Guidelines
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     List Conduct Guidelines
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 #1. Respect one another
 
 Discussion is the cornerstone of a project like this and the sharing of viewpoints 
@@ -141,4 +155,4 @@
 
 #More Useful Stuff#
 
-- [Apache Tips for Email Contributors](http://www.apache.org/dev/contrib-email-tips.html)
+- [Apache Tips for Email Contributors](http://www.apache.org/dev/contrib-email-tips.html)
\ No newline at end of file
diff --git a/content/mailing-lists.md b/content/mailing-lists.md
index deec3a6..0f0d11f 100644
--- a/content/mailing-lists.md
+++ b/content/mailing-lists.md
@@ -1,7 +1,21 @@
-type=page
-title=Mailing Lists
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     Mailing Lists
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 ## Apache OpenOffice Public Mailing Lists
 
 We welcome you to join our mailing lists and let us know about your thoughts or
diff --git a/content/mission.md b/content/mission.md
index f8b0cb7..d550089 100644
--- a/content/mission.md
+++ b/content/mission.md
@@ -1,7 +1,21 @@
-type=page
-title=The Public Service Mission of OpenOffice
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title: The Public Service Mission of OpenOffice
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 ##Introduction
 
 Along with an email client and a web browser, an office suite is a core essential
@@ -55,4 +69,4 @@
 of open standards promotes interoperability and choice in the market. But this 
 does not come without effort on our part. We commit to faithful implementation 
 of open standards, and to work with standards organizations and other vendors 
-to improve these standards and to test and improve interoperability.
+to improve these standards and to test and improve interoperability.
\ No newline at end of file
diff --git a/content/native-lang.md b/content/native-lang.md
index fbee9f3..df7ff3b 100644
--- a/content/native-lang.md
+++ b/content/native-lang.md
@@ -1,6 +1,5 @@
-type=page
-title=Native-Language Information
-~~~~~~
+Title: Native-Language Information
+
 ## Native Language Projects
 
 The scope of Native Language support in Apache OpenOffice consists of:
diff --git a/content/orientation/decision-making.md b/content/orientation/decision-making.md
index 6a18e37..3e8e1b4 100644
--- a/content/orientation/decision-making.md
+++ b/content/orientation/decision-making.md
@@ -1,7 +1,21 @@
-type=page
-title=Decision Making
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     Decision Making
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 In this Orientation Module you will learn about Decision Making within the project. As with the previous Level 1 Module, if you have prior experience with an open source software project, especially one at Apache, then much of this material will already be familiar to you.
 
 In the previous Module we read about collaboration on the mailings lists, how to do it efficiently and how to avoid the most common pitfalls. We use the mailing lists for many things, for asking questions, for sharing information or the like. But one of the most important uses of the mailing list is for decision making. It is important to understand how decisions are made in an Apache community. Here are a few general principles that you should keep in mind:
diff --git a/content/orientation/how-aoo-project-works.md b/content/orientation/how-aoo-project-works.md
index 3e6b9c9..81ed399 100644
--- a/content/orientation/how-aoo-project-works.md
+++ b/content/orientation/how-aoo-project-works.md
@@ -1,7 +1,21 @@
-type=page
-title=How the Apache OpenOffice Project Works

-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     How the Apache OpenOffice Project Works

+Notice:    Licensed to the Apache Software Foundation (ASF) under one

+           or more contributor license agreements.  See the NOTICE file

+           distributed with this work for additional information

+           regarding copyright ownership.  The ASF licenses this file

+           to you under the Apache License, Version 2.0 (the

+           "License"); you may not use this file except in compliance

+           with the License.  You may obtain a copy of the License at

+           .

+             http://www.apache.org/licenses/LICENSE-2.0

+           .

+           Unless required by applicable law or agreed to in writing,

+           software distributed under the License is distributed on an

+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+           KIND, either express or implied.  See the License for the

+           specific language governing permissions and limitations

+           under the License.

+

 1. Please send an email to [recruitment@openoffice.apache.org](mailto:recruitment@openoffice.apache.org?subject=Starting How the Apache OpenOffice Project Works) to let us know you are working on this module.

 

 1. As you learned in the [previous module](intro-contributing.html) the Apache Software Foundation formally has Members, who elect a Board of Directors who appoint Officers, including PMC (Project Management Committee) Chairs, who work with the PMC's of the individual Top Level Projects and their communities, to publish open source software for the public good. In this module we'll take a closer look at how exactly we accomplish this within the Apache OpenOffice project, how we divide up the tasks and get all the stuff done that is needed to release a new version of OpenOffice.

diff --git a/content/orientation/index.md b/content/orientation/index.md
index 68832ec..e93a612 100644
--- a/content/orientation/index.md
+++ b/content/orientation/index.md
@@ -1,7 +1,21 @@
-type=page
-title=New Volunteer Orientation
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     New Volunteer Orientation
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 ##Welcome!
 
 So you are interested in volunteering with the Apache OpenOffice project, one of the oldest and most famous open source projects around? Great, welcome to the project!
diff --git a/content/orientation/infrastructure.md b/content/orientation/infrastructure.md
index 85d3b7e..446d3cd 100644
--- a/content/orientation/infrastructure.md
+++ b/content/orientation/infrastructure.md
@@ -1,7 +1,21 @@
-type=page
-title=Infrastructure
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     Infrastructure
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 In this Orientation Module you will learn about tools and servers that are part of the daily operations of the project. You will interact with many of these on a regular basis, or at least hear them discussed on the lists, so it is important to know what they are, and where to go if you need more information or run into problems.
 
 1. First, Please send an email to [recruitment@openoffice.apache.org](mailto:recruitment@openoffice.apache.org?subject=Starting Infrastructure Module) to let us know you are working on this module.
diff --git a/content/orientation/intro-contributing.md b/content/orientation/intro-contributing.md
index 73adb91..1617e88 100644
--- a/content/orientation/intro-contributing.md
+++ b/content/orientation/intro-contributing.md
@@ -1,7 +1,21 @@
-type=page
-title=Introduction to Contributing to Apache OpenOffice
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     Introduction to Contributing to Apache OpenOffice
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 In this Orientation Module you will gain basic familiarity with the Apache Software Foundation and how it works, get signed up for various important online project services, and introduce yourself to the other volunteers on the project's mailing mailing list.
 
 Level 1 is focused on connecting you to the project.
diff --git a/content/orientation/intro-development.md b/content/orientation/intro-development.md
index ac51f67..1a29f12 100644
--- a/content/orientation/intro-development.md
+++ b/content/orientation/intro-development.md
@@ -1,7 +1,21 @@
-type=page
-title=Introduction to Development
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     Introduction to Development
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 ##Introduction
 
 In this orientation module you will learn how to get started programming OpenOffice.
diff --git a/content/orientation/intro-doc.md b/content/orientation/intro-doc.md
index c53218c..64f1005 100644
--- a/content/orientation/intro-doc.md
+++ b/content/orientation/intro-doc.md
@@ -1,7 +1,21 @@
-type=page
-title=Introduction to Documentation
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     Introduction to Documentation
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 ##Introduction
 
 In this orientation module you will learn how to get started in the OpenOffice Documentation Team.
diff --git a/content/orientation/intro-l10n.md b/content/orientation/intro-l10n.md
index 7cd25d5..37f04c7 100644
--- a/content/orientation/intro-l10n.md
+++ b/content/orientation/intro-l10n.md
@@ -1,7 +1,21 @@
-type=page
-title=Introduction to Localization

-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     Introduction to Localization

+Notice:    Licensed to the Apache Software Foundation (ASF) under one

+           or more contributor license agreements.  See the NOTICE file

+           distributed with this work for additional information

+           regarding copyright ownership.  The ASF licenses this file

+           to you under the Apache License, Version 2.0 (the

+           "License"); you may not use this file except in compliance

+           with the License.  You may obtain a copy of the License at

+           .

+             http://www.apache.org/licenses/LICENSE-2.0

+           .

+           Unless required by applicable law or agreed to in writing,

+           software distributed under the License is distributed on an

+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+           KIND, either express or implied.  See the License for the

+           specific language governing permissions and limitations

+           under the License.

+

 1. Please send an email to [L10N@openoffice.apache.org](mailto:L10N@openoffice.apache.org?subject=Starting Introduction to Localization) to let us know you are working on this module.

 

 1. Congratulations!  You have completed this Level. Please send a note to [L10N@openoffice.apache.org](mailto:L10N@openoffice.apache.org?subject=Completed Introduction to Localization) so we all know you have completed this level. This is also a good opportunity to send along any feedback or questions you might have on this Orientation Module.

diff --git a/content/orientation/intro-marketing.md b/content/orientation/intro-marketing.md
index 7302a94..932335c 100644
--- a/content/orientation/intro-marketing.md
+++ b/content/orientation/intro-marketing.md
@@ -1,7 +1,21 @@
-type=page
-title=Introduction to Marketing
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     Introduction to Marketing
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 In this orientation module you will be introduced to Marketing within the Apache OpenOffice community. You will learn about many of the ways in which we can do marketing, as well as some of the constraints we must keep in mind as an non-profit organization. After completion of this module you should be prepared to jump in and assist with ongoing marketing activities.
 
 To complete this module you should read the following material, along with associated links.
diff --git a/content/orientation/intro-qa.md b/content/orientation/intro-qa.md
index f491c5d..3155793 100644
--- a/content/orientation/intro-qa.md
+++ b/content/orientation/intro-qa.md
@@ -1,7 +1,21 @@
-type=page
-title=Introduction to QA
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     Introduction to QA
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 ## Introductions
 
 In this orientation module you will learn how Quality Assurance is done in our community. You will also learn about basic tasks that are easiest to do for new QA Volunteers.
diff --git a/content/people.md b/content/people.md
index 6e0768a..60db630 100644
--- a/content/people.md
+++ b/content/people.md
@@ -1,7 +1,21 @@
-type=page
-title=Project Volunteers
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     Project Volunteers
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
   - A list of current project volunteers can be found on our wiki [here](https://cwiki.apache.org/confluence/display/OOOUSERS/Directory+of+Volunteers).
     The information there is self-managed by volunteers.
   - Project Committers and PMC members  are listed in the [Apache Phone Book](https://people.apache.org/phonebook.html) under Apache OpenOffice. New developers are announced on the [Development Mailing List](https://openoffice.apache.org/mailing-lists.html).
diff --git a/content/pmc-faqs.md b/content/pmc-faqs.md
index ddd2d63..4676caf 100644
--- a/content/pmc-faqs.md
+++ b/content/pmc-faqs.md
@@ -1,7 +1,21 @@
-type=page
-title=PMC FAQs
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     PMC FAQs
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 Here are a number of FAQ's about how the Apache OpenOffice project governance works.
 
 **Contents**
diff --git a/content/press.md b/content/press.md
index eaf24ed..f1fc121 100644
--- a/content/press.md
+++ b/content/press.md
@@ -1,7 +1,21 @@
-type=page
-title=Press Inquiries
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     Press Inquiries
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 ## Press Inquiries
 
 The Apache OpenOffice Project Management Committee welcomes inquiries from the press. We can be contacted via email at [press@openoffice.apache.org][1].
diff --git a/content/privacy.md b/content/privacy.md
index c0f66d0..9ad388c 100644
--- a/content/privacy.md
+++ b/content/privacy.md
@@ -1,7 +1,21 @@
-type=page
-title=Privacy
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     Privacy
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 Information about your use of this website is collected using server access
 logs and a tracking cookie. The collected information consists of the
 following:
diff --git a/content/qa.md b/content/qa.md
index f75c9df..fc65e3c 100644
--- a/content/qa.md
+++ b/content/qa.md
@@ -1,7 +1,21 @@
-type=page
-title=Quality Assurance
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     Quality Assurance
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 ## What is Quality Assurance (QA)?
 
 [Quality assurance (QA)](https://en.wikipedia.org/wiki/Quality_assurance) refers to the planned and systematic activities implemented in a quality system so that quality requirements for a product or service will be fulfilled.
diff --git a/assets/robots.txt b/content/robots.txt
similarity index 100%
rename from assets/robots.txt
rename to content/robots.txt
diff --git a/content/security.md b/content/security.md
index ebc8fe0..6c29f03 100644
--- a/content/security.md
+++ b/content/security.md
@@ -1,7 +1,21 @@
-type=page
-title=Security Reports
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     Security Reports
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 ## Reporting New Security Problems with Apache OpenOffice
 
 The Apache Software Foundation takes a very active stance in eliminating security problems with Apache OpenOffice.
diff --git a/content/social.md b/content/social.md
index ab9933f..22e9963 100644
--- a/content/social.md
+++ b/content/social.md
@@ -1,7 +1,21 @@
-type=page
-title=Social Networking
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     Social Networking
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 ## Introduction
 
 The Apache OpenOffice PMC coordinates access to the project's official social networking accounts. Volunteers from the 
diff --git a/content/source.md b/content/source.md
index afcef80..67687e0 100644
--- a/content/source.md
+++ b/content/source.md
@@ -1,7 +1,21 @@
-type=page
-title=Source Control
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     Source Control
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 As of August, 2019, we use GIT for version control. You can [browse our
 repository][10] using the "tree" view from gitbox in your web browser. The [README.md](https://github.com/apache/openoffice) at github.com provides useful information on how to download and build Apache OpenOffice.
 
diff --git a/content/students.md b/content/students.md
index ab2a0c0..65fa463 100644
--- a/content/students.md
+++ b/content/students.md
@@ -1,7 +1,21 @@
-type=page
-title=Advice for Students
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     Advice for Students
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 As a well-known open source project, we get many requests each semester from students interested in volunteering with us.  Often it is a
 requirement for a course that they contribute to an open source project or demonstrate some specific skill or knowledge in a real-world
 context.  The following points will help make the experience volunteering with the OpenOffice project a good one for all:
diff --git a/content/style-test.md b/content/style-test.md
index b13843c..c82b9d1 100644
--- a/content/style-test.md
+++ b/content/style-test.md
@@ -1,7 +1,21 @@
-type=page
-title=This is the title
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     This is the title
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 # This is a level 1 header
 ## This is a level 2 header
 ### This is a level 3 header
diff --git a/content/svn-basics.md b/content/svn-basics.md
index 43138c9..5efa8d3 100644
--- a/content/svn-basics.md
+++ b/content/svn-basics.md
@@ -1,7 +1,21 @@
-type=page
-title=Subversion Basics
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title: Subversion Basics
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 We use [Apache Subversion][1] for version control. For a complete reference on Subversion see the [Subversion Book][2]. You can [browse our repository][3] in your web browser.
 
 This page gives instructions on performing basic development tasks using the Subversion Command-Line Client. This instruction assumes you have Apache Subversion installed.
diff --git a/content/terms.md b/content/terms.md
index 3af2609..550df3b 100644
--- a/content/terms.md
+++ b/content/terms.md
@@ -1,7 +1,21 @@
-type=page
-title=Terms of Use
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     Terms of Use
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 Terms of Use for Apache OpenOffice web site
 
 1. INTRODUCTION. This Site and its contents are made available by Apache Software Foundation, OpenOffice Project Management Committee (AOO-PMC). These Terms of Use apply to everyone who Uses this Site (as defined below), or who participates in any projects hosted on this Site. PLEASE READ THESE TERMS CAREFULLY FIRST. BY USING THE SITE OR PARTICIPATING IN ANY PROJECTS, YOU ACKNOWLEDGE THAT YOU HAVE READ THE TERMS AND AGREE TO THEM. IF YOU DO NOT WISH TO BE BOUND BY THE TERMS, THEN DO NOT USE THE SITE OR PARTICIPATE IN ANY PROJECTS HOSTED ON THIS SITE.
diff --git a/content/trademarks.md b/content/trademarks.md
index 9093f7e..251bc90 100644
--- a/content/trademarks.md
+++ b/content/trademarks.md
@@ -1,7 +1,21 @@
-type=page
-title=Apache OpenOffice Trademarks
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     Apache OpenOffice Trademarks
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 ## Getting permission to use our trademarks
 
 The Apache Software Foundation holds trademarks on behalf of its
diff --git a/content/translate.md b/content/translate.md
index afa4781..d923c20 100644
--- a/content/translate.md
+++ b/content/translate.md
@@ -1,7 +1,21 @@
-type=page
-title=How to Help Translate Apache OpenOffice
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     How to Help Translate Apache OpenOffice
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 ##Introduction
 
 OpenOffice traditionally has always had excellent localization support,
diff --git a/content/website-local.md b/content/website-local.md
index 491a2a5..5a66bf4 100644
--- a/content/website-local.md
+++ b/content/website-local.md
@@ -1,7 +1,21 @@
-type=page
-title=Website Development
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title: Website Development
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 Making updates to the Apache OpenOffice project's websites is simple. It's even easy 
 for non-committers (new contributors - like you) to create a patch to request that 
 pages are updated by the project community.
diff --git a/content/website-native.md b/content/website-native.md
index 8162cb4..857a420 100644
--- a/content/website-native.md
+++ b/content/website-native.md
@@ -1,7 +1,21 @@
-type=page
-title=How to edit the Native Language (NL) Websites?
-notice=https://www.apache.org/licenses/LICENSE-2.0
-~~~~~~
+Title:     How to edit the Native Language (NL) Websites?
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 ## Native Language (NL) Websites
 
 Apache OpenOffice supports users around the world via our many OpenOffice localizations, via
diff --git a/copy_staging.sh b/copy_staging.sh
deleted file mode 100755
index d2f5241..0000000
--- a/copy_staging.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-CURRENTDIR=`pwd`
-WORKDIR=/tmp/ooo-site
-ME=`basename $0`
-
-rm -rf $WORKDIR
-mkdir -p $WORKDIR
-
-# copy the staging site
-git checkout asf-staging
-git pull origin asf-staging
-cp -rp content $WORKDIR
-
-# push all of the results to asf-site
-git checkout asf-site
-git clean -f -d
-git pull origin asf-site
-rm -rf content
-cp -rp $WORKDIR/content .
-git add -f content
-git commit -m "git-site-role commit from $ME"
-git push -f origin asf-site
diff --git a/jbake.properties b/jbake.properties
deleted file mode 100644
index e0ed2c0..0000000
--- a/jbake.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#site.host=https://openofffice.apache.org
-site.host=http://localhost:8820
-template.navigator.file=navigator.gsp
-template.page.file=page.gsp
-markdown.extensions=ALL,-HARDWRAPS,+EXTRA,+KRAMDOWN
-#template.archive.file=archive.gsp
-#template.tag.file=tags.gsp
-#template.sitemap.file=sitemap.gsp
-#template.feed.file=feed.gsp
-render.encoding=UTF-8
-render.feed=false
-render.tags=false
-render.sitemap=false
-render.index=false
-render.archive=false
-index.file=index.html
-content.folder=content
-destination.folder=output
-asset.ignore=false
-default.type=page
-default.status=published
-#db.store=plocal
\ No newline at end of file
diff --git a/pelicanconf.py b/pelicanconf.py
new file mode 100644
index 0000000..655bf6d
--- /dev/null
+++ b/pelicanconf.py
@@ -0,0 +1,89 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*- #
+
+from __future__ import unicode_literals
+from datetime import date
+
+import sys
+import os
+
+AUTHOR = u'OpenOffice Community'
+SITENAME = 'Apache OpenOffice'
+SITEURL = ''
+CURRENTYEAR = date.today().year
+
+PATH = 'content'
+
+TIMEZONE = 'UTC'
+
+DEFAULT_DATE = 'fs'
+DEFAULT_LANG = u'en'
+
+# Save pages using full directory preservation
+PAGE_PATHS = [ '.' ]
+STATIC_PATHS = [ '.' ]
+PATH_METADATA= '(?P<path_no_ext>.*)\..*'
+PAGE_SAVE_AS= '{path_no_ext}.html'
+PAGE_URL= '{path_no_ext}.html'
+#SLUGIFY_SOURCE = 'basename'
+#PAGE_SAVE_AS = '{slug}.html'
+
+# We don't use articles, but we don't want pelican to think
+# that content/ contains articles.
+ARTICLE_PATHS = [ 'articles' ]
+
+# Disable these pages
+ARCHIVES_SAVE_AS = ''
+ARTICLE_SAVE_AS = ''
+AUTHORS_SAVE_AS = ''
+CATEGORIES_SAVE_AS = ''
+INDEX_SAVE_AS = ''
+TAGS_SAVE_AS = ''
+
+# Feed generation is usually not desired when developing
+FEED_ALL_ATOM = None
+CATEGORY_FEED_ATOM = None
+TRANSLATION_FEED_ATOM = None
+AUTHOR_FEED_ATOM = None
+AUTHOR_FEED_RSS = None
+
+# TOC Generator
+PLUGIN_PATHS = ['./theme/plugins']
+#PLUGINS = ['toc']
+TOC_HEADERS = r"h[1-6]"
+
+# Unused links
+LINKS = ( )
+SOCIAL = ( )
+
+# Blogroll
+#LINKS = (('Pelican', 'https://getpelican.com/'),
+#         ('Python.org', 'https://www.python.org/'),
+#         ('Jinja2', 'https://palletsprojects.com/p/jinja/'),
+#         ('You can modify those links in your config file', '#'),)
+
+# Social widget
+#SOCIAL = (('You can add links in your config file', '#'),
+#          ('Another social link', '#'),)
+
+DEFAULT_PAGINATION = False
+
+# Uncomment following line if you want document-relative URLs when developing
+#RELATIVE_URLS = True
+
+MARKDOWN = {
+    'extension_configs': {
+        'markdown.extensions.extra': {},
+        'markdown.extensions.admonition': {},
+        'markdown.extensions.codehilite': {
+            'css_class': 'highlight'
+        },
+        'markdown.extensions.meta': {},
+        'smarty' : {
+            'smart_angled_quotes' : 'true'
+        },
+        'markdown.extensions.toc': {
+            'permalink': 'true',
+        },
+    }
+}
diff --git a/publishconf.py b/publishconf.py
new file mode 100644
index 0000000..f8c938c
--- /dev/null
+++ b/publishconf.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*- #
+
+# This file is only used if you use `make publish` or
+# explicitly specify it as your config file.
+
+import os
+import sys
+sys.path.append(os.curdir)
+from pelicanconf import *
+
+# If your site is available via HTTPS, make sure SITEURL begins with https://
+SITEURL = 'https://openoffice.apache.org'
+RELATIVE_URLS = False
+
+FEED_ALL_ATOM = 'feeds/all.atom.xml'
+CATEGORY_FEED_ATOM = 'feeds/{slug}.atom.xml'
+
+DELETE_OUTPUT_DIRECTORY = True
+
+# Following items are often useful when publishing
+
+#DISQUS_SITENAME = ""
+#GOOGLE_ANALYTICS = ""
\ No newline at end of file
diff --git a/tasks.py b/tasks.py
new file mode 100644
index 0000000..f517267
--- /dev/null
+++ b/tasks.py
@@ -0,0 +1,118 @@
+# -*- coding: utf-8 -*-
+
+import os
+import shlex
+import shutil
+import sys
+import datetime
+
+from invoke import task
+from invoke.main import program
+from invoke.util import cd
+from pelican import main as pelican_main
+from pelican.server import ComplexHTTPRequestHandler, RootedHTTPServer
+from pelican.settings import DEFAULT_CONFIG, get_settings_from_file
+
+SETTINGS_FILE_BASE = 'pelicanconf.py'
+SETTINGS = {}
+SETTINGS.update(DEFAULT_CONFIG)
+LOCAL_SETTINGS = get_settings_from_file(SETTINGS_FILE_BASE)
+SETTINGS.update(LOCAL_SETTINGS)
+
+CONFIG = {
+    'settings_base': SETTINGS_FILE_BASE,
+    'settings_publish': 'publishconf.py',
+    # Output path. Can be absolute or relative to tasks.py. Default: 'output'
+    'deploy_path': SETTINGS['OUTPUT_PATH'],
+    # Host and port for `serve`
+    'host': 'localhost',
+    'port': 8000,
+}
+
+@task
+def clean(c):
+    """Remove generated files"""
+    if os.path.isdir(CONFIG['deploy_path']):
+        shutil.rmtree(CONFIG['deploy_path'])
+        os.makedirs(CONFIG['deploy_path'])
+
+@task
+def build(c):
+    """Build local version of site"""
+    pelican_run('-s {settings_base}'.format(**CONFIG))
+
+@task
+def rebuild(c):
+    """`build` with the delete switch"""
+    pelican_run('-d -s {settings_base}'.format(**CONFIG))
+
+@task
+def regenerate(c):
+    """Automatically regenerate site upon file modification"""
+    pelican_run('-r -s {settings_base}'.format(**CONFIG))
+
+@task
+def serve(c):
+    """Serve site at http://$HOST:$PORT/ (default is localhost:8000)"""
+
+    class AddressReuseTCPServer(RootedHTTPServer):
+        allow_reuse_address = True
+
+    server = AddressReuseTCPServer(
+        CONFIG['deploy_path'],
+        (CONFIG['host'], CONFIG['port']),
+        ComplexHTTPRequestHandler)
+
+    sys.stderr.write('Serving at {host}:{port} ...\n'.format(**CONFIG))
+    server.serve_forever()
+
+@task
+def reserve(c):
+    """`build`, then `serve`"""
+    build(c)
+    serve(c)
+
+@task
+def preview(c):
+    """Build production version of site"""
+    pelican_run('-s {settings_publish}'.format(**CONFIG))
+
+@task
+def livereload(c):
+    """Automatically reload browser tab upon file modification."""
+    from livereload import Server
+    build(c)
+    server = Server()
+    # Watch the base settings file
+    server.watch(CONFIG['settings_base'], lambda: build(c))
+    # Watch content source files
+    content_file_extensions = ['.md', '.rst']
+    for extension in content_file_extensions:
+        content_blob = '{0}/**/*{1}'.format(SETTINGS['PATH'], extension)
+        server.watch(content_blob, lambda: build(c))
+    # Watch the theme's templates and static assets
+    theme_path = SETTINGS['THEME']
+    server.watch('{}/templates/*.html'.format(theme_path), lambda: build(c))
+    static_file_extensions = ['.css', '.js']
+    for extension in static_file_extensions:
+        static_file = '{0}/static/**/*{1}'.format(theme_path, extension)
+        server.watch(static_file, lambda: build(c))
+    # Serve output path on configured host and port
+    server.serve(host=CONFIG['host'], port=CONFIG['port'], root=CONFIG['deploy_path'])
+
+
+@task
+def publish(c):
+    """Publish to production via rsync"""
+    pelican_run('-s {settings_publish}'.format(**CONFIG))
+    c.run(
+        'rsync --delete --exclude ".DS_Store" -pthrvz -c '
+        '-e "ssh -p {ssh_port}" '
+        '{} {ssh_user}@{ssh_host}:{ssh_path}'.format(
+            CONFIG['deploy_path'].rstrip('/') + '/',
+            **CONFIG))
+
+
+def pelican_run(cmd):
+    cmd += ' ' + program.core.remainder  # allows to pass-through args to pelican
+    pelican_main(shlex.split(cmd))
\ No newline at end of file
diff --git a/templates/navigator.gsp b/templates/navigator.gsp
deleted file mode 100644
index 34edb82..0000000
--- a/templates/navigator.gsp
+++ /dev/null
@@ -1 +0,0 @@
-${content.body}
diff --git a/assets/css/ooo.css b/theme/openoffice/static/css/openoffice.css
similarity index 94%
rename from assets/css/ooo.css
rename to theme/openoffice/static/css/openoffice.css
index 7bbd589..bd30640 100644
--- a/assets/css/ooo.css
+++ b/theme/openoffice/static/css/openoffice.css
@@ -366,3 +366,11 @@
   display: inline;
   float: left;
 }
+
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink {
+    visibility: visible
+}
+
diff --git a/templates/page.gsp b/theme/openoffice/templates/base.html
similarity index 92%
rename from templates/page.gsp
rename to theme/openoffice/templates/base.html
index 169acb5..f22aa70 100644
--- a/templates/page.gsp
+++ b/theme/openoffice/templates/base.html
@@ -17,16 +17,18 @@
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
--->
+  -->
+{% block head %}
 <meta name="description" content="The official developer website of the Apache OpenOffice open source project, home of OpenOffice Writer, Calc, Impress, Draw and Base." />
 <meta name="keywords" content="OpenOffice, Open Office, Apache OpenOffice, Apache Open Office, OpenOffice.org, Developer, Project, Website, Official, Writer, Calc, Impress, Draw, Base, ODF, Open Document Format" />
 <meta name="google-site-verification" content="uu79eqa3Tzx81rhyk66kY0sIwrFIayoneGXFEy-FkNY" />
 <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
 <link rel="icon" href="/favicon.ico" type="image/x-icon" />
-<link href="/css/ooo.css" rel="stylesheet" type="text/css">
-<title>${content.title}</title>
+<link href="/theme/css/openoffice.css" rel="stylesheet" type="text/css">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+{% endblock %}
 </head>
+
 <body>
   <div id="banner">
       <div id="bannerleft"><a alt="Apache OpenOffice" href="https://openoffice.apache.org/">
@@ -36,11 +38,11 @@
   </div>
   <div id="clear"></div>
   <div id="sidenav">
-    <!--#include virtual="/sidenav.html" -->
+    {% block sidenav %}{% include "sidenav.html" %}{% endblock %}
   </div>
   <div id="contenta">
-    <h1 class="title">${content.title}</h1>
-    ${content.body}
+    {% block content %}
+    {% endblock %}
   </div>
 
   <div id="footera">
diff --git a/theme/openoffice/templates/sidenav.html b/theme/openoffice/templates/sidenav.html
new file mode 100644
index 0000000..89e0bc6
--- /dev/null
+++ b/theme/openoffice/templates/sidenav.html
@@ -0,0 +1,49 @@
+<h1>General</h1>
+<ul>
+<li><a href="/index.html">About</a></li>
+<li><a href="/downloads.html">Downloads</a></li>
+<li><a href="/license.html">License</a></li>
+<li><a href="/trademarks.html">Trademarks</a></li>
+<li><a href="/press.html">Press</a></li>
+<li><a href="https://www.openoffice.org/">OpenOffice.org website</a></li>
+</ul>
+<h1>Community</h1>
+<ul>
+<li><a href="/get-involved.html">Get Involved</a></li>
+<li><a href="/orientation/index.html">Orientation</a></li>
+<li><a href="/mailing-lists.html">Mailing Lists</a></li>
+<li><a href="/social.html">Social Networking</a></li>
+<li><a href="/events.html">Events</a></li>
+<li><a href="https://www.openoffice.org/support/">Support</a></li>
+<li><a href="/native-lang.html">Native Language</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/OOOUSERS/">Planning Wiki</a></li>
+<li><a href="/people.html">People</a></li>
+<li><a href="/community-faqs.html">Community FAQs</a></li>
+</ul>
+<h1>Development</h1>
+<ul>
+<li><a href="/source.html">Source Code</a></li>
+<li><a href="/bug-tracking.html">Bug Tracking</a></li>
+<li><a href="/qa.html">Quality Assurance</a></li>
+<li><a href="/translate.html">Translation</a></li>
+<li><a href="/website-local.html">Website</a></li>
+<li><a href="/security.html">Security Reports</a></li>
+<li><a href="/contributing-code.html">Contributing Code</a></li>
+<li><a href="/developer-faqs.html">Developer FAQs</a></li>
+</ul>
+<h1>Project Management PMC</h1>
+<ul>
+<li><a href="https://blogs.apache.org/OOo/">Project Blog</a></li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a></li>
+</ul>
+<h1>The Apache Software Foundation</h1>
+<ul>
+<li><a href="https://www.apache.org/">Website</a></li>
+<li><a href="https://www.apache.org/licenses/">License</a></li>
+<li><a href="https://www.apache.org/security/">Security</a></li>
+<li><a href="https://www.apache.org/events/current-event">Events</a></li>
+<li><a href="https://www.openoffice.org/donations.html">Donations</a></li>
+<li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+<li><a href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
+</ul>
+
diff --git a/content/sidenav.md b/theme/openoffice/templates/sidenav.md
similarity index 98%
rename from content/sidenav.md
rename to theme/openoffice/templates/sidenav.md
index 2e4058f..9951271 100644
--- a/content/sidenav.md
+++ b/theme/openoffice/templates/sidenav.md
@@ -1,6 +1,3 @@
-type=navigator
-~~~~~~
-
 # General
 
   - [About](/index.html)
diff --git a/tools/README.md b/tools/README.md
deleted file mode 100644
index 1a14134..0000000
--- a/tools/README.md
+++ /dev/null
@@ -1,166 +0,0 @@
-# Migration from CMS to Github/JBake
-
-## Clone the Git Repository
-
-```
-cd ~/Development/openoffice
-rm -rf ooo-site.git
-git clone https://gitbox.apache.org/repos/asf/openoffice-org.git ooo-site.git
-git fetch
-git pull
-git checkout main
-```
-
-- Content goes here:
-
-```
-cd ~/Development/openoffice/ooo-sit.git/content/
-```
-
-  These files are processed by templates
-
-- Assets go here:
-
-```
-cd ~/Development/openoffice/ooo-sit.git/assets/
-```
-
-  These are copied to the site unmodified.
-
-
-## Checkout Old SVN CMS version of site.
-
-```
-cd ~/Development/openoffice
-rm -rf ooo-site
-svn co https://svn.apache.org/repos/asf/openoffice/ooo-site/trunk ooo-site
-```
-
-## Setup Environment variables.
-
-```
-# location of CMS content
-export SVNPATH="~/Development/openoffice/ooo-site/content"
-# location of Git repository checkout
-export GITPATH="~/Development/openoffice/ooo-site.git"
-```
-
-## List of Folders.
-
-These won't be done in one session. Make the list and track what you've migrated.
-
-```
-cd ${SVNPATH}
-find . -type d -depth 1 -print | sed -e 's!./!!' | sort
-```
-
-You could compare with the git targets with:
-
-```
-cd ${GITPATH}/assets
-find . -type d -depth 1 -print | sed -e 's!./!!' | sort
-cd ${GITPATH}/content
-find . -type d -depth 1 -print | sed -e 's!./!!' | sort
-```
-
-## Migration of a Folder.
-
-```
-cd ${SVNPATH}
-${GITPATH}/tools/migration2git.sh downloads
-```
-
-Some folders are larger than others. Pay attention to the running count.
-
-## Periodic Builds
-
-```
-cd ${GITPATH}
-./build_staging.sh
-# on asf-staging branch
-./copy_staging.sh
-# on asf-site branch
-```
-
-This is done so that the commits in asf-staging and asf-site do not get too large.
-
-# Tool Scripts
-
-1. `tools/commit2git.sh ${1} ${2} ${3}`
-
-```
-# ${1} Category 'assets','content'
-# ${2} Path to commit
-# ${3} Description for commit message - 'assets','large asset','html content','Markdown pages','brand','navigator'
-cd ${GITPATH}
-git add ${1}/${2}
-git commit -m 'Migration of ${2} ${3}'
-```
-
-2. `tools/convert2md.sh ${1} ${2}`
-
-   `tools/convert2md2.sh` was used in the part2 migration for api.
-
-```
-# ${1} Template type 'brand','navigator','page'
-# ${2} Path of mdtext file to convert to md file
-echo 'type=${1}' > ${GITPATH}/content/${2}
-nawk -f ${GITPATH}/tools/convert2md.awk ${2} >> ${GITPATH}/content/${2}
-```
-
-3. `tools/migration2git.sh ${1}`
-
-   `tools/migration2git2.sh` and `tools/migration4css.sh` were run in later phases.
-
-```
-# ${1} Site folder to migrate
-cd ${SVNPATH}
-echo 'Migrating ${SVNPATH}/${1} to ${GITPATH}
-echo
-# 1 - Tree structure
-echo 'copy directory structure to assets and content trees'
-find ${1} -type d ! -empty -exec mkdir -p ${GITPATH}/assets/{} \; -exec mkdir -p ${GITPATH}/content/{} \;
-# git does not commit empty directories
-echo
-# 2 - Large Assets
-echo 'copy assets larger than 3M as separate commits'
-find ${1} -type f -size +3M -exec cp {} ${GITPATH}/assets/{} \; -exec ${GITPATH}/tools/commit2git.sh assets {} 'large asset' \;
-echo
-# 3 - Assets
-echo 'copy assets not (html and mdtext) to assets tree'
-find ${1} -type f ! -name "*.html" ! -name "*.htm" ! -name "*.mdtext" ! -size +3M -exec cp -p {} ${GITPATH}/assets/{} \;
-# commit and push
-${GITPATH}/tools/commit2git.sh assets ${1} 'assets'
-echo
-# 4 - HTML
-echo 'copy html to content tree'
-find ${1}  -type f \( -name "*.html" -or -name "*.htm" \) ! -size +3M -exec cp -p {} ${GITPATH}/content/{} \;
-# commit and push
-${GITPATH}/tools/commit2git.sh content ${1} 'html content'
-echo
-# 5 - Brand
-echo 'Convert brand'
-find ${1} -name "brand.mdtext" -type f -exec ${GITPATH}/tools/convert2md.sh brand {} \;
-echo
-# 6 - Navigators
-echo 'Convert navigators'
-find ${1} -name "*nav.mdtext" -type f -exec ${GITPATH}/tools/convert2md.sh navigator {} \;
-echo
-# 7 - Markdown
-echo 'Convert markdown pages'
-find ${1} -name "*.mdtext" ! -name "brand.mdtext" ! -name "*nav.mdtext" -type f -exec ${GITPATH}/tools/convert2md.sh page {} \;
-# commit and push
-${GITPATH}/tools/commit2git.sh content ${1} 'Markdown pages'
-echo
-# 8 - Push to git
-echo 'Push to Gitbox'
-${GITPATH}/tools/push2git.sh
-```
-
-4. `tools/push2git.sh`
-
-```
-cd ${GITPATH}
-git push
-```
-
diff --git a/tools/convert2md.awk b/tools/convert2md.awk
deleted file mode 100644
index 09ed83a..0000000
--- a/tools/convert2md.awk
+++ /dev/null
@@ -1,37 +0,0 @@
-BEGIN {
-    META = 1;
-}
-// {
-    if ( META == 2 ) {
-	M = index($0," ");
-	if ( M == 1 ) next;
-	META = 1;
-    }
-    if ( META > 0 ) {
-	L = index($0,"Notice:");
-	if ( L == 1 ) {
-	    META = 2;
-	    print "notice=https://www.apache.org/licenses/LICENSE-2.0";
-	    next;
-	}
-	N = sub(/\:[ \t]*/,"=",$0);
-	if ( N > 0 ) {
-	    split($0,parts,"=");
-	    print tolower(parts[1])"="parts[2];
-	    next;
-	}
-	META = 0;
-	print "~~~~~~";
-    } else {
-	#K = sub(/ #.*{.*}$/,"",$0);
-	#if ( K > 0 && match($0,/^ *$/) > 0 ) {
-	#    next;
-	#}
-	print $0;
-    }
-}
-END {
-    if ( META > 0 ) {
-	print "~~~~~~";
-    }	
-}
diff --git a/tools/convert2md.sh b/tools/convert2md.sh
deleted file mode 100755
index 8847ace..0000000
--- a/tools/convert2md.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# tools/convert2md.sh ${1} ${2}
-# ${1} Template type 'brand','navigator','page'
-# ${2} Path of mdtext file to convert to md file
-
-if test "$#" != 2; then
-  echo "USAGE: $0 Type Path"
-  exit 1
-fi
-
-MDPATH=${2:0:${#2}-4}
-echo "Convert "${2}" to "${MDPATH}
-echo "type="${1} > ${GITPATH2}/content/${MDPATH}
-awk -f ${GITPATH2}/tools/convert2md.awk ${2} >> ${GITPATH2}/content/${MDPATH}
-
diff --git a/tools/dos2unix.pl b/tools/dos2unix.pl
deleted file mode 100755
index c4851a7..0000000
--- a/tools/dos2unix.pl
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /usr/bin/perl
-
-# dos2unix.pl by David Efflandt <efflandt@xnet.com>
-# Modification of script from "Learning perl" p.353
-# O'Reilly & Associates, Inc.
-#
-# Run after transfering text files from DOS to UNIX system.
-# Strips carriage returns from DOS files for use UNIX.
-# Transfers file permissions to new file (except suid bit).
-#
-#       Usage:\tdos2unix.pl FILELIST
-#       where FILELIST = one or more filenames
-#
-# If you edit this file in DOS you can run it on itself by typing:
-#       perl dos2unix.pl dos2unix.pl
-#
-# Modify variables below for other search and replace functions.
-
-$find = "\r";   # find this
-$sub = "";   # substitute with this
-$rm_bak = 1;    # remove old file after conversion: 0 = no, 1 = yes
-
-while (<>) {
-    if ($ARGV ne $oldargv) {
-	($dev,$ino,$mode,$nlink,$uid,$gid) = stat($ARGV);
-	$backup = $ARGV . '.bak';
-	rename($ARGV, $backup);
-	open (ARGVOUT, ">$ARGV");
-	chmod $mode, $ARGV;
-	select(ARGVOUT);
-	$oldargv = $ARGV;
-    }
-    s/$find/$sub/g;
-    s/\t/  /g;
-        s/
-	    /\n/g;
-} continue {
-    print;
-    if (eof) {
-	print STDOUT "Converted: $oldargv\n";
-	unlink $backup if $rm_bak;
-    }
-}
-select(STDOUT);
diff --git a/tools/migration2git.sh b/tools/migration2git.sh
deleted file mode 100755
index 7489f0e..0000000
--- a/tools/migration2git.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# tools/migration2git.sh ${1}
-# ${1} Site folder to migrate
-
-if test "$#" != 0; then
-  echo "USAGE: $0"
-  exit 1
-fi
-
-cd ${SVNPATH2}
-echo Migrating ${SVNPATH2}/. to ${GITPATH2}
-echo
-# 1 - Tree structure
-echo 'copy directory structure to assets and content trees'
-find . -type d ! -empty -exec mkdir -p ${GITPATH2}/assets/{} \; -exec mkdir -p ${GITPATH2}/content/{} \;
-# git does not commit empty directories
-echo
-# 2 - Assets
-echo 'copy assets not (html and mdtext) to assets tree'
-find . -type f ! -name "*.mdtext" -exec cp -p {} ${GITPATH2}/assets/{} \;
-echo
-# 3 - Markdown
-echo 'Convert markdown pages'
-find . -name "*.mdtext" -type f -exec ${GITPATH2}/tools/convert2md.sh page {} \;
-echo