diff --git a/README.md b/README.md index 077722111..2b4149647 100644 --- a/README.md +++ b/README.md @@ -201,7 +201,7 @@ The external chain configuration file specifies valid settings for the following | `bootstrap` | Determines __bootstrap nodes__ in [enode format](https://github.com/ethereumproject/wiki/wiki/enode-url-format). | -*Only the `name` field is optional. Geth will panic if any required field is missing, invalid, or in conflict with another flag. This renders `--chain-config` __incompatible__ with `--chain`, `--bootnodes`, and `--testnet`. It remains __compatible__ with `--data-dir`.* +*Only the `name` field is optional. Geth will panic if any required field is missing, invalid, or in conflict with another flag. This renders `--chain` __incompatible__ with `--bootnodes`, and `--testnet`. It remains __compatible__ with `--data-dir`.* To learn more about external chain configuration, please visit the [External Command Line Options Wiki page](https://github.com/ethereumproject/go-ethereum/wiki/Command-Line-Options.md). diff --git a/cmd/geth/migrate_datadir.bats b/cmd/geth/migrate_datadir.bats index 0014da122..5c495a412 100644 --- a/cmd/geth/migrate_datadir.bats +++ b/cmd/geth/migrate_datadir.bats @@ -83,7 +83,7 @@ teardown() { # 13 is last test. # Important: You must update this number if the number of tests change. - if [ "$BATS_TEST_NUMBER" -eq 13 ]; then + if [ "$BATS_TEST_NUMBER" -eq 11 ]; then # Remove downloaded executables. rm -rf "$CMD_DIR"