소스 검색

Merge pull request #2533 from philips/grammar-unsafe-flags

Documentation: fixup grammar around the unsafe flags
Brandon Philips 10 년 전
부모
커밋
b29eaed9ce
2개의 변경된 파일5개의 추가작업 그리고 3개의 파일을 삭제
  1. 3 1
      Documentation/configuration.md
  2. 2 2
      etcdmain/help.go

+ 3 - 1
Documentation/configuration.md

@@ -135,7 +135,9 @@ The security flags help to [build a secure etcd cluster][security].
 
 ### Unsafe Flags
 
-Be CAUTIOUS to use unsafe flags because it will break the guarantee given by consensus protocol. For example, it may panic if other members in the cluster are still alive. Follow the instructions when using these falgs.
+Please be CAUTIOUS when using unsafe flags because it will break the guarantees given by the consensus protocol.
+For example, it may panic if other members in the cluster are still alive.
+Follow the instructions when using these flags.
 
 ##### -force-new-cluster
 + Force to create a new one-member cluster. It commits configuration changes in force to remove all existing members in the cluster and add itself. It needs to be set to [restore a backup][restore].

+ 2 - 2
etcdmain/help.go

@@ -99,8 +99,8 @@ security flags:
 
 unsafe flags:
 
-Please be CAUTIOUS to use unsafe flags because it will break the guarantee given 
-by consensus protocol. 
+Please be CAUTIOUS when using unsafe flags because it will break the guarantees
+given by the consensus protocol.
 	
 	--force-new-cluster 'false'
 		force to create a new one-member cluster.