Move Cap'n Proto main site to capnproto.org.

doc/_config.yml

 safe: true
 permalink: /news/:year-:month-:day-:title.html
-baseurl: /capnproto/
+baseurl: /
 is_next: false

doc/_config_next.yml

 safe: true
 permalink: /news/:year-:month-:day-:title.html
-baseurl: /capnproto/next/
+baseurl: /next/
 is_next: true

doc/_posts/2013-04-01-announcing-capn-proto.md

@@ -12,4 +12,4 @@ I may have rewritten Protocol Buffers.
 
 Again.
 
-[And it's infinity times faster.](http://kentonv.github.com/capnproto)
+[And it's infinity times faster.](https://capnproto.org)

doc/javascripts/main.js

 function initSidebar() {
-  var filename = document.location.pathname.slice("/capnproto".length);
+  var filename = document.location.pathname;
 
   if (filename.slice(0, 5) == "/next") {
     filename = filename.slice(5);
@@ -79,7 +79,7 @@ function initSidebar() {
 }
 
 function setupSidebar() {
-  var isNews = document.location.pathname.slice("/capnproto".length).slice(0, 6) == "/news/";
+  var isNews = document.location.pathname.slice(0, 6) == "/news/";
 
   var toc = initSidebar();
   if (toc) {

doc/otherlang.md

@@ -68,7 +68,7 @@ schema from standard input and then generate the necessary code.  The descriptio
 Cap'n Proto message, defined by
 [schema.capnp](https://github.com/kentonv/capnproto/blob/master/c%2B%2B/src/capnp/schema.capnp).
 Specifically, the plugin receives a `CodeGeneratorRequest`, using
-[standard serialization](http://kentonv.github.io/capnproto/encoding.html#serialization-over-a-stream)
+[standard serialization](encoding.html#serialization-over-a-stream)
 (not packed).  (Note that installing the C++ runtime causes schema.capnp to be placed in
 `$PREFIX/include/capnp` -- `/usr/local/include/capnp` by default).
 

doc/push-site.sh

@@ -38,49 +38,19 @@ case $(git rev-parse --abbrev-ref HEAD) in
     ;;
 esac
 
-echo "Checking out doc branch in ./.gh-pages..."
-
-if [ ! -e .gh-pages ]; then
-  git clone -b gh-pages git@github.com:kentonv/capnproto.git .gh-pages
-  cd .gh-pages
-else
-  cd .gh-pages
-  git pull
-fi
-
-if [ "x$(git status --porcelain)" != "x" ]; then
-  echo "error:  .gh-pages is not clean." >&2
-  exit 1
-fi
-
-cd ..
-
 echo "Regenerating site..."
 
-rm -rf _site .gh-pages$PREFIX/!(next)
+rm -rf _site _site.tar.gz
 
 jekyll build --safe --config $CONFIG
-mkdir -p .gh-pages$PREFIX
-cp -r _site/* .gh-pages$PREFIX
-
-REV="$(git rev-parse HEAD)"
-
-cd .gh-pages
-git add *
-git commit -m "$LABEL generated @$REV"
-
-if [ "x$(git status --porcelain)" != "x" ]; then
-  echo "error:  .gh-pages is not clean after commit." >&2
-  exit 1
-fi
 
 echo -n "Push now? (y/N)"
 read -n 1 YESNO
 echo
 
 if [ "x$YESNO" == "xy" ]; then
-  git push
-  cd ..
+  echo "Pushing..."
+  tar cz --xform='s,_site/,,' _site/* | ssh fe.sandstorm.io "cd /var/www/capnproto.org$PREFIX && tar xz"
 else
-  echo "Did not push.  You may want to delete .gh-pages."
+  echo "Push CANCELED"
 fi