The actual LIVE site, visible at libreplanet.org/YEAR, is served from the "stable" branch of the git repository using a git hook. There is also a development branch called "master" which we use to preview edits on the Web. The master branch is served to the Web at http://wiki-dev0.libreplanet.org/YEAR and publicly visible, but not linked to.
-Full workflow to make, test and deploy an edit
+Full workflow to make, test and deploy an edit.
-----------------
* Check out the master branch and make sure it is up to date with origin/master by doing:
* git checkout master
* git pull
* Is this a large edit or a small edit? If it is small, edit, work in master. If this is a large edit that will take longer than a day, make a new branch based on the master branch and work there.
-* Make your edits. (See instructions for editing content below.)
+* Make your edits. (See site structure and instructions for editing content below.)
* Optionally, test them on your computer with a local development environment. (See instructions below for setting up your development environment).
* If you are working on your own branch created for your edit, merge, your branch into master by doing:
* git checkout master
* git push
* Your edits are now live and visible at libreplanet.org/YEAR
-##### SECTION 2: EDITING INSTRUCTIONS #####
+##### SECTION 2: SITE STRUCTURE #####
+
+The site is made up of HTML files, each representing part of a page (sidebar, content, footer, etc.). When a browser visits the site, the server finds the core HTML file for the page (for example, the core file for https://www.libreplanet.org/YEAR/getting-around is /YEAR/getting-around/index.html in the repo), then reads special comments in that file to which instruct it to pull various other HTML files in to produce a complete page, using an Apache feature called SSI. To edit part of a page, you will need to find out which HTML file contains the element in question. Do this by navigating to core HTML file and exploring the comments that start with "#include".
+
+##### SECTION 3: EDITING INSTRUCTIONS #####
To change content on existing pages, simply use your favorite text editor.
<!-- #top-right-desktop end -->
-##### SECTION 3: SETTING UP A LOCAL DEVELOPMENT ENVIRONMENT #####
+##### SECTION 4: SETTING UP A LOCAL DEVELOPMENT ENVIRONMENT #####
Apache is required in order to replicate the appearance of the website
on the live and staging servers on your machine. If you don't want to
<!-- <li class="volunteer-link"><a href="/2017/volunteer">Volunteer</a></li> -->
<!-- <li><a href="https://my.fsf.org/civicrm/event/register?id=43&reset=1">Host a streaming party</a></li> -->
-<li class="sponsors-link"><a href="https://static.fsf.org/nosvn/libreplanet/2017/lp2017-sponsorship-07-lowres.pdf">Sponsorship & exhibit hall</a></li>
+<li class="sponsors-link"><a href="/2017/sponsors/">Sponsorship & exhibit hall</a></li>
<li><a href="https://my.fsf.org/civicrm/contribute/transact?reset=1&id=33">Build the scholarship fund</a></li>
<li class="ahp-link"><a href="/2017/safe-space-policy/">Safe Space Policy</a></li>
<!-- <li class="sponsors-link"><a href="/2017/sponsors">Sponsors</a></li> -->
--- /dev/null
+<!--#include virtual="/2017/includes/header.html"-->
+
+<title>LibrePlanet Sponsorship</title>
+
+<!--#include virtual="/2017/includes/banner.html"-->
+<!--#include virtual="/2017/includes/sidebar.html"-->
+
+<h1>Sponsorship and Exhibit Hall</h1>
+
+<p>We are currently accepting sponsors and exhibitors for LibrePlanet 2017. Your sponsorship will help sustain, energize, and inspire the free software community.
+Sponsoring provides you the unique opportunity to engage hundreds of legal and policy
+experts, developers, students, activists, and free software and technology enthusiasts
+with your brand, message, and organization.</p>
+
+<p>Please contact Georgia Young at <a href="mailto:campaigns@fsf.org">campaigns@fs.org</a> or 617-542-5942 with questions. All sponsorship materials must be delivered to the FSF by March 5th in order to be included in the program.</p>
+
+<p>Please refer to our sponsorship prospectus PDF for more information:</p>
+<ul>
+ <li><a href="https://static.fsf.org/nosvn/libreplanet/2017/lp2017-sponsorship-07.pdf">PDF with high-resolution images</a> (suitable for printing)</li>
+ <li><a href="https://static.fsf.org/nosvn/libreplanet/2017/lp2017-sponsorship-07-lowres.pdf"> PDF with low-resoulation images</a> (smaller file size)</li>
+</ul>
+
+
+
+<!--<h1>Thank you to our sponsors!</h1>
+<br><br>
+<img class="spnsr-logo" alt="[ Sponsor - NAME ]" src="//static.fsf.org/nosvn/libreplanet/sponsor-logos/LOGO.jpg">-->
+
+
+ <!--#include virtual="/2017/includes/footer.html"-->
+ <!--#include virtual="/2017/includes/common_js.html"-->
+ <!--#include virtual="/2017/includes/sponsors_js.html"-->
+ <!--#include virtual="/2017/includes/close.html" -->