Website.md

-Overview: [wiki:Website/MainSiteRedesign main site redesign]
+Overview: [main site redesign](./Website/MainSiteRedesign)
 
 [[TicketQuery(max=1,milestone~=website redesign,order=priority,order=priority,format=table,col=id|summary|owner|priority,rows=description,status=!closed)]]
 
-= Website team communication channels =
+# Website team communication channels
 Mailing list:
 
- * [https://lists.torproject.org/cgi-bin/mailman/listinfo/www-team Subscribe to the www-team mailing list]
+ * [Subscribe to the www-team mailing list](https://lists.torproject.org/cgi-bin/mailman/listinfo/www-team)
  * To post a message to all the list members, send email to `www-team@lists.torproject.org`
- * To see the collection of prior postings to the list, visit the [http://lists.torproject.org/pipermail/www-team/ www-team Archives]
+ * To see the collection of prior postings to the list, visit the [www-team Archives](http://lists.torproject.org/pipermail/www-team/)
 
 IRC:
 
  * `#tor-www` on OFTC (`irc.oftc.net`)
 
-= Tickets =
+# Tickets
 [[TicketQuery(keywords~=www-team,format=table,col=id|summary|owner|component|milestone,rows=description,status=!closed)]]
 
-== Milestones ==
-* [https://trac.torproject.org/projects/tor/query?group=status&milestone=website+redesign website redesign]
+## Milestones
+* [website redesign](https://trac.torproject.org/projects/tor/query?group=status&milestone=website+redesign)
 [[TicketQuery(max=15,milestone~=website redesign,order=priority,format=table,col=id|summary|owner|priority,status=!closed)]]
 
-* [https://trac.torproject.org/projects/tor/query?group=status&milestone=WebsiteV3 Tor Website 3 Milestone]
+* [Tor Website 3 Milestone](https://trac.torproject.org/projects/tor/query?group=status&milestone=WebsiteV3)
 [[TicketQuery(max=15,milestone~=WebsiteV3,order=priority,format=table,col=id|summary|owner|priority,status=!closed)]]
 
-== All website tickets ==
-See [https://trac.torproject.org/projects/tor/report/45 all tickets related to the website], [https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=merge_ready&status=needs_information&status=needs_review&status=needs_revision&status=new&status=reopened&component=%5EWebpages&group=status&col=id&col=summary&col=component&col=owner&col=type&col=priority&col=version&order=priority sorted by status].
+## All website tickets
+See [all tickets related to the website](https://trac.torproject.org/projects/tor/report/45), [sorted by status](https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=merge_ready&status=needs_information&status=needs_review&status=needs_revision&status=new&status=reopened&component=%5EWebpages&group=status&col=id&col=summary&col=component&col=owner&col=type&col=priority&col=version&order=priority).
 [[TicketQuery(max=15,component=Webpages/Website,format=table,col=id|summary|owner|component|milestone,rows=description,status=!closed)]]
 
-= How to contribute ideas =
+# How to contribute ideas
 This wiki should be seen as a record of concrete proposals. As such, here is a loose procedure to follow if you would like to suggest new ideas:
 
  1. Write a proposal on the wiki
@@ -36,34 +36,34 @@ This wiki should be seen as a record of concrete proposals. As such, here is a l
  1. Repeat!
  1. Implement
 
-= Engine =
-The current website is powered by [https://bitbucket.org/shlomif/website-meta-language WML]. Switching to a more recent engine supporting lighter syntax (like Markdown) is probably worthwhile.
+# Engine
+The current website is powered by [WML](https://bitbucket.org/shlomif/website-meta-language). Switching to a more recent engine supporting lighter syntax (like Markdown) is probably worthwhile.
 
-== Technical requirements ==
+## Technical requirements
  * Generate static web pages that can work offline as well. That means self-contained and zero 3rd party requests. No mandatory client-side JavaScript either.
  * Content should be kept in Git.
  * Support for the “Don't Repeat Yourself” principle, e.g. the latest version of the Tor Browser Bundle needs to be kept at a single place but used at different places in the website.
  * Support translations. A changes in a single paragraph should be easily to propagate to translators and to then to translations.
 
-== Candidates ==
+## Candidates
 The following projects look like potential candidates:
 
-=== Pelican ===
-Pelican is a static site generator, written in Python. [http://docs.getpelican.com/ Documentation]
+### Pelican
+Pelican is a static site generator, written in Python. [Documentation](http://docs.getpelican.com/)
 
-=== Jekyll ===
-Jekyll is a simple, blog-aware, static site generator, written in Ruby. [http://jekyllrb.com/ Website]
+### Jekyll
+Jekyll is a simple, blog-aware, static site generator, written in Ruby. [Website](http://jekyllrb.com/)
 
-=== Middleman ===
-Middleman is a static site generator using all the shortcuts and tools in modern web development, written in Ruby. [http://middlemanapp.com/ Website]
+### Middleman
+Middleman is a static site generator using all the shortcuts and tools in modern web development, written in Ruby. [Website](http://middlemanapp.com/)
 
-=== Nikola ===
-Nikola is a Static Site and Blog Generator. [http://getnikola.com/ Website]
+### Nikola
+Nikola is a Static Site and Blog Generator. [Website](http://getnikola.com/)
 
-= How to build the current website =
+# How to build the current website
 Some commands than can be used on a Debian Wheezy system to build the current website:
 
-{{{
+```
     apt install wml
     apt install --no-install-recommends asciidoc
     git clone https://git.torproject.org/tor.git
@@ -71,18 +71,18 @@ Some commands than can be used on a Debian Wheezy system to build the current we
     echo "export TORGIT=$(pwd)/tor/.git" > webwml/Makefile.local
     cd webwml/
     make
-}}}
+```
 
 This should only be required if structural changes are necessary, typically you should push
 a branch with changes somewhere and ask for a pull by opening a ticket in the website
 component here.
 
-= Notes =
+# Notes
 Some notes from a discussion that happened during 30C3 gathering ideas on how to structure the website.
 
-== Roadmap ==
+## Roadmap
 
-''The following was brainstormed at the Berlin dev. meeting in September 2015.''
+_The following was brainstormed at the Berlin dev. meeting in September 2015._
 
 Sebastian will be the main gatekeeper of the website. Changes should be proposed using tickets on Trac with the “website” component. Ideally the ticket should contain a pull request or a patch. For people who are not able to modify the code or don't want to, we have a team of people willing to act as integrator.
 
@@ -92,15 +92,15 @@ For language changes, we might not want to push changes in production right away
 
 To make a language available, the 85% of the website needs to be translated and the language should have a designated reviewer. That person would send pull requests once they have vouched a translation as correct. They would also be the point of contact when bugs are reported for a given translation.
 
-== Contact ==
+## Contact
  * Sebastian
  * Isabela
 
-== Proposals ==
- * [wiki:WebsiteProposalClv Cristóbal's proposal]
- * [wiki:Website/MainSiteRedesign main site redesign]
+## Proposals
+ * [Cristóbal's proposal](./WebsiteProposalClv)
+ * [main site redesign](./Website/MainSiteRedesign)
 
-== Proposed new information architecture ==
+## Proposed new information architecture
  * Understand
    * For: Everyone and journalists
  * Use
@@ -119,42 +119,42 @@ To make a language available, the 85% of the website needs to be translated and
    * Localized blog? E.g. fa-blog.torproject.org contains information specific to a given location. Do the same for de, mx, or other places?
  * Press
 
-== Personas ==
-=== The Student ===
+## Personas
+### The Student
 The Student has recently heard about Tor and would like to discover more about it. Particularly he has heard from a friend that it could be used to protect his web browsing whilst using the university campus public wifi.
 
-=== The Journalist ===
+### The Journalist
 The Journalist has been writing about online privacy for the past year and would like to write a feature about Tor. Although she has previously experimented with Tor's browser bundle she would like further information of how the Tor infrastructure functions and the technical details behind how it enables online anonymity.
 
-=== The Researcher ===
+### The Researcher
 The Researcher works for a think tank. She has been a user of Tor since December 2011 and is a strong proponent for an open web. Since finding out about Tor, Stephanie has become involved in the Tor community contributing fixes and features to the Tor code base and engaging with other Tor contributers using the mailing lists and IRC.
 
-=== The Donor ===
+### The Donor
 The Donor has read about Tor in the local newspaper and would very much like to make a donation.
 
-=== The Engineer ===
+### The Engineer
 The Engineer has been a Tor Relay Operator for a little over a year and has encouraged two of his colleagues to do the same.
 
-=== The Activist ===
+### The Activist
 The Activist would like to comment anonymously on the Internet and not link her personal accounts to her activism work. She would like to use Tor to achieve this.
 
-=== The Dissident ===
+### The Dissident
 The Dissident lives under an oppressive regime which heavily filters the internet. He is very aware of the consequences to himself and his family if he is discovered. He is hesitant to use Tor without knowledge of how it works and what its limitations are (ie. an adversary that monitors Internet connections).
 
-== Technical Requirements ==
+## Technical Requirements
  * Debian native citizen
  * Static Site Generator
  * Easy to use for whole staff
  * Internationalization
 
-== Useful base concepts ==
+## Useful base concepts
  * Direct each user quickly to the right part
  * If graphic redesign, think about the whole project, general 'CI'
  * Communicate basic concepts with communication department
  * Primary target: never deliver software without education
 
-== Discussions ==
-=== User Education ===
+## Discussions
+### User Education
  * Educate before download
  * Educate on browser startup
  * …
\ No newline at end of file