diff options
| -rw-r--r-- | docs/rabbitmqctl.1.xml | 6 | ||||
| -rw-r--r-- | src/rabbit_control_main.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_mnesia.erl | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml index b476f4865c..1af93e85de 100644 --- a/docs/rabbitmqctl.1.xml +++ b/docs/rabbitmqctl.1.xml @@ -325,7 +325,7 @@ least one disk node, and usually should have more than one. </para> <para> - The node will be a disk node by default. If you wish to wish to + The node will be a disk node by default. If you wish to create a RAM node, provide the <command>--ram</command> flag. </para> <para> @@ -408,8 +408,8 @@ Enables node removal from an offline node. This is only useful in the situation where all the nodes are offline and the last node to go down cannot be brought online, thus - preventing the whole cluster to start. It should not be used - in any other circumstances since it can lead to + preventing the whole cluster from starting. It should not be + used in any other circumstances since it can lead to inconsistencies. </para> </listitem> diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl index 997b8e4d1d..bd01a1b1d7 100644 --- a/src/rabbit_control_main.erl +++ b/src/rabbit_control_main.erl @@ -261,7 +261,7 @@ action(change_cluster_node_type, Node, [Type], _Opts, Inform) action(update_cluster_nodes, Node, [ClusterNodeS], _Opts, Inform) -> ClusterNode = list_to_atom(ClusterNodeS), - Inform("Re-clustering ~p with ~p", [Node, ClusterNode]), + Inform("Updating cluster nodes for ~p from ~p", [Node, ClusterNode]), rpc_call(Node, rabbit_mnesia, update_cluster_nodes, [ClusterNode]); action(forget_cluster_node, Node, [ClusterNodeS], Opts, Inform) -> diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index ea2cbc1e4c..7ff70576d5 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -321,7 +321,7 @@ update_cluster_nodes(DiscoveryNode) -> ok. -%% We proceed like this: try to remove the node locally. If the node if offline, +%% We proceed like this: try to remove the node locally. If the node is offline, %% we remove the node if: %% * This node is a disc node %% * All other nodes are offline @@ -353,7 +353,7 @@ forget_cluster_node(Node, RemoveWhenOffline) -> "offline node. That's dangerous, but can be " "done with the --offline flag. Please consult " "the manual for rabbitmqctl for more " - "informations."}}) + "information."}}) end; Err = {error, _} -> throw(Err) |