Small site updates:

- Remove obsolete gittip buttons.
- Remove G+ follow crap.
- Indicate that Cap'n Proto is now a sub-project of Sandstorm.io.
- Add Twitter link.
- Update roadmap to not be obsolete.

doc/_includes/footer.html

@@ -5,22 +5,12 @@
     <!-- FOOTER  -->
     <div id="footer_wrap" class="outer">
       <footer class="inner">
-        <p class="copyright">Cap'n Proto maintained by <a href="https://github.com/kentonv">kentonv</a>
-          <span class="gplus-followbutton"><span class="g-follow" data-annotation="bubble" data-height="15" data-href="//plus.google.com/118187272963262049674" data-rel="author"></span></span>
-          <a href="https://www.gittip.com/kentonv/"><img class="gittip15" src="{{ site.baseurl }}images/gittip15.png" alt="Gittip"></a></p>
-        <p>Design by <a href="http://www.starfruit-cafe.net/blog">sailorhg</a> ∙ Published with <a href="http://pages.github.com">GitHub Pages</a></p>
+        <p class="copyright">Cap'n Proto is a project of <a href="https://sandstorm.io">Sandstorm.io</a></p>
+        <p>Maintained by <a href="https://github.com/kentonv">kentonv</a> ∙ Design by <a href="http://www.starfruit-cafe.net/blog">sailorhg</a>
+        <p><a href="https://twitter.com/capnproto">Follow Cap'n Proto on Twitter</a></p>
       </footer>
     </div>
 
-    <!-- Google+ follow button. -->
-    <script type="text/javascript">
-      (function() {
-        var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
-        po.src = 'https://apis.google.com/js/plusone.js';
-        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
-      })();
-    </script>
-
     <!-- Google Analytics. -->
     <script type="text/javascript">
       var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");

doc/_layouts/post.html

 {% include header.html %}
 
 <div class="hmargin" style="float: right"><a class="groups_link" style="color: #fff"
-href="https://groups.google.com/group/capnproto-announce">Stay Updated</a></div>
+href="https://groups.google.com/group/capnproto-announce">Get Email Updates</a> <a class="twitter_link" style="color: #fff" href="https://twitter.com/capnproto">Follow on Twitter</a></div>
 
 <h1><a href="{{ site.baseurl }}news/">News</a></h1>
 
 <h2>{{ page.title }}</h2>
 <p class="author">
   <a href="https://github.com/{{ page.author }}">{{ page.author }}</a>
-  {% if page.author == 'kentonv' %}
-  <span class="gplus-followbutton"><span class="g-follow" data-annotation="none" data-height="15" data-href="//plus.google.com/118187272963262049674" data-rel="author"></span></span>
-  <a href="https://www.gittip.com/kentonv/"><img class="gittip" src="{{ site.baseurl }}images/gittip.png" alt="Gittip"></a>
-  {% endif %}
   on <span class="date">{{ page.date | date_to_string }}</span>
 </p>
 {{ content }}

doc/faq.md

@@ -173,18 +173,13 @@ and then put them together as a list later, because struct lists are encoded as
 struct values, not an array of pointers to struct values.  You can, however, allocate any inner
 objects embedded within those structs as orphans.
 
-## Personal
+## Sandstorm
 
-### Who is paying you?
+### How does Cap'n Proto relate to Sandstorm.io?
 
