Merge branch 'news'

Conflicts: docs/conf/na/2015.md
writethedocs · Jan 28, 2015 · 5d7b6df · 5d7b6df
2 parents ffcbc6f + 9312efe
commit 5d7b6df
Show file tree

Hide file tree

Showing 6 changed files with 114 additions and 25 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,3 @@
-.Python
-include/
-bin/
-src/
-lib/
 *.swp
 *.swo
 .DS_Store

diff --git a/docs/conf/na/2015.md b/docs/conf/na/2015.md
@@ -1,6 +1,6 @@
 template: conf.2015.html
 
-# North America 2015
+# About
 
 Join us for a three-day event to explore the art and science of documentation.
 You can look forward to learning more about documentation systems, tech writing theory, information delivery, and more.
@@ -19,28 +19,38 @@ We will return to the historic [Crystal Ballroom][crystal-ballroom],
   </div>
 </div>
 
+
+## Speak
+
+Have something you want to share with the community? 
+Head over to our [Call for Proposals](cfp.md) for more information, and to submit your talk.
+
+The deadline for submitting your proposal is **Midnight PST on February 28**.
+
 ## Tickets
 
 Tickets will go on sale **January 28th**.
 
+<tito-button event="writethedocs/write-the-docs-na-2015">Buy Tickets!</tito-button>
+
 #### Corporate Tickets
 
