Adding sponsorship/exhibitor prospectus to the sidebar and improving README a little.

diff --git a/2017/README.md b/2017/README.md
index f3701d95fb06c59259152a68e2e971bebfd65bb5..64c030a87af121ec750bf669930a29fcf745122a 100644 (file)
--- a/2017/README.md
+++ b/2017/README.md
@@ -9,19 +9,19 @@ The actual LIVE site, visible at libreplanet.org/YEAR, is served from the "stabl
 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.
+* Check out the master branch and make sure it is up to date with origin/master by doing:
   * git checkout master
   * git pull
-* If 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.
+* 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.)
 * 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.
+* If you are working on your own branch created for your edit, merge, your branch into master by doing:
   * git checkout master
   * git merge BRANCHNAME
-* Push master
+* Push master by doing:
   * git push
 * Review the edited version of the site at http://wiki-dev0.libreplanet.org/YEAR. You can share this with others.
-* When you are satisfied, merge master into stable and then push stable.
+* When you are satisfied, merge master into stable and then push stable by doing:
   * git checkout stable
   * git merge master
   * git push
@@ -29,6 +29,8 @@ Full workflow to make, test and deploy an edit
 
 ##### SECTION 2: EDITING INSTRUCTIONS #####
 
+To change content on existing pages, simply use your favorite text editor.
+
 This site is built with [Bootstrap 3.3.5](https://github.com/twbs/bootstrap/releases/download/v3.3.5/bootstrap-3.3.5-dist.zip) and [jQuery 1.11.1](http://code.jquery.com/jquery-1.11.3.js) but you do not need to understand either of these technologies to make minor content edits to the site.
 
 Creating a New Page

diff --git a/2017/includes/nav-list-2.html b/2017/includes/nav-list-2.html
index d6c92b84534185fdc3e14c0c0d8bf3f564f7ce19..01de63a99a02bfa807559367339e941babdb8391 100644 (file)
--- a/2017/includes/nav-list-2.html
+++ b/2017/includes/nav-list-2.html
@@ -1,5 +1,6 @@
 <!-- <li class="volunteer-link"><a href="/2017/volunteer">Volunteer</a></li> -->
 <!-- <li><a href="https://my.fsf.org/civicrm/event/register?id=43&amp;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><a href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;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> -->