-Nobody.  That is, aside from [Gittip](https://www.gittip.com/kentonv/) contributors (thanks!).
+[Sandstorm.io](https://sandstorm.io) is an Open Source project and startup founded by Kenton, the author of Cap'n Proto. Cap'n Proto is owned and developed by Sandstorm the company and heavily used in Sandstorm the project.
 
-### Can I hire you?
+### How does Sandstorm use Cap'n Proto?
 
-If you would like to purchase my services on a contract basis specifically to work on features you
-need in Cap'n Proto or to help you apply Cap'n Proto within your business, I'd be happy to talk.
+See [this Sandstorm blog post](https://blog.sandstorm.io/news/2014-12-15-capnproto-0.5.html).
 
-If you are simply looking for engineers in general and are interested in me because you are
-impressed with my work, I am flattered.  It is especially nice when such inquiries come from other
-engineers rather than from headhunters.  However, I am not looking for employment at this time,
-unless it is directly advancing Cap'n Proto.

doc/news/index.html

@@ -5,7 +5,7 @@ title: News
 {% include header.html %}
 
 <div class="hmargin" style="float: right"><a class="groups_link" style="color: #fff"
-href="https://groups.google.com/group/capnproto-announce">Stay Updated</a></div>
+href="https://groups.google.com/group/capnproto-announce">Get Email Updates</a> <a class="twitter_link" style="color: #fff" href="https://twitter.com/capnproto">Follow on Twitter</a></div>
 
 <h1>News</h1>
 
@@ -14,8 +14,6 @@ href="https://groups.google.com/group/capnproto-announce">Stay Updated</a></div>
 <p class="author">
   <a href="https://github.com/{{ post.author }}">{{ post.author }}</a>
   {% if post.author == 'kentonv' %}
-  <span class="gplus-followbutton"><span class="g-follow" data-annotation="none" data-height="15" data-href="//plus.google.com/118187272963262049674" data-rel="author"></span></span>
-  <a href="https://www.gittip.com/kentonv/"><img class="gittip" src="{{ site.baseurl }}images/gittip.png" alt="Gittip"></a>
   {% endif %}
   on <span class="date">{{ post.date | date_to_string }}</span>
 </p>

doc/roadmap.md

@@ -8,11 +8,11 @@ title: Road Map
 Here's what's (hopefully) in store for future versions of Cap'n Proto!  Of course, everything here
 is subject to change.
 
-## Next version: 0.5
+## Near-ish future
 
-* **Shared memory RPC:**  Zero-copy inter-process communication.  Synchronized with futexes.
-* **Persistent capabilities (level 2 RPC):**  Allow system-assisted saving and restoring of
-  capabilities across connections.
+Provisionally, these are probably the things that will be worked on in the next few releases of Cap'n Proto and its C++ reference implementation.
+
+* **Shared memory RPC:**  Zero-copy inter-process communication.
 * **Three-way introductions (level 3 RPC):**  Allow RPC interactions between more than two parties,
   with new connections formed automatically as needed.
 * **Fiber-based concurrency:**  The C++ runtime's event loop concurrency model will be augmented
@@ -21,16 +21,9 @@ is subject to change.
   syntax sugar on top of the event loop model.
 * **Dynamic schema transmission:**  Allow e.g. Python applications to obtain schemas directly from
   the RPC server so that they need not have a local copy.  Great for interactive debugging.
-
-## Near future (after 0.5)
-
-Provisionally, these are probably the things that will be worked on after 0.5.
-
-* **C++98 Backport:**  Fork and backport the key functionality from the C++11 implementation to
-  work under C++98/C++03.  This will make Cap'n Proto accessible to MSVC users.  The schema and
-  dynamic reflection APIs will not be included.  This also means stringification will not be
-  available (though you can use the external `capnp` tool for that).
-* **Implement parameterized types:**  Template / generic types with type parameters.
+* **Improved MSVC support:**  Once MSVC improves its support for C++11 language features, we will
+  support Cap'n Proto's reflection and RPC APIs in MSVC. (Currently, only core serialization is
+  supported.)
 * **Implement encapsulated types:**  This will allow you to create a hand-written wrapper around a
   type which will be automatically injected into the generated code, so that you can provide a
   nicer interface which encapsulates the type's inner state.

doc/stylesheets/stylesheet.css

@@ -277,17 +277,6 @@ p.author {
 	color: #888;
 }
 
-p.author>span.gplus-followbutton {
-	position: relative;
-	top: 3px;
-}
-
-p.copyright>span.gplus-followbutton {
-	position: relative;
-	top: 1px;
-	/* Yes, it's off by one goddamn pixel, you got a problem with that? */
-}
-
 h1>a, h2>a {
 	color: black;
 }
@@ -372,6 +361,21 @@ body.normal #main_content.inner {
   border-bottom-right-radius: 2px;
 }
 
+.twitter_link {
+  display: inline-block;
+  z-index: 10;
+  padding: 10px 50px 10px 10px;
+  margin: 5px;
+  color: #fff;
+  background: url('../images/twitter.svg') #0090ff no-repeat 95% 50%;
+  background-color: #0090ff;
+  font-weight: 700;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 2px;
+  border-bottom-left-radius: 2px;
+  border-bottom-right-radius: 2px;
+}
+
 #header_wrap {
   background: #C42727;
 }