From ebf779461e0a30b83d0a30c3ee9ef7a8f9611864 2017-11-28 03:30:28
From: Christopher Neugebauer <chrisjrn@gmail.com>
Date: 2017-11-28 03:30:28
Subject: [PATCH] Merge branch 'master' into prod

---

diff --git a/pinaxcon/templates/static_pages/attend/food.html b/pinaxcon/templates/static_pages/attend/food.html
index d7804e9997a7c3b6d156aa572a2a0f34a3f2cb08..289efafb7515a991a1c2b8a29740e09f64ab244f 100644
--- a/pinaxcon/templates/static_pages/attend/food.html
+++ b/pinaxcon/templates/static_pages/attend/food.html
@@ -2,19 +2,111 @@
 
 {% load i18n %}
 
-{% block head_title %}Finding Food{% endblock %}
+{% block head_title %}Lunch Guide{% endblock %}
 
-{% block heading %}Finding Food{% endblock %}
+{% block heading %}Lunch Guide{% endblock %}
 
 {% block body_class %}attend{% endblock %}
 
 {% block lede %}
-  
+  Finding food is easy in Petaluma, especially with this guide to local restaurants and markets sponsored by Yelp.
 {% endblock %}
 
 
 {% block content %}
 
-Finding Food is easy in Petaluma, especially with this guide to local restaurants and markets with details about price, distance, and dietary restrictions.
+<h2>Nearby, Fast, and Cheap</h2>
+
+<ul>
+  <li><strong>New Yorker Pizza</strong>: 3 Petaluma Blvd N (next door!)</li>
+  <li><strong>Lunchette</strong>: 25 4th St (0.1 miles)</li>
+  <li><strong>North Bay Cafe</strong>: 25 Petaluma Blvd S (0.1 miles)</li>
+  <li><strong>Petaluma Pie Company</strong>: 125 Petaluma Blvd N (0.1 miles)</li>
+  <li><strong>Petaluma Market</strong>: 210 Western Ave (0.2 miles)</li>
+  <li><strong>Subway</strong>: 151 Petaluma Blvd S (0.2 miles)</li>
+</ul>
+
+<h2>Coffee</h2>
+
+<ul>
+  <li><strong>Acre Coffee</strong>: 21 4th St (0.1 miles)</li>
+  <li><strong>Peets Coffee</strong>: 5 Petaluma Blvd S (0.1 miles)</li>
+  <li><strong>Starbucks</strong>: 125 Petaluma Blvd N (0.1 miles)</li>
+</ul>
+
+<h2>Diners</h2>
+
+<ul>
+  <li><strong>North Bay Cafe</strong>: 25 Petaluma Blvd S (0.1 miles)</li>
+  <li><strong>Topsy's Kitchen</strong>: 131 Kentucky St (0.1 miles)</li>
+  <li><strong>Hallie's Diner</strong>: 125 Keller St (0.2 miles)</li>
+  <li><strong>Sax's Joint</strong>: 317 Petaluma Blvd S (0.3 miles)</li>
+</ul>
+
+<h2>Pizza and Italian</h2>
+
+<ul>
+  <li><strong>New Yorker Pizza</strong>: 3 Petaluma Blvd N (next door!)</li>
+  <li><strong>Old Chicago Pizza</strong>: 41 Petaluma Blvd N (next door!)</li>
+  <li><strong>Brixx Pizzeria</strong>: 16 Kentucky St (0.1 miles)</li>
+  <li><strong>Cucina Paradiso</strong>: 114 Petaluma Blvd N (0.1 miles)</li>
+  <li><strong>Risibisi Restaurant</strong>: 154 Petaluma Blvd N (0.1 miles)</li>
+  <li><strong>Sugo Trattoria</strong>: 5 Petaluma Blvd S (0.1 miles)</li>
+  <li><strong>Rosso Pizzeria &amp; Mozzarella Bar</strong>: 151 Petaluma Blvd S (0.2 miles)</li>
+  <li><strong>Volpi's Ristorante &amp; Bar</strong>: 124 E Washington St (0.3 miles)</li>
+  <li><strong>Mary’s Pizza Shack</strong>: 359 E Washington St (0.4 miles)</li>
+</ul>
+
+<h2>Pubs</h2>
+
+<ul>
+  <li><strong>McNear's Saloon &amp; Dining House</strong>: 23 Petaluma Blvd N (next door!)</li>
+  <li><strong>Speakeasy</strong>: 139 B Petaluma Blvd N (0.1 miles)</li>
+  <li><strong>Brewsters Beer Garden</strong>: 229 Water Street N (0.2 miles)</li>
+  <li><strong>256 North</strong>: 256 Petaluma Blvd N (0.2 miles)</li>
+  <li><strong>Sauced BBQ &amp; Spirits</strong>: 151 Petaluma Blvd S (0.2 miles)</li>
+  <li><strong>Maguire's Pub</strong>: 145 Kentucky St (0.3 miles)</li>
+  <li><strong>Dempsey's Restaurant &amp; Brewery</strong>: 50 E Washington St (0.4 miles)</li>
+  <li><strong>Taps Beer Co &amp; Kitchen</strong>: 54 E Washington St (0.4 miles)</li>
+</ul>
+
+<h2>Other</h2>
+
+<ul>
+  <li><strong>Water Street Bistro (French)</strong>: 100 Petaluma Blvd N (0.1 miles)</li>
+  <li><strong>Sake 107 (Japanese)</strong>: 107 Petaluma Blvd N (0.1 miles)</li>
+  <li><strong>CBC Cafe</strong>: 21 Kentucky St (0.1 miles)</li>
+  <li><strong>Slamburger</strong>: 5 Petaluma Blvd S (0.1 miles)</li>
+  <li><strong>Wild Goat Bistro (Modern American)</strong>: 6 Petaluma Blvd N (0.1 miles)</li>
+  <li><strong>Mi Pueblo El Centro (Mexican)</strong>: 108 Kentucky St (0.1 miles)</li>
+  <li><strong>Graffiti (Modern American)</strong>: 101 2nd St (0.1 miles)</li>
+  <li><strong>Thistle Meats (Deli)</strong>: 160 Petaluma Blvd N (0.1 miles)</li>
+  <li><strong>Kabuki Japanese Restaurant</strong>: 17 Petaluma Blvd N (0.1 miles)</li>
+  <li><strong>Chicken Pharm (Fried Chicken)</strong>: 132 Keller St (0.2 miles)</li>
+  <li><strong>Cafe Zazzle (Mexican, Asian)</strong>: 121 Kentucky St (0.2 miles)</li>
+  <li><strong>Tea Room Cafe</strong>: 316 Western Ave (0.2 miles)</li>
+  <li><strong>Everest Indian Restaurant</strong>: 56 E Washington St (0.2 miles)</li>
+  <li><strong>Jennie Low's Chinese Cuisine</strong>: 140 2nd St (0.2 miles)</li>
+  <li><strong>Crocodile (French)</strong>: 140 2nd St (0.2 miles)</li>
+  <li><strong>Fourth and Sea (Seafood)</strong>: 101 4th St (0.2 miles)</li>
+  <li><strong>Paradise Sushi &amp; Grill</strong>: 20 E Washington St (0.2 miles)</li>
+  <li><strong>The Drawing Board (Modern American)</strong>: 190 Kentucky St (0.2 miles)</li>
+  <li><strong>Kitaru (Japenese)</strong>: 212 Western Ave (0.2 miles)</li>
+  <li><strong>Chinatown Restaurant</strong>: 157 Kentucky St (0.2 miles)</li>
+  <li><strong>Seared (Steakhouse, Seafood)</strong>: 170 Petaluma Blvd N (0.2 miles)</li>
+  <li><strong>Tup Tim Thai Cuisine</strong>: 208 Petaluma Blvd N (0.2 miles)</li>
+  <li><strong>Thai River</strong>: 35 E Washington St (0.3 miles)</li>
+  <li><strong>The Block Petaluma (Pub, Food Trucks)</strong>: 20 Grey St (0.3 miles)</li>
+  <li><strong>Real Döner (Turkish)</strong>: 307 F St (0.4 miles)</li>
+  <li><strong>Quinua (Peruvian)</strong>: 500 Petaluma Blvd S (0.4 miles)</li>
+  <li><strong>Luma (Cafe)</strong>: 500 1st St (0.5 miles)</li>
+  <li><strong>Aqus Cafe</strong>: 189 H St (0.5 miles)</li>
+  <li><strong>El Roy's Mexican Grill</strong>: 210 Edith St (0.7 miles)</li>
+  <li><strong>In’n’Out Burger</strong>: 1010 Lakeville Hwy (1.3 miles)</li>
+  <li><strong>Soban Korean Cuisine</strong>: 255 N McDowell Blvd (1.8 miles)</li>
+  <li><strong>Simmer Vietnamese Kitchen</strong>: 299 N McDowell Blvd (1.9 miles)</li>
+  <li><strong>Lombardi's Gourmet Deli &amp; BBQ</strong>: 3413 Petaluma Blvd N (2.3 miles)</li>
+  <li><strong>Lagunitas Tap Room</strong>: 1280 N. McDowell Blvd (3.3 miles)</li>
+</ul>
 
 {% endblock %}
