From 76fad5a3db27fde2b75f6586a2a650ed361089d6 Mon Sep 17 00:00:00 2001
From: Arthur Breitman <Arthur Breitman>
Date: Wed, 15 Mar 2017 08:00:53 -0700
Subject: [PATCH] Economic = economique Economical = econome

---
 README.md                             | 4 ++--
 src/node/main/node_run_command.ml     | 2 +-
 src/node/shell/state.ml               | 2 +-
 src/node/updater/register.ml          | 4 ++--
 src/proto/environment/error_monad.mli | 2 +-
 src/utils/base58.mli                  | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 1511397fa..4d60648cd 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ This should produce three binaries:
 
 * `tezos-node`: the tezos daemon itself;
 * `tezos-client`: a minimal command-line client;
-* `tezos-protocol-compiler`: a protocol compiler used for developing new version of the economical protocol.
+* `tezos-protocol-compiler`: a protocol compiler used for developing new version of the economic protocol.
 
 Currently Tezos is being developed for Linux only. It should work on mac OS,
 but it has not been tested recently. A Windows port is in progress.
@@ -291,7 +291,7 @@ Shell:
 ```
 
 To get API attached to the "genesis" block, including the remote procedures
-provided by the associated economical protocol version:
+provided by the associated economic protocol version:
 
 ```
 ./tezos-client rpc list /blocks/genesis/
diff --git a/src/node/main/node_run_command.ml b/src/node/main/node_run_command.ml
index 3384986d2..ba9e98d42 100644
--- a/src/node/main/node_run_command.ml
+++ b/src/node/main/node_run_command.ml
@@ -212,7 +212,7 @@ module Term = struct
     let open Cmdliner in
     let doc =
       "Run the daemon in sandbox mode. P2P is disabled, and constants of \
-       the economical protocol can be altered with an optional JSON file. \
+       the economic protocol can be altered with an optional JSON file. \
        $(b,IMPORTANT): Using sandbox mode affects the node state and \
        subsequent runs of Tezos node must also use sandbox mode. \
        In order to run the node in normal mode afterwards, a full reset \
diff --git a/src/node/shell/state.ml b/src/node/shell/state.ml
index cfe4178f7..a57e18d6c 100644
--- a/src/node/shell/state.ml
+++ b/src/node/shell/state.ml
@@ -1234,7 +1234,7 @@ let () =
     ~id: "invalidBlock"
     ~title: "Invalid block"
     ~description:
-      "The economical protocol refused to validate the block."
+      "The economic protocol refused to validate the block."
     ~pp:(fun ppf block_hash ->
         Format.fprintf ppf "Cannot validate the block %a"
           Block_hash.pp_short block_hash)
diff --git a/src/node/updater/register.ml b/src/node/updater/register.ml
index bf90322c9..4e0ef55e1 100644
--- a/src/node/updater/register.ml
+++ b/src/node/updater/register.ml
@@ -18,10 +18,10 @@ module Make(Proto : Protocol.PACKED_PROTOCOL) = struct
     Error_monad.register_wrapped_error_kind
       (fun ecoerrors -> Proto.classify_errors ecoerrors)
       ~id ~title:"Error returned by the protocol"
-      ~description:"Wrapped error for the economical protocol."
+      ~description:"Wrapped error for the economic protocol."
       ~pp:(fun ppf ->
           Format.fprintf ppf
-            "@[<v 2>Economical error:@ %a@]"
+            "@[<v 2>Economic error:@ %a@]"
             (Format.pp_print_list Proto.pp))
       Data_encoding.(obj1 (req "ecoproto" (list Proto.error_encoding)))
       (function Ecoproto_error ecoerrors -> Some ecoerrors
diff --git a/src/proto/environment/error_monad.mli b/src/proto/environment/error_monad.mli
index 973f2d186..7cc4e83bc 100644
--- a/src/proto/environment/error_monad.mli
+++ b/src/proto/environment/error_monad.mli
@@ -9,7 +9,7 @@ type error_category =
   | `Permanent (** Errors that will happen no matter the context *)
   ]
 
-(** Custom error handling for economical protocols. *)
+(** Custom error handling for economic protocols. *)
 
 type error = ..
 
diff --git a/src/utils/base58.mli b/src/utils/base58.mli
index 51637b445..99895b910 100644
--- a/src/utils/base58.mli
+++ b/src/utils/base58.mli
@@ -86,7 +86,7 @@ val register_resolver: 'a encoding -> (string -> 'a list Lwt.t) -> unit
     value provides at least [n/2] bytes of a prefix of the original value. *)
 val complete: ?alphabet:Alphabet.t -> string -> string list Lwt.t
 
-(** {1 Low-level: distinct registering function for economical protocol} *)
+(** {1 Low-level: distinct registering function for economic protocol} *)
 
 (** See [src/proto/environment/base48.mli]} for an inlined
     documentation. *)