Cleanup for merge to gddo
- Remove license file.
- Update paths to for new home in golang/gddo repo.
- Update setup.sh to new golang/x paths.
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 65d761b..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2013 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
- * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/README.md b/README.md
index 22a60fe..5e77c6f 100644
--- a/README.md
+++ b/README.md
@@ -1,20 +1,12 @@
talksapp
========
-This project is the source for [go-talks.appspot.com](http://go-talks.appspot.com).
-
-Contributions
--------------
-Contributions to this project are welcome, though please send mail before
-starting work on anything major. Contributors retain their copyright, so we
-need you to fill out a short form before we can accept your contribution:
-https://developers.google.com/open-source/cla/individual
+This directory contains the source for [go-talks.appspot.com](http://go-talks.appspot.com).
Development Environment Setup
-----------------------------
- Copy config.go.template to config.go and edit the file as described in the comments.
- Install Go App Engine SDK
-- $ go get code.google.com/p/go.talks/present
- $ sh setup.sh
- Run the server using the dev_appserver command.
diff --git a/assets/home.article b/assets/home.article
index 64d23b7..21d5078 100644
--- a/assets/home.article
+++ b/assets/home.article
@@ -1,36 +1,27 @@
go-talks.appspot.org
-Gary Burd
-@gburd
-
Francesc Campoy (maintainer)
@francesc
+Gary Burd
+@gburd
+
* Introduction
-This site plays slide presentations and articles stored on GitHub and Google Project Hosting in the
+This site plays slide presentations and articles stored on GitHub in the
[[http://godoc.org/code.google.com/p/go.tools/present][present format]].
The syntax for URLs is:
- GitHub
-
- http://go-talks.appspot.com/github.com/owner/project/file.ext
- http://go-talks.appspot.com/github.com/owner/project/sub/directory/file.ext
-
- Google Code Project Hosting
-
- http://go-talks.appspot.com/code.google.com/p/project/file.ext
- http://go-talks.appspot.com/code.google.com/p/project/sub/directory/file.ext
- http://go-talks.appspot.com/code.google.com/p/project.subrepository/file.ext
- http://go-talks.appspot.com/code.google.com/p/project.subrepository/sub/directory/file.ext
+ http://go-talks.appspot.com/github.com/owner/project/file.ext
+ http://go-talks.appspot.com/github.com/owner/project/sub/directory/file.ext
The supported file extensions (.ext) are .slide and .article.
The .html command is not supported.
-This page is [[/github.com/garyburd/talksapp/assets/home.article][an article]].
+This page is [[/github.com/golang/gddo/talksapp/assets/home.article][an article]].
* Feedback
-Report bugs and request features using the [[https://github.com/garyburd/talksapp/issues/new][GitHub Issue Tracker]].
+Report bugs and request features using the [[https://github.com/golang/gddo/issues/new][GitHub Issue Tracker]].
diff --git a/setup.sh b/setup.sh
index 9082a56..bbac4a7 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,7 +1,8 @@
#!/bin/sh
-go get code.google.com/p/go.tools/godoc
-present=`go list -f '{{.Dir}}' code.google.com/p/go.tools/cmd/present`
-godoc=`go list -f '{{.Dir}}' code.google.com/p/go.tools/godoc`
+go get golang.org/x/tools/cmd/present
+go get golang.org/x/tools/godoc
+present=`go list -f '{{.Dir}}' golang.org/x/tools/cmd/present`
+godoc=`go list -f '{{.Dir}}' golang.org/x/tools/godoc`
mkdir -p present
(cat $godoc/static/jquery.js $godoc/static/playground.js $godoc/static/play.js && echo "initPlayground(new HTTPTransport());") > present/play.js
