This is an automated email from the ASF dual-hosted git repository.

wave pushed a commit to branch preview/refresh
in repository https://gitbox.apache.org/repos/asf/openoffice-project.git

commit c048bd6cb83a4581350a35fb8da9062bfd27698a
Author: Dave Fisher <[email protected]>
AuthorDate: Mon Jun 28 14:08:34 2021 -0700

    fixup markdown for actual use of GFM
---
 content/contributing-code.md                 |  30 ++--
 content/developer-faqs.md                    |  34 ++---
 content/docs/edit-cms.md                     |   2 +-
 content/docs/governance/consensusBuilding.md |   8 +-
 content/docs/governance/voting.md            |  11 +-
 content/events.md                            |  20 +--
 content/get-involved.md                      |  52 +++----
 content/get-it-here.md                       |  26 ++--
 content/index.md                             |  96 ++++++-------
 content/license.md                           |   1 -
 content/list-conduct.md                      |  24 ++--
 content/mailing-lists.md                     | 200 +++++++++++++--------------
 content/mission.md                           |  10 +-
 content/orientation/decision-making.md       |  70 +++++-----
 content/orientation/how-aoo-project-works.md |  30 ++--
 content/orientation/index.md                 |  26 ++--
 content/orientation/infrastructure.md        |  26 ++--
 content/orientation/intro-contributing.md    |  24 ++--
 content/orientation/intro-doc.md             |  12 +-
 content/orientation/intro-marketing.md       |  74 +++++-----
 content/orientation/intro-qa.md              |   8 +-
 content/people.md                            |   8 +-
 content/pmc-faqs.md                          |   8 +-
 content/source.md                            |   4 +-
 content/students.md                          |  16 +--
 content/style-test.md                        |  10 +-
 content/terms.md                             |  56 ++++----
 content/trademarks.md                        |  42 +++---
 content/translate.md                         |   4 +-
 content/website-local.md                     |  25 ++--
 content/website-native.md                    |  44 +++---
 31 files changed, 502 insertions(+), 499 deletions(-)

diff --git a/content/contributing-code.md b/content/contributing-code.md
index c3b9ad3..4c70033 100644
--- a/content/contributing-code.md
+++ b/content/contributing-code.md
@@ -9,27 +9,27 @@ if one of the first things we question you about is the 
license and the pedigree
 
 The main requirements for contributing code to Apache OpenOffice are:
 