diff --git a/pinaxcon/templates/static_pages/attend/guides.html b/pinaxcon/templates/static_pages/attend/guides.html
index 1a166a7b3091eccc7a9261883df862347bf73205..2680f416e32d51f66273a69936d69e96815e1834 100644
--- a/pinaxcon/templates/static_pages/attend/guides.html
+++ b/pinaxcon/templates/static_pages/attend/guides.html
@@ -25,6 +25,7 @@
   <li><strong><a href="/attend/business-case">How to Pitch Your Manager</a></strong> can help you articulate the business case for paying for you to go to North Bay Python to your manager.</li>
   <li><strong><a href="/attend/travel">How to Get Here</a></strong> covers traveling to and from the conference, including driving, flying, and public transportation.</li>
   <li><strong><a href="/wiki/ride-sharing/">Ride Sharing</a></strong> with other attendees can help you meet other attendees - and save money!</li>
+  <li><strong><a href="/wiki/room-sharing/">Room Sharing</a></strong> with other attendees can reduce the cost of lodging.</li>
   <li><strong><a href="/attend/hotels">Where to Stay</a></strong> will help you navigate local lodging with a listing of options alongside info about distance and cost.</li>
 </ul>
 
@@ -33,7 +34,7 @@
 <ul>
   <li><strong><a href="/attend/accessibility-and-accommodations">Accessibility and Accommodations</a></strong> includes information for: parents; people with vision, hearing, and mobility issues; and people with dietary restrictions.</li>
   <li><strong><a href="/attend/emergencies">Emergencies</a></strong> might involve the Code of Conduct, contacting organizers, calling the police, or finding a hospital or pharmacy.</li>
