documentation update so godoc doesn't replicate license information. …

…Also improved comments to conform to godoc. Part 2

api/baseRequest.go

@@ -1,16 +1,14 @@
-// Copyright 2012 Matthew Baird
-//
+// Copyright 2013 Matthew Baird
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-//
 //     http://www.apache.org/licenses/LICENSE-2.0
-//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 package api
 
 import (
@@ -67,7 +65,7 @@ func DoCommand(method string, url string, data interface{}) ([]byte, error) {
 	return body, nil
 }
 
-// The API also allows to check for the existance of a document using HEAD
+// Exists allows the caller to check for the existance of a document using HEAD
 // This appears to be broken in the current version of elasticsearch 0.19.10, currently
 // returning nothing
 func Exists(pretty bool, index string, _type string, id string) (BaseResponse, error) {

api/baseResponse.go

@@ -1,21 +1,19 @@
-// Copyright 2012 Matthew Baird
-//
+// Copyright 2013 Matthew Baird
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-//
 //     http://www.apache.org/licenses/LICENSE-2.0
-//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 package api
 
 import (
   "fmt"
-) 
+)
 
 type BaseResponse struct {
 	Ok      bool        `json:"ok"`

api/request.go

@@ -1,16 +1,14 @@
-// Copyright 2012 Matthew Baird
-//
+// Copyright 2013 Matthew Baird
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-//
 //     http://www.apache.org/licenses/LICENSE-2.0
-//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 package api
 
 import (

api/searchdsl.go

@@ -1,16 +1,14 @@
-// Copyright 2012 Matthew Baird
-//
+// Copyright 2013 Matthew Baird
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-//
 //     http://www.apache.org/licenses/LICENSE-2.0
-//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 package api
 
 type SearchRequest struct {

api/shared.go

@@ -1,16 +1,14 @@
-// Copyright 2012 Matthew Baird
-//
+// Copyright 2013 Matthew Baird
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-//
 //     http://www.apache.org/licenses/LICENSE-2.0
-//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 package api
 
 type Query struct {

cluster/clusterReroute.go

@@ -1,16 +1,14 @@
-// Copyright 2012 Matthew Baird
-//
+// Copyright 2013 Matthew Baird
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-//
 //     http://www.apache.org/licenses/LICENSE-2.0
-//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 package cluster
 
 import (
@@ -23,7 +21,7 @@ import (
 // The cluster health API allows to get a very simple status on the health of the cluster.
 // see http://www.elasticsearch.org/guide/reference/api/admin-cluster-health.html
 // TODO: implement wait_for_status, timeout, wait_for_relocating_shards, wait_for_nodes
-// TODO: implement level (Can be one of cluster, indices or shards. Controls the details level of the health 
+// TODO: implement level (Can be one of cluster, indices or shards. Controls the details level of the health
 // information returned. Defaults to cluster.)
 func Reroute(pretty bool, dryRun bool, commands Commands) (ClusterHealthResponse, error) {
 	var url string

cluster/health.go

@@ -1,16 +1,14 @@
-// Copyright 2012 Matthew Baird
-//
+// Copyright 2013 Matthew Baird
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-//
 //     http://www.apache.org/licenses/LICENSE-2.0
-//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 package cluster
 
 import (
@@ -23,7 +21,7 @@ import (
 // The cluster health API allows to get a very simple status on the health of the cluster.
 // see http://www.elasticsearch.org/guide/reference/api/admin-cluster-health.html
 // TODO: implement wait_for_status, timeout, wait_for_relocating_shards, wait_for_nodes
-// TODO: implement level (Can be one of cluster, indices or shards. Controls the details level of the health 
+// TODO: implement level (Can be one of cluster, indices or shards. Controls the details level of the health
 // information returned. Defaults to cluster.)
 func Health(pretty bool, indices ...string) (ClusterHealthResponse, error) {
 	var url string

cluster/nodesHotThreads.go

@@ -1,14 +1,12 @@
-// Copyright 2012 Matthew Baird
-//
+// Copyright 2013 Matthew Baird
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-//
 //     http://www.apache.org/licenses/LICENSE-2.0
-//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 package cluster

cluster/nodesInfo.go

@@ -1,15 +1,13 @@
-// Copyright 2012 Matthew Baird
-//
+// Copyright 2013 Matthew Baird
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-//
 //     http://www.apache.org/licenses/LICENSE-2.0
-//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 package cluster
 

cluster/nodesShutdown.go

@@ -1,14 +1,12 @@
-// Copyright 2012 Matthew Baird
-//
+// Copyright 2013 Matthew Baird
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-//
 //     http://www.apache.org/licenses/LICENSE-2.0
-//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 package cluster

cluster/state.go

@@ -1,16 +1,14 @@
-// Copyright 2012 Matthew Baird
-//
+// Copyright 2013 Matthew Baird
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-//
 //     http://www.apache.org/licenses/LICENSE-2.0
-//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 package cluster
 
 import (

cluster/updateSettings.go

@@ -1,14 +1,12 @@
-// Copyright 2012 Matthew Baird
-//
+// Copyright 2013 Matthew Baird
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-//
 //     http://www.apache.org/licenses/LICENSE-2.0
-//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 package cluster

core/bulk.go

@@ -1,16 +1,14 @@
-// Copyright 2012 Matthew Baird
-//
+// Copyright 2013 Matthew Baird
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-//
 //     http://www.apache.org/licenses/LICENSE-2.0
-//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 package core
 
 import (

core/bulkUDP.go

@@ -1,14 +1,12 @@
-// Copyright 2012 Matthew Baird
-//
+// Copyright 2013 Matthew Baird
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-//
 //     http://www.apache.org/licenses/LICENSE-2.0
-//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 package core

core/bulk_test.go

@@ -1,16 +1,14 @@
-// Copyright 2012 Matthew Baird
-//
+// Copyright 2013 Matthew Baird
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-//
 //     http://www.apache.org/licenses/LICENSE-2.0
-//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 package core
 
 import (

core/count.go

@@ -1,16 +1,14 @@
-// Copyright 2012 Matthew Baird
-//
+// Copyright 2013 Matthew Baird
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-//
 //     http://www.apache.org/licenses/LICENSE-2.0
-//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 package core
 
 import (
@@ -24,12 +22,12 @@ type CountResponse struct {
 	Shard api.Status `json:"_shards"`
 }
 
-// The count API allows to easily execute a query and get the number of matches for that query. 
-// It can be executed across one or more indices and across one or more types. 
-// The query can either be provided using a simple query string as a parameter, 
-//or using the Query DSL defined within the request body.
+// Count allows the caller to easily execute a query and get the number of matches for that query.
+// It can be executed across one or more indices and across one or more types.
+// The query can either be provided using a simple query string as a parameter,
+// or using the Query DSL defined within the request body.
 // http://www.elasticsearch.org/guide/reference/api/count.html
-// TODO: take parameters. 
+// TODO: take parameters.
 // currently not working against 0.19.10
 func Count(pretty bool, index string, _type string) (CountResponse, error) {
 	var url string

core/deleteByQuery.go

@@ -1,16 +1,14 @@
-// Copyright 2012 Matthew Baird
-//
+// Copyright 2013 Matthew Baird
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-//
 //     http://www.apache.org/licenses/LICENSE-2.0
-//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 package core
 
 import (
@@ -20,8 +18,8 @@ import (
 	"strings"
 )
 
-// The delete by query API allows to delete documents from one or more indices and one or more types based on a query. 
-// The query can either be provided using a simple query string as a parameter, or using the Query DSL defined within 
+// DeleteByQuery allows the caller to delete documents from one or more indices and one or more types based on a query.
+// The query can either be provided using a simple query string as a parameter, or using the Query DSL defined within
 // the request body.
 // see: http://www.elasticsearch.org/guide/reference/api/delete-by-query.html
 func DeleteByQuery(pretty bool, indices []string, types []string, query interface{}) (api.BaseResponse, error) {