Merge pull request ok

htlc link

docs/bts_guide/tutorials/cli_import_guiwallet_account.rst

@@ -49,7 +49,10 @@ You should get a prompt::
 
 Set a password for your CLI-wallet and unlock.
 
-.. Note::  This password does not need to be the same with your GUI-wallet password. You will create a *new wallet* and it will be secured by the new password.
+.. Note:: 
+  - **New Feature:** Keep your password safe. New features will not show your password while you are typing in. :ref:`Click here to check it out. <3-unlock-cli-wallet>`
+
+  - This password does not need to be the same with your GUI-wallet password. You will create a *new wallet* and it will be secured by the new password.
 
 ::
 

docs/supports_dev/supports.rst

@@ -40,7 +40,21 @@ BitShares Core C++ Library
    * - `Websocket pp <https://github.com/bitshares/websocketpp>`_  
      - C++ websocket client/server library 	
 
+|
+
+HTLC
+----------------------
 
+.. list-table::
+   :widths: 15 80
+   :header-rows: 0	 
+
+   * - `Hashed Time-Lock Contracts (HTLC) on BitShares <https://github.com/bitshares/bitshares-core/wiki/HTLC>`_  
+     - TESTNET: User Guide for Hashed Time-Lock Contracts (HTLC) on BitShares	 
+   * - `Hashed Time-Lock Contracts (HTLC) on BitShares:CN <https://github.com/bitshares/bitshares-core/wiki/HTLC-(CN)>`_  
+     - 测试网：BitShares 哈希时间锁合约（HTLC）用户指南
+
+
 |
 
 API Related 
@@ -82,8 +96,8 @@ JavaScript
 
    * - `Bitshares JS <https://github.com/bitshares/bitsharesjs>`_  
      - JavaScript tools for BitShares Encryption and Serialization. https://bitsharesjs.bitshares.org/
-   * - `Bitshares JA-WS <https://github.com/bitshares/bitsharesjs-ws>`_  
-     - Javascript websocket interface for Bitshares
+   * - `Bitshares JS-WS <https://github.com/bitshares/bitsharesjs-ws>`_  
+     - JavaScript websocket interface for Bitshares
 
 |