-  <li>Guide coming soon: <strong><!--a href="/attend/food"-->Finding Food<!--/a--></strong> is easy in Petaluma, especially with this guide to local restaurants and markets with details about price, distance, and dietary restrictions.</li>
+  <li><strong><a href="/attend/food">Finding Food</a></strong> is easy in Petaluma, especially with this guide to local restaurants and markets sponsored by Yelp.</li>
   <li><strong><a href="/wiki/fitness">Fitness</a></strong> doesn't need to take a backseat while at North Bay Python, we have information about gyms and pools as well as running and hiking paths.</li>
   <li><strong><a href="/attend/transit">Getting Around P'town</a></strong> has key distances and details about taxis, busses, and walking paths.</li>
   <li><strong><a href="/wiki/meetups">Meetups</a></strong> and birds of a feather sessions are great ways to connect with other attendees. Find and attend one or organize your own!</li>
diff --git a/pinaxcon/templates/static_pages/program/events.html b/pinaxcon/templates/static_pages/program/events.html
index e689509666f24d9b6cb517c1ae78b13ab3d8b9f2..f354ed64f24eb0b2d1018d940bdaeb6edd735173 100644
--- a/pinaxcon/templates/static_pages/program/events.html
+++ b/pinaxcon/templates/static_pages/program/events.html
@@ -20,14 +20,39 @@
 
 <p>A pre-conference event with local meetup group, Web &amp; Interactive Media Professionals (WIMP). At least three of the North Bay Python organizers will be present at this potluck-style event at Santa Rosa Junior College. <a href="https://www.facebook.com/events/1936385509950665/">Find more information and join us!</a></p>
 