-  - The code must be under the Apache License 2.0 and it must be
-contributed by or with permission of the original author(s) of the code.
-Dependencies on third party libraries should be
-discussed on the [dev 
list](https://openoffice.apache.org/mailing-lists.html#development-mailing-list-public),
-to see how these can be brought into conformance with
-[ASF policy](https://www.apache.org/legal/resolved.html#category-a).
-  - The code must be of sufficient quality and value  to the project that our 
programmer (Committers) approve it, or at least don't reject it.
-  - We're happy to accept a small patch to fix a bug here or there, without 
further commitment from the code author. But the larger the contribution 
-the greater is the need for help integrating, testing and maintaining the 
code. This doesn't necessarily
-require participation from the original author(s) of the code, though this is 
encouraged. But we will want to see that there is support in the community
-sufficient for sustaining the development of significant contributions.
+- The code must be under the Apache License 2.0 and it must be
+  contributed by or with permission of the original author(s) of the code.
+  Dependencies on third party libraries should be
+  discussed on the [dev 
list](https://openoffice.apache.org/mailing-lists.html#development-mailing-list-public),
+  to see how these can be brought into conformance with
+  [ASF policy](https://www.apache.org/legal/resolved.html#category-a).
+- The code must be of sufficient quality and value  to the project that our 
programmer (Committers) approve it, or at least don't reject it.
+- We're happy to accept a small patch to fix a bug here or there, without 
further commitment from the code author. But the larger the contribution 
+  the greater is the need for help integrating, testing and maintaining the 
code. This doesn't necessarily
+  require participation from the original author(s) of the code, though this 
is encouraged. But we will want to see that there is support in the community
+  sufficient for sustaining the development of significant contributions.
 
 Some specific scenarios:
 
-  - For small bug fixes and enhancements, contributed by the original author 
of the code, these are best submitted as patches attached to a [Bugzilla 
issue](https://bz.apache.org/ooo/)
-  - For larger contributions, contributed by a single original author, we 
might ask you to
+- For small bug fixes and enhancements, contributed by the original author of 
the code, these are best submitted as patches attached to a [Bugzilla 
issue](https://bz.apache.org/ooo/)
+- For larger contributions, contributed by a single original author, we might 
ask you to
   submit an [Individual Contributor License Agreement 
(ICLA)](https://www.apache.org/licenses/icla.txt) form.
   The copyright on your code will still belong to you, but the ICLA helps
   protect the users of Apache OpenOffice. All project Committers have also 
signed this form.
-  - For contributions of multi-author code, it is best to start a discussion 
on our [dev mailing list](mailto:[email protected]) so we can discuss 
the most appropriate way of processing it.
-  - For large codebases developed outside of Apache, especially ones created 
behind a corporate firewall, we typically require a [Software Grant 
Agreement](https://www.apache.org/licenses/cla-corporate.txt) 
+- For contributions of multi-author code, it is best to start a discussion on 
our [dev mailing list](mailto:[email protected]) so we can discuss the 
most appropriate way of processing it.
+- For large codebases developed outside of Apache, especially ones created 
behind a corporate firewall, we typically require a [Software Grant 
Agreement](https://www.apache.org/licenses/cla-corporate.txt) 
   before we can accept the contribution. Again, an early discussion on our 
[dev mailing list](mailto:[email protected]) is recommended.
 
 Note: It is perfectly fine for a programmer to contribute the same bug fix or 
feature patch to multiple open source projects. As the author you have the 
right to make your code available
diff --git a/content/developer-faqs.md b/content/developer-faqs.md
index e962ef8..1a315c1 100644
--- a/content/developer-faqs.md
+++ b/content/developer-faqs.md
@@ -28,27 +28,29 @@ hope that as a Committer you will be even more active.
 But before you are officially given Committer permissions, there are a few 
 administrative steps that you will need to complete. 
 
- 1. Submit a signed [ICLA] [4] to Apache.
- 1. Wait for the ICLA to be received and recorded by Apache. You will know 
-when this has occurred when your name appears in the [Unlisted ICLAs] [5] 
section 
-on the Apache Committers page. This could take a couple of days, longer if you
-submitted the ICLA via post.
- 1. Once the your ICLA has been recorded, you should send a note to the [PMC] 
[6] 
-and request an Apache account. You will want to include your full name and 
email address, 
-as you entered in the ICLA, as well as your preferred userid. Please [check 
first] [7] 
-that your preferred userid is not already in use by another Apache Committer.
- 1. Once your Apache account has been created, you will receive an email with
-further instructions for setting up your account. This may take a couple of 
days.
- 1. If you were also voted as a PMC member, you should then [subscribe] [8] to 
the 
-PMC's private mailing list.
-
- 1. Finally, you should read the ["Guide for new committers"] [9]
+1. Submit a signed [ICLA] [4] to Apache.
+1. Wait for the ICLA to be received and recorded by Apache. You will know 
+   when this has occurred when your name appears in the [Unlisted ICLAs] [5] 
section 
+   on the Apache Committers page. This could take a couple of days, longer if 
you
+   submitted the ICLA via post.
+1. Once the your ICLA has been recorded, you should send a note to the [PMC] 
[6] 
+   and request an Apache account. You will want to include your full name and 
email address, 
+   as you entered in the ICLA, as well as your preferred userid. Please [check 
first] [7] 
+   that your preferred userid is not already in use by another Apache 
Committer.
+1. Once your Apache account has been created, you will receive an email with
+   further instructions for setting up your account. This may take a couple of 
days.
+1. If you were also voted as a PMC member, you should then [subscribe] [8] to 
the 
+   PMC's private mailing list.
+
+1. Finally, you should read the ["Guide for new committers"] [9]
 
 
 ## I'm not a committer, but would like to contribute, what should I do? 
 
 Apache OpenOffice welcomes your contributions!
 
+> The project now uses Git.
+
 To contribute to the OpenOffice product, you will need to submit subversion 
patches ("diff" files), and attach them to issues in our [issues reporting 
system](https://bz.apache.org/ooo/), Bugzilla.
 
 Your contributions will be recognized by the committer submitting the PATCH in 
the
@@ -78,7 +80,7 @@ Apache OpenOffice makes use of buildbots for some of our 
environments. You can r
 
 Development snapshots, which are manually generated, are used as the final 
step leading up to a release. These are used for final testing before an 
approved release. You will also find helpful hints for specific platform 
building here.
 
->[the Unofficial Development Snapshots 
page](https://cwiki.apache.org/confluence/display/OOOUSERS/Development+Snapshot+Builds)
+> [the Unofficial Development Snapshots 
page](https://cwiki.apache.org/confluence/display/OOOUSERS/Development+Snapshot+Builds)
 
 
 Also, please see the [Planning Area of the Project 
Wiki](https://cwiki.apache.org/confluence/display/OOOUSERS/Project+Planning) for
diff --git a/content/docs/edit-cms.md b/content/docs/edit-cms.md
index eb02779..07c0fe5 100644
--- a/content/docs/edit-cms.md
+++ b/content/docs/edit-cms.md
@@ -13,7 +13,7 @@ Workflow is described in the README files in each repository.
 
 -----
 
-**The Apache CMS is deprecated**. Some of the material below is still useful 
and can be repurposed.
+**The Apache CMS is obsolete**. Some of the workflow below _might_ be useful 
and can be repurposed.
 
 -----
 
diff --git a/content/docs/governance/consensusBuilding.md 
b/content/docs/governance/consensusBuilding.md
index 10ceb55..bf852e1 100644
--- a/content/docs/governance/consensusBuilding.md
+++ b/content/docs/governance/consensusBuilding.md
@@ -17,12 +17,12 @@ The notation used is "+1", "-1" and "0". It's also common 
to see "+0" and "-0".
 
 So, what do these notations mean?
 
-  - +1 means "I agree with this and will help make it happen"
-  - +0 means "I agree with this but probably won't make it happen, so my 
+- +1 means "I agree with this and will help make it happen"
+- +0 means "I agree with this but probably won't make it happen, so my 
 opinion is not that important"
-  - -0 means "I don't agree with this, but I'm offering no alternative so 
+- -0 means "I don't agree with this, but I'm offering no alternative so 
 my opinion is not that important"
-  - -1 means "I don't agree and I am offering an alternative that I am able 
+- -1 means "I don't agree and I am offering an alternative that I am able 
 to help implement"
 
 Many people will use fractions to indicate the strength of their feelings,
diff --git a/content/docs/governance/voting.md 
b/content/docs/governance/voting.md
index 0f0cdd8..85f90a2 100644
--- a/content/docs/governance/voting.md
+++ b/content/docs/governance/voting.md
@@ -25,14 +25,13 @@ and present the results. Everyone has 1 vote.
 
 The notation used in voting is:
 
-+1 (means I vote positive)
-   You can say why you vote positive but it's not a must-have.
+**+1** (means I vote positive) -- You can say why you vote positive but it's 
not a must-have.
 
- 0 (means vote abstention and nothing else)
+**0** (means vote abstention and nothing else)
 
--1 (means I vote negative because of the following reason)
-   Yes, you must support your objection and provide an alternative course of 
action
-   that you are willing and able to implement (where appropriate).
+**-1** (means I vote negative because of the following reason)
+You must support your objection and provide an alternative course of action
+that you are willing and able to implement (where appropriate).
 
 #### Example for a vote mail:
 
diff --git a/content/events.md b/content/events.md
index 28fb75e..6383869 100644
--- a/content/events.md
+++ b/content/events.md
@@ -5,7 +5,7 @@ Notice: http://www.apache.org/licenses/LICENSE-2.0
 
 Some useful links for conference planning:
 
-  - [ASF policy on 3rd party Event 
Branding](http://www.apache.org/foundation/marks/events.html)
+- [ASF policy on 3rd party Event 
Branding](http://www.apache.org/foundation/marks/events.html)
 
 ## Future Event Planning
 
@@ -21,24 +21,24 @@ The following sections link to material related to past 
events where Apache Open
 
 Conference materials :
 
-   - [Presentation abstracts](http://www.apachecon.eu/schedule/)
-   - [Slides and audio/video](http://www.apachecon.eu) (when available)
+- [Presentation abstracts](http://www.apachecon.eu/schedule/)
+- [Slides and audio/video](http://www.apachecon.eu) (when available)
 
 Please note: If the ApacheCon Europe 2012 site is not available, you may find 
presentations (by day)
 from the [ApacheCon archive 
site](http://archive.apachecon.com/eu2012/presentations/).
 
 Blog posts:
 
-   - Blog Post: [Apache OpenOffice track at ApacheCon: Day 
1](https://blogs.apache.org/OOo/entry/openoffice_track_at_apachecon_day)
-   - Blog Post: [Apache OpenOffice track at ApacheCon: Day 
2](https://blogs.apache.org/OOo/entry/apache_openoffice_track_at_apachecon)
-   - Blog Post: [Apache OpenOffice track at ApacheCon: Day 
3](https://blogs.apache.org/OOo/entry/apache_openoffice_track_at_apachecon1)
+- Blog Post: [Apache OpenOffice track at ApacheCon: Day 
1](https://blogs.apache.org/OOo/entry/openoffice_track_at_apachecon_day)
+- Blog Post: [Apache OpenOffice track at ApacheCon: Day 
2](https://blogs.apache.org/OOo/entry/apache_openoffice_track_at_apachecon)
+- Blog Post: [Apache OpenOffice track at ApacheCon: Day 
3](https://blogs.apache.org/OOo/entry/apache_openoffice_track_at_apachecon1)
     
 Photos:
 
-   - from [imacat](https://www.dropbox.com/sh/gabjkfhzqcyfw8p/ouBYojX5P9)
-   - from [Andre](http://www.flickr.com/photos/awf-aoo/sets/)
-   - from [Andrew](http://360.io/LWdsMb)
-   - from [Andrea]( http://www.flickr.com/photos/89947020@N07/sets/)
+- from [imacat](https://www.dropbox.com/sh/gabjkfhzqcyfw8p/ouBYojX5P9)
+- from [Andre](http://www.flickr.com/photos/awf-aoo/sets/)
+- from [Andrew](http://360.io/LWdsMb)
+- from [Andrea]( http://www.flickr.com/photos/89947020@N07/sets/)
 
 
 
diff --git a/content/get-involved.md b/content/get-involved.md
index 49bae32..52af530 100644
--- a/content/get-involved.md
+++ b/content/get-involved.md
@@ -7,10 +7,10 @@ Notice: http://www.apache.org/licenses/LICENSE-2.0
 
 OpenOffice is currently looking for people with the following:
 
-  - Are you a software developer with C++ skills?
-  - Do you have expertise with build systems for different platforms?
-  - Are you proficient in English?
-  - Do you like contributing to open source projects?
+- Are you a software developer with C++ skills?
+- Do you have expertise with build systems for different platforms?
+- Are you proficient in English?
+- Do you like contributing to open source projects?
 
 Come and join us in helping OpenOffice to thrive. Subscribe to the
 [recruitment mailing 
list](http://openoffice.apache.org/mailing-lists.html#recruitment-mailing-list-public)
@@ -25,17 +25,17 @@ contribution), some users want to do more and volunteer 
their time and expertise
 the project. There are many motivations for why volunteers participate in an 
open source
 project like OpenOffice. Some of the more common ones include:
 
-  - To help reduce the "digital divide" by ensuring continued access to free
-high-quality free productivity applications world-wide.
-  - To help bring the benefits of OpenOffice to your country or region
-  - To "give back" to open source
-  - To learn or practice a new skill
-  - To enhance a résumé or portfolio, showcasing the work you've done in this 
project
-  - To support a customer or other commercial venture that relies on OpenOffice
-  - To develop credentials for consulting work related to OpenOffice
-  - To bring something to OpenOffice that you've always wanted to see done
-  - To have fun, working with a close-knit international team of volunteers 
working on
-one of the oldest and most famous open source projects around.
+- To help reduce the "digital divide" by ensuring continued access to free
+  high-quality free productivity applications world-wide.
+- To help bring the benefits of OpenOffice to your country or region
+- To "give back" to open source
+- To learn or practice a new skill
+- To enhance a résumé or portfolio, showcasing the work you've done in this 
project
+- To support a customer or other commercial venture that relies on OpenOffice
+- To develop credentials for consulting work related to OpenOffice
+- To bring something to OpenOffice that you've always wanted to see done
+- To have fun, working with a close-knit international team of volunteers 
working on
+  one of the oldest and most famous open source projects around.
 
 
 ## A multidisciplinary open source project
@@ -46,17 +46,17 @@ involved in OpenOffice, there is almost certainly a role 
for you.
 
 We are looking for people to:
 
-  - Work on bug reports and try to reproduce them
-  - Write new or improve existing documentation and about technical topics 
-  - Help support new users
-  - Test the program and report problems
-  - Fix bugs
-  - Code new features
-  - Design artwork and other marketing materials
-  - Translate the UI and help topics to different languages
-  - Maintain the website and develop new materials
-  - Promote OpenOffice and help explain its benefits
-  - Anything you can see that needs doing
+- Work on bug reports and try to reproduce them
+- Write new or improve existing documentation and about technical topics 
+- Help support new users
+- Test the program and report problems
+- Fix bugs
+- Code new features
+- Design artwork and other marketing materials
+- Translate the UI and help topics to different languages
+- Maintain the website and develop new materials
+- Promote OpenOffice and help explain its benefits
+- Anything you can see that needs doing
 
 All of these contributions help to keep a project active and strengthen the 
community.
 We welcome and encourage participation, and try to make it as easy as possible 
for
diff --git a/content/get-it-here.md b/content/get-it-here.md
index 2656b33..26f06b3 100644
--- a/content/get-it-here.md
+++ b/content/get-it-here.md
@@ -4,7 +4,7 @@ Notice: http://www.apache.org/licenses/LICENSE-2.0
 Anyone, without additional permission from this project, may use the
 following logo subject to the following conditions:
 
-##The Logo:
+## The Logo:
 
 <p> 
 <a href="https://download.openoffice.org/";>
@@ -18,37 +18,39 @@ The logo file may be [found here] [1].
 If translations of the "Get it here!" text are required, send a request to the 
 [dev mailing list] [2] and we can make a translated version for you.
 
-##Conditions:
+## Conditions:
 
 1. The logo may be resized, so long as the aspect ratio is preserved and the 
logo
-remains legible, but the logo may not be otherwise altered.
+   remains legible, but the logo may not be otherwise altered.
 
 1. The logo **must directly link** to one of:
 
-    * The Apache OpenOffice [home page][3]
-    * The download page for Apache OpenOffice, either the [main download 
page][4] or
-    the [detailed download page][5].
-    * One of the official Native Language pages at openoffice.org, e.g., 
-    https://www.openoffice.org/de, https://www.openoffice.org/it, 
https://www.openoffice.org/fr, etc.
+   * The Apache OpenOffice [home page][3]
+   * The download page for Apache OpenOffice, either the [main download 
page][4] or
+     the [detailed download page][5].
+   * One of the official Native Language pages at openoffice.org, e.g., 
+     https://www.openoffice.org/de, https://www.openoffice.org/it, 
https://www.openoffice.org/fr, etc.
 
 1. The logo **must not** link to a page at any other website other than 
openoffice.org.
 
 1. The logo **must not** link to a specific download file or mirror.  This
-causes problems with load balancing and fallbacks and may prevent
-users from getting the latest version of Apache OpenOffice.  
+   causes problems with load balancing and fallbacks and may prevent
+   users from getting the latest version of Apache OpenOffice.  
 
 1. Any use of this logo or any other Apache logo beyond the above 
-requires explicit permission per the existing [trademark policy][6]
+   requires explicit permission per the existing [trademark policy][6]
 
-##Example
+## Example
 
 This is an example of how the "Get it here!" logo might be included in an
 HTML page:
 
+```
     <a href="https://www.openoffice.org/download";>
     <img width="300" height="100" alt="Download Apache OpenOffice here" 
     src="https://openoffice.apache.org/images/get-it-here/en.png"/>
     </a>
+```
 
 ##Feedback
 
diff --git a/content/index.md b/content/index.md
index d7ac3f1..a94bda4 100644
--- a/content/index.md
+++ b/content/index.md
@@ -14,105 +14,105 @@ the ASF, OpenOffice.org underwent incubation before 
[graduating][3] to a top-lev
 A lot of good information can be found on the [Apache OpenOffice user 
portal][4], including a [brief history of
 OpenOffice.org][5].
 
-##Announcements
+## Announcements
 
 *2021-05-04 -- [Apache OpenOffice][1] 4.1.10 is released!*
 
-  - [Download Source and SDK](https://openoffice.apache.org/downloads.html)
-  - [Download Binaries](https://www.openoffice.org/download/)
-  - [Release 
Notes](https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.10+Release+Notes)
+- [Download Source and SDK](https://openoffice.apache.org/downloads.html)
+- [Download Binaries](https://www.openoffice.org/download/)
+- [Release 
Notes](https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.10+Release+Notes)
 
 *2021-02-07 -- [Apache OpenOffice][1] 4.1.9 is released!*
 
-  - [Download Source and SDK](https://openoffice.apache.org/downloads.html)
-  - [Download Binaries](https://www.openoffice.org/download/)
-  - [Release 
Notes](https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.9+Release+Notes)
+- [Download Source and SDK](https://openoffice.apache.org/downloads.html)
+- [Download Binaries](https://www.openoffice.org/download/)
+- [Release 
Notes](https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.9+Release+Notes)
 
 *2020-11-10 -- [Apache OpenOffice][1] 4.1.8 is released!*
 
-  - [Download Source and SDK](https://openoffice.apache.org/downloads.html)
-  - [Download Binaries](https://www.openoffice.org/download/)
-  - [Release 
Notes](https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.8+Release+Notes)
+- [Download Source and SDK](https://openoffice.apache.org/downloads.html)
+- [Download Binaries](https://www.openoffice.org/download/)
+- [Release 
Notes](https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.8+Release+Notes)
 
 *2019-09-21 -- [Apache OpenOffice][1] 4.1.7 is released!*
 
-  - [Download Source and SDK](https://openoffice.apache.org/downloads.html)
-  - [Download Binaries](https://www.openoffice.org/download/)
-  - [Release 
Notes](https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.7+Release+Notes)
+- [Download Source and SDK](https://openoffice.apache.org/downloads.html)
+- [Download Binaries](https://www.openoffice.org/download/)
+- [Release 
Notes](https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.7+Release+Notes)
 
 *2018-11-18 -- [Apache OpenOffice][1] 4.1.6 is released!*
 
-  - [Download Source and SDK](https://openoffice.apache.org/downloads.html)
-  - [Download Binaries](https://www.openoffice.org/download/)
-  - [Release 
Notes](https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.6+Release+Notes)
+- [Download Source and SDK](https://openoffice.apache.org/downloads.html)
+- [Download Binaries](https://www.openoffice.org/download/)
+- [Release 
Notes](https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.6+Release+Notes)
 
 *2017-12-30 -- [Apache OpenOffice][1] 4.1.5 is released!*
 
-  - [Download Source and 
SDK](https://openoffice.apache.org/downloads.html#release-archives)
-  - [Download Binaries](https://www.openoffice.org/download/)
-  - [Release 
Notes](https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.5+Release+Notes)
+- [Download Source and 
SDK](https://openoffice.apache.org/downloads.html#release-archives)
+- [Download Binaries](https://www.openoffice.org/download/)
+- [Release 
Notes](https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.5+Release+Notes)
 
 *2017-10-19 -- [Apache OpenOffice][1] 4.1.4 is released!*
 
-  - [Download Source and 
SDK](https://openoffice.apache.org/downloads.html#release-archives)
-  - [Download Binaries](https://www.openoffice.org/download/)
-  - [Release 
Notes](https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.4+Release+Notes)
+- [Download Source and 
SDK](https://openoffice.apache.org/downloads.html#release-archives)
+- [Download Binaries](https://www.openoffice.org/download/)
+- [Release 
Notes](https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.4+Release+Notes)
 
 *2016-10-12 -- [Apache OpenOffice][1] 4.1.3 is released!*
 
-  - [Download Source and 
SDK](https://openoffice.apache.org/downloads.html#release-archives)
-  - [Download Binaries](https://www.openoffice.org/download/)
-  - [Release 
Notes](https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.3+Release+Notes)
+- [Download Source and 
SDK](https://openoffice.apache.org/downloads.html#release-archives)
+- [Download Binaries](https://www.openoffice.org/download/)
+- [Release 
Notes](https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.3+Release+Notes)
 
 *2015-10-28 -- [Apache OpenOffice][1] 4.1.2 is released!*
 
-  - [Download Source and 
SDK](https://openoffice.apache.org/downloads.html#release-archives)
-  - [Download Binaries](https://www.openoffice.org/download/)
-  - [Release 
Notes](https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.2+Release+Notes)
+- [Download Source and 
SDK](https://openoffice.apache.org/downloads.html#release-archives)
+- [Download Binaries](https://www.openoffice.org/download/)
+- [Release 
Notes](https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.2+Release+Notes)
 
 *2014-08-21 -- [Apache OpenOffice][1] 4.1.1 is released!*
 
-  - [Download Source and 
SDK](https://openoffice.apache.org/downloads.html#release-archives)
-  - [Download Binaries](https://www.openoffice.org/download/)
-  - [Release 
Notes](https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.1+Release+Notes)
+- [Download Source and 
SDK](https://openoffice.apache.org/downloads.html#release-archives)
+- [Download Binaries](https://www.openoffice.org/download/)
+- [Release 
Notes](https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.1+Release+Notes)
 
 *2014-04-29 -- [Apache OpenOffice][1] 4.1.0 is released!*
 
-  - [Download Source and 
SDK](https://openoffice.apache.org/downloads.html#release-archives)
-  - [Download Binaries](https://www.openoffice.org/download/)
-  - [Release 
Notes](https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1+Release+Notes)
+- [Download Source and 
SDK](https://openoffice.apache.org/downloads.html#release-archives)
+- [Download Binaries](https://www.openoffice.org/download/)
+- [Release 
Notes](https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1+Release+Notes)
 
 *2013-10-01 -- [Apache OpenOffice][1] 4.0.1 is released!*
 
-  - [Download Source and 
SDK](https://openoffice.apache.org/downloads.html#release-archives)
-  - [Download Binaries](https://www.openoffice.org/download/)
-  - [Release 
Notes](https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0.1+Release+Notes)
+- [Download Source and 
SDK](https://openoffice.apache.org/downloads.html#release-archives)
+- [Download Binaries](https://www.openoffice.org/download/)
+- [Release 
Notes](https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0.1+Release+Notes)
 
 *2013-07-23 -- [Apache OpenOffice][1] 4.0.0 is released!*
 
-  - [Download Source and 
SDK](https://openoffice.apache.org/downloads.html#release-archives)
-  - [Download Binaries](https://www.openoffice.org/download/)
-  - [Release 
Notes](https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0+Release+Notes)
+- [Download Source and 
SDK](https://openoffice.apache.org/downloads.html#release-archives)
+- [Download Binaries](https://www.openoffice.org/download/)
+- [Release 
Notes](https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0+Release+Notes)
 
 *2013-01-30 -- [Apache OpenOffice][1] 3.4.1 now available in Danish, 
Norwegian, Swedish, Korean, Polish, Basque, Asturian and Scottish Gaelic*
 
-  - 
[Announcement](https://blogs.apache.org/OOo/entry/apache_openoffice_now_available_in)
+- 
[Announcement](https://blogs.apache.org/OOo/entry/apache_openoffice_now_available_in)
 
 *2012-10-17 -- [Apache OpenOffice][1] graduates from the Apache Incubator*
 
-  - 
[Announcement](https://blogs.apache.org/OOo/entry/openoffice_graduates_from_the_apache)
+- 
[Announcement](https://blogs.apache.org/OOo/entry/openoffice_graduates_from_the_apache)
 
 *2012-08-23 -- [Apache OpenOffice][1] 3.4.1 (incubating) is released!*
 
-  - [Release 
announcement](https://blogs.apache.org/OOo/entry/announcing_apache_openoffice_3_41)
-  - [Download Source and 
SDK](https://openoffice.apache.org/downloads.html#release-archives)
-  - [Download Binaries](https://www.openoffice.org/download)
+- [Release 
announcement](https://blogs.apache.org/OOo/entry/announcing_apache_openoffice_3_41)
+- [Download Source and 
SDK](https://openoffice.apache.org/downloads.html#release-archives)
+- [Download Binaries](https://www.openoffice.org/download)
 
 *2012-05-08 -- [Apache OpenOffice][1] 3.4.0 (incubating) is released!*
 
-  - [Release announcement](https://www.openoffice.org/news/aoo34.html)
-  - [Download Source and 
SDK](https://openoffice.apache.org/downloads.html#release-archives)
-  - [Download Binaries](https://www.openoffice.org/download/archive.html)
+- [Release announcement](https://www.openoffice.org/news/aoo34.html)
+- [Download Source and 
SDK](https://openoffice.apache.org/downloads.html#release-archives)
+- [Download Binaries](https://www.openoffice.org/download/archive.html)
 
 
 [0]: https://www.apache.org/
diff --git a/content/license.md b/content/license.md
index ab661d7..74c30b0 100644
--- a/content/license.md
+++ b/content/license.md
@@ -181,7 +181,6 @@ recommend that a file or class name and description of 
purpose be included
 on the same "printed page" as the copyright notice for easier
 identification within third-party archives.
 
-       :::text
        Copyright [yyyy] [name of copyright owner]
 
        Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/content/list-conduct.md b/content/list-conduct.md
index a25d3dc..f0ba69b 100644
--- a/content/list-conduct.md
+++ b/content/list-conduct.md
@@ -1,7 +1,7 @@
 Title:     List Conduct Guidelines
 Notice: http://www.apache.org/licenses/LICENSE-2.0
 
-#1. Respect one another
+# 1. Respect one another
 
 Discussion is the cornerstone of a project like this and the sharing of 
viewpoints 
 is crucial, as is understanding and accepting that many views will differ from 
@@ -14,7 +14,7 @@ robust discussion and steamrollering. Civility is paramount.
 Manners cost nothing; we are all capable of self-moderation, and of being aware
 of our conduct.
 
-#2. Remember the Apache OpenOffice Mission
+# 2. Remember the Apache OpenOffice Mission
 
 “To create, as a community, the leading international office suite that will 
run 
 on all major platforms and provide access to all functionality and data 
through open-component based APIs and an XML-based file format.”
@@ -24,7 +24,7 @@ and consumption. We believe in making AOO freely available 
because we are the so
  of people who welcome diversity in others, creativity of all sorts and who 
enjoy 
 finding the best in all situations.
 
-#3. Be Nice
+# 3. Be Nice
 
 Not only are there lots of people on this list whose first language is not 
English 
 there are some busy readers who, by necessity, have to read things quickly. If 
@@ -35,14 +35,14 @@ follow easily. This does not necessarily indicate that you 
are mean, wrong and
 bad, so just be nice and reword the passage. Assume people are not in 
 "attack mode." We are all on the same team here.
 
-#4. Don't Respond When You are Angry
+# 4. Don't Respond When You are Angry
 
 Assuming people are not in attack mode means that if you think they are, just 
now, 
 then probably you are just misunderstanding their point. Ad hominem attacks,
  e.g., "You are too dumb to get this," are a sign that you yourself may not 
have
  a good-enough handle on the issue to explain your point clearly.
 
-#5. Relax
+# 5. Relax
 
 Always remember that unless there is a *darn* good reason, nothing gets 
decided 
 at the ASF in less than 72 elapsed hours, so your reply can wait until 
morning. 
@@ -61,7 +61,7 @@ Of course, not all threads are decision-making threads.  Some 
are debugging or
 problem solving.  In those cases, the opposite advice applies.  If you know the
  answer, and can state it briefly, then do so.
 
-#6. Get to the point
+# 6. Get to the point
 
 Write as tersely as possible and edit down as much possible so that other 
people 
 who are just as busy as you may quickly get your point without ending up 
@@ -69,7 +69,7 @@ defensive. Of course, balance is needed. Do not let brevity 
get in the way of
 providing enough information. Remember that people must understand your post 
in 
 order to understand your point.
 
-#7. Consider trimming the post to which you are responding
+# 7. Consider trimming the post to which you are responding
 
 People who read emails on small screens are not the only ones who are 
frustrated
  by picking important new information out of tons of stuff they have already 
read.
@@ -78,7 +78,7 @@ that are not important to understand ones reply. If the 
response to one of these
 posts is, “What? I do not understand,” then it may be that too much of the 
context
  may have been removed.
 
-#8. Respect the private lists
+# 8. Respect the private lists
 
 What happens on a private list, stays on that list.  There are only a few 
private 
 lists on the project, e.g., the PMC list and the Security Team.  But you might 
on 
@@ -92,7 +92,7 @@ necessary, and for for topics that require confidentiality, 
such as information
 that deals with security vulnerabilities, personnel matters, user private 
 information, etc. 
 
-#9. There are going to be exceptions to the rule
+# 9. There are going to be exceptions to the rule
 
 All of these guidelines are subject to sanity-testing. A person posting 
illegal 
 material on any Apache.org or Apache OpenOffice list will be reported to the 
@@ -101,7 +101,7 @@ has been violated. Ramping up to a release, there are a lot 
of postings at high
 frequency. Sometimes it unavoidably requires a long post to say what needs to 
be 
 said.
 
-#10. Moderators are guiding the lists#
+# 10. Moderators are guiding the lists
 >**A. General**
 
 >We have various mailing lists, they all have a purpose. Lists are how we work
@@ -138,6 +138,6 @@ said.
 >PMC at <a href="mailto:[email protected]";> 
 >[email protected].</a>
 >The decision of the PMC is final.
 
-#More Useful Stuff#
+# More Useful Stuff
 
-- [Apache Tips for Email 
Contributors](http://www.apache.org/dev/contrib-email-tips.html)
\ No newline at end of file
+- [Apache Tips for Email 
Contributors](http://www.apache.org/dev/contrib-email-tips.html)
diff --git a/content/mailing-lists.md b/content/mailing-lists.md
index eb7c008..6abc88d 100644
--- a/content/mailing-lists.md
+++ b/content/mailing-lists.md
@@ -11,21 +11,21 @@ and is visible to the public, indexed by search engines, 
etc. Posts can only
 be removed in extraordinary circumstances, in accordance with Apache's [Public 
Forum
 Archive Policy](http://www.apache.org/foundation/public-archives.html)
 
- - [Using Mailing Lists](#using-mailing-lists)
- - [Participation Guidelines](#participation-guidelines)
- - [Users Mailing List](#users-mailing-list-public)
- - [API Mailing List](#api-mailing-list-public)
- - [Marketing Mailing List](#marketing-mailing-list-public)
- - [Announce Mailing List](#announce-mailing-list)
- - [Development Mailing List](#development-mailing-list-public)
- - [Volunteer Mailing List](#volunteer-mailing-list-public)
- - [Documentation Mailing List](#documentation-mailing-list-public)
- - [Quality Assurance (QA) Mailing List](#qa-mailing-list-public)
- - [Localization Mailing List](#localization-mailing-list-public)
- - [Commits Mailing List](#commits-mailing-list)
- - [Issues Mailing List](#issues-mailing-list)
- - [Native Language (non-English) Mailing Lists](#native-lang-lists)
- - [Legacy OpenOffice.org Lists](#legacy-openofficeorg-lists)
+- [Using Mailing Lists](#using-mailing-lists)
+- [Participation Guidelines](#participation-guidelines)
+- [Users Mailing List](#users-mailing-list-public)
+- [API Mailing List](#api-mailing-list-public)
+- [Marketing Mailing List](#marketing-mailing-list-public)
+- [Announce Mailing List](#announce-mailing-list)
+- [Development Mailing List](#development-mailing-list-public)
+- [Volunteer Mailing List](#volunteer-mailing-list-public)
+- [Documentation Mailing List](#documentation-mailing-list-public)
+- [Quality Assurance (QA) Mailing List](#qa-mailing-list-public)
+- [Localization Mailing List](#localization-mailing-list-public)
+- [Commits Mailing List](#commits-mailing-list)
+- [Issues Mailing List](#issues-mailing-list)
+- [Native Language (non-English) Mailing Lists](#native-lang-lists)
+- [Legacy OpenOffice.org Lists](#legacy-openofficeorg-lists)
 
 
 ## Using Mailing Lists
@@ -42,23 +42,23 @@ such as "dev" or "qa" or "marketing".
 
 There are three basic operations you should know about:
 
-  - To *send* an e-mail to the mailing list, and have it forwarded to all other
-subscribers, send an e-mail to the list's address, *xyz*@openoffice.apache.org.
-  - To *subscribe* to the mailing list, so you start receiving all posts to 
the mailing
-list, send an e-mail to *xyz*[email protected]. You will then 
receive a
-confirmation e-mail. Once you respond to the confirmation e-mail you are 
subscribed.
-Please keep the initial e-mail you receive from 
*xyz*[email protected] as it
-contains helpful information you may need in the future.
-  - To *unsubscribe* from the mailing list, so you stop receiving all posts to 
the
-mailing list, send an e-mail to *xyz*[email protected]. You 
will then
-receive a confirmation e-mail. Once you respond to the confirmation e-mail you 
are
-unsubscribed.
+- To *send* an e-mail to the mailing list, and have it forwarded to all other
+  subscribers, send an e-mail to the list's address, 
*xyz*@openoffice.apache.org.
+- To *subscribe* to the mailing list, so you start receiving all posts to the 
mailing
+  list, send an e-mail to *xyz*[email protected]. You will then 
receive a
+  confirmation e-mail. Once you respond to the confirmation e-mail you are 
subscribed.
+  Please keep the initial e-mail you receive from 
*xyz*[email protected] as it
+  contains helpful information you may need in the future.
+- To *unsubscribe* from the mailing list, so you stop receiving all posts to 
the
+  mailing list, send an e-mail to *xyz*[email protected]. You 
will then
+  receive a confirmation e-mail. Once you respond to the confirmation e-mail 
you are
+  unsubscribed.
 
 NOTE: Please do not send subscribe/unsubscribe requests to the mailing list 
itself
 (*xyz*@openoffice.apache.org). You must send these requests to the special
 *xyz*-subscribe and *xyz*-unsubscribe addresses.
 
-### List Moderators ###
+### List Moderators
 Each mailing list at OpenOffice has at least two human moderators. If you need
 additional help with a mailing list in any way including reporting 
inappropriate
 behavior, you can e-mail the list moderator at 
*xyz*[email protected] where
@@ -76,26 +76,26 @@ sorting and filtering by e-mail inbox rules.
 
 Some subject tags often seen on dev include:
 
- - [www] for posts related to the website
- - [Repo] for posts related to the source code repository
- - [download] for posts related to the release download and mirroring 
infrastruture
- - [API] for posts related to API specific topics
- - [EXT] for posts related to Extension specific topics
+- [www] for posts related to the website
+- [Repo] for posts related to the source code repository
+- [download] for posts related to the release download and mirroring 
infrastruture
+- [API] for posts related to API specific topics
+- [EXT] for posts related to Extension specific topics
 
 Other useful topic tags can be found by observing traffic on the list or by 
looking at
 the list archives.
 
 In addition to the topic subject tags, there are also tags used to indicate a 
request:
 
- - [DISCUSS] indicates a rough idea is being floated, and input is welcome
- - [PROPOSAL] indicates a specific proposal is being made, and often that Lazy
+- [DISCUSS] indicates a rough idea is being floated, and input is welcome
+- [PROPOSAL] indicates a specific proposal is being made, and often that Lazy
 Consensus is being sought.
- - [VOTE] indicates that a formal vote is being called. This is rare.
+- [VOTE] indicates that a formal vote is being called. This is rare.
 
 Note: it is common for a topic tag and an action tag to be combined, e.g.:
 
- - [PROPOSAL][Repo] Migration of legacy repository to SVN
- - [DISCUSS][download] What are our options of mirroring legacy releases?
+- [PROPOSAL][Repo] Migration of legacy repository to SVN
+- [DISCUSS][download] What are our options of mirroring legacy releases?
 
 Finally, please keep in mind that all of the above mailing lists are public
 and any post you make will likely be archived by a variety of services. The 
Apache
@@ -108,43 +108,43 @@ to Apache mail archives, not archives from other services 
such as Gmane or Markm
 This list is for users, for questions about OpenOffice, for feature requests, 
for
 discussions about the product and project, etc.
 
-  - Subscribe: [[email protected]][2]
-  - Post (after subscription): [[email protected]][3]
-  - Unsubscribe: [[email protected]][4]
-  - Apache Archives: [current][47], [legacy][6]
-  - Third-party Archives: [Markmail][5], [Nabble][83], [Mail Archive][71]
+- Subscribe: [[email protected]][2]
+- Post (after subscription): [[email protected]][3]
+- Unsubscribe: [[email protected]][4]
+- Apache Archives: [current][47], [legacy][6]
+- Third-party Archives: [Markmail][5], [Nabble][83], [Mail Archive][71]
 
 ## API Mailing List (Public)
 
 This list is for application developers and other interested in scripting, 
macros or
 developing OpenOffice extensions.
 
-  - Subscribe: [[email protected]][42]
-  - Post (after subscription): [[email protected]][43]
-  - Unsubscribe: [[email protected]][44]
-  - Apache Archives: [current][48], [legacy][46]
-  - Third-party Archives: [Markmail][45], [Mail Archive][72]
+- Subscribe: [[email protected]][42]
+- Post (after subscription): [[email protected]][43]
+- Unsubscribe: [[email protected]][44]
+- Apache Archives: [current][48], [legacy][46]
+- Third-party Archives: [Markmail][45], [Mail Archive][72]
 
 ## Marketing Mailing List (Public)
 
 This is where the community discusses marketing, branding, communications, 
event
 planning and related activities.
 
-  - Subscribe: [[email protected]][7]
-  - Post (after subscription): [[email protected]][8]
-  - Unsubscribe: [[email protected]][9]
-  - Apache Archives: [current][49], [legacy][11]
-  - Third-party Archives: [Markmail][10], [Mail Archive][73]
+- Subscribe: [[email protected]][7]
+- Post (after subscription): [[email protected]][8]
+- Unsubscribe: [[email protected]][9]
+- Apache Archives: [current][49], [legacy][11]
+- Third-party Archives: [Markmail][10], [Mail Archive][73]
 
 ## Announce Mailing List
 
 Subscribe to this list to receive notice about new releases and other 
important news
 from the project.
 
-  - Subscribe: [[email protected]][12]
-  - Unsubscribe: [[email protected]][13]
-  - Apache Archives: [current][50], [legacy][15]
-  - Third-party Archives: [Markmail][14], [Mail Archive][74]
+- Subscribe: [[email protected]][12]
+- Unsubscribe: [[email protected]][13]
+- Apache Archives: [current][50], [legacy][15]
+- Third-party Archives: [Markmail][14], [Mail Archive][74]
 
 **Note:** Only Apache OpenOffice committers may post to the Announce mailing 
list.
 And, you must use your Apache id and domain to post - for example, send using
@@ -156,21 +156,21 @@ This is where the project community hangs out. This list 
is used to coordinate
 activities and ensure we are all pulling in the same direction. This is a high
 traffic list, with an average of 30 posts/day.
 
-  - Subscribe: [[email protected]][16]
-  - Post (after subscription): [[email protected]][17]
-  - Unsubscribe: [[email protected]][18]
-  - Apache Archives: [current][51], [legacy][21]
-  - Third-party Archives: [Mail Archive][75], [Nabble][82], [Markmail][19] 
(incomplete)
+- Subscribe: [[email protected]][16]
+- Post (after subscription): [[email protected]][17]
+- Unsubscribe: [[email protected]][18]
+- Apache Archives: [current][51], [legacy][21]
+- Third-party Archives: [Mail Archive][75], [Nabble][82], [Markmail][19] 
(incomplete)
 
 ## Documentation Mailing List (Public)
 
 This list is for discussing and developing the OpenOffice documentation.
 
-  - Subscribe: [[email protected]][56]
-  - Post (after subscription): [[email protected]][57]
-  - Unsubscribe: [[email protected]][58]
-  - Apache Archives: [current][60]
-  - Third-party Archives: [Mail Archive][76], [Markmail][59] (incomplete)
+- Subscribe: [[email protected]][56]
+- Post (after subscription): [[email protected]][57]
+- Unsubscribe: [[email protected]][58]
+- Apache Archives: [current][60]
+- Third-party Archives: [Mail Archive][76], [Markmail][59] (incomplete)
 
 ## QA Mailing List (Public)
 
@@ -179,22 +179,22 @@ automated tests, etc. You should subscribe (initiate the 
procedure by sending an
 empty e-mail to the address below, then follow the instructions you will 
receive by
 e-mail) if you don't want to miss important announcements.
 
-  - Subscribe: [[email protected]][22]
-  - Post (after subscription): [[email protected]][23]
-  - Unsubscribe: [[email protected]][24]
-  - Apache Archives: [current][52], [legacy][26]
-  - Third-party Archives: [Mail Archive][77], [Markmail][25] (incomplete)
+- Subscribe: [[email protected]][22]
+- Post (after subscription): [[email protected]][23]
+- Unsubscribe: [[email protected]][24]
+- Apache Archives: [current][52], [legacy][26]
+- Third-party Archives: [Mail Archive][77], [Markmail][25] (incomplete)
 
 ## Localization Mailing List (Public)
 
 The list is discussion of translation and other aspects of localization, for 
both
 the OpenOffice product, as well as documentation and the website.
 
-  - Subscribe: [[email protected]][37]
-  - Post (after subscription): [[email protected]][38]
-  - Unsubscribe: [[email protected]][39]
-  - Apache Archives: [current][53], [legacy][41]
-  - Third-party Archives: [Markmail][40], [Mail Archive][78]
+- Subscribe: [[email protected]][37]
+- Post (after subscription): [[email protected]][38]
+- Unsubscribe: [[email protected]][39]
+- Apache Archives: [current][53], [legacy][41]
+- Third-party Archives: [Markmail][40], [Mail Archive][78]
 
 ## Commits Mailing List
 
@@ -202,10 +202,10 @@ This is where the community receives automated 
notifications of any changes to t
 Apache OpenOffice code and documentation. This is a moderate traffic list, 
with an
 average of 10 posts/day.
 
-  - Subscribe: [[email protected]][27]
-  - Unsubscribe: [[email protected]][28]
-  - Apache Archives: [current][54], [legacy][30]
-  - Third-party Archives: [Mail Archive][79], [Markmail][29] (incomplete)
+- Subscribe: [[email protected]][27]
+- Unsubscribe: [[email protected]][28]
+- Apache Archives: [current][54], [legacy][30]
+- Third-party Archives: [Mail Archive][79], [Markmail][29] (incomplete)
 
 ## Issues Mailing List
 
@@ -213,21 +213,21 @@ This is where the community receives automated 
notifications of all issues that
 created or modified in Bugzilla. Currently this is a moderate traffic list, 
with an
 average of 20 posts/day and will increase in the future.
 
-  - Subscribe: [[email protected]][31]
-  - Unsubscribe: [[email protected]][32]
-  - Apache Archives: [current][55], [legacy][34]
-  - Third-party Archives: [Mail Archive][80], [Markmail][33] (incomplete)
+- Subscribe: [[email protected]][31]
+- Unsubscribe: [[email protected]][32]
+- Apache Archives: [current][55], [legacy][34]
+- Third-party Archives: [Mail Archive][80], [Markmail][33] (incomplete)
 
 ## Volunteer Mailing List (Public)
 
 This list is for welcoming new contributors. It coordinates the activities for 
new
 people and tries to help to find the right part. This is a low traffic list.
 
-  - Subscribe: [[email protected]][84]
-  - Post (after subscription): [[email protected]][85]
-  - Unsubscribe: [[email protected]][86]
-  - Apache Archives: [current][87]
-  - Third-party Archives: [Mail Archive][81]
+- Subscribe: [[email protected]][84]
+- Post (after subscription): [[email protected]][85]
+- Unsubscribe: [[email protected]][86]
+- Apache Archives: [current][87]
+- Third-party Archives: [Mail Archive][81]
 
 ##<a id="native-lang-lists"></a> Native Language (non-English) Mailing Lists
 
@@ -249,17 +249,17 @@ If you have been directed to this page from an e-mail 
bounce notification, the f
 guide might be useful for directing your post to an appropriate new mailing 
list for
 the OpenOffice project:
 
- - [email protected] posts should be sent to [email protected]
- - [email protected] posts should be sent to [email protected]
- - [email protected] posts should be sent to [email protected]
- - [email protected] posts should be sent to 
[email protected]
- - project marketing related posts should be sent to 
[email protected]
- - requests to use trademarks should be sent to [email protected]
- - anything of a confidential nature should be sent to 
[email protected]
- - support questions related to the OpenOffice product should go to 
[email protected]
- - website related questions should go to [email protected]
- - questions on volunteering for the project should go to 
[email protected]
- - press queries should go to [email protected]
+- [email protected] posts should be sent to [email protected]
+- [email protected] posts should be sent to [email protected]
+- [email protected] posts should be sent to [email protected]
+- [email protected] posts should be sent to 
[email protected]
+- project marketing related posts should be sent to 
[email protected]
+- requests to use trademarks should be sent to [email protected]
+- anything of a confidential nature should be sent to 
[email protected]
+- support questions related to the OpenOffice product should go to 
[email protected]
+- website related questions should go to [email protected]
+- questions on volunteering for the project should go to 
[email protected]
+- press queries should go to [email protected]
 
 For any topic not covered by the above, send your post to: 
[email protected]
 
diff --git a/content/mission.md b/content/mission.md
index 8ccbcf1..6fa8e41 100644
--- a/content/mission.md
+++ b/content/mission.md
@@ -1,7 +1,7 @@
 Title: The Public Service Mission of OpenOffice
 Notice: http://www.apache.org/licenses/LICENSE-2.0
 
-##Introduction
+## Introduction
 
 Along with an email client and a web browser, an office suite is a core 
essential
 application that almost every computer user requires. Although there is a 
dominant
@@ -13,7 +13,7 @@ free for anyone to build upon. Using the generally available 
discounted price of
 commercial office products, the value of OpenOffice downloads over the past 
decade
 exceeds USD 10 billion (10,000,000,000).
 
-##Overcoming the "Digital Divide"
+## Overcoming the "Digital Divide"
 
 More than 40% of the world population lives on less than US$ 2 per day, and 
around 
 20% live on less than US$ 1 per day. Against these numbers, commercial 
@@ -23,7 +23,7 @@ would otherwise have no other affordable options. Within the 
ICT for Development
 (ICT4D) community, OpenOffice has long been an important part of achieving 
 development goals.
 
-##Support for Linguistic and Cultural Diversity
+## Support for Linguistic and Cultural Diversity
 
 There are over 6,000 languages in the world, but unless the language is 
associated 
 with a G20 economic superpower, commercial vendors tend to ignore it. The 
@@ -33,7 +33,7 @@ endangered languages, etc.  By supporting languages that would
 not otherwise be supported we help reduce "digital exclusion" and promote 
 development, local education and administration.
 
-##Accessibility
+## Accessibility
 
 Persons with disabilities, especially those with visual impairments, commonly 
 rely on "assistive technology" to interact with computers. Such technologies 
@@ -45,7 +45,7 @@ aims to provide strong accessibility support, both in the 
core product and
 including broader ecosystem support via extensions, for working with Braille 
 printers, exporting to DAISY talking books, etc.
 
-##Open Standards
+## Open Standards
 
 Open standards are those standards which are created in an open, transparent 
 process, where the specifications can be freely accessed and implemented 
without 
diff --git a/content/orientation/decision-making.md 
b/content/orientation/decision-making.md
index e93501a..af71be9 100644
--- a/content/orientation/decision-making.md
+++ b/content/orientation/decision-making.md
@@ -5,65 +5,65 @@ In this Orientation Module you will learn about Decision 
Making within the proje
 
 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:
 
-  1. Commit-Then-Review (CTR) and Review-Then-Commit (RTC).
+1. Commit-Then-Review (CTR) and Review-Then-Commit (RTC).
 
-       The two primary ways of managing product changes go by the names 
Commit-Then-Review (CTR) and Review-Then-Commit (RTC). For most cases we 
operate in a CTR mode, meaning that our 
[Committers](https://www.apache.org/foundation/how-it-works.html#committers) 
are able to check in changes as they desire, with no advance approval or review.
+   The two primary ways of managing product changes go by the names 
Commit-Then-Review (CTR) and Review-Then-Commit (RTC). For most cases we 
operate in a CTR mode, meaning that our 
[Committers](https://www.apache.org/foundation/how-it-works.html#committers) 
are able to check in changes as they desire, with no advance approval or review.
 
-       We trust our Committers to do the right thing. By default Committers 
don't ask permission before acting. They avoid unnecessary discussion and email 
traffic. This is not because they are anti-social. This is because they realize 
that in a project of this size it is impossible to discuss every small change 
in advance. Discussing too much is both 
-       unnecessary and unproductive. We have a "time machine" called 
Subversion that allows us to undo any changes to the product or website. So if 
a Committer believes that a change would be uncontroversial, and the change is 
reversible, then the default approach is to go ahead make the change.
+   We trust our Committers to do the right thing. By default Committers don't 
ask permission before acting. They avoid unnecessary discussion and email 
traffic. This is not because they are anti-social. This is because they realize 
that in a project of this size it is impossible to discuss every small change 
in advance. Discussing too much is both 
+   unnecessary and unproductive. We have a "time machine" called Subversion 
that allows us to undo any changes to the product or website. So if a Committer 
believes that a change would be uncontroversial, and the change is reversible, 
then the default approach is to go ahead make the change.
 
-       Terms that you might need to know related to the above are: 
[JFDI](https://www.urbandictionary.com/define.php?term=JFDI) and ["assuming 
lazy consensus"](https://www.apache.org/foundation/glossary.html#LazyConsensus).
+   Terms that you might need to know related to the above are: 
[JFDI](https://www.urbandictionary.com/define.php?term=JFDI) and ["assuming 
lazy consensus"](https://www.apache.org/foundation/glossary.html#LazyConsensus).
 
-  2. When is RTC, Review-Then-Commit Used?
+2. When is RTC, Review-Then-Commit Used?
 
-       There are times where CTR is not appropriate and RTC is used. This 
happens, for example, at the end of a release cycle, when we want to carefully 
review changes made to the product, in order to control the final quality 
before the release. When we're in RTC mode, no changes are made to the code 
unless first discussed and approved on the mailing list.
+   There are times where CTR is not appropriate and RTC is used. This happens, 
for example, at the end of a release cycle, when we want to carefully review 
changes made to the product, in order to control the final quality before the 
release. When we're in RTC mode, no changes are made to the code unless first 
discussed and approved on the mailing list.
 
-       Other situations when RTC is used instead of CTR might include:
+   Other situations when RTC is used instead of CTR might include:
 
-       1. A Committer is unsure of the technical merits of what they want to 
do. They want
-       an extra pair of eyes to review the proposal point out weaknesses, 
alternatives, etc.
+   1. A Committer is unsure of the technical merits of what they want to do. 
They want
+      an extra pair of eyes to review the proposal point out weaknesses, 
alternatives, etc.
 
-       2. A change is a job for more than one person or requires coordination 
across several
-       subgroups within the project.
+   2. A change is a job for more than one person or requires coordination 
across several
+      subgroups within the project.
 
-       3. A change to one of our websites that impacts terms and conditions, 
license,
-       copyright, branding, etc. So not a technical change, but a substantive 
change to
-       content in these areas. These require PMC review.
+   3. A change to one of our websites that impacts terms and conditions, 
license,
+      copyright, branding, etc. So not a technical change, but a substantive 
change to
+      content in these areas. These require PMC review.
 
-       4. A technical change that breaks backwards compatibility of the 
product.
+   4. A technical change that breaks backwards compatibility of the product.
 
-       5. Changes that break things. Sometimes this is unavoidable. But it 
should be
-       proposed and coordinated like #2 above.
+   5. Changes that break things. Sometimes this is unavoidable. But it should 
be
+      proposed and coordinated like #2 above.
 
-       6. Changes that cannot easily be reversed. Code changes and most 
website changes are
-       in SVN and can be reverted. But some changes, like administrative bulk 
actions in
-       BZ, cannot be easily undone.
+   6. Changes that cannot easily be reversed. Code changes and most website 
changes are
+      in SVN and can be reverted. But some changes, like administrative bulk 
actions in
+      BZ, cannot be easily undone.
 
-       7. Public statements in behalf of the project, e.g., some blog posts and
-       announcements, press releases, etc.
+   7. Public statements in behalf of the project, e.g., some blog posts and
+      announcements, press releases, etc.
 
-       In all of the above cases, a Proposal detailing the change is sent to 
the development
-       list.
+   In all of the above cases, a Proposal detailing the change is sent to the 
development
+   list.
 
-  3. Proposals
+3. Proposals
 
-       The convention is to send all proposals in their own new thread. (Don't 
hide a proposal 10 posts deep in an existing thread). Put "[PROPOSAL]" in the 
subject line or make it obvious that you are making a proposal.
+   The convention is to send all proposals in their own new thread. (Don't 
hide a proposal 10 posts deep in an existing thread). Put "[PROPOSAL]" in the 
subject line or make it obvious that you are making a proposal.
 
-       Because the Volunteers are spread out all across the globe, in various 
time zones, and many have day jobs or other commitments, the convention is to 
wait *at least* 72 hours for feedback on a proposal.
+   Because the Volunteers are spread out all across the globe, in various time 
zones, and many have day jobs or other commitments, the convention is to wait 
*at least* 72 hours for feedback on a proposal.
 
-       In cases where the proposer wants to act on their proposal, if there 
are no objections, they should state this in the proposal. For example, "If 
there are no objections voiced within 72 hours, I'll go ahead and make these 
changes". This is called "stating lazy consensus". You can read more about lazy 
consensus 
[here](https://openoffice.apache.org/docs/governance/lazyConsensus.html).
+   In cases where the proposer wants to act on their proposal, if there are no 
objections, they should state this in the proposal. For example, "If there are 
no objections voiced within 72 hours, I'll go ahead and make these changes". 
This is called "stating lazy consensus". You can read more about lazy consensus 
[here](https://openoffice.apache.org/docs/governance/lazyConsensus.html).
 
-  4. Voting, Consensus, and Vetoes
+4. Voting, Consensus, and Vetoes
 
-       1. In Apache projects it is common to use a shorthand way of responding 
to proposals, where +1 indicates approval, 0 indicates indifference and -1 
indicates disapproval.
+   1. In Apache projects it is common to use a shorthand way of responding to 
proposals, where +1 indicates approval, 0 indicates indifference and -1 
indicates disapproval.
 
-       2. In most cases proposals are decided by consensus, based on community 
discussions. Only in rare cases, and in a small number of pre-defined 
administrative questions, do we resort to a formal counting of votes. The 
places where we require voting are: voting to release, voting in a new 
Committer or PMC Member, Voting in a new PMC Chair. That's it. Generally 
speaking, voting on any other topic is avoided in favor of consensus building. 
With voting there are winners and losers. With conse [...]
+   2. In most cases proposals are decided by consensus, based on community 
discussions. Only in rare cases, and in a small number of pre-defined 
administrative questions, do we resort to a formal counting of votes. The 
places where we require voting are: voting to release, voting in a new 
Committer or PMC Member, Voting in a new PMC Chair. That's it. Generally 
speaking, voting on any other topic is avoided in favor of consensus building. 
With voting there are winners and losers. With con [...]
 
-       3. Another aspect of decision making in an Apache project is the 
"veto". Every Committer has the ability to "veto" a change, for technical 
reasons, provided he explains the technical reasons for the veto, describes an 
alternative approach, and offers to help implement the alternative approach. 
Vetos are quite rare.
+   3. Another aspect of decision making in an Apache project is the "veto". 
Every Committer has the ability to "veto" a change, for technical reasons, 
provided he explains the technical reasons for the veto, describes an 
alternative approach, and offers to help implement the alternative approach. 
Vetos are quite rare.
 
-       4. There is one disorder of community decision making that is common 
enough to warrant a colorful name: [bikeshedding](http://bikeshed.com/). Follow 
the link and read more about this topic.
+   4. There is one disorder of community decision making that is common enough 
to warrant a colorful name: [bikeshedding](http://bikeshed.com/). Follow the 
link and read more about this topic.
 
-  5. To apply the above skills, be sure you are subscribed to the project's 
[main mailing 
list](https://openoffice.apache.org/mailing-lists.html#development-mailing-list-public).
 Keep your eye out for terms like "proposal", "lazy consensus", "vote" or 
"veto" and see how they are used in practice. Compare actual practice to the 
above descriptions. No, we're not perfect. But we work best and have the most 
fun when we follow the above guidelines. And so will you when you apply then in 
your  [...]
+   5. To apply the above skills, be sure you are subscribed to the project's 
[main mailing 
list](https://openoffice.apache.org/mailing-lists.html#development-mailing-list-public).
 Keep your eye out for terms like "proposal", "lazy consensus", "vote" or 
"veto" and see how they are used in practice. Compare actual practice to the 
above descriptions. No, we're not perfect. But we work best and have the most 
fun when we follow the above guidelines. And so will you when you apply then in 
your [...]
 
 Congratulations, you have completed this Module!
 
diff --git a/content/orientation/how-aoo-project-works.md 
b/content/orientation/how-aoo-project-works.md
index e122ed7..133db6f 100644
--- a/content/orientation/how-aoo-project-works.md
+++ b/content/orientation/how-aoo-project-works.md
@@ -7,23 +7,23 @@ Notice: http://www.apache.org/licenses/LICENSE-2.0
 
 1. Volunteers in the project tend to self-identify themselves in one or more 
of the following categories, depending on their interests, skills and 
contributions:
 
-       * Developers are the programmers who write, debug and fix the C++ code 
that is the core of the OpenOffice software.
-       * QA (Quality Assurance) are the volunteers to test OpenOffice builds, 
looking for bugs. They also develop test automation and test cases.
-       * Support are the volunteers who answer user questions on our Community 
Forums and User list.
-       * UX (Usability)
-       * Localization/Internationalization are the volunteers whose expertise 
is in adapting OpenOffice so it works well with the writing and other cultural 
conventions and expectations of
-       users around the globe. This includes translations and related 
activities.
-       * Documentation
-       * Admins, including moderators,
-       * Marketing
-       * Website development
+   * Developers are the programmers who write, debug and fix the C++ code that 
is the core of the OpenOffice software.
+   * QA (Quality Assurance) are the volunteers to test OpenOffice builds, 
looking for bugs. They also develop test automation and test cases.
+   * Support are the volunteers who answer user questions on our Community 
Forums and User list.
+   * UX (Usability)
+   * Localization/Internationalization are the volunteers whose expertise is 
in adapting OpenOffice so it works well with the writing and other cultural 
conventions and expectations of
+     users around the globe. This includes translations and related activities.
+   * Documentation
+   * Admins, including moderators,
+   * Marketing
+   * Website development
 
 1. We also work closely with other specialized teams within Apache for topics 
where it is important to enforce ASF-wide policies:
 
-       * Infrastructure
-       * Legal Affairs
-       * Trademarks/Branding
-       * Conference Committee (ConCom)
-       * Incubator
+   * Infrastructure
+   * Legal Affairs
+   * Trademarks/Branding
+   * Conference Committee (ConCom)
+   * Incubator
 
 1. Congratulations! You have completed this Level. Please send a note to 
[[email protected]](mailto:[email protected]?subject=Completed
 How the Apache OpenOffice Project Works) 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/index.md b/content/orientation/index.md
index 1f88cae..e4d3a12 100644
--- a/content/orientation/index.md
+++ b/content/orientation/index.md
@@ -1,7 +1,7 @@
 Title:     New Volunteer Orientation
 Notice: http://www.apache.org/licenses/LICENSE-2.0
 
-##Welcome!
+## 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!
 
@@ -9,7 +9,7 @@ Getting involved in a large open source project can be a little 
intimidating. Th
 
 In order to help new Volunteers fit into the OpenOffice Community and 
understand socially and technically how we work, we have created a set of 
self-directed Orientation Modules to provide key information and help you 
develop key skills needed to contribute effectively to the project.
 
-##Four Levels
+## Four Levels
 
 We've designed the Orientation Modules in four levels:
 
@@ -27,17 +27,17 @@ Levels 3 and 4 are specialized Levels, that focus on basic 
and intermediate know
 
 * Level 3: Introductory Specialized Areas
 
-       * [Introduction to Development](intro-development.html)
-       * [Introduction to QA](intro-qa.html)
-       * [Introduction to 
Localization](http://openoffice.apache.org/translate.html) (How to Help 
Translate OpenOffice)
-       * [Introduction to Marketing](intro-marketing.html)
-       * [Introduction to Documentation](intro-doc.html)
-       * Introduction to Website Content Authoring
+  * [Introduction to Development](intro-development.html)
+  * [Introduction to QA](intro-qa.html)
+  * [Introduction to 
Localization](http://openoffice.apache.org/translate.html) (How to Help 
Translate OpenOffice)
+  * [Introduction to Marketing](intro-marketing.html)
+  * [Introduction to Documentation](intro-doc.html)
+  * Introduction to Website Content Authoring
 
 * Level 4: Intermediate Specialized Areas
 
-       * Intermediate Development
-       * Intermediate QA
-       * Intermediate Localization and Internationalization
-       * Intermediate Marketing
-       * Intermediate Website Development using Perl and the CMS
+  * Intermediate Development
+  * Intermediate QA
+  * Intermediate Localization and Internationalization
+  * Intermediate Marketing
+  * Intermediate Website Development using Perl and the CMS (Obsolete)
diff --git a/content/orientation/infrastructure.md 
b/content/orientation/infrastructure.md
index fbeb09f..b378ee2 100644
--- a/content/orientation/infrastructure.md
+++ b/content/orientation/infrastructure.md
@@ -7,32 +7,32 @@ In this Orientation Module you will learn about tools and 
servers that are part
 
 1. List of tools and services we use
 
-       * ezmlm: This is the time-tested EZ Mailing List Manager application 
that manages our mailing lists. You control ezmlm by sending commands to a list 
address. For example, if the list address is [email protected] then 
you subscribe to the list with the command 
dev-**subscribe**@openoffice.apache.org. Some other popular commands are listed 
[here](https://www.apache.org/foundation/mailinglists.html). You can get a full 
list of commands available to you by sending the *help* command [...]
+   * ezmlm: This is the time-tested EZ Mailing List Manager application that 
manages our mailing lists. You control ezmlm by sending commands to a list 
address. For example, if the list address is [email protected] then 
you subscribe to the list with the command 
dev-**subscribe**@openoffice.apache.org. Some other popular commands are listed 
[here](https://www.apache.org/foundation/mailinglists.html). You can get a full 
list of commands available to you by sending the *help* comma [...]
 
-       * Our two websites: [www.openoffice.org](https://www.openoffice.org) 
and [openoffice.apache.org](https://openoffice.apache.org). Why two? There is 
some logic here, although it is not perfectly executed (yet). The 
www.openoffice.org website is our primary user-facing website. It is where we 
put content intended for end-users to use, so downloads, product 
documentations, support and other related materials. The openoffice.apache.org 
website, on the other hand, is the main portal for proje [...]
+   * Our two websites: [www.openoffice.org](https://www.openoffice.org) and 
[openoffice.apache.org](https://openoffice.apache.org). Why two? There is some 
logic here, although it is not perfectly executed (yet). The www.openoffice.org 
website is our primary user-facing website. It is where we put content intended 
for end-users to use, so downloads, product documentations, support and other 
related materials. The openoffice.apache.org website, on the other hand, is the 
main portal for pro [...]
 
-       * MediaWiki (also called MWiki) is used for the wiki on the 
[wiki.openoffice.org](https://wiki.openoffice.org/wiki/Main_Page) website. We 
use MWiki for many of the user-facing pages on the website, especially in the 
areas of documentation and support. If you are familiar with Wikipedia and the 
syntax used for authoring articles there, then you will find our MediaWiki very 
easy to use, since Wikipedia also uses MediaWiki. If you are new to MediaWiki 
please read over this [introduction to [...]
+   * MediaWiki (also called MWiki) is used for the wiki on the 
[wiki.openoffice.org](https://wiki.openoffice.org/wiki/Main_Page) website. We 
use MWiki for many of the user-facing pages on the website, especially in the 
areas of documentation and support. If you are familiar with Wikipedia and the 
syntax used for authoring articles there, then you will find our MediaWiki very 
easy to use, since Wikipedia also uses MediaWiki. If you are new to MediaWiki 
please read over this [introduction  [...]
 
-       * Confluence Wiki (also called CWiki) is used for some [project 
management 
webpages](https://cwiki.apache.org/confluence/display/OOOUSERS/Wiki+Home)
+   * Confluence Wiki (also called CWiki) is used for some [project management 
webpages](https://cwiki.apache.org/confluence/display/OOOUSERS/Wiki+Home)
 
-       * [Pootle](https://translate.apache.org) is our translation management 
server, an online service used by translators to translate the UI and help 
files of OpenOffice into various languages. Unless you are involved with 
translations or builds you probably will never use Pootle. But you will hear it 
mentioned on the mailing lists.
+   * [Pootle](https://translate.apache.org) is our translation management 
server, an online service used by translators to translate the UI and help 
files of OpenOffice into various languages. Unless you are involved with 
translations or builds you probably will never use Pootle. But you will hear it 
mentioned on the mailing lists.
 
-       * Apache CMS (Content Management System) is the software that manages 
our websites, including the application of side-wide templates used to apply, 
for example, the common page footers that occur on each page). There is a web 
interface to the Apache CMS that makes it easy to make small updates to a page. 
If you are interested in adding or editing the website you can watch this video 
on the [Apache CMS's Anonymous 
Mode](https://www.youtube.com/watch?v=7fvg1pfHLhE) now. Otherwise this is  [...]
+   * **OBSOLETE** Apache CMS (Content Management System) is the software that 
manages our websites, including the application of side-wide templates used to 
apply, for example, the common page footers that occur on each page). There is 
a web interface to the Apache CMS that makes it easy to make small updates to a 
page. If you are interested in adding or editing the website you can watch this 
video on the [Apache CMS's Anonymous 
Mode](https://www.youtube.com/watch?v=7fvg1pfHLhE) now. Oth [...]
 
-       * Subversion is the Version Control System (VCS) used by the project. 
Subversion is also its own Apache project. The source code for the OpenOffice 
product as well as the files for the websites are all stored in Subversion. 
Developers use Subversion heavily in their work. Advanced work in QA and bulk 
website changes also involve using Subversion.
+   * **OBSOLETE** Subversion is the Version Control System (VCS) used by the 
project. Subversion is also its own Apache project. The source code for the 
OpenOffice product as well as the files for the websites are all stored in 
Subversion. Developers use Subversion heavily in their work. Advanced work in 
QA and bulk website changes also involve using Subversion.
 
-       * phpBB is the software that runs our [Community 
Forums](https://forum.openoffice.org/en/forum/), used for technical support of 
our users.
+   * phpBB is the software that runs our [Community 
Forums](https://forum.openoffice.org/en/forum/), used for technical support of 
our users.
 
-       * [Bugzilla](https://issues.apache.org/ooo/) is used to track defect 
OpenOffice (bug) report.
+   * [Bugzilla](https://issues.apache.org/ooo/) is used to track defect 
OpenOffice (bug) report.
 
-       * [JIRA](https://issues.apache.org/jira/) is another issue tracking 
application. Some Apache projects use JIRA instead of Bugzilla. We mainly use 
JIRA when we need to raise an issue with another group at Apache that uses 
JIRA, for example the Apache Infrastructure Team.
+   * [JIRA](https://issues.apache.org/jira/) is another issue tracking 
application. Some Apache projects use JIRA instead of Bugzilla. We mainly use 
JIRA when we need to raise an issue with another group at Apache that uses 
JIRA, for example the Apache Infrastructure Team.
 
 1. It is important to understand the role of the [Apache Infrastructure 
Team](https://www.apache.org/dev/infrastructure.html) (Infra or Infra@. The 
Infrastructure team are essentially the system administrators for all 
Apache-wide servers and services, including many of the services described 
above. As you can imagine, with all the projects that are part of Apache, this 
is huge job. In order to support this number of projects and provide good 
service levels in this shared infrastructure e [...]
 
 1. What to do if you have a problem:
 
-       * Questions on how to use the service: First, look for instructions on 
the website. If that fails, post a note to the dev mailing list for hints.
-       * Outages: [Current status](https://monitoring.apache.org/status/) is 
posted. You might also want to subscribe to Infra's [Twitter 
feed](https://twitter.com/infrabot). If you see an outage not noted there 
already, you can notify Infra via IRC channel #asfinfra on Freenode.
-       * Requests to enhance or modify the service: Propose something on dev. 
Even though Infra is required to carry out some tasks, you still should get 
consensus first on the project's mailing list.
+   * Questions on how to use the service: First, look for instructions on the 
website. If that fails, post a note to the dev mailing list for hints.
+   * Outages: [Current status](https://monitoring.apache.org/status/) is 
posted. You might also want to subscribe to Infra's [Twitter 
feed](https://twitter.com/infrabot). If you see an outage not noted there 
already, you can notify Infra via IRC channel #asfinfra on Freenode.
+   * Requests to enhance or modify the service: Propose something on dev. Even 
though Infra is required to carry out some tasks, you still should get 
consensus first on the project's mailing list.
 
 1. Congratulations! You have completed this Module. Please send a note to 
[[email protected]](mailto:[email protected]?subject=Completed
 Infrastructure Module) 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-contributing.md 
b/content/orientation/intro-contributing.md
index 0fa54ac..d18a6d2 100644
--- a/content/orientation/intro-contributing.md
+++ b/content/orientation/intro-contributing.md
@@ -12,16 +12,16 @@ Apache, then much of this will already be familiar to you.
 
 1. It is important that you understand a little about the Apache Software 
Foundation and OpenOffice, what it is, how it is organized and how the Apache 
OpenOffice Project fits into the overall Foundation. This is partially 
organizational knowledge and a little history. But it is important for 
understanding how things work here, and understanding the culture of this open 
source community. Suggested readings are:
 
-       1. [How It Works](https://apache.org/foundation/how-it-works.html) (to 
learn about how the ASF is organized and how its meritocracy works)
-       1. [ASF FAQ's](https://www.apache.org/foundation/faq.html) (browse to 
see if it answers any questions you might have)
-       1. [OpenOffice Wikipedia 
article](https://en.wikipedia.org/wiki/OpenOffice) (for basic historical 
background)
-       1. [14 Ways to Contribute to Open Source without Being a Programming 
Genius or a Rock 
Star](https://smartbear.com/blog/test-and-monitor/14-ways-to-contribute-to-open-source-without-being/)
+   1. [How It Works](https://apache.org/foundation/how-it-works.html) (to 
learn about how the ASF is organized and how its meritocracy works)
+   1. [ASF FAQ's](https://www.apache.org/foundation/faq.html) (browse to see 
if it answers any questions you might have)
+   1. [OpenOffice Wikipedia article](https://en.wikipedia.org/wiki/OpenOffice) 
(for basic historical background)
+   1. [14 Ways to Contribute to Open Source without Being a Programming Genius 
or a Rock 
Star](https://smartbear.com/blog/test-and-monitor/14-ways-to-contribute-to-open-source-without-being/)
 
 1. As a globally-distributed all-volunteer open source project, there is never 
a time or place where we can all meet together in the same room or even on a 
telephone call. Because of this, and out of respect for everyone's busy and 
varying schedule, we use mailing lists to coordinate our work, make proposals, 
gather consensus and resolve community issues. There are three mailing lists 
that every Volunteer should be on:
 
-       1. 
[dev](https://openoffice.apache.org/mailing-lists.html#development-mailing-list-public)
 This is the main mailing list for the project, and gets a lot of traffic. But 
this is where project-wide discussions occur.
-       1. 
[announce](https://openoffice.apache.org/mailing-lists.html#announce-mailing-list)
 This is the official announcement list for the project. It is used for 
announcing things like new releases, security patches, conferences, etc.
-       1. 
[users](https://openoffice.apache.org/mailing-lists.html#users-mailing-list-public)
 This is our users list and is one way in which we provide support to end 
users. Although you may not be interested specifically in user support, it is 
still recommended that you follow this list, even if just to get a feel for 
user concerns, problems, feature ideas, etc.
+   1. 
[dev](https://openoffice.apache.org/mailing-lists.html#development-mailing-list-public)
 This is the main mailing list for the project, and gets a lot of traffic. But 
this is where project-wide discussions occur.
+   1. 
[announce](https://openoffice.apache.org/mailing-lists.html#announce-mailing-list)
 This is the official announcement list for the project. It is used for 
announcing things like new releases, security patches, conferences, etc.
+   1. 
[users](https://openoffice.apache.org/mailing-lists.html#users-mailing-list-public)
 This is our users list and is one way in which we provide support to end 
users. Although you may not be interested specifically in user support, it is 
still recommended that you follow this list, even if just to get a feel for 
user concerns, problems, feature ideas, etc.
 
 1. You can also review other mailing lists we host and which may be of 
interest, including ones focused on specific [project 
functions](https://openoffice.apache.org/mailing-lists.html) and [native 
languages](https://openoffice.apache.org/native-lang.html).
 
@@ -35,10 +35,10 @@ Apache, then much of this will already be familiar to you.
 
 1. Aside from the mailing lists there are several online services that every 
volunteer should be signed up for:
 
-       1. Our [MediaWiki](https://wiki.openoffice.org/wiki/Main_Page) 
(sometimes called MWiki) used for user documentation and many other things.
-       1. Our 
[ConfluenceWiki](https://cwiki.apache.org/confluence/display/OOOUSERS/Wiki+Home)
 (sometimes called CWiki) where we do project planning.
-       1. Our [Bugzilla database](https://bz.apache.org/ooo/) (sometimes 
called BZ) where we report and track status on bugs.
-       1. Our [Community Forums](https://forum.openoffice.org/) These are 
available in several languages. This is the primary way in which we engage with 
the user community.
-       1. Join our [Social Networks](https://openoffice.apache.org/social.html)
+   1. Our [MediaWiki](https://wiki.openoffice.org/wiki/Main_Page) (sometimes 
called MWiki) used for user documentation and many other things.
+   1. Our 
[ConfluenceWiki](https://cwiki.apache.org/confluence/display/OOOUSERS/Wiki+Home)
 (sometimes called CWiki) where we do project planning.
+   1. Our [Bugzilla database](https://bz.apache.org/ooo/) (sometimes called 
BZ) where we report and track status on bugs.
+   1. Our [Community Forums](https://forum.openoffice.org/) These are 
available in several languages. This is the primary way in which we engage with 
the user community.
+   1. Join our [Social Networks](https://openoffice.apache.org/social.html)
 
 1. Finally, once you have done the above, go to our our [Directory of 
Volunteers](https://cwiki.apache.org/confluence/display/OOOUSERS/Directory+of+Volunteers)
 wiki page and add your information. Congratulations! Please send a note to 
[[email protected]](mailto:[email protected]?subject=Completed
 Introduction to Contributing to Apache OpenOffice Module) so we know.
diff --git a/content/orientation/intro-doc.md b/content/orientation/intro-doc.md
index 68f1c59..d2444ed 100644
--- a/content/orientation/intro-doc.md
+++ b/content/orientation/intro-doc.md
@@ -1,7 +1,7 @@
 Title:     Introduction to Documentation
 Notice: http://www.apache.org/licenses/LICENSE-2.0
 
-##Introduction
+## Introduction
 
 In this orientation module you will learn how to get started in the OpenOffice 
Documentation Team.
 
@@ -15,7 +15,7 @@ Note: In parallel with the Doc-specific items on this page, 
you may want to also
 
 Now with the introductions out of the way, let's get started!
 
-##The Big Picture
+## The Big Picture
 
 As a popular end-user facing product, Apache OpenOffice is used by millions of 
people around the world, with a wide range of skills and backgrounds. Some have 
been using OpenOffice for decades. Others are just moving over from Microsoft 
Office. Some are very familiar with computers and their operating systems. 
Others may be using a computer for the first time. Some are doing just basic 
editing. Others are "power users" and are creating complex applications built 
on top of OpenOffice.
 
@@ -29,7 +29,7 @@ When users have a question, when they get stuck, there are a 
wide range of optio
 
 The documentation we write aids both the end-users as well as those who 
support the end users. We aim to provide authoritative, up-to-date material for 
Apache OpenOffice, and to aid users of all skill levels. If we do our tasks 
well, users are more satisfied and more productive.
 
-##Varieties of Documentation
+## Varieties of Documentation
 
 We maintain documentation in a variety of forms:
 
@@ -39,7 +39,7 @@ We maintain documentation in a variety of forms:
 
 All OpenOffice documentation is housed on the [OpenOffice 
wiki](https://wiki.openoffice.org/wiki/Documentation) for ease of maintenance 
by volunteers with the exception of the help files which are integrated with 
the OpenOffice product itself.
 
-##Goals and Constraints
+## Goals and Constraints
 
 In our documentation work we need to be aware of the following goals and 
constraints:
 
@@ -48,7 +48,7 @@ In our documentation work we need to be aware of the 
following goals and constra
   - We use the [Apache License 
2.0](https://www.apache.org/licenses/LICENSE-2.0.html) for all project 
deliverables. This "permissive" open source license ensures that everyone has 
the ability to adapt and reuse the documentation that we create. But it also 
means that we need to be careful about what other 3rd party material we use in 
our documentation. Until you are familiar with the Apache rules for using 3rd 
party material into an Apache product, you should start a discussion on the ma 
[...]
   - We're aiming to provide as much content as possible in the form of MWiki 
pages. These are easy for users to access, from any device. Also, since they 
are indexed by search engines they will be easy to find for the users who like 
to resolve issues by searching Google for solutions.
 
-##Volunteers are Welcome
+## Volunteers are Welcome
 
 We're looking for volunteers with technical writing experience, a good working 
knowledge of OpenOffice, or ideally both. The ability to collaborate with 
others in written English on the mailing list is required, but you just need to 
be understandable. For the actual writing, we have editor volunteers who will 
review and edit the rough drafts to fix any language errors. So you don't need 
to have native-level English skills.
 
@@ -62,7 +62,7 @@ Volunteers on the Documentation Team work on a variety of 
tasks, including:
   - Preparing screenshots, diagrams and artwork for covers.
   - Developing tools and scripts to aid in repetitive tasks, such as document 
format conversions.
 
-##Getting Started
+## Getting Started
 
 The Documentation Team is the easiest one to get started with. There are just 
a few basic steps:
 
diff --git a/content/orientation/intro-marketing.md 
b/content/orientation/intro-marketing.md
index 6433614..4d97681 100644
--- a/content/orientation/intro-marketing.md
+++ b/content/orientation/intro-marketing.md
@@ -9,7 +9,7 @@ But first, please subscribe to our [Marketing Mailing 
List](http://openoffice.ap
 
 Note:  You may also want to review the [Level 1 and Level 2 Orientation 
Modules](http://openoffice.apache.org/orientation/index.html) which give an 
overview of the project as a whole, and a perspective on working on open source 
at Apache.
 
-##What is Marketing?
+## What is Marketing?
 
 There are many definitions, and most of them are right. Heidi Cohen has a nice 
blog post with [72 definitions](http://heidicohen.com/marketing-definition/) 
which you should browse through.
 
@@ -17,35 +17,35 @@ From the perspective of Apache OpenOffice:  *Marketing is 
the set of activities
 
 In practice we don't have access to a large Madison Avenue advertising firm. 
We don't have a huge budget. We don't have a *New York Times* editor on our 
speed dial. So our marketing activities are by necessity grassroots, 
technically savvy, viral and therefore more exciting. 
 
-##Why does a good, free product need to marketed?
+## Why does a good, free product need to marketed?
 
 Short answer: To increase awareness of OpenOffice and its benefits. Even a 
free product needs to be known. Read more 
[here](http://mail-archives.apache.org/mod_mbox/openoffice-marketing/201212.mbox/%3CCAP-ksoi_pc4FU3_zikB3oy+G+kjfonurbFxzZ5q_QtFusB=e...@mail.gmail.com%3E).
 
-##Why Help with Marketing?
+## Why Help with Marketing?
 
 As a volunteer why would you want to help with OpenOffice Marketing?  A few 
things to consider:
 
-  - OpenOffice is one of the best known open source brands, up there with 
Linux, Android and Firefox. Your contributions to our marketing efforts will 
potentially be seen by millions of users.
-  - We're a fun, international group of volunteers, with a range of skills and 
experience, dedicated to free software and spreading the word about OpenOffice.
-  - This is a good way to learn about marketing, or one if its 
sub-disciplines, and gain practical experience.
-  - Helping with marketing is a good way to "give back" to the open source 
community, something that can be done without requiring special technical 
skills.
-  - We have tasks for volunteers with a range of experience levels and 
interests. From copy writing to event planning to graphic design, we need 
volunteers in many creative and business-oriented disciplines.
+- OpenOffice is one of the best known open source brands, up there with Linux, 
Android and Firefox. Your contributions to our marketing efforts will 
potentially be seen by millions of users.
+- We're a fun, international group of volunteers, with a range of skills and 
experience, dedicated to free software and spreading the word about OpenOffice.
+- This is a good way to learn about marketing, or one if its sub-disciplines, 
and gain practical experience.
+- Helping with marketing is a good way to "give back" to the open source 
community, something that can be done without requiring special technical 
skills.
+- We have tasks for volunteers with a range of experience levels and 
interests. From copy writing to event planning to graphic design, we need 
volunteers in many creative and business-oriented disciplines.
 
-##Marketing Activities
+## Marketing Activities
 
 Marketing activities within the Apache OpenOffice project include:
 
-  - Planning and participating at local and international conferences, giving 
presentations or staffing booths and answering questions about Apache 
OpenOffice and the project
-  - Monitoring and contributing to our social networking presence
-  - Writing and reviewing project blog posts and press releases
-  - Answering questions from the press, or being interviewed about the project
-  - Designing new marketing collateral, such as brochures or CD cover art
-  - Working as a team to refresh the product's brand and visual signature
-  - Surveying users to understand their needs and concerns
-  - Creating a YouTube video to show the highlights of an upcoming release
-  - Working as a member of a core marketing team to enable a much larger group 
of volunteers and users promote OpenOffice.
+- Planning and participating at local and international conferences, giving 
presentations or staffing booths and answering questions about Apache 
OpenOffice and the project
+- Monitoring and contributing to our social networking presence
+- Writing and reviewing project blog posts and press releases
+- Answering questions from the press, or being interviewed about the project
+- Designing new marketing collateral, such as brochures or CD cover art
+- Working as a team to refresh the product's brand and visual signature
+- Surveying users to understand their needs and concerns
+- Creating a YouTube video to show the highlights of an upcoming release
+- Working as a member of a core marketing team to enable a much larger group 
of volunteers and users promote OpenOffice.
 
-##Brand and Trademark
+## Brand and Trademark
 
 Our brand is the set of attributes and associations that distinguish Apache 
OpenOffice from other applications in the market. The brand includes the name, 
of course, but also logos, colors, text, look & feel, etc.
 
@@ -57,19 +57,19 @@ It is important that we, in our public-facing marketing 
communications, treat th
 
 The Apache Software Foundation owns the trademarks for its projects, and they 
have defined a [trademark policy](http://www.apache.org/foundation/marks/), 
including some FAQ's that are worth reviewing.
 
-##Tools for Communications
+## Tools for Communications
 
-  - Mailing Lists: Our project-wide mailing lists are listed 
[here](http://openoffice.apache.org/mailing-lists.html). From a marketing 
perspective, the two most relevant are the dev list, which reaches the "core" 
team, and the announce list which reaches 9000+ users.
-  - Website:  [http://www.openoffice.org](http://www.openoffice.org) and 
[http://openoffice.apache.org](http://openoffice.apache.org). The former gets 
750K+ visits/day. We have the ability to add news stories to the front page as 
well as a banner message on all pages.
-  - Events: Our events page is 
[here](http://openoffice.apache.org/events.html).
-  - Project Blog: The Blog is [here](http://blogs.apache.org/OOo/). New posts 
are easily cross-promoted. With a new post, the blog easily gets 4000+ 
visits/day.
-  - Social Networking: A list of our accounts is 
[here](http://openoffice.apache.org/social.html)
-  - Word of Mouth:  Along with other occasional programs we have a ["Get it 
here!"](http://openoffice.apache.org/get-it-here.html) logo that we encourage 
users to put on their websites.
-  - The Press: Our press contact page is 
[here](http://openoffice.apache.org/press.html). As you can see we seriously 
need some work there, and any volunteer who can make a more meaningful page 
here, with most-requested information, would be most welcome.
-  - Surveys:  We have the ability to poll users via surveys both informal and 
formal.
-  - Statistics:  We maintain a variety of product and project statistics 
[here](http://www.openoffice.org/stats/).
+- Mailing Lists: Our project-wide mailing lists are listed 
[here](http://openoffice.apache.org/mailing-lists.html). From a marketing 
perspective, the two most relevant are the dev list, which reaches the "core" 
team, and the announce list which reaches 9000+ users.
+- Website:  [http://www.openoffice.org](http://www.openoffice.org) and 
[http://openoffice.apache.org](http://openoffice.apache.org). The former gets 
750K+ visits/day. We have the ability to add news stories to the front page as 
well as a banner message on all pages.
+- Events: Our events page is [here](http://openoffice.apache.org/events.html).
+- Project Blog: The Blog is [here](http://blogs.apache.org/OOo/). New posts 
are easily cross-promoted. With a new post, the blog easily gets 4000+ 
visits/day.
+- Social Networking: A list of our accounts is 
[here](http://openoffice.apache.org/social.html)
+- Word of Mouth:  Along with other occasional programs we have a ["Get it 
here!"](http://openoffice.apache.org/get-it-here.html) logo that we encourage 
users to put on their websites.
+- The Press: Our press contact page is 
[here](http://openoffice.apache.org/press.html). As you can see we seriously 
need some work there, and any volunteer who can make a more meaningful page 
here, with most-requested information, would be most welcome.
+- Surveys:  We have the ability to poll users via surveys both informal and 
formal.
+- Statistics:  We maintain a variety of product and project statistics 
[here](http://www.openoffice.org/stats/).
 
-##Marketing Collateral
+## Marketing Collateral
 
 These are the items, typically written material, that support our marketing 
activities. These range from product brochures, to white papers, to interviews 
that we can redistribute, to video demos to CD covers.
 
@@ -77,18 +77,18 @@ You can see some of our existing collateral 
[here](http://www.openoffice.org/mar
 
 This is an area where we are currently weak. The renaming from 
"OpenOffice.org" to "Apache OpenOffice" has not been yet reflected in the 
materials. This, along with the upcoming branding refresh for Apache OpenOffice 
4.0 means that there is a lot of work here to refresh our collateral as well. 
Help here, especially from volunteers with graphic design skills, is most 
welcome.
 
-##Marketing in a Non-Profit Organization
+## Marketing in a Non-Profit Organization
 
 We need to make an important distinction between marketing in a non-profit 
organization like Apache versus marketing in a commercial context. Most of the 
tools and activities are the same, as you may have noticed. But the orientation 
is different. Although users have alternatives, we don't think of these 
alternatives as competitors. If a user decides another product serves them 
better, we have lost nothing. We count our wins, not our loses.
 
 Along with this orientation, and the ASF's [charitable 
mission](https://www.apache.org/foundation/faq.html#why), we place a high 
premium on:
 
-  - Honesty
-  - Integrity
-  - Serving the Public Good
-  - Focus on our strengths, not on others' weaknesses
-  - Marketing != Competing against
+- Honesty
+- Integrity
+- Serving the Public Good
+- Focus on our strengths, not on others' weaknesses
+- Marketing != Competing against
 
-##End of Module
+## End of Module
 
 Congratulations!  You have completed this Module. Please send a note to 
[[email protected]](mailto:[email protected]?subject=Completed
 Marketing Module) 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-qa.md b/content/orientation/intro-qa.md
index d5df628..4ecb7fd 100644
--- a/content/orientation/intro-qa.md
+++ b/content/orientation/intro-qa.md
@@ -135,10 +135,10 @@ Here's what to do to confirm a new defect report:
 If they are asking for a new feature, change the Issue Type field to 
"FEATURE". If they are asking for an enhancement of an existing feature, set 
the Issue Type field to "ENHANCEMENT".
 You can now set the Status to CONFIRMED and then save your changes. You are 
done with the report.
  1. Otherwise, search Bugzilla for keywords related to the bug report to see 
if this is a duplicate defect report. If it is, change the Status to 
RESOLVED/DUPLICATE and type in the defect number that this report is a 
duplicate of. You are now done with this report.
-     1. If the report is actually reporting a defect, then you have more work 
to do. Try to reproduce it with the latest release of OpenOffice. If you can 
reproduce the defect. set the Status to CONFIRMED, set the "Last Confirmation" 
field to the release that you tested with, and set the Importance field to an 
appropriate value, depending on the severity of the defect.
-     1. If the report is not clear enough to reproduce, enter a comment asking 
the user for more information and add the "needmoreinfo" to the Keyword field. 
Be specific about what information you need:  more detailed steps, a test 
document, clarification about what version they are running, etc. When the user 
responds you will be copied on their response and can continue with this 
report. But for now you are done with this report.
-     1. If your testing cannot reproduce the bug, and you **do not** need more 
information from the user, then change the status to RESOLVED/IRREPRODUCIBLE.
-     1. If the user was confused, did not understand the functionality or was 
asking a support question, then point them to the [Community Support 
Forums](http://forum.openoffice.org) and mark the issue as RESOLVED/INVALID. Of 
course, you can help if it is a simple question, but the forums are the better 
place for a user to find help. Bugzilla is not for support. It is for reporting 
bugs.
+    1. If the report is actually reporting a defect, then you have more work 
to do. Try to reproduce it with the latest release of OpenOffice. If you can 
reproduce the defect. set the Status to CONFIRMED, set the "Last Confirmation" 
field to the release that you tested with, and set the Importance field to an 
appropriate value, depending on the severity of the defect.
+    1. If the report is not clear enough to reproduce, enter a comment asking 
the user for more information and add the "needmoreinfo" to the Keyword field. 
Be specific about what information you need:  more detailed steps, a test 
document, clarification about what version they are running, etc. When the user 
responds you will be copied on their response and can continue with this 
report. But for now you are done with this report.
+    1. If your testing cannot reproduce the bug, and you **do not** need more 
information from the user, then change the status to RESOLVED/IRREPRODUCIBLE.
+    1. If the user was confused, did not understand the functionality or was 
asking a support question, then point them to the [Community Support 
Forums](http://forum.openoffice.org) and mark the issue as RESOLVED/INVALID. Of 
course, you can help if it is a simple question, but the forums are the better 
place for a user to find help. Bugzilla is not for support. It is for reporting 
bugs.
 
 Note: Once you have reviewed a bug report, it should only be left in the 
UNCONFIRMED state if you are waiting for more information from the user, in 
which case you should also set the "needmoreinfo" value into the Keyword field. 
In all other cases you should push the report forward to a new status, either 
CONFIRMED, RESOLVED/IRREPRODUCIBLE, RESOLVED/INVALID or RESOLVED/DUPLICATE, or 
by changing the Issue Type to FEATURE or ENHANCEMENT.
 
diff --git a/content/people.md b/content/people.md
index f74f45f..a95292f 100644
--- a/content/people.md
+++ b/content/people.md
@@ -1,7 +1,7 @@
 Title:     Project Volunteers
 Notice: http://www.apache.org/licenses/LICENSE-2.0
 
-  - 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).
-  - We also have a large cumulative list of [legacy 
contributors](https://www.openoffice.org/welcome/credits.html) to OpenOffice 
+- 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).
+ - We also have a large cumulative list of [legacy 
contributors](https://www.openoffice.org/welcome/credits.html) to OpenOffice 
diff --git a/content/pmc-faqs.md b/content/pmc-faqs.md
index 700f2f9..1a86f6a 100644
--- a/content/pmc-faqs.md
+++ b/content/pmc-faqs.md
@@ -7,7 +7,7 @@ Here are a number of FAQ's about how the Apache OpenOffice 
project governance wo
 
 [TOC]
 
-# What is the PMC? # {#pmc}
+# What is the PMC? {#pmc}
 
 The Project Management Committee (PMC) is the government of the project. The 
committee
 is responsible for the project and decides what to do and which direction to 
go.
@@ -90,7 +90,7 @@ Admin: Matthias Seidel
 
 Admin: Jim Jagielski<p>
 
-# How to participate? # {#participate}
+# How to participate? {#participate}
 
 First of all you have to think how you want to participate as we have different
 kind of roles like user, developer, committer. The easiest way is to use what 
we
@@ -171,7 +171,7 @@ The following is a brief summary of what to expect as 
committer:
 See the [Guide for new committers][9] and the [Committers' FAQ][10] for more
 information.
 
-# How and when to vote? # {#voting}
+# How and when to vote? {#voting}
 
 Voting is done when a formal decision has to be made or due to legal reasons, 
e.g.,
 to vote in new members as committers. In any case avoid voting as the normal 
way is
@@ -179,7 +179,7 @@ to come to a decision by discussions. The initiator is 
responsible for the vote,
 that means also to count the votes and present the result. Every member has 1 
vote.
 <br> ([see here for more information][11])
 
-# Information for Release Managers # {#release_managers}
+# Information for Release Managers {#release_managers}
 
 * ASF General Information:
 [Publishing Releases](https://www.apache.org/dev/release-publishing.html)
diff --git a/content/source.md b/content/source.md
index 2c6cda6..f16b68b 100644
--- a/content/source.md
+++ b/content/source.md
@@ -33,7 +33,7 @@ Including SVN overhead, this requires approximately 4 GB of 
storage.
 ### Source archive of the latest release
 
 An archive of the source for the latest release can be obtainted from the 
Apache Software Foundation repository:
-    
[https://archive.apache.org/dist/openoffice](https://archive.apache.org/dist/openoffice/)
+[https://archive.apache.org/dist/openoffice](https://archive.apache.org/dist/openoffice/)
 
 
 ## Browsing/Searching Source Code
@@ -47,7 +47,7 @@ main repository areas.
 ## Building and Running
 
 See the [Apache OpenOffice Building Guide page][5]
-    for an overview on building.
+for an overview on building.
 
 The [Development Snapshots builds][7] page, pre-release builds, also provide 
additional information on building.
 
diff --git a/content/students.md b/content/students.md
index 08029f9..8c34d0a 100644
--- a/content/students.md
+++ b/content/students.md
@@ -5,27 +5,27 @@ As a well-known open source project, we get many requests 
each semester from stu
 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:
 
-  - [Let us 
know](http://openoffice.apache.org/mailing-lists.html#development-mailing-list-public)
 what you are trying to accomplish.  Do you need to volunteer a specific number 
of hours?  Weeks?  Enough to write up a report?
+- [Let us 
know](http://openoffice.apache.org/mailing-lists.html#development-mailing-list-public)
 what you are trying to accomplish.  Do you need to volunteer a specific number 
of hours?  Weeks?  Enough to write up a report?
   When do you need to have this done?  Next week?  Or three months from now?  
The more you let us know what your goal is the better we can
   recommend appropriate tasks for you to work on.
 
-  - Similarly, let us know what skills you have.  C++?  Technical writing?  
Translation?  Communications? Graphic design?
+- Similarly, let us know what skills you have.  C++?  Technical writing?  
Translation?  Communications? Graphic design?
 
-  - For example, an ideal query might be, "I am a 3rd year computer science 
student.  I have 1 year experience with C++.  I need to contribute to an
+- For example, an ideal query might be, "I am a 3rd year computer science 
student.  I have 1 year experience with C++.  I need to contribute to an
   open source project for the duration of this semester (ending in May).  I 
was hoping I could help with QA, maybe 2 hours a week for this time."
 
-  - Be patient and don't be deterred if your initial notes are not responded 
to immediately.  We're a community of volunteers, spread through
+- Be patient and don't be deterred if your initial notes are not responded to 
immediately.  We're a community of volunteers, spread through
   many time zones.  Many of us have "day jobs" or otherwise work on OpenOffice 
only part time.  
 
-  - In general, it takes longer to become productive with the programming side 
of OpenOffice than with the QA, translation or marketing areas.
+- In general, it takes longer to become productive with the programming side 
of OpenOffice than with the QA, translation or marketing areas.
   Keep this in mind if you will be volunteering only for a short period of 
time (less than a month or two). 
   
-  - You will find lots of useful information about QA, development, 
documentation, and translation in the [Orientation 
Modules](http://openoffice.apache.org/orientation/index.html).
+- You will find lots of useful information about QA, development, 
documentation, and translation in the [Orientation 
Modules](http://openoffice.apache.org/orientation/index.html).
 
-  - We cannot offer any formal grade or evaluation of a student's 
contributions, but your contributions will be public, on our mailing lists
+- We cannot offer any formal grade or evaluation of a student's contributions, 
but your contributions will be public, on our mailing lists
   and other tools, so your professor can easily verify your work. 
 
-  - If your class will be having multiple students wanting to volunteer at the 
same time, please have your professor [contact 
us](http://openoffice.apache.org/mailing-lists.html#development-mailing-list-public)
 
+- If your class will be having multiple students wanting to volunteer at the 
same time, please have your professor [contact 
us](http://openoffice.apache.org/mailing-lists.html#development-mailing-list-public)
 
   in advance, so we can understand the course requirements and have time to 
prepare of some appropriate tasks.
 
 
diff --git a/content/style-test.md b/content/style-test.md
index 187de36..9c0fc38 100644
--- a/content/style-test.md
+++ b/content/style-test.md
@@ -15,11 +15,11 @@ This is ordinary text in a paragraph.  This is **bold**, 
*italics* and a [hyperl
 > Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.
 
 
-   * This is a list item in an unordered list
-   * This is a list item in an unordered list
-   * This is a list item in an unordered list
-    * This is a nested list item
-    * This is a nested list item
+* This is a list item in an unordered list
+* This is a list item in an unordered list
+* This is a list item in an unordered list
+  * This is a nested list item
+  * This is a nested list item
 
 Here is a horizontal rule
 
diff --git a/content/terms.md b/content/terms.md
index 22f13f4..1bd905c 100644
--- a/content/terms.md
+++ b/content/terms.md
@@ -7,67 +7,67 @@ Terms of Use for Apache OpenOffice web site
 
 2. DEFINITIONS. As used here:  
 
-    a. "Host" means AOO-PMC.  
+   a. "Host" means AOO-PMC.  
 
-    b. "Materials" means source code, code samples, object code, technical 
materials, documentation , discussion thread postings, weblogs, wikis, data, 
and any other content, information or technology available on the Site.  
+   b. "Materials" means source code, code samples, object code, technical 
materials, documentation , discussion thread postings, weblogs, wikis, data, 
and any other content, information or technology available on the Site.  
  
-    c. "Project" means a project hosted on the Site.  
+   c. "Project" means a project hosted on the Site.  
  
-    d. "Site" means the collection of web pages that can be accessed via this 
website, as well as any successor web pages or other technology as may be 
designated by the Host.  
+   d. "Site" means the collection of web pages that can be accessed via this 
website, as well as any successor web pages or other technology as may be 
designated by the Host.  
  
-    e. "Submissions" means any Materials submitted to the Site, including all 
Projects.  
+   e. "Submissions" means any Materials submitted to the Site, including all 
Projects.  
  
-    f. "Terms" means these Terms of Use.  
+   f. "Terms" means these Terms of Use.  
  
-    g. "Use" and its variants are meant in their broadest sense, including, 
but not limited to, the acts of using, accessing, receiving, browsing, 
downloading from, and uploading to. A "User" is a person or entity who Uses the 
Site.  
+   g. "Use" and its variants are meant in their broadest sense, including, but 
not limited to, the acts of using, accessing, receiving, browsing, downloading 
from, and uploading to. A "User" is a person or entity who Uses the Site.  
  
-    h. "You" means you personally, as well as the person or entity on whose 
behalf you are Using the Site.
+   h. "You" means you personally, as well as the person or entity on whose 
behalf you are Using the Site.
 
 3. ACCESS TO THE SITE AND THINGS YOU FIND HERE.
  This section refers to the Materials found on the Site, as defined above.   
 
-    a. Other Licenses/Terms. Some of the Materials may be accompanied by their 
own licenses or terms of use. With respect to Your rights in and obligations 
regarding such Materials, and to the extent there is a conflict, those licenses 
or terms of use take precedence over these Terms, and you agree to be bound 
accordingly. With respect to any other matters, including but not limited to 
Your Use of this Site, submission of Materials hereto, and obligations to the 
Host, these Terms take pr [...]
+   a. Other Licenses/Terms. Some of the Materials may be accompanied by their 
own licenses or terms of use. With respect to Your rights in and obligations 
regarding such Materials, and to the extent there is a conflict, those licenses 
or terms of use take precedence over these Terms, and you agree to be bound 
accordingly. With respect to any other matters, including but not limited to 
Your Use of this Site, submission of Materials hereto, and obligations to the 
Host, these Terms take pre [...]
 
-    b. Use at Your Own Risk. You understand that the Host does not pre-screen 
Materials, and You agree to assume all risks in Using them. These risks 
include, but are not limited to, errors, viruses, worms, time-limited software 
that expires without notice, and the possibility that the Materials infringe or 
misappropriate the intellectual property rights of others. You agree to assume 
all such risks.
+   b. Use at Your Own Risk. You understand that the Host does not pre-screen 
Materials, and You agree to assume all risks in Using them. These risks 
include, but are not limited to, errors, viruses, worms, time-limited software 
that expires without notice, and the possibility that the Materials infringe or 
misappropriate the intellectual property rights of others. You agree to assume 
all such risks.
 
-    c. Don't Blame the Messenger. You understand that Materials may contain 
the opinions of others and You do not hold the Host responsible for such 
opinions.
+   c. Don't Blame the Messenger. You understand that Materials may contain the 
opinions of others and You do not hold the Host responsible for such opinions.
 
-    d. Copyright Infringement. If You believe that any Materials infringe Your 
copyrights, please follow the procedure set forth at Apache Software Foundation 
legal affairs website: http://apache.org/legal/.
+   d. Copyright Infringement. If You believe that any Materials infringe Your 
copyrights, please follow the procedure set forth at Apache Software Foundation 
legal affairs website: http://apache.org/legal/.
 
-    e. Management of Materials and Access. You agree that the Host has sole 
discretion in deciding whether to accept and post Materials, and that the Host 
may delete Materials for any reason (including no reason) whatsoever. You 
understand that access to the Site may be limited for technical reasons, that 
outages may occur, and that the Host has no obligation to store or back up any 
Materials. You agree that the Host has the right to restrict or terminate, in 
their sole discretion, acces [...]
+   e. Management of Materials and Access. You agree that the Host has sole 
discretion in deciding whether to accept and post Materials, and that the Host 
may delete Materials for any reason (including no reason) whatsoever. You 
understand that access to the Site may be limited for technical reasons, that 
outages may occur, and that the Host has no obligation to store or back up any 
Materials. You agree that the Host has the right to restrict or terminate, in 
their sole discretion, access [...]
 
-    f. Links to Other Sites. You understand that this Site may provide links 
to other sites or content that is not hosted or managed by the Host, and you 
agree that the Host has no control over, responsibility or liability whatsoever 
relating to any such sites or content, including Your Use of them.
+   f. Links to Other Sites. You understand that this Site may provide links to 
other sites or content that is not hosted or managed by the Host, and you agree 
that the Host has no control over, responsibility or liability whatsoever 
relating to any such sites or content, including Your Use of them.
 
 4. THINGS YOU SUBMIT TO THE SITE. This Site offers many opportunities for You 
to contribute Materials to the on this site. In addition to the other terms 
found here, the following terms apply to any Submissions made by You ("Your 
Submissions").
 
-    a. You Take Responsibility for Your Submissions. You warrant that You have 
all rights needed to provide Your Submissions to the Host for posting to the 
Site in accordance with the Terms and to grant the licenses set forth in 
sections 4.b and 4.c. You agree that You will make all reasonable efforts to 
ensure that Your Submissions:  do not infringe, misappropriate or violate the 
intellectual property rights or privacy interests of others; (ii) are not 
confidential or trade secret infor [...]
+   a. You Take Responsibility for Your Submissions. You warrant that You have 
all rights needed to provide Your Submissions to the Host for posting to the 
Site in accordance with the Terms and to grant the licenses set forth in 
sections 4.b and 4.c. You agree that You will make all reasonable efforts to 
ensure that Your Submissions:  do not infringe, misappropriate or violate the 
intellectual property rights or privacy interests of others; (ii) are not 
confidential or trade secret inform [...]
 
-    b. Source Code Submissions. You agree that any source code You contribute 
to a Project will be submitted under, and subject to, the license posted for 
that Project. If no license is posted, You agree that Your Submission will be 
governed by the Apache License, Version 2.0, which terms can be found at 
http://opensource.org/licenses/apache2.0.php. You acknowledge that You are 
responsible for including all applicable copyright notices and licenses with 
Your Submissions, and that You ass [...]
+   b. Source Code Submissions. You agree that any source code You contribute 
to a Project will be submitted under, and subject to, the license posted for 
that Project. If no license is posted, You agree that Your Submission will be 
governed by the Apache License, Version 2.0, which terms can be found at 
http://opensource.org/licenses/apache2.0.php. You acknowledge that You are 
responsible for including all applicable copyright notices and licenses with 
Your Submissions, and that You assu [...]
 
-    c. Other Submissions. (This Section 4.c applies to all Submissions other 
than source code contributed to a Project, which is governed by the preceding 
section.) The Host does not claim ownership of Your Submissions. However, in 
order to fulfill the purposes of this Site, You must give the Host and all 
Users the right to post, access, evaluate, discuss, and refine Your 
Submissions. 
+   c. Other Submissions. (This Section 4.c applies to all Submissions other 
than source code contributed to a Project, which is governed by the preceding 
section.) The Host does not claim ownership of Your Submissions. However, in 
order to fulfill the purposes of this Site, You must give the Host and all 
Users the right to post, access, evaluate, discuss, and refine Your 
Submissions. 
 
-    In legalese: You hereby grant to the Host and all Users a royalty-free, 
perpetual, irrevocable, worldwide, non-exclusive and fully sub-licensable right 
and license under Your intellectual property rights to reproduce, modify, 
adapt, publish, translate, create derivative works from, distribute, perform, 
display and use Your Submissions (in whole or part) and to incorporate them in 
other works in any form, media, or technology now known or later developed, all 
subject to the obligation [...]
+   In legalese: You hereby grant to the Host and all Users a royalty-free, 
perpetual, irrevocable, worldwide, non-exclusive and fully sub-licensable right 
and license under Your intellectual property rights to reproduce, modify, 
adapt, publish, translate, create derivative works from, distribute, perform, 
display and use Your Submissions (in whole or part) and to incorporate them in 
other works in any form, media, or technology now known or later developed, all 
subject to the obligation  [...]
 
-    d. Private Projects. With respect to a Project that is designated as 
"Private," the preceding license for "Other Submissions" is limited to Users 
who have access to the Project, and such rights may only be sublicensed to 
other Users with authorized access to the Project.
+   d. Private Projects. With respect to a Project that is designated as 
"Private," the preceding license for "Other Submissions" is limited to Users 
who have access to the Project, and such rights may only be sublicensed to 
other Users with authorized access to the Project.
 
-    e. Other Licenses/Terms. Some Projects are governed by their own terms 
regarding Submissions and may require You to sign agreements (such as an Apache 
Software Foundation Individual Contributor License Agreement) licensing Your 
rights in Your Submissions. In all such cases, and to the extent there is a 
conflict, the terms of those Projects and agreements take precedence over these 
Terms.
+   e. Other Licenses/Terms. Some Projects are governed by their own terms 
regarding Submissions and may require You to sign agreements (such as an Apache 
Software Foundation Individual Contributor License Agreement) licensing Your 
rights in Your Submissions. In all such cases, and to the extent there is a 
conflict, the terms of those Projects and agreements take precedence over these 
Terms.
 
-    f. Privacy. You consent to the collection, processing and storage by the 
Host of any personal information provided by You in accordance with the terms 
of AOO-PMC Privacy Policy, which is available at 
[http://openoffice.apache.org/privacy.html][1]. You agree to comply with all 
applicable laws and regulations, and the terms of Apache OpenOffice Privacy 
Policy, with respect to any use by You of any personal information in 
connection with this Site.
+   f. Privacy. You consent to the collection, processing and storage by the 
Host of any personal information provided by You in accordance with the terms 
of AOO-PMC Privacy Policy, which is available at 
[http://openoffice.apache.org/privacy.html][1]. You agree to comply with all 
applicable laws and regulations, and the terms of Apache OpenOffice Privacy 
Policy, with respect to any use by You of any personal information in 
connection with this Site.
 
 5. MISCELLANEOUS.
 
-    a. Disclaimer of Warranties. YOUR USE OF THE SITE IS AT YOUR SOLE RISK. 
THE SITE, INCLUDING ALL MATERIALS FOUND ON IT, IS PROVIDED ON AN "AS IS," "AS 
AVAILABLE" AND "WITH ALL FAULTS" BASIS. THE HOST DISCLAIMS ALL EXPRESS OR 
IMPLIED CONDITIONS, REPRESENTATIONS, AND WARRANTIES OF ANY KIND, INCLUDING ANY 
IMPLIED WARRANTY OR CONDITION OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS 
FOR A PARTICULAR PURPOSE, OR NONINFRINGEMENT. THE HOST MAKES NO 
REPRESENTATIONS, WARRANTIES, CONDITIONS O [...]
+   a. Disclaimer of Warranties. YOUR USE OF THE SITE IS AT YOUR SOLE RISK. THE 
SITE, INCLUDING ALL MATERIALS FOUND ON IT, IS PROVIDED ON AN "AS IS," "AS 
AVAILABLE" AND "WITH ALL FAULTS" BASIS. THE HOST DISCLAIMS ALL EXPRESS OR 
IMPLIED CONDITIONS, REPRESENTATIONS, AND WARRANTIES OF ANY KIND, INCLUDING ANY 
IMPLIED WARRANTY OR CONDITION OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS 
FOR A PARTICULAR PURPOSE, OR NONINFRINGEMENT. THE HOST MAKES NO 
REPRESENTATIONS, WARRANTIES, CONDITIONS OR [...]
 
-    b. Limitation of Liability. TO THE FULLEST EXTENT PERMITTED BY LAW, THE 
HOST IS NOT LIABLE FOR ANY DIRECT, INDIRECT, PUNITIVE, SPECIAL, INCIDENTAL, 
CONSEQUENTIAL, OR EXEMPLARY DAMAGES (INCLUDING, WITHOUT LIMITATION, LOSS OF 
BUSINESS, REVENUE, PROFITS, GOODWILL, USE, DATA, ELECTRONICALLY TRANSMITTED 
ORDERS, OR OTHER ECONOMIC ADVANTAGE) ARISING OUT OF OR IN CONNECTION WITH THE 
SITE OR MATERIALS, EVEN IF THE HOST HAS PREVIOUSLY BEEN ADVISED OF, OR 
REASONABLY COULD HAVE FORESEEN, THE POS [...]
+   b. Limitation of Liability. TO THE FULLEST EXTENT PERMITTED BY LAW, THE 
HOST IS NOT LIABLE FOR ANY DIRECT, INDIRECT, PUNITIVE, SPECIAL, INCIDENTAL, 
CONSEQUENTIAL, OR EXEMPLARY DAMAGES (INCLUDING, WITHOUT LIMITATION, LOSS OF 
BUSINESS, REVENUE, PROFITS, GOODWILL, USE, DATA, ELECTRONICALLY TRANSMITTED 
ORDERS, OR OTHER ECONOMIC ADVANTAGE) ARISING OUT OF OR IN CONNECTION WITH THE 
SITE OR MATERIALS, EVEN IF THE HOST HAS PREVIOUSLY BEEN ADVISED OF, OR 
REASONABLY COULD HAVE FORESEEN, THE POSS [...]
 
-    c. Trademarks. All logos and trademarks contained on this Site are and 
remain the property of their respective owners. No licenses or other rights in 
or to such logos and/or trademarks are granted to You by these Terms.
+   c. Trademarks. All logos and trademarks contained on this Site are and 
remain the property of their respective owners. No licenses or other rights in 
or to such logos and/or trademarks are granted to You by these Terms.
 
-    d. Changes to Terms. These Terms may be changed or updated by the Host 
without notice.
+   d. Changes to Terms. These Terms may be changed or updated by the Host 
without notice.
 
-    e. Export Compliance. You agree that U.S. export control laws and other 
applicable export and import laws govern your Submissions and use of the Site, 
Materials and Submissions, including technical data; additional information can 
be found on http://apache.org/dev/crypto.html. You agree that neither the 
Materials and Submissions nor any direct product thereof will be exported, 
directly, or indirectly, in violation of these laws, or will be used for any 
purpose prohibited by these law [...]
+   e. Export Compliance. You agree that U.S. export control laws and other 
applicable export and import laws govern your Submissions and use of the Site, 
Materials and Submissions, including technical data; additional information can 
be found on http://apache.org/dev/crypto.html. You agree that neither the 
Materials and Submissions nor any direct product thereof will be exported, 
directly, or indirectly, in violation of these laws, or will be used for any 
purpose prohibited by these laws [...]
 
-    f. Governing Law. These Terms of Use are governed by the substantive and 
procedural laws of Delaware.
+   f. Governing Law. These Terms of Use are governed by the substantive and 
procedural laws of Delaware.
 
-    g. General. You agree that these Terms of Use are the complete agreement 
for the Site, Materials and Submissions, and these Terms of Use supersedes all 
prior or contemporaneous agreements or representations. If any term of these 
Terms of Use is found to be invalid or unenforceable, the remaining provisions 
will remain effective
+   g. General. You agree that these Terms of Use are the complete agreement 
for the Site, Materials and Submissions, and these Terms of Use supersedes all 
prior or contemporaneous agreements or representations. If any term of these 
Terms of Use is found to be invalid or unenforceable, the remaining provisions 
will remain effective
 
 [1]: http://openoffice.apache.org/privacy.html
diff --git a/content/trademarks.md b/content/trademarks.md
index cba679c..b44d813 100644
--- a/content/trademarks.md
+++ b/content/trademarks.md
@@ -18,32 +18,32 @@ fully in conformance with Apache policies.
 To request such permission, follow these steps:
 
 1. First familiarize yourself with the [Apache Trademark Policy] [1].
-Many of the common cases are already addressed there. And some uses
-of ASF marks ("nominative use") are automatically allowed.
+   Many of the common cases are already addressed there. And some uses
+   of ASF marks ("nominative use") are automatically allowed.
 
 1. Email a proposal to [[email protected]] [2]. In the
-proposal, please include:
+   proposal, please include:
 
-    1. Name and contact information of the company, organization or
-       person requesting the permission
+   1. Name and contact information of the company, organization or
+      person requesting the permission
 
-    1. A list of what ASF controlled marks you wish to use
+   1. A list of what ASF controlled marks you wish to use
 
-    1. A description of how these marks would be used. Give supporting
-       detail, along with context  If you are requesting use of the
-       logo, for example, provide a prototype of how the logo would
-       appear in the context of the overall design.
+   1. A description of how these marks would be used. Give supporting
+      detail, along with context  If you are requesting use of the
+      logo, for example, provide a prototype of how the logo would
+      appear in the context of the overall design.
 
-    1. Any other information you think would be useful, e.g., any
-       impeding deadlines
+   1. Any other information you think would be useful, e.g., any
+      impeding deadlines
 
 1. On receipt of the proposal, the Apache OpenOffice PMC will review
-and decide whether or not to recommend approval.
+   and decide whether or not to recommend approval.
 
 1. If the PMC recommends approval, then they will forward their
-recommendation, along with your proposal and any follow up
-communications, to the Apache V.P. of Brand Management for final
-approval.
+   recommendation, along with your proposal and any follow up
+   communications, to the Apache V.P. of Brand Management for final
+   approval.
 
 1. We will then notify you of the outcome.
 
@@ -53,13 +53,13 @@ If you see a possible violation of an OpenOffice-related 
trademark,
 please:
 
 1. Review the details above about the trademarks held by the Apache
-Software Foundation on behalf of the Apache OpenOffice project, and
-about the acceptable usage of trademarks.
+   Software Foundation on behalf of the Apache OpenOffice project, and
+   about the acceptable usage of trademarks.
 
 1. If this confirms your belief that a website or product is
-infringing one of the above-mentioned trademarks, report it to
-[[email protected]] [4]. Make sure you include all
-relevant details, especially, a URL for the offending page.
+   infringing one of the above-mentioned trademarks, report it to
+   [[email protected]] [4]. Make sure you include all
+   relevant details, especially, a URL for the offending page.
 
 ## The "Get it here!" download logo
 
diff --git a/content/translate.md b/content/translate.md
index 06d011a..e024e02 100644
--- a/content/translate.md
+++ b/content/translate.md
@@ -1,7 +1,7 @@
 Title:     How to Help Translate Apache OpenOffice
 Notice: http://www.apache.org/licenses/LICENSE-2.0
 
-##Introduction
+## Introduction
 
 OpenOffice traditionally has always had excellent localization support,
 especially with its support of over 100 languages, including many
@@ -25,7 +25,7 @@ while the full list of available translations,
 including incomplete and dormant ones, is available
 [here](https://github.com/apache/openoffice/tree/trunk/extras/l10n/source).
 
-##How to Help
+## How to Help
 
 First, subscribe to our localization ("L10N")
 mailing list by sending an email to
diff --git a/content/website-local.md b/content/website-local.md
index 1029f21..0b11de9 100644
--- a/content/website-local.md
+++ b/content/website-local.md
@@ -12,10 +12,12 @@ pages are updated by the project community.
 The Apache OpenOffice project maintains two websites:
 
 * The [project website](https://openoffice.apache.org/), primarily for 
development and technical information (which you're viewing now). 
- All content for this website uses 
[Markdown](http://daringfireball.net/projects/markdown/) syntax (.mdtext files).
+  All content for this website uses 
[Markdown](http://daringfireball.net/projects/markdown/) syntax (.mdtext files).
 * The user portal, [www.openoffice.org](https://www.openoffice.org), primarily 
for end user information and support.
- Content for the user portal primarily uses html, but some content is in
- [Markdown](http://daringfireball.net/projects/markdown/) syntax (.mdtext 
files).
+  Content for the user portal primarily uses html, but some content is in
+  [Markdown](http://daringfireball.net/projects/markdown/) syntax (.mdtext 
files).
+
+> **The following instructions are obsolete! Both websites have been migrated 
away from the deprecated Apache CMS!**
 
 Both of these sites use the [Apache Content Management 
System](https://www.apache.org/dev/cms.html) (CMS) to manage editing, 
submitting changes, and updating the live websites.
 In essence, regardless of how you make changes to either web area, the changes 
first go
@@ -39,7 +41,7 @@ You can make changes to either site using svn (subversion). 
This typically invol
 doing an svn checkout, making changes to files and --
 
 * committing your changes
-if you are an "Apache committer", or 
+  if you are an "Apache committer", or 
 * submitting a "patch" (an svn "diff" file) if you are a contributor but not a 
"committer". 
 
 Consult your local svn implementation for how to do commits or create patches. 
(See also, the [SVN Book](http://svnbook.red-bean.com/) ). 
@@ -47,12 +49,12 @@ Consult your local svn implementation for how to do commits 
or create patches. (
 Patches, svn "diff" files can be submitted in a variety of ways:
 
 * File an issue using [OpenOffice Bugzilla](https://bz.apache.org/ooo/) and 
select the "www"
-category to file it. You should then use your saved patch as an attachment to 
the
-issue. Please send a follow-up e-mail to 
[dev](mailto:[email protected]) and provide the
-issue number so we can follow-up.
+  category to file it. You should then use your saved patch as an attachment 
to the
+  issue. Please send a follow-up e-mail to 
[dev](mailto:[email protected]) and provide the
+  issue number so we can follow-up.
 
 * Patches can be submitted as attachments to e-mail to the 
-[Apache OpenOffice developer](mailto:[email protected]) list.
+  [Apache OpenOffice developer](mailto:[email protected]) list.
 
 Changes committed with SVN commit your changes to the "staging area". These 
changes will need to be published to become active on the "production" site.
 
@@ -75,13 +77,12 @@ As previously noted, changes you make, either through an 
svn commit or using the
 are enacted on the staging sites. Once you review your changes on the staging 
site,
 you can "publish" the site -- enacting your changes on the production site. 
Only Apache "committers" can actually publish sites.  
 
-
 * You can use the CMS GUI tool to also commit, review, and publish your 
changes from the 
-staging site. 
+  staging site. 
 * Or, you can use the "publish" link for a site from the [CMS Web 
Site](https://cms.apache.org/)
-after reviewing it in staging from a "commit" operations.
+  after reviewing it in staging from a "commit" operations.
 * Or, you can use the command line, **publish.pl "site-name"**. For our 
purposes,
-**"site-name"** will either be **"openofficeorg"** or **"ooo-site"**. 
+  **"site-name"** will either be **"openofficeorg"** or **"ooo-site"**. 
 
 Generally speaking, unless you have established a full **Complete Local 
Website Development** environment as described in the next
 section, you will likely be running **publish.pl** from your 
"people.apache.org" account.
diff --git a/content/website-native.md b/content/website-native.md
index 5296941..5b8a45b 100644
--- a/content/website-native.md
+++ b/content/website-native.md
@@ -41,17 +41,17 @@ the following. If you are not a committer and are not 
familiar with Subversion t
 will want to get help with these steps by asking on the mailing list.
 
 1. Make a copy (svn copy) of the
-[ooo-site/trunk/content/xx 
directory](https://svn.apache.org/repos/asf/openoffice/ooo-site/trunk/content/xx/)
-as ooo-site/trunk/content/test-it. In the copy replace all instances of "/xx" 
in paths,
-files and also within files with "/test-it". Then replace occurrences of "xx" 
with "it" (not "test-it")
-and rename the "msg_prop_l10n_xx.js" file to "msg_prop_l10n_it.js"
+   [ooo-site/trunk/content/xx 
directory](https://svn.apache.org/repos/asf/openoffice/ooo-site/trunk/content/xx/)
+   as ooo-site/trunk/content/test-it. In the copy replace all instances of 
"/xx" in paths,
+   files and also within files with "/test-it". Then replace occurrences of 
"xx" with "it" (not "test-it")
+   and rename the "msg_prop_l10n_xx.js" file to "msg_prop_l10n_it.js"
 1. Also make a copy of
-[ooo-site/trunk/templates/xx](https://svn.apache.org/repos/asf/openoffice/ooo-site/trunk/templates/xx/)
-and call the copy ooo-site/trunk/templates/test-it.
+   
[ooo-site/trunk/templates/xx](https://svn.apache.org/repos/asf/openoffice/ooo-site/trunk/templates/xx/)
+   and call the copy ooo-site/trunk/templates/test-it.
 1. Commit these changes and publish via the CMS
 1. If you are a committer then you can translate the contents of the files in 
/test-it
-locally or via the CMS, whatever you prefer. If you are not a committer then 
ask someone
-to do an "svn export" of the new /test-it and send a ZIP file of the contents.
+   locally or via the CMS, whatever you prefer. If you are not a committer 
then ask someone
+   to do an "svn export" of the new /test-it and send a ZIP file of the 
contents.
 
 **Important:**
 <br />
@@ -64,10 +64,10 @@ The files will be in two main formats:
 
 1. HTML files.
 1. Markdown text files.
-[Need to know more about Markdown 
Text?](https://daringfireball.net/projects/markdown/basics)
+   [Need to know more about Markdown 
Text?](https://daringfireball.net/projects/markdown/basics)
 
-In your translation, do not change the file or directory names. Be careful to 
preserve
-the markup of the HTML and the indentation levels of the MDText files.
+   In your translation, do not change the file or directory names. Be careful 
to preserve
+   the markup of the HTML and the indentation levels of the MDText files.
 
 ## The Template
 
@@ -104,18 +104,18 @@ exist.
 A few other things to watch out for.
 
 1. Some files contain an Apache License header at the top of the page. You 
should not
-translate that.
+   translate that.
 1. Some files contain comments. These don't need to be translated, but no harm 
is done if
-they are.
+   they are.
 1. The /download/index.html requires special care since the language strings 
are stored in
-a the separate Javascript file "msg_prop_l10n_xx.js". The file "index.html" 
contains only
-the variables. Look for the further section if you need more help on this.
+   a the separate Javascript file "msg_prop_l10n_xx.js". The file "index.html" 
contains only
+   the variables. Look for the further section if you need more help on this.
 1. It is easy to miss the social networking messages in /download/index.html.
-These are in the HTML header block and in function shareTwitter(). The string 
is something
-like "Join the OpenOffice revolution, the free office productivity suite with 
over 275
-million trusted downloads."
-You should translate these, but adapt if needed to keep the string within the 
280 limit
-for Twitter.
+   These are in the HTML header block and in function shareTwitter(). The 
string is something
+   like "Join the OpenOffice revolution, the free office productivity suite 
with over 275
+   million trusted downloads."
+   You should translate these, but adapt if needed to keep the string within 
the 280 limit
+   for Twitter.
 
 ## How to find the right text for the file at the right place?
 
@@ -167,8 +167,8 @@ Also many links in the navigation bar refers to global 
webpages.
 It may be desired to add language-specific custom content to the website. For 
example:
 
 - A localized Arabic website might want a special page dedicated to a 
description of how
-to use the bidirectional text features in OpenOffice. The Tamil website might 
want a page
-that links to a particular open source font download that is recommended.
+  to use the bidirectional text features in OpenOffice. The Tamil website 
might want a page
+  that links to a particular open source font download that is recommended.
 - There may be a local OpenOffice-related event that you want to publicize.
 
 New content pages can be added to your NL directory and links page from a 
navigator or

Reply via email to