-Purchase a corporate ticket if a company is paying for your attendance.
+Purchase this ticket if a company is paying for your attendance.
 Companies interested in sponsorship can also receive tickets to the conference with a [sponsorship package](#sponsors).
 
 * $200 Corporate Early Bird
 * $250 Corporate Regular
 
 #### Independent Tickets
 
-If you are paying for yourself, work at a non-profit, or at a company with less than 10 employees.
+Purchase this ticket if you are paying for yourself, work at a non-profit, or at a company with less than 10 employees.
 
 * $100 Independent Early Bird
 * $150 Independent Regular
 
 #### Student or Unemployed
 
-If you are currently enrolled as a student, or don't currently have a source of income.
+Purchase this ticket if you are currently enrolled as a student, or don't currently have a source of income.
 
 * $75 Student or Unemployed Tickets
 
@@ -81,7 +91,12 @@ Wind down and talk about the days talks in a relaxed and friendly environment
   </div>
 </div>
 
-## Subscribe
+## Sponsors
+
+We are seeking corporate partners to help us create the best conference possible.
+Contact us at [sponsorships@writethedocs.org](sponsorships@writethedocs.org) for more information on sponsoring Write the Docs.
+
+## Contact Us
 
 If you wish to receive more information as it becomes available, follow us on Twitter at [@writethedocs][twitter] or sign up for our mailing list:
 
@@ -98,16 +113,6 @@ If you wish to receive more information as it becomes available, follow us on Tw
 </form>
 </div>
 
-## Sponsors
-
-We are seeking corporate partners to help us create the best conference possible.
-Contact us at [sponsorships@writethedocs.org][sponsorships] for more information on sponsoring Write the Docs.
-
-## Contact Us
-
-Reach us by email at [conf@writethedocs.org][conf-email] if you have any questions or concerns.
-
-
 [crystal-ballroom]: http://www.mcmenamins.com/CrystalBallroom
 [wabisabi]: http://en.wikipedia.org/wiki/Wabi-sabi
 [twitter]: https://twitter.com/writethedocs

diff --git a/docs/conf/na/cfp.md b/docs/conf/na/cfp.md
@@ -1,10 +1,11 @@
-## Write the Docs NA 2015 Call for Proposals
+template: blog.2015.html
 
-We here at Write the Docs are accepting proposals for our 2015
+## Call for Proposals
+
+We are accepting proposals for our 2015
 conference, which is happening **May 17-19, 2015** in Portland, Oregon.
 
-The deadline for submitting your proposal is **11:59 PM PST on March
-1**.
+The deadline for submitting your proposal is **Midnight PST on February 28**.
 
 ## Conference Goals
 
@@ -83,3 +84,7 @@ Proposal decisions will be sent by the middle of March.
 
 If you have any questions, please email us at
 [conf@writethedocs.org](mailto:conf@writethedocs.org) and let us know.
+
+# Submit a Proposal
+
+<iframe src="https://docs.google.com/forms/d/1ZW77cqr01rA9OiU9h015uQNdQURaeODkqw8aQ9Uqo6Y/viewform?embedded=true" width="760" height="1000" frameborder="0" marginheight="0" marginwidth="0">Loading...</iframe>
diff --git a/docs/news/cfp-ticket-prices.md b/docs/news/cfp-ticket-prices.md
@@ -0,0 +1,76 @@
+template: blog.2015.html
+
+# Announcing Call for Proposals and Ticket Prices
+
+Today we are announcing our Call for Proposals and ticket prices.
+Speaking at Write the Docs is a fantastic way to share your ideas with our wonderful community of documentarians. 
+
+## Call for Proposals
+
+Although the general focus of Write the Docs is on documentation,
+there's a strong emphasis on the software industry. Within that thematic
+scope, we love having wide-ranging content that will stretch people in
+new directions.
+
+Some of our favorite talks are ones that make people see the world in a
+new way. Teaching someone something they already knew about is great;
+showing someone something they didn't know existed is magical.
+
+We love talks that deliver hard-earned knowledge based on real-world
+experience and research. Whether it's a story about spreading the
+documentarian gospel in your company or tips and tricks for writing that
+you've learned, come share it with people who are eager to know.
+
+We believe that tech writing and documentation don't always get the
+respect and consideration they deserve. So come share with us how you
+convinced your company why documentation should be an organizational
+priority
+
+You can read our full [Call for Proposals]() on the website.
+
+## Tickets
+
+Write the Docs is a community event.
+We attempt to run the conferences a little above break even,
+so that we can make the events as good as possible.
+We believe that everyone who cares about this topic has a place at our event.
+
+We have previously relied on sponsors to cover a large cost of the event,
+but that has increased stress for the organizers a lot.
+This year we are raising ticket prices so that the ticket cost covers the baseline cost of the event (venue, food, wifi, shirts).
+Sponsorship money will then be used to make the conference even better.
+
+If you can't afford these prices and still wish to attend, please email us at [conf@writethedocs.org](conf@writethedocs.org] and we can work something out.
+
+#### Ticket Prices
+
+As with the previous years, we have tiered pricing to make it fair for everyone.
+Please buy the ticket that best fits your situation.
+
+Tickets will go on sale **January 28th**.
+
+#### Corporate Tickets
+
+Purchase this ticket if a company is paying for your attendance.
+
+* $200 Corporate Early Bird
+* $250 Corporate Regular
+
+#### Independent Tickets
+
+Purchase this ticket if you are paying for yourself, work at a non-profit, or at a company with less than 10 employees.
+
+* $100 Independent Early Bird
+* $150 Independent Regular
+
+#### Student or Unemployed
+
+Purchase this ticket if you are currently enrolled as a student, or don't currently have a source of income.
+
+* $75 Student or Unemployed Tickets 
+
+## Conclusion
+
+We hope you will join us at Write the Docs again this year.
+Whether as a speaker or attendee,
+you can bet it will be another delightful year.
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -4,6 +4,8 @@ pages:
   - ['index.md', 'Write the Docs']
   - ['code-of-conduct.md', 'Code of Conduct']
   - ['news/announcing-2015.md', 'Announcing Write the Docs 2015 NA']
+  - ['news/cfp-ticket-prices.md', 'Announcing Call for Proposals and Ticket Prices']
   - ['conf/index.md', 'Conferences']
   - ['conf/na/2015.md', 'Conferences', 'North America 2015']
+  - ['conf/na/cfp.md', 'Conferences', 'Call for Proposals - North America 2015']
   - ['meetups.md', 'Meetups']
diff --git a/theme/conf.2015.html b/theme/conf.2015.html
@@ -3,6 +3,7 @@
 {% block head_link %}
   {{ super() }}
   <link href="{{ base_url }}/css/2015.main.css" rel="stylesheet" />
+  <script src='https://js.tito.io/v1' async></script>
 {% endblock %}
 
 {% block container %}
@@ -21,7 +22,12 @@
             <li><a href="#north-america-2015">About</a></li>
             <li><a href="#tickets">Tickets</a></li>
             <li><a href="#events">Events</a></li>
-            <li class="highlight"><a href="#subscribe">Subscribe</a></li>
+            <li><a href="#sponsors">Sponsors</a></li>
+            <li><a href="#contact-us">Contact</a></li>
+          </ul>
+          <ul class="nav nav-pills nav-center">
+            <li class="highlight"><a href="../cfp/">Submit a Talk</a></li>
+            <li class="highlight"><a onclick="$('#button-tito-writethedocs-write-the-docs-na-2015-1').click()" href="#tickets">Buy a Ticket</a></li>
           </ul>
         </div>
       </div>