-<h2>Speaker Training<br/>
-  <small>December 1, 2017</small></h2>
+<h2>Speaker Training (<a href="/wiki/meetups/speaker-training/">Wiki</a>)<br/>
+  <small>December 1, 2017 @ 5pm</small></h2>
 
-<p>We are running a speaker training the day before the conference. Everyone who is accepted to speak at the conference is invited to attend. <a href="mailto:spam@northbaypython.org">Let us know</a> if you're interested in attending, we may have seats available.</p>
+<p>We are running a free speaker training the day before the conference. Everyone is invited to attend, but seating is limited so people who are accepted to speak at the conference are given priority.</p>
+
+<p><strong>You must <a href="/attend">register to attend</a>.</strong> Due to the location, the training is only open to people age 21 and older.</p>
+
+<p><strong>The Blue Room<br/>
+  Jamison's Roaring Donkey</strong><br/>
+  146 Kentucky Street</br>
+  Petaluma, CA 94952</p>
+
+<h2>Pre-conference Social Hour (<a href="/wiki/meetups/social-hour/">Wiki</a>)<br/>
+  <small>December 1, 2017 @ 7:30pm</small></h2>
+
+<p>Getting into town early? Come meet other attendees at the Pre-conference Social Hour! We have a table reserved for 20, come find us and say hello. The venue is quite large so once the table fills up we'll just start seeding tables in unreserved space.</p>
+
+<p><strong>Brewster's</strong><br/>
+  229 Water Street North<br/>
+  Petaluma, CA 94952</p>
 
 <h2>North Bay Python 2017<br/>
   <small>December 2-3, 2017</small></h2>
 
-<p>This year's main event will run from 10:00am to 6:00pm each day with check-in starting at 9:00am on Saturday. There are <a href="/schedule/general-sessions/list/">20 sessions</a> and <a href="/news">2 keynotes</a> that make up the North Bay Python 2017 program. We will post our session schedule in the coming weeks.</p>
+<p>This year's main event will run from 10:00am to about 6:15pm each day with check-in starting at 8:30am on Saturday. There are <a href="/schedule/general-sessions/list/">20 sessions</a> and <a href="/news">2 keynotes</a> that make up the North Bay Python 2017 program.</p>
+
+<p>There will be a variety of official and unofficial events running during the conference, each day before opening, during lunch, and after closing. You can find a regularly updated list of events on the <a href="/wiki/">Attendee Wiki</a>. You can find events, and organize your own, on the <a href="/wiki/meetups/">Meetups</a> page.</p>
+
+<h2>PyLadies Lunch (<a href="/wiki/meetups/pyladies-lunch/">Wiki</a>)<br/>
+  <small>December 2, 2017 @ 12pm</small></h2>
+
+<p>Come hear some awesome talks and then have lunch with your favorite women or non-binary programmers and their friends!</p>
+
+<p>It's free to join and lunch is on us, but space is limited so <strong>you must <a href="/attend">register to attend</a>.</strong></p>
 
 {% endblock %}