aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-07-28 19:29:42 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-07-28 19:29:42 +0800
commit1fad8798ec043b9b829caea96dd7a2c5e7b1ed36 (patch)
tree8ff1d0588ec33c9d3d2f0a031fe92daa33fb8c14
parent572e78cee056951c12cfc1c941b48b0fcc1ed6ed (diff)
parentcd657b98780a74d08c110291dcf8d1183b64be15 (diff)
downloadgo-tangerine-1fad8798ec043b9b829caea96dd7a2c5e7b1ed36.tar.gz
go-tangerine-1fad8798ec043b9b829caea96dd7a2c5e7b1ed36.tar.zst
go-tangerine-1fad8798ec043b9b829caea96dd7a2c5e7b1ed36.zip
Merge pull request #1515 from fjl/license-fixes
all: fix license headers one more time
-rw-r--r--Godeps/Godeps.json10
-rw-r--r--Godeps/_workspace/src/github.com/rakyll/globalconf/.travis.yml2
-rw-r--r--Godeps/_workspace/src/github.com/rakyll/globalconf/README.md144
-rw-r--r--Godeps/_workspace/src/github.com/rakyll/globalconf/globalconf.go179
-rw-r--r--Godeps/_workspace/src/github.com/rakyll/globalconf/globalconf_test.go267
-rw-r--r--Godeps/_workspace/src/github.com/rakyll/globalconf/testdata/custom.ini2
-rw-r--r--Godeps/_workspace/src/github.com/rakyll/globalconf/testdata/global.ini3
-rw-r--r--Godeps/_workspace/src/github.com/rakyll/globalconf/testdata/globalandcustom.ini6
-rw-r--r--Godeps/_workspace/src/github.com/rakyll/goini/.gitignore8
-rw-r--r--Godeps/_workspace/src/github.com/rakyll/goini/Makefile7
-rw-r--r--Godeps/_workspace/src/github.com/rakyll/goini/empty.ini0
-rw-r--r--Godeps/_workspace/src/github.com/rakyll/goini/example.ini18
-rw-r--r--Godeps/_workspace/src/github.com/rakyll/goini/ini.go241
-rw-r--r--Godeps/_workspace/src/github.com/rakyll/goini/ini_test.go169
-rw-r--r--Godeps/_workspace/src/gopkg.in/karalabe/cookiejar.v2/collections/prque/prque.go17
-rw-r--r--Godeps/_workspace/src/gopkg.in/karalabe/cookiejar.v2/collections/prque/prque_test.go17
-rw-r--r--Godeps/_workspace/src/gopkg.in/karalabe/cookiejar.v2/collections/prque/sstack.go17
-rw-r--r--Godeps/_workspace/src/gopkg.in/karalabe/cookiejar.v2/collections/prque/sstack_test.go17
-rw-r--r--accounts/abi/abi.go2
-rw-r--r--accounts/abi/abi_test.go2
-rw-r--r--accounts/abi/doc.go2
-rw-r--r--accounts/abi/numbers.go2
-rw-r--r--accounts/abi/numbers_test.go2
-rw-r--r--accounts/abi/type.go2
-rw-r--r--accounts/account_manager.go2
-rw-r--r--accounts/accounts_test.go2
-rw-r--r--build/update-license.go2
-rw-r--r--common/big.go2
-rw-r--r--common/big_test.go2
-rw-r--r--common/bytes.go2
-rw-r--r--common/bytes_test.go2
-rw-r--r--common/compiler/solidity.go2
-rw-r--r--common/compiler/solidity_test.go2
-rw-r--r--common/config.go83
-rw-r--r--common/db.go2
-rw-r--r--common/debug.go2
-rw-r--r--common/docserver/docserver.go2
-rw-r--r--common/docserver/docserver_test.go2
-rw-r--r--common/list.go2
-rw-r--r--common/main_test.go2
-rw-r--r--common/math/dist.go2
-rw-r--r--common/math/dist_test.go2
-rw-r--r--common/natspec/natspec.go2
-rw-r--r--common/natspec/natspec_e2e_test.go2
-rw-r--r--common/natspec/natspec_js.go2
-rw-r--r--common/natspec/natspec_test.go2
-rw-r--r--common/number/int.go2
-rw-r--r--common/number/uint_test.go2
-rw-r--r--common/package.go2
-rw-r--r--common/path.go2
-rw-r--r--common/path_test.go2
-rw-r--r--common/registrar/contracts.go2
-rw-r--r--common/registrar/ethreg/ethreg.go2
-rw-r--r--common/registrar/registrar.go2
-rw-r--r--common/registrar/registrar_test.go2
-rw-r--r--common/rlp.go2
-rw-r--r--common/rlp_test.go2
-rw-r--r--common/size.go2
-rw-r--r--common/size_test.go2
-rw-r--r--common/test_utils.go2
-rw-r--r--common/types.go2
-rw-r--r--common/types_template.go2
-rw-r--r--common/types_test.go2
-rw-r--r--common/value.go2
-rw-r--r--common/value_test.go2
-rw-r--r--compression/rle/read_write.go2
-rw-r--r--compression/rle/read_write_test.go2
-rw-r--r--core/asm.go2
-rw-r--r--core/bad_block.go2
-rw-r--r--core/bench_test.go2
-rw-r--r--core/block_cache.go2
-rw-r--r--core/block_cache_test.go2
-rw-r--r--core/block_processor.go2
-rw-r--r--core/block_processor_test.go2
-rw-r--r--core/blocks.go2
-rw-r--r--core/canary.go2
-rw-r--r--core/chain_makers.go2
-rw-r--r--core/chain_makers_test.go2
-rw-r--r--core/chain_manager.go2
-rw-r--r--core/chain_manager_test.go2
-rw-r--r--core/chain_util.go2
-rw-r--r--core/error.go2
-rw-r--r--core/events.go2
-rw-r--r--core/execution.go2
-rw-r--r--core/fees.go2
-rw-r--r--core/filter.go2
-rw-r--r--core/filter_test.go2
-rw-r--r--core/genesis.go2
-rw-r--r--core/helper_test.go2
-rw-r--r--core/manager.go2
-rw-r--r--core/state/dump.go2
-rw-r--r--core/state/errors.go2
-rw-r--r--core/state/log.go2
-rw-r--r--core/state/main_test.go2
-rw-r--r--core/state/managed_state.go2
-rw-r--r--core/state/managed_state_test.go2
-rw-r--r--core/state/state_object.go2
-rw-r--r--core/state/state_test.go2
-rw-r--r--core/state/statedb.go2
-rw-r--r--core/state_transition.go2
-rw-r--r--core/transaction_pool.go2
-rw-r--r--core/transaction_pool_test.go2
-rw-r--r--core/transaction_util.go2
-rw-r--r--core/types/block.go2
-rw-r--r--core/types/block_test.go2
-rw-r--r--core/types/bloom9.go2
-rw-r--r--core/types/bloom9_test.go2
-rw-r--r--core/types/common.go2
-rw-r--r--core/types/derive_sha.go2
-rw-r--r--core/types/receipt.go2
-rw-r--r--core/types/transaction.go2
-rw-r--r--core/types/transaction_test.go2
-rw-r--r--core/vm/analysis.go2
-rw-r--r--core/vm/asm.go2
-rw-r--r--core/vm/common.go2
-rw-r--r--core/vm/context.go2
-rw-r--r--core/vm/contracts.go2
-rw-r--r--core/vm/disasm.go2
-rw-r--r--core/vm/environment.go2
-rw-r--r--core/vm/errors.go2
-rw-r--r--core/vm/gas.go2
-rw-r--r--core/vm/logger.go2
-rw-r--r--core/vm/memory.go2
-rw-r--r--core/vm/opcodes.go2
-rw-r--r--core/vm/stack.go2
-rw-r--r--core/vm/virtual_machine.go2
-rw-r--r--core/vm/vm.go2
-rw-r--r--core/vm/vm_jit.go2
-rw-r--r--core/vm/vm_jit_fake.go2
-rw-r--r--core/vm_env.go2
-rw-r--r--crypto/crypto.go2
-rw-r--r--crypto/crypto_test.go2
-rw-r--r--crypto/encrypt_decrypt_test.go2
-rw-r--r--crypto/key.go2
-rw-r--r--crypto/key_store_passphrase.go2
-rw-r--r--crypto/key_store_plain.go2
-rw-r--r--crypto/key_store_test.go2
-rw-r--r--crypto/keypair.go2
-rw-r--r--crypto/mnemonic.go2
-rw-r--r--crypto/mnemonic_test.go2
-rw-r--r--crypto/mnemonic_words.go2
-rw-r--r--crypto/randentropy/rand_entropy.go2
-rw-r--r--crypto/secp256k1/notes.go2
-rw-r--r--crypto/secp256k1/secp256.go2
-rw-r--r--crypto/secp256k1/secp256_test.go2
-rw-r--r--crypto/sha3/keccakf.go28
-rw-r--r--crypto/sha3/sha3.go28
-rw-r--r--errs/errors.go2
-rw-r--r--errs/errors_test.go2
-rw-r--r--eth/backend.go2
-rw-r--r--eth/downloader/downloader.go2
-rw-r--r--eth/downloader/downloader_test.go2
-rw-r--r--eth/downloader/events.go2
-rw-r--r--eth/downloader/peer.go2
-rw-r--r--eth/downloader/queue.go2
-rw-r--r--eth/fetcher/fetcher.go2
-rw-r--r--eth/fetcher/fetcher_test.go2
-rw-r--r--eth/fetcher/metrics.go2
-rw-r--r--eth/gasprice.go2
-rw-r--r--eth/handler.go2
-rw-r--r--eth/metrics.go2
-rw-r--r--eth/peer.go2
-rw-r--r--eth/protocol.go2
-rw-r--r--eth/protocol_test.go2
-rw-r--r--eth/sync.go2
-rw-r--r--ethdb/database.go2
-rw-r--r--ethdb/database_test.go2
-rw-r--r--ethdb/memory_database.go2
-rw-r--r--event/event.go2
-rw-r--r--event/event_test.go2
-rw-r--r--event/example_test.go2
-rw-r--r--event/filter/eth_filter.go2
-rw-r--r--event/filter/filter.go2
-rw-r--r--event/filter/filter_test.go2
-rw-r--r--event/filter/generic_filter.go2
-rw-r--r--generators/defaults.go2
-rw-r--r--jsre/bignumber_js.go2
-rw-r--r--jsre/ethereum_js.go2
-rw-r--r--jsre/jsre.go2
-rw-r--r--jsre/jsre_test.go2
-rw-r--r--jsre/pp_js.go2
-rw-r--r--logger/example_test.go2
-rw-r--r--logger/log.go2
-rw-r--r--logger/loggers.go2
-rw-r--r--logger/loggers_test.go2
-rw-r--r--logger/logsystem.go2
-rw-r--r--logger/sys.go2
-rw-r--r--logger/types.go2
-rw-r--r--logger/verbosity.go2
-rw-r--r--metrics/disk.go2
-rw-r--r--metrics/disk_linux.go2
-rw-r--r--metrics/disk_nop.go2
-rw-r--r--metrics/metrics.go2
-rw-r--r--miner/agent.go2
-rw-r--r--miner/miner.go2
-rw-r--r--miner/remote_agent.go2
-rw-r--r--miner/worker.go2
-rw-r--r--p2p/dial.go2
-rw-r--r--p2p/dial_test.go2
-rw-r--r--p2p/discover/database.go2
-rw-r--r--p2p/discover/database_test.go2
-rw-r--r--p2p/discover/node.go2
-rw-r--r--p2p/discover/node_test.go2
-rw-r--r--p2p/discover/table.go2
-rw-r--r--p2p/discover/table_test.go2
-rw-r--r--p2p/discover/udp.go2
-rw-r--r--p2p/discover/udp_test.go2
-rw-r--r--p2p/message.go2
-rw-r--r--p2p/message_test.go2
-rw-r--r--p2p/metrics.go2
-rw-r--r--p2p/nat/nat.go2
-rw-r--r--p2p/nat/nat_test.go2
-rw-r--r--p2p/nat/natpmp.go2
-rw-r--r--p2p/nat/natupnp.go2
-rw-r--r--p2p/nat/natupnp_test.go2
-rw-r--r--p2p/peer.go2
-rw-r--r--p2p/peer_error.go2
-rw-r--r--p2p/peer_test.go2
-rw-r--r--p2p/protocol.go2
-rw-r--r--p2p/rlpx.go2
-rw-r--r--p2p/rlpx_test.go2
-rw-r--r--p2p/server.go2
-rw-r--r--p2p/server_test.go2
-rwxr-xr-xparams/protocol_params.go2
-rw-r--r--pow/block.go2
-rw-r--r--pow/dagger/dagger.go2
-rw-r--r--pow/dagger/dagger_test.go2
-rw-r--r--pow/ezp/pow.go2
-rw-r--r--pow/pow.go2
-rw-r--r--rlp/decode.go2
-rw-r--r--rlp/decode_test.go2
-rw-r--r--rlp/doc.go2
-rw-r--r--rlp/encode.go2
-rw-r--r--rlp/encode_test.go2
-rw-r--r--rlp/encoder_example_test.go2
-rw-r--r--rlp/typecache.go2
-rw-r--r--rpc/api/admin.go2
-rw-r--r--rpc/api/admin_args.go2
-rw-r--r--rpc/api/admin_js.go2
-rw-r--r--rpc/api/api.go2
-rw-r--r--rpc/api/api_test.go2
-rw-r--r--rpc/api/args.go2
-rw-r--r--rpc/api/args_test.go2
-rw-r--r--rpc/api/db.go2
-rw-r--r--rpc/api/db_args.go2
-rw-r--r--rpc/api/db_js.go2
-rw-r--r--rpc/api/debug.go2
-rw-r--r--rpc/api/debug_args.go2
-rw-r--r--rpc/api/debug_js.go2
-rw-r--r--rpc/api/eth.go2
-rw-r--r--rpc/api/eth_args.go2
-rw-r--r--rpc/api/eth_js.go2
-rw-r--r--rpc/api/mergedapi.go2
-rw-r--r--rpc/api/miner.go2
-rw-r--r--rpc/api/miner_args.go2
-rw-r--r--rpc/api/miner_js.go2
-rw-r--r--rpc/api/net.go2
-rw-r--r--rpc/api/net_js.go2
-rw-r--r--rpc/api/parsing.go2
-rw-r--r--rpc/api/personal.go2
-rw-r--r--rpc/api/personal_args.go2
-rw-r--r--rpc/api/personal_js.go2
-rw-r--r--rpc/api/shh.go2
-rw-r--r--rpc/api/shh_args.go2
-rw-r--r--rpc/api/ssh_js.go2
-rw-r--r--rpc/api/txpool.go2
-rw-r--r--rpc/api/txpool_js.go2
-rw-r--r--rpc/api/utils.go2
-rw-r--r--rpc/api/web3.go2
-rw-r--r--rpc/api/web3_args.go2
-rw-r--r--rpc/codec/codec.go2
-rw-r--r--rpc/codec/json.go2
-rw-r--r--rpc/codec/json_test.go2
-rw-r--r--rpc/comms/comms.go2
-rw-r--r--rpc/comms/http.go2
-rw-r--r--rpc/comms/http_net.go2
-rw-r--r--rpc/comms/inproc.go2
-rw-r--r--rpc/comms/ipc.go2
-rw-r--r--rpc/comms/ipc_unix.go2
-rw-r--r--rpc/comms/ipc_windows.go2
-rw-r--r--rpc/jeth.go2
-rw-r--r--rpc/shared/errors.go2
-rw-r--r--rpc/shared/types.go2
-rw-r--r--rpc/shared/utils.go2
-rw-r--r--rpc/xeth.go2
-rw-r--r--tests/block_test.go2
-rw-r--r--tests/block_test_util.go2
-rw-r--r--tests/init.go2
-rw-r--r--tests/rlp_test.go2
-rw-r--r--tests/rlp_test_util.go2
-rw-r--r--tests/state_test.go2
-rw-r--r--tests/state_test_util.go2
-rw-r--r--tests/transaction_test.go2
-rw-r--r--tests/transaction_test_util.go2
-rw-r--r--tests/util.go2
-rw-r--r--tests/vm_test.go2
-rw-r--r--tests/vm_test_util.go2
-rw-r--r--trie/cache.go2
-rw-r--r--trie/encoding.go2
-rw-r--r--trie/encoding_test.go2
-rw-r--r--trie/fullnode.go2
-rw-r--r--trie/hashnode.go2
-rw-r--r--trie/iterator.go2
-rw-r--r--trie/iterator_test.go2
-rw-r--r--trie/node.go2
-rw-r--r--trie/secure_trie.go2
-rw-r--r--trie/shortnode.go2
-rw-r--r--trie/slice.go2
-rw-r--r--trie/trie.go2
-rw-r--r--trie/trie_test.go2
-rw-r--r--trie/valuenode.go2
-rw-r--r--whisper/doc.go2
-rw-r--r--whisper/envelope.go2
-rw-r--r--whisper/envelope_test.go2
-rw-r--r--whisper/filter.go2
-rw-r--r--whisper/filter_test.go2
-rw-r--r--whisper/main.go2
-rw-r--r--whisper/message.go2
-rw-r--r--whisper/message_test.go2
-rw-r--r--whisper/peer.go2
-rw-r--r--whisper/peer_test.go2
-rw-r--r--whisper/topic.go2
-rw-r--r--whisper/topic_test.go2
-rw-r--r--whisper/whisper.go2
-rw-r--r--whisper/whisper_test.go2
-rw-r--r--xeth/frontend.go2
-rw-r--r--xeth/state.go2
-rw-r--r--xeth/types.go2
-rw-r--r--xeth/whisper.go2
-rw-r--r--xeth/whisper_filter.go2
-rw-r--r--xeth/whisper_message.go2
-rw-r--r--xeth/xeth.go2
332 files changed, 380 insertions, 1505 deletions
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index c01655894..199914baa 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -67,14 +67,6 @@
"Rev": "29f6a646557d83e2b6e9ba05c45fbea9c006dbe8"
},
{
- "ImportPath": "github.com/rakyll/globalconf",
- "Rev": "415abc325023f1a00cd2d9fa512e0e71745791a2"
- },
- {
- "ImportPath": "github.com/rakyll/goini",
- "Rev": "907cca0f578a5316fb864ec6992dc3d9730ec58c"
- },
- {
"ImportPath": "github.com/rcrowley/go-metrics",
"Rev": "a5cfc242a56ba7fa70b785f678d6214837bf93b9"
},
@@ -129,7 +121,7 @@
},
{
"ImportPath": "gopkg.in/karalabe/cookiejar.v2/collections/prque",
- "Rev": "0b2e270613f5d7ba262a5749b9e32270131497a2"
+ "Rev": "8dcd6a7f4951f6ff3ee9cbb919a06d8925822e57"
}
]
}
diff --git a/Godeps/_workspace/src/github.com/rakyll/globalconf/.travis.yml b/Godeps/_workspace/src/github.com/rakyll/globalconf/.travis.yml
deleted file mode 100644
index fb9efcb9a..000000000
--- a/Godeps/_workspace/src/github.com/rakyll/globalconf/.travis.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-language: go
-go: 1.2
diff --git a/Godeps/_workspace/src/github.com/rakyll/globalconf/README.md b/Godeps/_workspace/src/github.com/rakyll/globalconf/README.md
deleted file mode 100644
index dcbf4ddf0..000000000
--- a/Godeps/_workspace/src/github.com/rakyll/globalconf/README.md
+++ /dev/null
@@ -1,144 +0,0 @@
-# globalconf
-
-[![Build Status](https://travis-ci.org/rakyll/globalconf.png?branch=master)](https://travis-ci.org/rakyll/globalconf)
-
-Effortlessly persist/retrieve flags of your Golang programs. If you need global configuration instead of requiring user always to set command line flags, you are looking at the right package. `globalconf` allows your users to not only provide flags, but config files and environment variables as well.
-
-## Usage
-
-~~~ go
-import "github.com/rakyll/globalconf"
-~~~
-
-### Loading a config file
-
-By default, globalconf provides you a config file under `~/.config/<yourappname>/config.ini`.
-
-~~~ go
-globalconf.New("appname") // loads from ~/.config/<appname>/config.ini
-~~~
-
-If you don't prefer the default location you can load from a specified path as well.
-
-~~~ go
-globalconf.NewWithOptions(&globalconf.Options{
- Filename: "/path/to/config/file",
-})
-~~~
-
-You may like to override configuration with env variables. See "Environment variables" header to see how to it works.
-
-~~~ go
-globalconf.NewWithOptions(&globalconf.Options{
- Filename: "/path/to/config/file",
- EnvPrefix: "APPCONF_",
-})
-~~~
-
-### Parsing flag values
-
-`globalconf` populates flags with data in the config file if they are not already set.
-
-~~~ go
-var (
- flagName = flag.String("name", "", "Name of the person.")
- flagAddress = flag.String("addr", "", "Address of the person.")
-)
-~~~
-
-Assume the configuration file to be loaded contains the following lines.
-
- name = Burcu
- addr = Brandschenkestrasse 110, 8002
-
-And your program is being started, `$ myapp -name=Jane`
-~~~ go
-conf, err := globalconf.New("myapp")
-conf.ParseAll()
-~~~
-
-`*flagName` is going to be equal to `Jane`, whereas `*flagAddress` is `Brandschenkestrasse 110, 8002`, what is provided in the configuration file.
-
-### Custom flag sets
-
-Custom flagsets are supported, but required registration before parse is done. The default flagset `flag.CommandLine` is automatically registered.
-
-~~~ go
-globalconf.Register("termopts", termOptsFlagSet)
-conf.ParseAll() // parses command line and all registered flag sets
-~~~
-
-Custom flagset values should be provided in their own segment. Getting back to the sample ini config file, termopts values will have their own segment.
-
- name = Burcu
- addr = Brandschenkestrasse 110, 8002
-
- [termopts]
- color = true
- background = ff0000
-
-### Environment variables
-
-If an EnvPrefix is provided, environment variables will take precedence over values in the configuration file.
-Set the `EnvPrefix` option when calling `globalconf.NewWithOptions`.
-An `EnvPrefix` will only be used if it is a non-empty string.
-Command line flags will override the environment variables.
-
-~~~ go
-opts := globalconf.Options{
- EnvPrefix: "MYAPP_",
- Filename: "/path/to/config",
-}
-conf, err := globalconf.NewWithOptions(&opts)
-conf.ParseAll()
-~~~
-
-With environment variables:
-
- APPCONF_NAME = Burcu
-
-and configuration:
-
- name = Jane
- addr = Brandschenkestrasse 110, 8002
-
-`name` will be set to "burcu" and `addr` will be set to "Brandschenkestrasse 110, 8002".
-
-### Modifying stored flags
-
-Modifications are persisted as long as you set a new flag and your GlobalConf
-object was configured with a filename.
-
-~~~ go
-f := &flag.Flag{Name: "name", Value: val}
-conf.Set("", f) // if you are modifying a command line flag
-
-f := &flag.Flag{Name: "color", Value: val}
-conf.Set("termopts", color) // if you are modifying a custom flag set flag
-~~~
-
-### Deleting stored flags
-
-Like Set, Deletions are persisted as long as you delete a flag's value and your
-GlobalConf object was configured with a filename.
-
-~~~ go
-conf.Delete("", "name") // removes command line flag "name"s value from config
-conf.Delete("termopts", "color") // removes "color"s value from the custom flag set
-~~~
-
-## License
-
-Copyright 2014 Google Inc. All Rights Reserved.
-
-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. ![Analytics](https://ga-beacon.appspot.com/UA-46881978-1/globalconf?pixel)
diff --git a/Godeps/_workspace/src/github.com/rakyll/globalconf/globalconf.go b/Godeps/_workspace/src/github.com/rakyll/globalconf/globalconf.go
deleted file mode 100644
index 57d5dd42a..000000000
--- a/Godeps/_workspace/src/github.com/rakyll/globalconf/globalconf.go
+++ /dev/null
@@ -1,179 +0,0 @@
-package globalconf
-
-import (
- "flag"
- "io/ioutil"
- "os"
- "os/user"
- "path"
- "strings"
-
- ini "github.com/rakyll/goini"
-)
-
-const (
- defaultConfigFileName = "config.ini"
-)
-
-var flags map[string]*flag.FlagSet = make(map[string]*flag.FlagSet)
-
-// Represents a GlobalConf context.
-type GlobalConf struct {
- Filename string
- EnvPrefix string
- dict *ini.Dict
-}
-
-type Options struct {
- Filename string
- EnvPrefix string
-}
-
-// NewWithOptions creates a GlobalConf from the provided
-// Options. The caller is responsible for creating any
-// referenced config files.
-func NewWithOptions(opts *Options) (g *GlobalConf, err error) {
- Register("", flag.CommandLine)
-
- var dict ini.Dict
- if opts.Filename != "" {
- dict, err = ini.Load(opts.Filename)
- if err != nil {
- return nil, err
- }
- } else {
- dict = make(ini.Dict, 0)
- }
-
- return &GlobalConf{
- Filename: opts.Filename,
- EnvPrefix: opts.EnvPrefix,
- dict: &dict,
- }, nil
-}
-
-// Opens/creates a config file for the specified appName.
-// The path to config file is ~/.config/appName/config.ini.
-func New(appName string) (g *GlobalConf, err error) {
- var u *user.User
- if u, err = user.Current(); u == nil {
- return
- }
- // Create config file's directory.
- dirPath := path.Join(u.HomeDir, ".config", appName)
- if err = os.MkdirAll(dirPath, 0755); err != nil {
- return
- }
- // Touch a config file if it doesn't exit.
- filePath := path.Join(dirPath, defaultConfigFileName)
- if _, err = os.Stat(filePath); err != nil {
- if !os.IsNotExist(err) {
- return
- }
- // create file
- if err = ioutil.WriteFile(filePath, []byte{}, 0644); err != nil {
- return
- }
- }
- opts := Options{Filename: filePath}
- return NewWithOptions(&opts)
-}
-
-// Sets a flag's value and persists the changes to the disk.
-func (g *GlobalConf) Set(flagSetName string, f *flag.Flag) error {
- g.dict.SetString(flagSetName, f.Name, f.Value.String())
- if g.Filename != "" {
- return ini.Write(g.Filename, g.dict)
- }
- return nil
-}
-
-// Deletes a flag from config file and persists the changes
-// to the disk.
-func (g *GlobalConf) Delete(flagSetName, flagName string) error {
- g.dict.Delete(flagSetName, flagName)
- if g.Filename != "" {
- return ini.Write(g.Filename, g.dict)
- }
- return nil
-}
-
-// Parses the config file for the provided flag set.
-// If the flags are already set, values are overwritten
-// by the values in the config file. Defaults are not set
-// if the flag is not in the file.
-func (g *GlobalConf) ParseSet(flagSetName string, set *flag.FlagSet) {
- set.VisitAll(func(f *flag.Flag) {
- val := getEnv(g.EnvPrefix, flagSetName, f.Name)
- if val != "" {
- set.Set(f.Name, val)
- return
- }
-
- val, found := g.dict.GetString(flagSetName, f.Name)
- if found {
- set.Set(f.Name, val)
- }
- })
-}
-
-// Parses all the registered flag sets, including the command
-// line set and sets values from the config file if they are
-// not already set.
-func (g *GlobalConf) Parse() {
- for name, set := range flags {
- alreadySet := make(map[string]bool)
- set.Visit(func(f *flag.Flag) {
- alreadySet[f.Name] = true
- })
- set.VisitAll(func(f *flag.Flag) {
- // if not already set, set it from dict if exists
- if alreadySet[f.Name] {
- return
- }
-
- val := getEnv(g.EnvPrefix, name, f.Name)
- if val != "" {
- set.Set(f.Name, val)
- return
- }
-
- val, found := g.dict.GetString(name, f.Name)
- if found {
- set.Set(f.Name, val)
- }
- })
- }
-}
-
-// Parses command line flags and then, all of the registered
-// flag sets with the values provided in the config file.
-func (g *GlobalConf) ParseAll() {
- if !flag.Parsed() {
- flag.Parse()
- }
- g.Parse()
-}
-
-// Looks up variable in environment
-func getEnv(envPrefix, flagSetName, flagName string) string {
- // If we haven't set an EnvPrefix, don't lookup vals in the ENV
- if envPrefix == "" {
- return ""
- }
- // Append a _ to flagSetName if it exists.
- if flagSetName != "" {
- flagSetName += "_"
- }
- flagName = strings.Replace(flagName, ".", "_", -1)
- flagName = strings.Replace(flagName, "-", "_", -1)
- envKey := strings.ToUpper(envPrefix + flagSetName + flagName)
- return os.Getenv(envKey)
-}
-
-// Registers a flag set to be parsed. Register all flag sets
-// before calling this function. flag.CommandLine is automatically
-// registered.
-func Register(flagSetName string, set *flag.FlagSet) {
- flags[flagSetName] = set
-}
diff --git a/Godeps/_workspace/src/github.com/rakyll/globalconf/globalconf_test.go b/Godeps/_workspace/src/github.com/rakyll/globalconf/globalconf_test.go
deleted file mode 100644
index f36f74cea..000000000
--- a/Godeps/_workspace/src/github.com/rakyll/globalconf/globalconf_test.go
+++ /dev/null
@@ -1,267 +0,0 @@
-package globalconf
-
-import (
- "flag"
- "io/ioutil"
- "os"
- "testing"
-)
-
-const envTestPrefix = "CONFTEST_"
-
-func TestNewWithOptionsNoFilename(t *testing.T) {
- opts := Options{EnvPrefix: envTestPrefix}
-
- os.Setenv(envTestPrefix+"D", "EnvD")
-
- flagD := flag.String("d", "default", "")
- flagE := flag.Bool("e", true, "")
-
- conf, err := NewWithOptions(&opts)
- if err != nil {
- t.Fatal(err)
- }
- conf.ParseAll()
-
- if *flagD != "EnvD" {
- t.Errorf("flagD found %v, expected 'EnvD'", *flagD)
- }
- if !*flagE {
- t.Errorf("flagE found %v, expected true", *flagE)
- }
-}
-
-func TestParse_Global(t *testing.T) {
- resetForTesting("")
-
- os.Setenv(envTestPrefix+"D", "EnvD")
- os.Setenv(envTestPrefix+"E", "true")
- os.Setenv(envTestPrefix+"F", "5.5")
-
- flagA := flag.Bool("a", false, "")
- flagB := flag.Float64("b", 0.0, "")
- flagC := flag.String("c", "", "")
-
- flagD := flag.String("d", "", "")
- flagE := flag.Bool("e", false, "")
- flagF := flag.Float64("f", 0.0, "")
-
- parse(t, "./testdata/global.ini", envTestPrefix)
- if !*flagA {
- t.Errorf("flagA found %v, expected true", *flagA)
- }
- if *flagB != 5.6 {
- t.Errorf("flagB found %v, expected 5.6", *flagB)
- }
- if *flagC != "Hello world" {
- t.Errorf("flagC found %v, expected 'Hello world'", *flagC)
- }
- if *flagD != "EnvD" {
- t.Errorf("flagD found %v, expected 'EnvD'", *flagD)
- }
- if !*flagE {
- t.Errorf("flagE found %v, expected true", *flagE)
- }
- if *flagF != 5.5 {
- t.Errorf("flagF found %v, expected 5.5", *flagF)
- }
-}
-
-func TestParse_DashConversion(t *testing.T) {
- resetForTesting("")
-
- flagFooBar := flag.String("foo-bar", "", "")
- os.Setenv("PREFIX_FOO_BAR", "baz")
-
- opts := Options{EnvPrefix: "PREFIX_"}
- conf, err := NewWithOptions(&opts)
- if err != nil {
- t.Fatal(err)
- }
- conf.ParseAll()
-
- if *flagFooBar != "baz" {
- t.Errorf("flagFooBar found %v, expected 5.5", *flagFooBar)
- }
-}
-
-func TestParse_GlobalWithDottedFlagname(t *testing.T) {
- resetForTesting("")
- os.Setenv(envTestPrefix+"SOME_VALUE", "some-value")
- flagSomeValue := flag.String("some.value", "", "")
-
- parse(t, "./testdata/global.ini", envTestPrefix)
- if *flagSomeValue != "some-value" {
- t.Errorf("flagSomeValue found %v, some-value expected", *flagSomeValue)
- }
-}
-
-func TestParse_GlobalOverwrite(t *testing.T) {
- resetForTesting("-b=7.6")
- flagB := flag.Float64("b", 0.0, "")
-
- parse(t, "./testdata/global.ini", "")
- if *flagB != 7.6 {
- t.Errorf("flagB found %v, expected 7.6", *flagB)
- }
-}
-
-func TestParse_Custom(t *testing.T) {
- resetForTesting("")
-
- os.Setenv(envTestPrefix+"CUSTOM_E", "Hello Env")
-
- flagB := flag.Float64("b", 5.0, "")
-
- name := "custom"
- custom := flag.NewFlagSet(name, flag.ExitOnError)
- flagD := custom.String("d", "dd", "")
- flagE := custom.String("e", "ee", "")
-
- Register(name, custom)
- parse(t, "./testdata/custom.ini", envTestPrefix)
- if *flagB != 5.0 {
- t.Errorf("flagB found %v, expected 5.0", *flagB)
- }
- if *flagD != "Hello d" {
- t.Errorf("flagD found %v, expected 'Hello d'", *flagD)
- }
- if *flagE != "Hello Env" {
- t.Errorf("flagE found %v, expected 'Hello Env'", *flagE)
- }
-}
-
-func TestParse_CustomOverwrite(t *testing.T) {
- resetForTesting("-b=6")
- flagB := flag.Float64("b", 5.0, "")
-
- name := "custom"
- custom := flag.NewFlagSet(name, flag.ExitOnError)
- flagD := custom.String("d", "dd", "")
-
- Register(name, custom)
- parse(t, "./testdata/custom.ini", "")
- if *flagB != 6.0 {
- t.Errorf("flagB found %v, expected 6.0", *flagB)
- }
- if *flagD != "Hello d" {
- t.Errorf("flagD found %v, expected 'Hello d'", *flagD)
- }
-}
-
-func TestParse_GlobalAndCustom(t *testing.T) {
- resetForTesting("")
- flagA := flag.Bool("a", false, "")
- flagB := flag.Float64("b", 0.0, "")
- flagC := flag.String("c", "", "")
-
- name := "custom"
- custom := flag.NewFlagSet(name, flag.ExitOnError)
- flagD := custom.String("d", "", "")
-
- Register(name, custom)
- parse(t, "./testdata/globalandcustom.ini", "")
- if !*flagA {
- t.Errorf("flagA found %v, expected true", *flagA)
- }
- if *flagB != 5.6 {
- t.Errorf("flagB found %v, expected 5.6", *flagB)
- }
- if *flagC != "Hello world" {
- t.Errorf("flagC found %v, expected 'Hello world'", *flagC)
- }
- if *flagD != "Hello d" {
- t.Errorf("flagD found %v, expected 'Hello d'", *flagD)
- }
-}
-
-func TestParse_GlobalAndCustomOverwrite(t *testing.T) {
- resetForTesting("-a=true", "-b=5", "-c=Hello")
- flagA := flag.Bool("a", false, "")
- flagB := flag.Float64("b", 0.0, "")
- flagC := flag.String("c", "", "")
-
- name := "custom"
- custom := flag.NewFlagSet(name, flag.ExitOnError)
- flagD := custom.String("d", "", "")
-
- Register(name, custom)
- parse(t, "./testdata/globalandcustom.ini", "")
- if !*flagA {
- t.Errorf("flagA found %v, expected true", *flagA)
- }
- if *flagB != 5.0 {
- t.Errorf("flagB found %v, expected 5.0", *flagB)
- }
- if *flagC != "Hello" {
- t.Errorf("flagC found %v, expected 'Hello'", *flagC)
- }
- if *flagD != "Hello d" {
- t.Errorf("flagD found %v, expected 'Hello d'", *flagD)
- }
-}
-
-func TestSet(t *testing.T) {
- resetForTesting()
- file, _ := ioutil.TempFile("", "")
- conf := parse(t, file.Name(), "")
- conf.Set("", &flag.Flag{Name: "a", Value: newFlagValue("test")})
-
- flagA := flag.String("a", "", "")
- parse(t, file.Name(), "")
- if *flagA != "test" {
- t.Errorf("flagA found %v, expected 'test'", *flagA)
- }
-}
-
-func TestDelete(t *testing.T) {
- resetForTesting()
- file, _ := ioutil.TempFile("", "")
- conf := parse(t, file.Name(), "")
- conf.Set("", &flag.Flag{Name: "a", Value: newFlagValue("test")})
- conf.Delete("", "a")
-
- flagA := flag.String("a", "", "")
- parse(t, file.Name(), "")
- if *flagA != "" {
- t.Errorf("flagNewA found %v, expected ''", *flagA)
- }
-}
-
-func parse(t *testing.T, filename, envPrefix string) *GlobalConf {
- opts := Options{
- Filename: filename,
- EnvPrefix: envPrefix,
- }
- conf, err := NewWithOptions(&opts)
- if err != nil {
- t.Error(err)
- }
- conf.ParseAll()
- return conf
-}
-
-// Resets os.Args and the default flag set.
-func resetForTesting(args ...string) {
- os.Clearenv()
-
- os.Args = append([]string{"cmd"}, args...)
- flag.CommandLine = flag.NewFlagSet(os.Args[0], flag.ExitOnError)
-}
-
-type flagValue struct {
- str string
-}
-
-func (f *flagValue) String() string {
- return f.str
-}
-
-func (f *flagValue) Set(value string) error {
- f.str = value
- return nil
-}
-
-func newFlagValue(val string) *flagValue {
- return &flagValue{str: val}
-}
diff --git a/Godeps/_workspace/src/github.com/rakyll/globalconf/testdata/custom.ini b/Godeps/_workspace/src/github.com/rakyll/globalconf/testdata/custom.ini
deleted file mode 100644
index 23795a1f0..000000000
--- a/Godeps/_workspace/src/github.com/rakyll/globalconf/testdata/custom.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[custom]
-d = Hello d
diff --git a/Godeps/_workspace/src/github.com/rakyll/globalconf/testdata/global.ini b/Godeps/_workspace/src/github.com/rakyll/globalconf/testdata/global.ini
deleted file mode 100644
index 126888858..000000000
--- a/Godeps/_workspace/src/github.com/rakyll/globalconf/testdata/global.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-a = true
-b = 5.6
-c = Hello world
diff --git a/Godeps/_workspace/src/github.com/rakyll/globalconf/testdata/globalandcustom.ini b/Godeps/_workspace/src/github.com/rakyll/globalconf/testdata/globalandcustom.ini
deleted file mode 100644
index c48a933ed..000000000
--- a/Godeps/_workspace/src/github.com/rakyll/globalconf/testdata/globalandcustom.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-a = true
-b = 5.6
-c = Hello world
-
-[custom]
-d = Hello d
diff --git a/Godeps/_workspace/src/github.com/rakyll/goini/.gitignore b/Godeps/_workspace/src/github.com/rakyll/goini/.gitignore
deleted file mode 100644
index 6facd5a72..000000000
--- a/Godeps/_workspace/src/github.com/rakyll/goini/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.*.swp
-
-*.[689]
-[689].out
-
-_obj
-_test
-_testmain.go
diff --git a/Godeps/_workspace/src/github.com/rakyll/goini/Makefile b/Godeps/_workspace/src/github.com/rakyll/goini/Makefile
deleted file mode 100644
index bc67d570d..000000000
--- a/Godeps/_workspace/src/github.com/rakyll/goini/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-test:
- go test
-
-format:
- gofmt -w *.go
-
-.PHONY: format test
diff --git a/Godeps/_workspace/src/github.com/rakyll/goini/empty.ini b/Godeps/_workspace/src/github.com/rakyll/goini/empty.ini
deleted file mode 100644
index e69de29bb..000000000
--- a/Godeps/_workspace/src/github.com/rakyll/goini/empty.ini
+++ /dev/null
diff --git a/Godeps/_workspace/src/github.com/rakyll/goini/example.ini b/Godeps/_workspace/src/github.com/rakyll/goini/example.ini
deleted file mode 100644
index 1a21f8e37..000000000
--- a/Godeps/_workspace/src/github.com/rakyll/goini/example.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# This is an example of ini file
-#
-
-[Pizza]
-
-Ham = yes;
-Mushrooms = TRUE;
-Capres = 0;
-Cheese = Non;
-
-
-[Wine]
-
-Grape = Cabernet Sauvignon;
-Year = 1989;
-Country = Spain;
-Alcohol = 12.5;
diff --git a/Godeps/_workspace/src/github.com/rakyll/goini/ini.go b/Godeps/_workspace/src/github.com/rakyll/goini/ini.go
deleted file mode 100644
index 54b81f18b..000000000
--- a/Godeps/_workspace/src/github.com/rakyll/goini/ini.go
+++ /dev/null
@@ -1,241 +0,0 @@
-package ini
-
-import (
- "bufio"
- "bytes"
- "fmt"
- "io/ioutil"
- "os"
- "regexp"
- "strconv"
- "strings"
- "unicode"
-)
-
-type Dict map[string]map[string]string
-
-type Error string
-
-var (
- regDoubleQuote = regexp.MustCompile("^([^= \t]+)[ \t]*=[ \t]*\"([^\"]*)\"$")
- regSingleQuote = regexp.MustCompile("^([^= \t]+)[ \t]*=[ \t]*'([^']*)'$")
- regNoQuote = regexp.MustCompile("^([^= \t]+)[ \t]*=[ \t]*([^#;]+)")
- regNoValue = regexp.MustCompile("^([^= \t]+)[ \t]*=[ \t]*([#;].*)?")
-)
-
-func Load(filename string) (dict Dict, err error) {
- file, err := os.Open(filename)
- if err != nil {
- return nil, err
- }
- defer file.Close()
-
- dict = make(map[string]map[string]string)
- reader := bufio.NewReader(file)
- lineno := 0
- section := ""
- dict[section] = make(map[string]string)
-
- for err == nil {
- l, _, err := reader.ReadLine()
- if err != nil {
- break
- }
- lineno++
- if len(l) == 0 {
- continue
- }
- line := strings.TrimFunc(string(l), unicode.IsSpace)
-
- for line[len(line)-1] == '\\' {
- line = line[:len(line)-1]
- l, _, err := reader.ReadLine()
- if err != nil {
- return nil, err
- }
- line += strings.TrimFunc(string(l), unicode.IsSpace)
- }
-
- section, err = dict.parseLine(section, line)
- if err != nil {
- return nil, newError(
- err.Error() + fmt.Sprintf("'%s:%d'.", filename, lineno))
- }
- }
-
- return
-}
-
-func Write(filename string, dict *Dict) error {
- buffer := dict.format()
- return ioutil.WriteFile(filename, buffer.Bytes(), 0644)
-}
-
-func (e Error) Error() string {
- return string(e)
-}
-func (dict Dict) parseLine(section, line string) (string, error) {
- // commets
- if line[0] == '#' || line[0] == ';' {
- return section, nil
- }
-
- // section name
- if line[0] == '[' && line[len(line)-1] == ']' {
- section := strings.TrimFunc(line[1:len(line)-1], unicode.IsSpace)
- section = strings.ToLower(section)
- dict[section] = make(map[string]string)
- return section, nil
- }
-
- // key = value
- if m := regDoubleQuote.FindAllStringSubmatch(line, 1); m != nil {
- dict.add(section, m[0][1], m[0][2])
- return section, nil
- } else if m = regSingleQuote.FindAllStringSubmatch(line, 1); m != nil {
- dict.add(section, m[0][1], m[0][2])
- return section, nil
- } else if m = regNoQuote.FindAllStringSubmatch(line, 1); m != nil {
- dict.add(section, m[0][1], strings.TrimFunc(m[0][2], unicode.IsSpace))
- return section, nil
- } else if m = regNoValue.FindAllStringSubmatch(line, 1); m != nil {
- dict.add(section, m[0][1], "")
- return section, nil
- }
-
- return section, newError("iniparser: syntax error at ")
-}
-
-func (dict Dict) add(section, key, value string) {
- key = strings.ToLower(key)
- dict[section][key] = value
-}
-
-func (dict Dict) GetBool(section, key string) (bool, bool) {
- sec, ok := dict[section]
- if !ok {
- return false, false
- }
- value, ok := sec[key]
- if !ok {
- return false, false
- }
- v := value[0]
- if v == 'y' || v == 'Y' || v == '1' || v == 't' || v == 'T' {
- return true, true
- }
- if v == 'n' || v == 'N' || v == '0' || v == 'f' || v == 'F' {
- return false, true
- }
- return false, false
-}
-
-func (dict Dict) SetBool(section, key string, value bool) {
- dict.SetString(section, key, strconv.FormatBool(value))
-}
-
-func (dict Dict) GetString(section, key string) (string, bool) {
- sec, ok := dict[section]
- if !ok {
- return "", false
- }
- value, ok := sec[key]
- if !ok {
- return "", false
- }
- return value, true
-}
-
-func (dict Dict) SetString(section, key, value string) {
- _, ok := dict[section]
- if !ok {
- dict[section] = make(map[string]string)
- }
- dict[section][key] = value
-}
-
-func (dict Dict) GetInt(section, key string) (int, bool) {
- sec, ok := dict[section]
- if !ok {
- return 0, false
- }
- value, ok := sec[key]
- if !ok {
- return 0, false
- }
- i, err := strconv.Atoi(value)
- if err != nil {
- return 0, false
- }
- return i, true
-}
-
-func (dict Dict) SetInt(section, key string, value int) {
- dict.SetString(section, key, strconv.FormatInt(int64(value), 10))
-}
-
-func (dict Dict) GetDouble(section, key string) (float64, bool) {
- sec, ok := dict[section]
- if !ok {
- return 0, false
- }
- value, ok := sec[key]
- if !ok {
- return 0, false
- }
- d, err := strconv.ParseFloat(value, 64)
- if err != nil {
- return 0, false
- }
- return d, true
-}
-
-func (dict Dict) SetDouble(section, key string, value float64) {
- dict.SetString(section, key, strconv.FormatFloat(value, 'f', -1, 64))
-}
-
-func (dict Dict) Delete(section, key string) {
- _, ok := dict[section]
- if !ok {
- return
- }
- delete(dict[section], key)
- // If there are no items left in the section,
- // delete the section.
- if len(dict[section]) == 0 {
- delete(dict, section)
- }
-}
-
-func (dict Dict) GetSections() []string {
- size := len(dict)
- sections := make([]string, size)
- i := 0
- for section, _ := range dict {
- sections[i] = section
- i++
- }
- return sections
-}
-
-func (dict Dict) String() string {
- return (*dict.format()).String()
-}
-
-func (dict Dict) format() *bytes.Buffer {
- var buffer bytes.Buffer
- for section, vals := range dict {
- if section != "" {
- buffer.WriteString(fmt.Sprintf("[%s]\n", section))
- }
- for key, val := range vals {
- buffer.WriteString(fmt.Sprintf("%s = %s\n", key, val))
- }
- buffer.WriteString("\n")
- }
- return &buffer
-}
-
-func newError(message string) (e error) {
- return Error(message)
-}
diff --git a/Godeps/_workspace/src/github.com/rakyll/goini/ini_test.go b/Godeps/_workspace/src/github.com/rakyll/goini/ini_test.go
deleted file mode 100644
index 8a15eea4c..000000000
--- a/Godeps/_workspace/src/github.com/rakyll/goini/ini_test.go
+++ /dev/null
@@ -1,169 +0,0 @@
-package ini
-
-import (
- "io/ioutil"
- "testing"
-)
-
-const (
- exampleStr = `key1 = true
-
-[section1]
-key1 = value2
-key2 = 5
-key3 = 1.3
-
-[section2]
-key1 = 5
-
-`
-)
-
-var (
- dict Dict
- err error
-)
-
-func init() {
- dict, err = Load("example.ini")
-}
-
-func TestLoad(t *testing.T) {
- if err != nil {
- t.Error("Example: load error:", err)
- }
-}
-
-func TestWrite(t *testing.T) {
- d, err := Load("empty.ini")
- if err != nil {
- t.Error("Example: load error:", err)
- }
- d.SetString("", "key", "value")
- tempFile, err := ioutil.TempFile("", "")
- if err != nil {
- t.Error("Write: Couldn't create temp file.", err)
- }
- err = Write(tempFile.Name(), &d)
- if err != nil {
- t.Error("Write: Couldn't write to temp config file.", err)
- }
- contents, err := ioutil.ReadFile(tempFile.Name())
- if err != nil {
- t.Error("Write: Couldn't read from the temp config file.", err)
- }
- if string(contents) != "key = value\n\n" {
- t.Error("Write: Contents of the config file doesn't match the expected.")
- }
-}
-
-func TestGetBool(t *testing.T) {
- b, found := dict.GetBool("pizza", "ham")
- if !found || !b {
- t.Error("Example: parse error for key ham of section pizza.")
- }
- b, found = dict.GetBool("pizza", "mushrooms")
- if !found || !b {
- t.Error("Example: parse error for key mushrooms of section pizza.")
- }
- b, found = dict.GetBool("pizza", "capres")
- if !found || b {
- t.Error("Example: parse error for key capres of section pizza.")
- }
- b, found = dict.GetBool("pizza", "cheese")
- if !found || b {
- t.Error("Example: parse error for key cheese of section pizza.")
- }
-}
-
-func TestGetStringIntAndDouble(t *testing.T) {
- str, found := dict.GetString("wine", "grape")
- if !found || str != "Cabernet Sauvignon" {
- t.Error("Example: parse error for key grape of section wine.")
- }
- i, found := dict.GetInt("wine", "year")
- if !found || i != 1989 {
- t.Error("Example: parse error for key year of section wine.")
- }
- str, found = dict.GetString("wine", "country")
- if !found || str != "Spain" {
- t.Error("Example: parse error for key grape of section wine.")
- }
- d, found := dict.GetDouble("wine", "alcohol")
- if !found || d != 12.5 {
- t.Error("Example: parse error for key grape of section wine.")
- }
-}
-
-func TestSetBoolAndStringAndIntAndDouble(t *testing.T) {
- dict.SetBool("pizza", "ham", false)
- b, found := dict.GetBool("pizza", "ham")
- if !found || b {
- t.Error("Example: bool set error for key ham of section pizza.")
- }
- dict.SetString("pizza", "ham", "no")
- n, found := dict.GetString("pizza", "ham")
- if !found || n != "no" {
- t.Error("Example: string set error for key ham of section pizza.")
- }
- dict.SetInt("wine", "year", 1978)
- i, found := dict.GetInt("wine", "year")
- if !found || i != 1978 {
- t.Error("Example: int set error for key year of section wine.")
- }
- dict.SetDouble("wine", "not-exists", 5.6)
- d, found := dict.GetDouble("wine", "not-exists")
- if !found || d != 5.6 {
- t.Error("Example: float set error for not existing key for wine.")
- }
-}
-
-func TestDelete(t *testing.T) {
- d, err := Load("empty.ini")
- if err != nil {
- t.Error("Example: load error:", err)
- }
- d.SetString("pizza", "ham", "yes")
- d.Delete("pizza", "ham")
- _, found := d.GetString("pizza", "ham")
- if found {
- t.Error("Example: delete error for key ham of section pizza.")
- }
- if len(d.GetSections()) > 1 {
- t.Error("Only a single section should exist after deletion.")
- }
-}
-
-func TestGetNotExist(t *testing.T) {
- _, found := dict.GetString("not", "exist")
- if found {
- t.Error("There is no key exist of section not.")
- }
-}
-
-func TestGetSections(t *testing.T) {
- sections := dict.GetSections()
- if len(sections) != 3 {
- t.Error("The number of sections is wrong:", len(sections))
- }
- for _, section := range sections {
- if section != "" && section != "pizza" && section != "wine" {
- t.Errorf("Section '%s' should not be exist.", section)
- }
- }
-}
-
-func TestString(t *testing.T) {
- d, err := Load("empty.ini")
- if err != nil {
- t.Error("Example: load error:", err)
- }
- d.SetBool("", "key1", true)
- d.SetString("section1", "key1", "value2")
- d.SetInt("section1", "key2", 5)
- d.SetDouble("section1", "key3", 1.3)
- d.SetDouble("section2", "key1", 5.0)
- if d.String() != exampleStr {
- t.Errorf("Dict cannot be stringified as expected.")
- }
-}
diff --git a/Godeps/_workspace/src/gopkg.in/karalabe/cookiejar.v2/collections/prque/prque.go b/Godeps/_workspace/src/gopkg.in/karalabe/cookiejar.v2/collections/prque/prque.go
index a1009f3be..5c1967c65 100644
--- a/Godeps/_workspace/src/gopkg.in/karalabe/cookiejar.v2/collections/prque/prque.go
+++ b/Godeps/_workspace/src/gopkg.in/karalabe/cookiejar.v2/collections/prque/prque.go
@@ -1,19 +1,10 @@
// CookieJar - A contestant's algorithm toolbox
// Copyright (c) 2013 Peter Szilagyi. All rights reserved.
//
-// CookieJar is dual licensed: you can redistribute it and/or modify it under
-// the terms of the GNU General Public License as published by the Free Software
-// Foundation, either version 3 of the License, or (at your option) any later
-// version.
-//
-// The toolbox is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-// more details.
-//
-// Alternatively, the CookieJar toolbox may be used in accordance with the terms
-// and conditions contained in a signed written agreement between you and the
-// author(s).
+// CookieJar is dual licensed: use of this source code is governed by a BSD
+// license that can be found in the LICENSE file. Alternatively, the CookieJar
+// toolbox may be used in accordance with the terms and conditions contained
+// in a signed written agreement between you and the author(s).
// Package prque implements a priority queue data structure supporting arbitrary
// value types and float priorities.
diff --git a/Godeps/_workspace/src/gopkg.in/karalabe/cookiejar.v2/collections/prque/prque_test.go b/Godeps/_workspace/src/gopkg.in/karalabe/cookiejar.v2/collections/prque/prque_test.go
index daba691e1..6a46bb807 100644
--- a/Godeps/_workspace/src/gopkg.in/karalabe/cookiejar.v2/collections/prque/prque_test.go
+++ b/Godeps/_workspace/src/gopkg.in/karalabe/cookiejar.v2/collections/prque/prque_test.go
@@ -1,19 +1,10 @@
// CookieJar - A contestant's algorithm toolbox
// Copyright (c) 2013 Peter Szilagyi. All rights reserved.
//
-// CookieJar is dual licensed: you can redistribute it and/or modify it under
-// the terms of the GNU General Public License as published by the Free Software
-// Foundation, either version 3 of the License, or (at your option) any later
-// version.
-//
-// The toolbox is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-// more details.
-//
-// Alternatively, the CookieJar toolbox may be used in accordance with the terms
-// and conditions contained in a signed written agreement between you and the
-// author(s).
+// CookieJar is dual licensed: use of this source code is governed by a BSD
+// license that can be found in the LICENSE file. Alternatively, the CookieJar
+// toolbox may be used in accordance with the terms and conditions contained
+// in a signed written agreement between you and the author(s).
package prque
diff --git a/Godeps/_workspace/src/gopkg.in/karalabe/cookiejar.v2/collections/prque/sstack.go b/Godeps/_workspace/src/gopkg.in/karalabe/cookiejar.v2/collections/prque/sstack.go
index c11347f9d..9f393196e 100644
--- a/Godeps/_workspace/src/gopkg.in/karalabe/cookiejar.v2/collections/prque/sstack.go
+++ b/Godeps/_workspace/src/gopkg.in/karalabe/cookiejar.v2/collections/prque/sstack.go
@@ -1,19 +1,10 @@
// CookieJar - A contestant's algorithm toolbox
// Copyright (c) 2013 Peter Szilagyi. All rights reserved.
//
-// CookieJar is dual licensed: you can redistribute it and/or modify it under
-// the terms of the GNU General Public License as published by the Free Software
-// Foundation, either version 3 of the License, or (at your option) any later
-// version.
-//
-// The toolbox is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-// more details.
-//
-// Alternatively, the CookieJar toolbox may be used in accordance with the terms
-// and conditions contained in a signed written agreement between you and the
-// author(s).
+// CookieJar is dual licensed: use of this source code is governed by a BSD
+// license that can be found in the LICENSE file. Alternatively, the CookieJar
+// toolbox may be used in accordance with the terms and conditions contained
+// in a signed written agreement between you and the author(s).
package prque
diff --git a/Godeps/_workspace/src/gopkg.in/karalabe/cookiejar.v2/collections/prque/sstack_test.go b/Godeps/_workspace/src/gopkg.in/karalabe/cookiejar.v2/collections/prque/sstack_test.go
index bcb5b830b..def121812 100644
--- a/Godeps/_workspace/src/gopkg.in/karalabe/cookiejar.v2/collections/prque/sstack_test.go
+++ b/Godeps/_workspace/src/gopkg.in/karalabe/cookiejar.v2/collections/prque/sstack_test.go
@@ -1,19 +1,10 @@
// CookieJar - A contestant's algorithm toolbox
// Copyright (c) 2013 Peter Szilagyi. All rights reserved.
//
-// CookieJar is dual licensed: you can redistribute it and/or modify it under
-// the terms of the GNU General Public License as published by the Free Software
-// Foundation, either version 3 of the License, or (at your option) any later
-// version.
-//
-// The toolbox is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-// more details.
-//
-// Alternatively, the CookieJar toolbox may be used in accordance with the terms
-// and conditions contained in a signed written agreement between you and the
-// author(s).
+// CookieJar is dual licensed: use of this source code is governed by a BSD
+// license that can be found in the LICENSE file. Alternatively, the CookieJar
+// toolbox may be used in accordance with the terms and conditions contained
+// in a signed written agreement between you and the author(s).
package prque
diff --git a/accounts/abi/abi.go b/accounts/abi/abi.go
index c31127cb3..de3128902 100644
--- a/accounts/abi/abi.go
+++ b/accounts/abi/abi.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/accounts/abi/abi_test.go b/accounts/abi/abi_test.go
index 8c08c6a74..7706de05d 100644
--- a/accounts/abi/abi_test.go
+++ b/accounts/abi/abi_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/accounts/abi/doc.go b/accounts/abi/doc.go
index 8e47ce674..824206858 100644
--- a/accounts/abi/doc.go
+++ b/accounts/abi/doc.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/accounts/abi/numbers.go b/accounts/abi/numbers.go
index 23ec2020e..2a7049425 100644
--- a/accounts/abi/numbers.go
+++ b/accounts/abi/numbers.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/accounts/abi/numbers_test.go b/accounts/abi/numbers_test.go
index 4beb5204a..78dc57543 100644
--- a/accounts/abi/numbers_test.go
+++ b/accounts/abi/numbers_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/accounts/abi/type.go b/accounts/abi/type.go
index c3f1968d9..b16822d3b 100644
--- a/accounts/abi/type.go
+++ b/accounts/abi/type.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/accounts/account_manager.go b/accounts/account_manager.go
index 9a7d8397f..2781be656 100644
--- a/accounts/account_manager.go
+++ b/accounts/account_manager.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/accounts/accounts_test.go b/accounts/accounts_test.go
index 94c2489fd..02a255f3e 100644
--- a/accounts/accounts_test.go
+++ b/accounts/accounts_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/build/update-license.go b/build/update-license.go
index 3c18ee40f..e28005cbd 100644
--- a/build/update-license.go
+++ b/build/update-license.go
@@ -68,7 +68,7 @@ var licenseT = template.Must(template.New("").Parse(`
// Copyright {{.Year}} The go-ethereum Authors
// This file is part of {{.Whole false}}.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// {{.Whole true}} is free software: you can redistribute it and/or modify
// it under the terms of the GNU {{.License}} as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/big.go b/common/big.go
index ebec0cbdb..a5d512d0d 100644
--- a/common/big.go
+++ b/common/big.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/big_test.go b/common/big_test.go
index 80f706bba..1eb0c0c1f 100644
--- a/common/big_test.go
+++ b/common/big_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/bytes.go b/common/bytes.go
index fec8db393..ba6987a9e 100644
--- a/common/bytes.go
+++ b/common/bytes.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/bytes_test.go b/common/bytes_test.go
index 5cc940b8a..816d2082b 100644
--- a/common/bytes_test.go
+++ b/common/bytes_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/compiler/solidity.go b/common/compiler/solidity.go
index 3981ae8c7..56928ac27 100644
--- a/common/compiler/solidity.go
+++ b/common/compiler/solidity.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/compiler/solidity_test.go b/common/compiler/solidity_test.go
index f25bff5b3..8255e8e2d 100644
--- a/common/compiler/solidity_test.go
+++ b/common/compiler/solidity_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/config.go b/common/config.go
deleted file mode 100644
index d2a0d4fa3..000000000
--- a/common/config.go
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2014 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// go-ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-package common
-
-import (
- "flag"
- "fmt"
- "os"
-
- "github.com/rakyll/globalconf"
-)
-
-// Config struct
-type ConfigManager struct {
- ExecPath string
- Debug bool
- Diff bool
- DiffType string
- Paranoia bool
- VmType int
-
- conf *globalconf.GlobalConf
-}
-
-// Read config
-//
-// Initialize Config from Config File
-func ReadConfig(ConfigFile string, Datadir string, EnvPrefix string) *ConfigManager {
- if !FileExist(ConfigFile) {
- // create ConfigFile if it does not exist, otherwise
- // globalconf will panic when trying to persist flags.
- fmt.Printf("config file '%s' doesn't exist, creating it\n", ConfigFile)
- os.Create(ConfigFile)
- }
- g, err := globalconf.NewWithOptions(&globalconf.Options{
- Filename: ConfigFile,
- EnvPrefix: EnvPrefix,
- })
- if err != nil {
- fmt.Println(err)
- } else {
- g.ParseAll()
- }
- cfg := &ConfigManager{ExecPath: Datadir, Debug: true, conf: g, Paranoia: true}
- return cfg
-}
-
-// provides persistence for flags
-func (c *ConfigManager) Save(key string, value interface{}) {
- f := &flag.Flag{Name: key, Value: newConfValue(value)}
- c.conf.Set("", f)
-}
-
-func (c *ConfigManager) Delete(key string) {
- c.conf.Delete("", key)
-}
-
-// private type implementing flag.Value
-type confValue struct {
- value string
-}
-
-// generic constructor to allow persising non-string values directly
-func newConfValue(value interface{}) *confValue {
- return &confValue{fmt.Sprintf("%v", value)}
-}
-
-func (self confValue) String() string { return self.value }
-func (self confValue) Set(s string) error { self.value = s; return nil }
diff --git a/common/db.go b/common/db.go
index e83d8802b..60c090cdc 100644
--- a/common/db.go
+++ b/common/db.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/debug.go b/common/debug.go
index 7897c24f5..fa93d7bda 100644
--- a/common/debug.go
+++ b/common/debug.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/docserver/docserver.go b/common/docserver/docserver.go
index e07ee3a62..fa120fb38 100644
--- a/common/docserver/docserver.go
+++ b/common/docserver/docserver.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/docserver/docserver_test.go b/common/docserver/docserver_test.go
index aa75ff4fd..92e39d167 100644
--- a/common/docserver/docserver_test.go
+++ b/common/docserver/docserver_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/list.go b/common/list.go
index 21ae41dde..07b2f17f5 100644
--- a/common/list.go
+++ b/common/list.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/main_test.go b/common/main_test.go
index 5e26721b2..149d09928 100644
--- a/common/main_test.go
+++ b/common/main_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/math/dist.go b/common/math/dist.go
index d3a096133..913fbfbd4 100644
--- a/common/math/dist.go
+++ b/common/math/dist.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/math/dist_test.go b/common/math/dist_test.go
index 07397f332..1eacfbcaf 100644
--- a/common/math/dist_test.go
+++ b/common/math/dist_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/natspec/natspec.go b/common/natspec/natspec.go
index e68f50f54..0265c2e13 100644
--- a/common/natspec/natspec.go
+++ b/common/natspec/natspec.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/natspec/natspec_e2e_test.go b/common/natspec/natspec_e2e_test.go
index d55c3fff7..fc8ca6af2 100644
--- a/common/natspec/natspec_e2e_test.go
+++ b/common/natspec/natspec_e2e_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/natspec/natspec_js.go b/common/natspec/natspec_js.go
index 9db3050ec..2b30d31d3 100644
--- a/common/natspec/natspec_js.go
+++ b/common/natspec/natspec_js.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/natspec/natspec_test.go b/common/natspec/natspec_test.go
index 726b3ef67..9ec14829a 100644
--- a/common/natspec/natspec_test.go
+++ b/common/natspec/natspec_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/number/int.go b/common/number/int.go
index 9f32c9d86..6dab2436d 100644
--- a/common/number/int.go
+++ b/common/number/int.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/number/uint_test.go b/common/number/uint_test.go
index 17110ecc2..3ab9e4c34 100644
--- a/common/number/uint_test.go
+++ b/common/number/uint_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/package.go b/common/package.go
index 8e57f2fbe..4e8780c08 100644
--- a/common/package.go
+++ b/common/package.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/path.go b/common/path.go
index e55eb1ab7..0d7adb961 100644
--- a/common/path.go
+++ b/common/path.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/path_test.go b/common/path_test.go
index ffc72bc53..71ffd5fe1 100644
--- a/common/path_test.go
+++ b/common/path_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/registrar/contracts.go b/common/registrar/contracts.go
index 6d6d190ae..cd80dfcab 100644
--- a/common/registrar/contracts.go
+++ b/common/registrar/contracts.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/registrar/ethreg/ethreg.go b/common/registrar/ethreg/ethreg.go
index 46aa5c95d..626ebe1d7 100644
--- a/common/registrar/ethreg/ethreg.go
+++ b/common/registrar/ethreg/ethreg.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/registrar/registrar.go b/common/registrar/registrar.go
index 976991ad6..d891e161e 100644
--- a/common/registrar/registrar.go
+++ b/common/registrar/registrar.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/registrar/registrar_test.go b/common/registrar/registrar_test.go
index 7d109a268..63f283563 100644
--- a/common/registrar/registrar_test.go
+++ b/common/registrar/registrar_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/rlp.go b/common/rlp.go
index 757a0466f..481b451b1 100644
--- a/common/rlp.go
+++ b/common/rlp.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/rlp_test.go b/common/rlp_test.go
index b6ceac485..2320ffe3c 100644
--- a/common/rlp_test.go
+++ b/common/rlp_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/size.go b/common/size.go
index eb9b1f430..9653b3629 100644
--- a/common/size.go
+++ b/common/size.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/size_test.go b/common/size_test.go
index 85e01fa9a..8709a0237 100644
--- a/common/size_test.go
+++ b/common/size_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/test_utils.go b/common/test_utils.go
index 8603ba222..a848642f7 100644
--- a/common/test_utils.go
+++ b/common/test_utils.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/types.go b/common/types.go
index 90d253318..624f4b826 100644
--- a/common/types.go
+++ b/common/types.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/types_template.go b/common/types_template.go
index d24c9c7f7..8048f9cc3 100644
--- a/common/types_template.go
+++ b/common/types_template.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/types_test.go b/common/types_test.go
index fec45e959..edf8d4d14 100644
--- a/common/types_test.go
+++ b/common/types_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/value.go b/common/value.go
index 20829eecd..7abbf67b1 100644
--- a/common/value.go
+++ b/common/value.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/common/value_test.go b/common/value_test.go
index 6ec0c744f..ac2ef02a7 100644
--- a/common/value_test.go
+++ b/common/value_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/compression/rle/read_write.go b/compression/rle/read_write.go
index ad1830c7f..19133119b 100644
--- a/compression/rle/read_write.go
+++ b/compression/rle/read_write.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/compression/rle/read_write_test.go b/compression/rle/read_write_test.go
index 99785af80..ba3965025 100644
--- a/compression/rle/read_write_test.go
+++ b/compression/rle/read_write_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/asm.go b/core/asm.go
index 4c71cb1d9..a86a2c44c 100644
--- a/core/asm.go
+++ b/core/asm.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/bad_block.go b/core/bad_block.go
index 23bc6800c..cd3fb575a 100644
--- a/core/bad_block.go
+++ b/core/bad_block.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/bench_test.go b/core/bench_test.go
index 0c960108f..67ba15970 100644
--- a/core/bench_test.go
+++ b/core/bench_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/block_cache.go b/core/block_cache.go
index 2c72f9397..0fd711448 100644
--- a/core/block_cache.go
+++ b/core/block_cache.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/block_cache_test.go b/core/block_cache_test.go
index ecf0e42a1..ef826d5bd 100644
--- a/core/block_cache_test.go
+++ b/core/block_cache_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/block_processor.go b/core/block_processor.go
index ed0335630..6687cd000 100644
--- a/core/block_processor.go
+++ b/core/block_processor.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/block_processor_test.go b/core/block_processor_test.go
index 54fa34472..f48ce9607 100644
--- a/core/block_processor_test.go
+++ b/core/block_processor_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/blocks.go b/core/blocks.go
index 178230b5b..326e4c3fc 100644
--- a/core/blocks.go
+++ b/core/blocks.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/canary.go b/core/canary.go
index efdf19e7d..5eefe066c 100644
--- a/core/canary.go
+++ b/core/canary.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/chain_makers.go b/core/chain_makers.go
index 63e9334d2..283653d9a 100644
--- a/core/chain_makers.go
+++ b/core/chain_makers.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/chain_makers_test.go b/core/chain_makers_test.go
index edc0333be..98a585f9b 100644
--- a/core/chain_makers_test.go
+++ b/core/chain_makers_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/chain_manager.go b/core/chain_manager.go
index 5c132a668..c2e89a10d 100644
--- a/core/chain_manager.go
+++ b/core/chain_manager.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/chain_manager_test.go b/core/chain_manager_test.go
index e2ad86942..f0c097df6 100644
--- a/core/chain_manager_test.go
+++ b/core/chain_manager_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/chain_util.go b/core/chain_util.go
index 38273d2f0..326bf13fb 100644
--- a/core/chain_util.go
+++ b/core/chain_util.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/error.go b/core/error.go
index f055b103d..5e6ff4de7 100644
--- a/core/error.go
+++ b/core/error.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/events.go b/core/events.go
index f820b6b0b..a487fc51d 100644
--- a/core/events.go
+++ b/core/events.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/execution.go b/core/execution.go
index bab3a72e3..699bad9a3 100644
--- a/core/execution.go
+++ b/core/execution.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/fees.go b/core/fees.go
index 29ba5c5a6..0bb26f055 100644
--- a/core/fees.go
+++ b/core/fees.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/filter.go b/core/filter.go
index b78647f05..8a876396b 100644
--- a/core/filter.go
+++ b/core/filter.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/filter_test.go b/core/filter_test.go
index c973bbed3..58e71e305 100644
--- a/core/filter_test.go
+++ b/core/filter_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/genesis.go b/core/genesis.go
index 86e494766..4c0323c17 100644
--- a/core/genesis.go
+++ b/core/genesis.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/helper_test.go b/core/helper_test.go
index c85df133e..b21f31d7c 100644
--- a/core/helper_test.go
+++ b/core/helper_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/manager.go b/core/manager.go
index c9fdce78e..a07c32659 100644
--- a/core/manager.go
+++ b/core/manager.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/state/dump.go b/core/state/dump.go
index 6b5e40565..9acb8a024 100644
--- a/core/state/dump.go
+++ b/core/state/dump.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/state/errors.go b/core/state/errors.go
index 343567b18..a08ed2d23 100644
--- a/core/state/errors.go
+++ b/core/state/errors.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/state/log.go b/core/state/log.go
index 67450c689..5d7d7357d 100644
--- a/core/state/log.go
+++ b/core/state/log.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/state/main_test.go b/core/state/main_test.go
index 38b62df02..cd9661031 100644
--- a/core/state/main_test.go
+++ b/core/state/main_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/state/managed_state.go b/core/state/managed_state.go
index 13535a405..4df047979 100644
--- a/core/state/managed_state.go
+++ b/core/state/managed_state.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/state/managed_state_test.go b/core/state/managed_state_test.go
index a751e04bc..58e77d842 100644
--- a/core/state/managed_state_test.go
+++ b/core/state/managed_state_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/state/state_object.go b/core/state/state_object.go
index e366444db..3d4f0b376 100644
--- a/core/state/state_object.go
+++ b/core/state/state_object.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/state/state_test.go b/core/state/state_test.go
index a2cab025e..5972d266a 100644
--- a/core/state/state_test.go
+++ b/core/state/state_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/state/statedb.go b/core/state/statedb.go
index f438fc00b..f481c8ab3 100644
--- a/core/state/statedb.go
+++ b/core/state/statedb.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/state_transition.go b/core/state_transition.go
index 8d2acb904..a5d4fc19b 100644
--- a/core/state_transition.go
+++ b/core/state_transition.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/transaction_pool.go b/core/transaction_pool.go
index 003d4a14a..2a6666ea1 100644
--- a/core/transaction_pool.go
+++ b/core/transaction_pool.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/transaction_pool_test.go b/core/transaction_pool_test.go
index 5e2294068..26af4fc16 100644
--- a/core/transaction_pool_test.go
+++ b/core/transaction_pool_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/transaction_util.go b/core/transaction_util.go
index d4b9f53c9..ce2ceac46 100644
--- a/core/transaction_util.go
+++ b/core/transaction_util.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/types/block.go b/core/types/block.go
index 8c6ed8591..427a3e6cb 100644
--- a/core/types/block.go
+++ b/core/types/block.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/types/block_test.go b/core/types/block_test.go
index 03fa679b1..aebb6328b 100644
--- a/core/types/block_test.go
+++ b/core/types/block_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/types/bloom9.go b/core/types/bloom9.go
index bfc27c6f7..0629b31d4 100644
--- a/core/types/bloom9.go
+++ b/core/types/bloom9.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/types/bloom9_test.go b/core/types/bloom9_test.go
index 25c96c7ca..f020670b1 100644
--- a/core/types/bloom9_test.go
+++ b/core/types/bloom9_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/types/common.go b/core/types/common.go
index 2b834a255..de6efcd86 100644
--- a/core/types/common.go
+++ b/core/types/common.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/types/derive_sha.go b/core/types/derive_sha.go
index 1c793becc..478edb0e8 100644
--- a/core/types/derive_sha.go
+++ b/core/types/derive_sha.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/types/receipt.go b/core/types/receipt.go
index 914ff0b3c..e01d69005 100644
--- a/core/types/receipt.go
+++ b/core/types/receipt.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/types/transaction.go b/core/types/transaction.go
index c60e45fe8..cc1793112 100644
--- a/core/types/transaction.go
+++ b/core/types/transaction.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/types/transaction_test.go b/core/types/transaction_test.go
index 11c30b1f7..1c0e27d9a 100644
--- a/core/types/transaction_test.go
+++ b/core/types/transaction_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/vm/analysis.go b/core/vm/analysis.go
index b88f33fdc..a0f615821 100644
--- a/core/vm/analysis.go
+++ b/core/vm/analysis.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/vm/asm.go b/core/vm/asm.go
index ccaacd36b..639201e50 100644
--- a/core/vm/asm.go
+++ b/core/vm/asm.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/vm/common.go b/core/vm/common.go
index be8511a8f..2e03ec80b 100644
--- a/core/vm/common.go
+++ b/core/vm/common.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/vm/context.go b/core/vm/context.go
index 18617b98f..162666ef2 100644
--- a/core/vm/context.go
+++ b/core/vm/context.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/vm/contracts.go b/core/vm/contracts.go
index 0e7c04c04..2d70f173e 100644
--- a/core/vm/contracts.go
+++ b/core/vm/contracts.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/vm/disasm.go b/core/vm/disasm.go
index 0aefbd659..2bfea5cbd 100644
--- a/core/vm/disasm.go
+++ b/core/vm/disasm.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/vm/environment.go b/core/vm/environment.go
index 8ef2a7426..723924b6f 100644
--- a/core/vm/environment.go
+++ b/core/vm/environment.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/vm/errors.go b/core/vm/errors.go
index 3af1ce6f5..24567e9a1 100644
--- a/core/vm/errors.go
+++ b/core/vm/errors.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/vm/gas.go b/core/vm/gas.go
index 9dbfe65fd..af2e586a7 100644
--- a/core/vm/gas.go
+++ b/core/vm/gas.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/vm/logger.go b/core/vm/logger.go
index c6d3fbd93..736f595f6 100644
--- a/core/vm/logger.go
+++ b/core/vm/logger.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/vm/memory.go b/core/vm/memory.go
index 169707a32..0109050d7 100644
--- a/core/vm/memory.go
+++ b/core/vm/memory.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/vm/opcodes.go b/core/vm/opcodes.go
index 24d6b5294..ecced3650 100644
--- a/core/vm/opcodes.go
+++ b/core/vm/opcodes.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/vm/stack.go b/core/vm/stack.go
index d9d9dd2a5..3d669b2f2 100644
--- a/core/vm/stack.go
+++ b/core/vm/stack.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/vm/virtual_machine.go b/core/vm/virtual_machine.go
index 1d765d36c..047723744 100644
--- a/core/vm/virtual_machine.go
+++ b/core/vm/virtual_machine.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/vm/vm.go b/core/vm/vm.go
index d67e01307..21e0a4665 100644
--- a/core/vm/vm.go
+++ b/core/vm/vm.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/vm/vm_jit.go b/core/vm/vm_jit.go
index 6f7163c22..339cb8ea8 100644
--- a/core/vm/vm_jit.go
+++ b/core/vm/vm_jit.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/vm/vm_jit_fake.go b/core/vm/vm_jit_fake.go
index 191496e0a..456fcb8d4 100644
--- a/core/vm/vm_jit_fake.go
+++ b/core/vm/vm_jit_fake.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/core/vm_env.go b/core/vm_env.go
index 79aa460b2..c1a86d63e 100644
--- a/core/vm_env.go
+++ b/core/vm_env.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/crypto/crypto.go b/crypto/crypto.go
index 1c34f9a7d..a474d6f13 100644
--- a/crypto/crypto.go
+++ b/crypto/crypto.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go
index e68d6e50d..b891f41a9 100644
--- a/crypto/crypto_test.go
+++ b/crypto/crypto_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/crypto/encrypt_decrypt_test.go b/crypto/encrypt_decrypt_test.go
index a2d8a2189..fcf40b70f 100644
--- a/crypto/encrypt_decrypt_test.go
+++ b/crypto/encrypt_decrypt_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/crypto/key.go b/crypto/key.go
index 994ebe4af..d80b99759 100644
--- a/crypto/key.go
+++ b/crypto/key.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/crypto/key_store_passphrase.go b/crypto/key_store_passphrase.go
index 2198d1af4..f21af8dd9 100644
--- a/crypto/key_store_passphrase.go
+++ b/crypto/key_store_passphrase.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/crypto/key_store_plain.go b/crypto/key_store_plain.go
index bb7a2b7a5..c1c23f8b8 100644
--- a/crypto/key_store_plain.go
+++ b/crypto/key_store_plain.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/crypto/key_store_test.go b/crypto/key_store_test.go
index 8634aad46..fda87ddc8 100644
--- a/crypto/key_store_test.go
+++ b/crypto/key_store_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/crypto/keypair.go b/crypto/keypair.go
index 3e600d98a..e070f292f 100644
--- a/crypto/keypair.go
+++ b/crypto/keypair.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/crypto/mnemonic.go b/crypto/mnemonic.go
index ad6207b90..34698926c 100644
--- a/crypto/mnemonic.go
+++ b/crypto/mnemonic.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/crypto/mnemonic_test.go b/crypto/mnemonic_test.go
index 46dfc79ca..07b364a01 100644
--- a/crypto/mnemonic_test.go
+++ b/crypto/mnemonic_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/crypto/mnemonic_words.go b/crypto/mnemonic_words.go
index 6127be60e..6b8412e89 100644
--- a/crypto/mnemonic_words.go
+++ b/crypto/mnemonic_words.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/crypto/randentropy/rand_entropy.go b/crypto/randentropy/rand_entropy.go
index ec1a20f92..0c2e3c051 100644
--- a/crypto/randentropy/rand_entropy.go
+++ b/crypto/randentropy/rand_entropy.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/crypto/secp256k1/notes.go b/crypto/secp256k1/notes.go
index c26079d21..93e6d1902 100644
--- a/crypto/secp256k1/notes.go
+++ b/crypto/secp256k1/notes.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/crypto/secp256k1/secp256.go b/crypto/secp256k1/secp256.go
index 88aa32a4b..39cfda607 100644
--- a/crypto/secp256k1/secp256.go
+++ b/crypto/secp256k1/secp256.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/crypto/secp256k1/secp256_test.go b/crypto/secp256k1/secp256_test.go
index 0e4fe5033..deeec98d5 100644
--- a/crypto/secp256k1/secp256_test.go
+++ b/crypto/secp256k1/secp256_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/crypto/sha3/keccakf.go b/crypto/sha3/keccakf.go
index 13e7058fa..5fb98cbeb 100644
--- a/crypto/sha3/keccakf.go
+++ b/crypto/sha3/keccakf.go
@@ -1,6 +1,30 @@
// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
+//
+// 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.
package sha3
diff --git a/crypto/sha3/sha3.go b/crypto/sha3/sha3.go
index 6b058ae4d..ee24df5c9 100644
--- a/crypto/sha3/sha3.go
+++ b/crypto/sha3/sha3.go
@@ -1,6 +1,30 @@
// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
+//
+// 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.
// Package sha3 implements the SHA3 hash algorithm (formerly called Keccak) chosen by NIST in 2012.
// This file provides a SHA3 implementation which implements the standard hash.Hash interface.
diff --git a/errs/errors.go b/errs/errors.go
index 854796d0a..675649efa 100644
--- a/errs/errors.go
+++ b/errs/errors.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/errs/errors_test.go b/errs/errors_test.go
index 5d39938fe..d6d14b45e 100644
--- a/errs/errors_test.go
+++ b/errs/errors_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/eth/backend.go b/eth/backend.go
index cba1b3939..dc592e7fc 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go
index 7b0cd86b8..4c8b2e8d0 100644
--- a/eth/downloader/downloader.go
+++ b/eth/downloader/downloader.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/eth/downloader/downloader_test.go b/eth/downloader/downloader_test.go
index 993b64dda..8299dd62c 100644
--- a/eth/downloader/downloader_test.go
+++ b/eth/downloader/downloader_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/eth/downloader/events.go b/eth/downloader/events.go
index cd2ffdad5..64905b8f2 100644
--- a/eth/downloader/events.go
+++ b/eth/downloader/events.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/eth/downloader/peer.go b/eth/downloader/peer.go
index 28922c683..4273b9168 100644
--- a/eth/downloader/peer.go
+++ b/eth/downloader/peer.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/eth/downloader/queue.go b/eth/downloader/queue.go
index a84509a9b..96e08e144 100644
--- a/eth/downloader/queue.go
+++ b/eth/downloader/queue.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/eth/fetcher/fetcher.go b/eth/fetcher/fetcher.go
index 1f02aab6e..55b6c5c1c 100644
--- a/eth/fetcher/fetcher.go
+++ b/eth/fetcher/fetcher.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/eth/fetcher/fetcher_test.go b/eth/fetcher/fetcher_test.go
index 4670713b2..499d6d546 100644
--- a/eth/fetcher/fetcher_test.go
+++ b/eth/fetcher/fetcher_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/eth/fetcher/metrics.go b/eth/fetcher/metrics.go
index 08941c255..76cc49226 100644
--- a/eth/fetcher/metrics.go
+++ b/eth/fetcher/metrics.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/eth/gasprice.go b/eth/gasprice.go
index ae679c676..031098e9a 100644
--- a/eth/gasprice.go
+++ b/eth/gasprice.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/eth/handler.go b/eth/handler.go
index f2ae2b6f7..2bd369901 100644
--- a/eth/handler.go
+++ b/eth/handler.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/eth/metrics.go b/eth/metrics.go
index 2ec6e47d9..625b90b67 100644
--- a/eth/metrics.go
+++ b/eth/metrics.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/eth/peer.go b/eth/peer.go
index f06dbea72..ade1f37ea 100644
--- a/eth/peer.go
+++ b/eth/peer.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/eth/protocol.go b/eth/protocol.go
index 226b98360..b8c9b50d0 100644
--- a/eth/protocol.go
+++ b/eth/protocol.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/eth/protocol_test.go b/eth/protocol_test.go
index 4a6736b7a..a24d98f69 100644
--- a/eth/protocol_test.go
+++ b/eth/protocol_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/eth/sync.go b/eth/sync.go
index 5d1c066a2..a69bd6c69 100644
--- a/eth/sync.go
+++ b/eth/sync.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/ethdb/database.go b/ethdb/database.go
index bf27df592..ace56c6c7 100644
--- a/ethdb/database.go
+++ b/ethdb/database.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/ethdb/database_test.go b/ethdb/database_test.go
index 5eb4c8c42..ae4906166 100644
--- a/ethdb/database_test.go
+++ b/ethdb/database_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/ethdb/memory_database.go b/ethdb/memory_database.go
index 3dcb9fa98..70b03dfad 100644
--- a/ethdb/memory_database.go
+++ b/ethdb/memory_database.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/event/event.go b/event/event.go
index 6a0525f18..ce74e5286 100644
--- a/event/event.go
+++ b/event/event.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/event/event_test.go b/event/event_test.go
index 8b2856bc4..465af38cd 100644
--- a/event/event_test.go
+++ b/event/event_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/event/example_test.go b/event/example_test.go
index 1b27197b5..d4642ef2f 100644
--- a/event/example_test.go
+++ b/event/example_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/event/filter/eth_filter.go b/event/filter/eth_filter.go
index 7f7b3a909..6f61e2b60 100644
--- a/event/filter/eth_filter.go
+++ b/event/filter/eth_filter.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/event/filter/filter.go b/event/filter/filter.go
index 7f07194b5..b1fbf30ee 100644
--- a/event/filter/filter.go
+++ b/event/filter/filter.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/event/filter/filter_test.go b/event/filter/filter_test.go
index fbf088145..0cd26bfc9 100644
--- a/event/filter/filter_test.go
+++ b/event/filter/filter_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/event/filter/generic_filter.go b/event/filter/generic_filter.go
index 3193bb75e..27f35920d 100644
--- a/event/filter/generic_filter.go
+++ b/event/filter/generic_filter.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/generators/defaults.go b/generators/defaults.go
index f28d249c4..386c6743d 100644
--- a/generators/defaults.go
+++ b/generators/defaults.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/jsre/bignumber_js.go b/jsre/bignumber_js.go
index 9ecefcb03..2e9c74c9f 100644
--- a/jsre/bignumber_js.go
+++ b/jsre/bignumber_js.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/jsre/ethereum_js.go b/jsre/ethereum_js.go
index abaeb7026..27dbed24c 100644
--- a/jsre/ethereum_js.go
+++ b/jsre/ethereum_js.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/jsre/jsre.go b/jsre/jsre.go
index 8a7b257b8..d4c982897 100644
--- a/jsre/jsre.go
+++ b/jsre/jsre.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/jsre/jsre_test.go b/jsre/jsre_test.go
index 38c9e5026..ad210932a 100644
--- a/jsre/jsre_test.go
+++ b/jsre/jsre_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/jsre/pp_js.go b/jsre/pp_js.go
index 876ea89f5..80fe523c1 100644
--- a/jsre/pp_js.go
+++ b/jsre/pp_js.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/logger/example_test.go b/logger/example_test.go
index c44f7f892..ce5f9da67 100644
--- a/logger/example_test.go
+++ b/logger/example_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/logger/log.go b/logger/log.go
index 6329259d7..38a6ce139 100644
--- a/logger/log.go
+++ b/logger/log.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/logger/loggers.go b/logger/loggers.go
index f1ed3a4ec..e63355d0b 100644
--- a/logger/loggers.go
+++ b/logger/loggers.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/logger/loggers_test.go b/logger/loggers_test.go
index 88a375ebb..85564698b 100644
--- a/logger/loggers_test.go
+++ b/logger/loggers_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/logger/logsystem.go b/logger/logsystem.go
index da56ba719..24f4351d4 100644
--- a/logger/logsystem.go
+++ b/logger/logsystem.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/logger/sys.go b/logger/sys.go
index f6fbf6cd0..18d4ea641 100644
--- a/logger/sys.go
+++ b/logger/sys.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/logger/types.go b/logger/types.go
index e1f47e47c..ee7e845de 100644
--- a/logger/types.go
+++ b/logger/types.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/logger/verbosity.go b/logger/verbosity.go
index f1196f144..aa3d59c30 100644
--- a/logger/verbosity.go
+++ b/logger/verbosity.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/metrics/disk.go b/metrics/disk.go
index f1a00c6fb..25142d2ad 100644
--- a/metrics/disk.go
+++ b/metrics/disk.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/metrics/disk_linux.go b/metrics/disk_linux.go
index 73692421b..e0c8a1a3a 100644
--- a/metrics/disk_linux.go
+++ b/metrics/disk_linux.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/metrics/disk_nop.go b/metrics/disk_nop.go
index 4aef17008..4319f8b27 100644
--- a/metrics/disk_nop.go
+++ b/metrics/disk_nop.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/metrics/metrics.go b/metrics/metrics.go
index 82519d902..6d1a065ed 100644
--- a/metrics/metrics.go
+++ b/metrics/metrics.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/miner/agent.go b/miner/agent.go
index caf1cb322..2f8d9fee4 100644
--- a/miner/agent.go
+++ b/miner/agent.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/miner/miner.go b/miner/miner.go
index a5cd71702..bf6a48802 100644
--- a/miner/miner.go
+++ b/miner/miner.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/miner/remote_agent.go b/miner/remote_agent.go
index 59080fc44..674ca40ac 100644
--- a/miner/remote_agent.go
+++ b/miner/remote_agent.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/miner/worker.go b/miner/worker.go
index 5d548584c..7fb40af78 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/p2p/dial.go b/p2p/dial.go
index 9d9623c60..0fd3a4cf5 100644
--- a/p2p/dial.go
+++ b/p2p/dial.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/p2p/dial_test.go b/p2p/dial_test.go
index 9f036241f..d24e03e29 100644
--- a/p2p/dial_test.go
+++ b/p2p/dial_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/p2p/discover/database.go b/p2p/discover/database.go
index 4a3a217cd..d5c594364 100644
--- a/p2p/discover/database.go
+++ b/p2p/discover/database.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/p2p/discover/database_test.go b/p2p/discover/database_test.go
index 88ca580f8..569585903 100644
--- a/p2p/discover/database_test.go
+++ b/p2p/discover/database_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/p2p/discover/node.go b/p2p/discover/node.go
index 3d5251d7e..b6956e197 100644
--- a/p2p/discover/node.go
+++ b/p2p/discover/node.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/p2p/discover/node_test.go b/p2p/discover/node_test.go
index bf9af4b48..e523e12d2 100644
--- a/p2p/discover/node_test.go
+++ b/p2p/discover/node_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/p2p/discover/table.go b/p2p/discover/table.go
index db0ed8cd8..48c473475 100644
--- a/p2p/discover/table.go
+++ b/p2p/discover/table.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/p2p/discover/table_test.go b/p2p/discover/table_test.go
index c6db96d3c..310fe2b7b 100644
--- a/p2p/discover/table_test.go
+++ b/p2p/discover/table_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/p2p/discover/udp.go b/p2p/discover/udp.go
index f54f19a02..4e6ecaf23 100644
--- a/p2p/discover/udp.go
+++ b/p2p/discover/udp.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/p2p/discover/udp_test.go b/p2p/discover/udp_test.go
index c034ec072..8d6d3e855 100644
--- a/p2p/discover/udp_test.go
+++ b/p2p/discover/udp_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/p2p/message.go b/p2p/message.go
index 69d5beeaa..1292d2121 100644
--- a/p2p/message.go
+++ b/p2p/message.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/p2p/message_test.go b/p2p/message_test.go
index ac369a9ef..8599b7e87 100644
--- a/p2p/message_test.go
+++ b/p2p/message_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/p2p/metrics.go b/p2p/metrics.go
index 74048a170..f98cac274 100644
--- a/p2p/metrics.go
+++ b/p2p/metrics.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/p2p/nat/nat.go b/p2p/nat/nat.go
index 17e5517f2..505a1fc77 100644
--- a/p2p/nat/nat.go
+++ b/p2p/nat/nat.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/p2p/nat/nat_test.go b/p2p/nat/nat_test.go
index 78a968acf..a079e7a22 100644
--- a/p2p/nat/nat_test.go
+++ b/p2p/nat/nat_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/p2p/nat/natpmp.go b/p2p/nat/natpmp.go
index fae0874af..c2f940891 100644
--- a/p2p/nat/natpmp.go
+++ b/p2p/nat/natpmp.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/p2p/nat/natupnp.go b/p2p/nat/natupnp.go
index 0c234a7b8..0bcb262bf 100644
--- a/p2p/nat/natupnp.go
+++ b/p2p/nat/natupnp.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/p2p/nat/natupnp_test.go b/p2p/nat/natupnp_test.go
index 6198754fa..c1e322af7 100644
--- a/p2p/nat/natupnp_test.go
+++ b/p2p/nat/natupnp_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/p2p/peer.go b/p2p/peer.go
index ba0781d75..1b3b19c79 100644
--- a/p2p/peer.go
+++ b/p2p/peer.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/p2p/peer_error.go b/p2p/peer_error.go
index e3f9a6d94..b1762a6ee 100644
--- a/p2p/peer_error.go
+++ b/p2p/peer_error.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/p2p/peer_test.go b/p2p/peer_test.go
index e9bd8555b..6f96a823b 100644
--- a/p2p/peer_test.go
+++ b/p2p/peer_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/p2p/protocol.go b/p2p/protocol.go
index d25a49c1b..ac0c3d942 100644
--- a/p2p/protocol.go
+++ b/p2p/protocol.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/p2p/rlpx.go b/p2p/rlpx.go
index 927cc5412..fd43f565e 100644
--- a/p2p/rlpx.go
+++ b/p2p/rlpx.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/p2p/rlpx_test.go b/p2p/rlpx_test.go
index c7b98136c..900353f0e 100644
--- a/p2p/rlpx_test.go
+++ b/p2p/rlpx_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/p2p/server.go b/p2p/server.go
index df5b11ee7..ba83c5503 100644
--- a/p2p/server.go
+++ b/p2p/server.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/p2p/server_test.go b/p2p/server_test.go
index bec0fcf29..976d5baf5 100644
--- a/p2p/server_test.go
+++ b/p2p/server_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/params/protocol_params.go b/params/protocol_params.go
index 684e06b7e..b1a6757b1 100755
--- a/params/protocol_params.go
+++ b/params/protocol_params.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/pow/block.go b/pow/block.go
index 7a56a2323..11807113d 100644
--- a/pow/block.go
+++ b/pow/block.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/pow/dagger/dagger.go b/pow/dagger/dagger.go
index 9c812ee63..f54ba71ca 100644
--- a/pow/dagger/dagger.go
+++ b/pow/dagger/dagger.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/pow/dagger/dagger_test.go b/pow/dagger/dagger_test.go
index 7cf1d5b9d..39b74df30 100644
--- a/pow/dagger/dagger_test.go
+++ b/pow/dagger/dagger_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/pow/ezp/pow.go b/pow/ezp/pow.go
index 358e2f82d..03bb3da29 100644
--- a/pow/ezp/pow.go
+++ b/pow/ezp/pow.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/pow/pow.go b/pow/pow.go
index 7d67d0c60..22daf35e4 100644
--- a/pow/pow.go
+++ b/pow/pow.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rlp/decode.go b/rlp/decode.go
index f27dcebc3..c0b5f0699 100644
--- a/rlp/decode.go
+++ b/rlp/decode.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rlp/decode_test.go b/rlp/decode_test.go
index 0347424de..331faa9d8 100644
--- a/rlp/decode_test.go
+++ b/rlp/decode_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rlp/doc.go b/rlp/doc.go
index 62b54bc73..72667416c 100644
--- a/rlp/doc.go
+++ b/rlp/doc.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rlp/encode.go b/rlp/encode.go
index 86fe3ac5f..0ddef7bbb 100644
--- a/rlp/encode.go
+++ b/rlp/encode.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rlp/encode_test.go b/rlp/encode_test.go
index bfe893353..e83c76b51 100644
--- a/rlp/encode_test.go
+++ b/rlp/encode_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rlp/encoder_example_test.go b/rlp/encoder_example_test.go
index c3c3b40d7..1cffa241c 100644
--- a/rlp/encoder_example_test.go
+++ b/rlp/encoder_example_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rlp/typecache.go b/rlp/typecache.go
index f5387a271..0ab096695 100644
--- a/rlp/typecache.go
+++ b/rlp/typecache.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/api/admin.go b/rpc/api/admin.go
index 44815ae2d..29f342ab6 100644
--- a/rpc/api/admin.go
+++ b/rpc/api/admin.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/api/admin_args.go b/rpc/api/admin_args.go
index a4e6713f3..e3a2f72bf 100644
--- a/rpc/api/admin_args.go
+++ b/rpc/api/admin_args.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/api/admin_js.go b/rpc/api/admin_js.go
index 847a1e840..25dbb4a8d 100644
--- a/rpc/api/admin_js.go
+++ b/rpc/api/admin_js.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/api/api.go b/rpc/api/api.go
index 07f0896a6..e03250ec6 100644
--- a/rpc/api/api.go
+++ b/rpc/api/api.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/api/api_test.go b/rpc/api/api_test.go
index 1b00a9d49..131ef68f8 100644
--- a/rpc/api/api_test.go
+++ b/rpc/api/api_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/api/args.go b/rpc/api/args.go
index a4393a41a..20f073b67 100644
--- a/rpc/api/args.go
+++ b/rpc/api/args.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/api/args_test.go b/rpc/api/args_test.go
index fdaa38864..bb279718b 100644
--- a/rpc/api/args_test.go
+++ b/rpc/api/args_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/api/db.go b/rpc/api/db.go
index 5371572b1..0eddc410e 100644
--- a/rpc/api/db.go
+++ b/rpc/api/db.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/api/db_args.go b/rpc/api/db_args.go
index b6d38cbbd..d61ea77ee 100644
--- a/rpc/api/db_args.go
+++ b/rpc/api/db_args.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/api/db_js.go b/rpc/api/db_js.go
index 09e3401d0..899f8abd9 100644
--- a/rpc/api/db_js.go
+++ b/rpc/api/db_js.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/api/debug.go b/rpc/api/debug.go
index 396584765..cdacd6c62 100644
--- a/rpc/api/debug.go
+++ b/rpc/api/debug.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/api/debug_args.go b/rpc/api/debug_args.go
index edc4003ec..041ad6b6a 100644
--- a/rpc/api/debug_args.go
+++ b/rpc/api/debug_args.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/api/debug_js.go b/rpc/api/debug_js.go
index 7afc414d4..0eb9f97f1 100644
--- a/rpc/api/debug_js.go
+++ b/rpc/api/debug_js.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/api/eth.go b/rpc/api/eth.go
index a94279b65..ed636004c 100644
--- a/rpc/api/eth.go
+++ b/rpc/api/eth.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/api/eth_args.go b/rpc/api/eth_args.go
index 256313472..ae394e7ec 100644
--- a/rpc/api/eth_args.go
+++ b/rpc/api/eth_args.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/api/eth_js.go b/rpc/api/eth_js.go
index d80e6f4d8..393dac22f 100644
--- a/rpc/api/eth_js.go
+++ b/rpc/api/eth_js.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/api/mergedapi.go b/rpc/api/mergedapi.go
index 7ed8cfedb..8f4ef8e60 100644
--- a/rpc/api/mergedapi.go
+++ b/rpc/api/mergedapi.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/api/miner.go b/rpc/api/miner.go
index 12203ffe0..3c3d1ee0b 100644
--- a/rpc/api/miner.go
+++ b/rpc/api/miner.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/api/miner_args.go b/rpc/api/miner_args.go
index f19411a70..5ceb244fe 100644
--- a/rpc/api/miner_args.go
+++ b/rpc/api/miner_args.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/api/miner_js.go b/rpc/api/miner_js.go
index be4257447..0998a9f41 100644
--- a/rpc/api/miner_js.go
+++ b/rpc/api/miner_js.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/api/net.go b/rpc/api/net.go
index 93ea77c65..39c230e14 100644
--- a/rpc/api/net.go
+++ b/rpc/api/net.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/api/net_js.go b/rpc/api/net_js.go
index 99052b115..2ee1f0041 100644
--- a/rpc/api/net_js.go
+++ b/rpc/api/net_js.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/api/parsing.go b/rpc/api/parsing.go
index 3f1f79e22..0698e8dbe 100644
--- a/rpc/api/parsing.go
+++ b/rpc/api/parsing.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/api/personal.go b/rpc/api/personal.go
index e4fe329a0..e9942c1e5 100644
--- a/rpc/api/personal.go
+++ b/rpc/api/personal.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/api/personal_args.go b/rpc/api/personal_args.go
index 5224d2411..7f00701e3 100644
--- a/rpc/api/personal_args.go
+++ b/rpc/api/personal_args.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/api/personal_js.go b/rpc/api/personal_js.go
index cb94c7cfb..81c5d4a36 100644
--- a/rpc/api/personal_js.go
+++ b/rpc/api/personal_js.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/api/shh.go b/rpc/api/shh.go
index e55b0ae17..9ca6f9dda 100644
--- a/rpc/api/shh.go
+++ b/rpc/api/shh.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/api/shh_args.go b/rpc/api/shh_args.go
index 42508a2c8..468a0b98f 100644
--- a/rpc/api/shh_args.go
+++ b/rpc/api/shh_args.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/api/ssh_js.go b/rpc/api/ssh_js.go
index 02ff7a1e5..a92ad1644 100644
--- a/rpc/api/ssh_js.go
+++ b/rpc/api/ssh_js.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/api/txpool.go b/rpc/api/txpool.go
index b75f33f34..27e40cae5 100644
--- a/rpc/api/txpool.go
+++ b/rpc/api/txpool.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/api/txpool_js.go b/rpc/api/txpool_js.go
index 4856683b0..b6c29871a 100644
--- a/rpc/api/txpool_js.go
+++ b/rpc/api/txpool_js.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/api/utils.go b/rpc/api/utils.go
index a35dc3cb9..a791dcd65 100644
--- a/rpc/api/utils.go
+++ b/rpc/api/utils.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/api/web3.go b/rpc/api/web3.go
index 8666a0634..e2d8543d3 100644
--- a/rpc/api/web3.go
+++ b/rpc/api/web3.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/api/web3_args.go b/rpc/api/web3_args.go
index 8c0cb135b..9e39f7130 100644
--- a/rpc/api/web3_args.go
+++ b/rpc/api/web3_args.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/codec/codec.go b/rpc/codec/codec.go
index 504907622..2fdb0d8f3 100644
--- a/rpc/codec/codec.go
+++ b/rpc/codec/codec.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/codec/json.go b/rpc/codec/json.go
index dbac95436..d811b2096 100644
--- a/rpc/codec/json.go
+++ b/rpc/codec/json.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/codec/json_test.go b/rpc/codec/json_test.go
index 28533af66..01ef77e57 100644
--- a/rpc/codec/json_test.go
+++ b/rpc/codec/json_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/comms/comms.go b/rpc/comms/comms.go
index b2955d7c2..f5eeae84f 100644
--- a/rpc/comms/comms.go
+++ b/rpc/comms/comms.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/comms/http.go b/rpc/comms/http.go
index 91eacca91..108ba0c5f 100644
--- a/rpc/comms/http.go
+++ b/rpc/comms/http.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/comms/http_net.go b/rpc/comms/http_net.go
index 4eec824ac..dba2029d4 100644
--- a/rpc/comms/http_net.go
+++ b/rpc/comms/http_net.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/comms/inproc.go b/rpc/comms/inproc.go
index 2a92f12f5..f279f0163 100644
--- a/rpc/comms/inproc.go
+++ b/rpc/comms/inproc.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/comms/ipc.go b/rpc/comms/ipc.go
index 2b5fc8b6c..0250aa01e 100644
--- a/rpc/comms/ipc.go
+++ b/rpc/comms/ipc.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/comms/ipc_unix.go b/rpc/comms/ipc_unix.go
index 2504058f9..aff90cfaa 100644
--- a/rpc/comms/ipc_unix.go
+++ b/rpc/comms/ipc_unix.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/comms/ipc_windows.go b/rpc/comms/ipc_windows.go
index 991882160..ee49f069b 100644
--- a/rpc/comms/ipc_windows.go
+++ b/rpc/comms/ipc_windows.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/jeth.go b/rpc/jeth.go
index 56fd72568..07add2bad 100644
--- a/rpc/jeth.go
+++ b/rpc/jeth.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/shared/errors.go b/rpc/shared/errors.go
index 97872f463..85af1bb2f 100644
--- a/rpc/shared/errors.go
+++ b/rpc/shared/errors.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/shared/types.go b/rpc/shared/types.go
index 9c791f4c7..659b74bf6 100644
--- a/rpc/shared/types.go
+++ b/rpc/shared/types.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/shared/utils.go b/rpc/shared/utils.go
index 33639cc35..b13e9eb1b 100644
--- a/rpc/shared/utils.go
+++ b/rpc/shared/utils.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/rpc/xeth.go b/rpc/xeth.go
index beb20ecd9..65a1edeb8 100644
--- a/rpc/xeth.go
+++ b/rpc/xeth.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/tests/block_test.go b/tests/block_test.go
index 5019b758d..6bb123184 100644
--- a/tests/block_test.go
+++ b/tests/block_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/tests/block_test_util.go b/tests/block_test_util.go
index 9a964bb92..42e4383d1 100644
--- a/tests/block_test_util.go
+++ b/tests/block_test_util.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/tests/init.go b/tests/init.go
index d372ead25..3f8b8c684 100644
--- a/tests/init.go
+++ b/tests/init.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/tests/rlp_test.go b/tests/rlp_test.go
index 35461813b..2469ce0db 100644
--- a/tests/rlp_test.go
+++ b/tests/rlp_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/tests/rlp_test_util.go b/tests/rlp_test_util.go
index 3c8028b82..ac53a4f52 100644
--- a/tests/rlp_test_util.go
+++ b/tests/rlp_test_util.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/tests/state_test.go b/tests/state_test.go
index 15c5967e4..1684614df 100644
--- a/tests/state_test.go
+++ b/tests/state_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/tests/state_test_util.go b/tests/state_test_util.go
index 1195fa5e0..7086de389 100644
--- a/tests/state_test_util.go
+++ b/tests/state_test_util.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/tests/transaction_test.go b/tests/transaction_test.go
index bfe085ffe..f1dfbd0a7 100644
--- a/tests/transaction_test.go
+++ b/tests/transaction_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/tests/transaction_test_util.go b/tests/transaction_test_util.go
index b20ae6089..09511acb7 100644
--- a/tests/transaction_test_util.go
+++ b/tests/transaction_test_util.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/tests/util.go b/tests/util.go
index 88341cffd..6ee1a42db 100644
--- a/tests/util.go
+++ b/tests/util.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/tests/vm_test.go b/tests/vm_test.go
index f80e50592..3674ed440 100644
--- a/tests/vm_test.go
+++ b/tests/vm_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/tests/vm_test_util.go b/tests/vm_test_util.go
index 126073a70..e63a92558 100644
--- a/tests/vm_test_util.go
+++ b/tests/vm_test_util.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/trie/cache.go b/trie/cache.go
index fdaba5de1..2705b0e45 100644
--- a/trie/cache.go
+++ b/trie/cache.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/trie/encoding.go b/trie/encoding.go
index 8f5f276ac..524807f06 100644
--- a/trie/encoding.go
+++ b/trie/encoding.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/trie/encoding_test.go b/trie/encoding_test.go
index 323e4d73e..e52c6ba8d 100644
--- a/trie/encoding_test.go
+++ b/trie/encoding_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/trie/fullnode.go b/trie/fullnode.go
index 620fd759e..8ff019ec4 100644
--- a/trie/fullnode.go
+++ b/trie/fullnode.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/trie/hashnode.go b/trie/hashnode.go
index 4cc82d2b4..d4a0bc7ec 100644
--- a/trie/hashnode.go
+++ b/trie/hashnode.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/trie/iterator.go b/trie/iterator.go
index 226dc38d4..698e64b34 100644
--- a/trie/iterator.go
+++ b/trie/iterator.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/trie/iterator_test.go b/trie/iterator_test.go
index 7bbd3c5a5..148f9adf9 100644
--- a/trie/iterator_test.go
+++ b/trie/iterator_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/trie/node.go b/trie/node.go
index fb6ae81ca..9d49029de 100644
--- a/trie/node.go
+++ b/trie/node.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/trie/secure_trie.go b/trie/secure_trie.go
index e3dbe7bdf..47c7542bb 100644
--- a/trie/secure_trie.go
+++ b/trie/secure_trie.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/trie/shortnode.go b/trie/shortnode.go
index 15b06a70d..b5fc6d1f9 100644
--- a/trie/shortnode.go
+++ b/trie/shortnode.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/trie/slice.go b/trie/slice.go
index 8b1024391..ccefbd064 100644
--- a/trie/slice.go
+++ b/trie/slice.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/trie/trie.go b/trie/trie.go
index 4050e2dc6..e7ee86402 100644
--- a/trie/trie.go
+++ b/trie/trie.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/trie/trie_test.go b/trie/trie_test.go
index d36b32523..ae4e5efe4 100644
--- a/trie/trie_test.go
+++ b/trie/trie_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/trie/valuenode.go b/trie/valuenode.go
index e1a76fb72..0afa64d54 100644
--- a/trie/valuenode.go
+++ b/trie/valuenode.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/whisper/doc.go b/whisper/doc.go
index b47948060..cfb0b5117 100644
--- a/whisper/doc.go
+++ b/whisper/doc.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/whisper/envelope.go b/whisper/envelope.go
index ef4bf0f8e..b231c6b44 100644
--- a/whisper/envelope.go
+++ b/whisper/envelope.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/whisper/envelope_test.go b/whisper/envelope_test.go
index 155571834..3bfe52737 100644
--- a/whisper/envelope_test.go
+++ b/whisper/envelope_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/whisper/filter.go b/whisper/filter.go
index bb58b579d..9f6d6b781 100644
--- a/whisper/filter.go
+++ b/whisper/filter.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/whisper/filter_test.go b/whisper/filter_test.go
index ab4bce255..b805b2baf 100644
--- a/whisper/filter_test.go
+++ b/whisper/filter_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/whisper/main.go b/whisper/main.go
index acbab6eed..be4160489 100644
--- a/whisper/main.go
+++ b/whisper/main.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/whisper/message.go b/whisper/message.go
index faba84fe6..506f142ed 100644
--- a/whisper/message.go
+++ b/whisper/message.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/whisper/message_test.go b/whisper/message_test.go
index 3a95297ba..6ff95efff 100644
--- a/whisper/message_test.go
+++ b/whisper/message_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/whisper/peer.go b/whisper/peer.go
index 9fa50d65e..ee10e66e7 100644
--- a/whisper/peer.go
+++ b/whisper/peer.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/whisper/peer_test.go b/whisper/peer_test.go
index 7fdb9f71b..594671ee1 100644
--- a/whisper/peer_test.go
+++ b/whisper/peer_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/whisper/topic.go b/whisper/topic.go
index ba17fdfcb..7ac3e8dc1 100644
--- a/whisper/topic.go
+++ b/whisper/topic.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/whisper/topic_test.go b/whisper/topic_test.go
index e86b4f543..9c45f6740 100644
--- a/whisper/topic_test.go
+++ b/whisper/topic_test.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/whisper/whisper.go b/whisper/whisper.go
index 243f6222f..676d8ae7a 100644
--- a/whisper/whisper.go
+++ b/whisper/whisper.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/whisper/whisper_test.go b/whisper/whisper_test.go
index abd35317a..b5a919984 100644
--- a/whisper/whisper_test.go
+++ b/whisper/whisper_test.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/xeth/frontend.go b/xeth/frontend.go
index 315de18dc..e89282242 100644
--- a/xeth/frontend.go
+++ b/xeth/frontend.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/xeth/state.go b/xeth/state.go
index 689ddd2c1..16bfb523d 100644
--- a/xeth/state.go
+++ b/xeth/state.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/xeth/types.go b/xeth/types.go
index 82da39960..ad5101d61 100644
--- a/xeth/types.go
+++ b/xeth/types.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/xeth/whisper.go b/xeth/whisper.go
index 7c0c586e8..e7130978f 100644
--- a/xeth/whisper.go
+++ b/xeth/whisper.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/xeth/whisper_filter.go b/xeth/whisper_filter.go
index 92d020716..fdf5cebae 100644
--- a/xeth/whisper_filter.go
+++ b/xeth/whisper_filter.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/xeth/whisper_message.go b/xeth/whisper_message.go
index 593c7399b..b3014a697 100644
--- a/xeth/whisper_message.go
+++ b/xeth/whisper_message.go
@@ -1,7 +1,7 @@
// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
diff --git a/xeth/xeth.go b/xeth/xeth.go
index 078a3fb8a..63826a334 100644
--- a/xeth/xeth.go
+++ b/xeth/xeth.go
@@ -1,7 +1,7 @@
// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
+// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.