blog: delete per-repo files, update README.md, go.mod
It would be nice to delete go.mod and let the directory
be part of the x/website module, but right now x/website
requires Go 1.16 and the blog runs on App Engine which
doesn't yet support Go 1.16. So the blog is actually requiring
an older, pre-Go 1.16 version of x/website.
Once App Engine updates to Go 1.16 we can take that next
step of making blog not a submodule.
Or perhaps before that we will get to the point of serving the
blog from the cmd/golangorg server.
One way or another, this will get even simpler.
Change-Id: I04f9b4d4433009c8b204acba9043b2d8a6261189
Reviewed-on: https://go-review.googlesource.com/c/website/+/322791
Trust: Russ Cox <rsc@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
diff --git a/blog/.gitattributes b/.gitattributes
similarity index 100%
rename from blog/.gitattributes
rename to .gitattributes
diff --git a/blog/.gcloudignore b/blog/.gcloudignore
index 0030d4f..7df1578 100644
--- a/blog/.gcloudignore
+++ b/blog/.gcloudignore
@@ -1,2 +1 @@
.gcloudignore
-.git
diff --git a/blog/AUTHORS b/blog/AUTHORS
deleted file mode 100644
index 2b00ddb..0000000
--- a/blog/AUTHORS
+++ /dev/null
@@ -1,3 +0,0 @@
-# This source code refers to The Go Authors for copyright purposes.
-# The master list of authors is in the main Go distribution,
-# visible at https://tip.golang.org/AUTHORS.
diff --git a/blog/CONTRIBUTING.md b/blog/CONTRIBUTING.md
deleted file mode 100644
index d0485e8..0000000
--- a/blog/CONTRIBUTING.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Contributing to Go
-
-Go is an open source project.
-
-It is the work of hundreds of contributors. We appreciate your help!
-
-## Filing issues
-
-When [filing an issue](https://golang.org/issue/new), make sure to answer these five questions:
-
-1. What version of Go are you using (`go version`)?
-2. What operating system and processor architecture are you using?
-3. What did you do?
-4. What did you expect to see?
-5. What did you see instead?
-
-General questions should go to the [golang-nuts mailing list](https://groups.google.com/group/golang-nuts) instead of the issue tracker.
-The gophers there will answer or ask you to file an issue if you've tripped over a bug.
-
-## Contributing code
-
-Please read the [Contribution Guidelines](https://golang.org/doc/contribute.html)
-before sending patches.
-
-Unless otherwise noted, the Go source files are distributed under
-the BSD-style license found in the LICENSE file.
diff --git a/blog/CONTRIBUTORS b/blog/CONTRIBUTORS
deleted file mode 100644
index 1fbd3e9..0000000
--- a/blog/CONTRIBUTORS
+++ /dev/null
@@ -1,3 +0,0 @@
-# This source code was written by the Go contributors.
-# The master list of contributors is in the main Go distribution,
-# visible at https://tip.golang.org/CONTRIBUTORS.
diff --git a/blog/LICENSE b/blog/LICENSE
deleted file mode 100644
index 6a66aea..0000000
--- a/blog/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2009 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/blog/PATENTS b/blog/PATENTS
deleted file mode 100644
index 7330990..0000000
--- a/blog/PATENTS
+++ /dev/null
@@ -1,22 +0,0 @@
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go. This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation. If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
diff --git a/blog/README.md b/blog/README.md
index d25e498..b518df2 100644
--- a/blog/README.md
+++ b/blog/README.md
@@ -1,13 +1,13 @@
# Go Blog
-[](https://pkg.go.dev/golang.org/x/blog)
+[](https://pkg.go.dev/golang.org/x/website/blog)
-This repository holds the Go Blog server code and content.
+This directory holds the Go Blog server code and content.
## Download/Install
-The easiest way to install is to run `go get -u golang.org/x/blog`. You can also
-manually git clone the repository to \$GOPATH/src/golang.org/x/blog.
+The easiest way to install is to run `go get -u golang.org/x/website/blog`. You can also
+manually git clone the repository to \$GOPATH/src/golang.org/x/website.
## Running Locally
@@ -38,7 +38,7 @@
this repository, see https://golang.org/doc/contribute.html.
The main issue tracker for the blog is located at
-https://github.com/golang/go/issues. Prefix your issue with "x/blog:" in the
+https://github.com/golang/go/issues. Prefix your issue with "x/website/blog:" in the
subject line, so it is easy to find.
## Deploying
diff --git a/blog/codereview.cfg b/blog/codereview.cfg
deleted file mode 100644
index 3f8b14b..0000000
--- a/blog/codereview.cfg
+++ /dev/null
@@ -1 +0,0 @@
-issuerepo: golang/go
diff --git a/blog/go.mod b/blog/go.mod
index 76e34c4..949db4e 100644
--- a/blog/go.mod
+++ b/blog/go.mod
@@ -1,4 +1,4 @@
-module golang.org/x/blog
+module golang.org/x/website/blog
go 1.11
