Moneropedia: update Garlic-Routing/Encryption entries

Also, move Layered-Encryption to Garlic-Encryption

Referencing:
 - monero-project/kovri#256
 - monero-project/monero-site#155

knowledge-base/moneropedia/encryption.md

@@ -28,7 +28,7 @@ The purpose of encryption is to ensure that only somebody who is authorized to a
 @Kovri implements various types of encryption in *at least* 4 essential capacities:
 
 - @Reseed for bootstrapping
-- @Garlic-routing: three layers of encryption are used to verify the secure delivery of @messages to the recipient/peer/@destination
+- @Garlic-routing: three layers of encryption (@garlic-encryption) are used to verify the secure delivery of @messages to the recipient/peer/@destination
 - @Tunnel encryption: garlic messages are passed through a @tunnel and encrypted by the @tunnel gateway to the @tunnel endpoint
 - @Transport layer encryption prevents the ability to decrypt @messages at the [media layer](https://en.wikipedia.org/wiki/OSI_model)
 

knowledge-base/moneropedia/garlic-encryption.md

@@ -1,8 +1,8 @@
 ---
 layout: moneropedia
-entry: "Layered Encryption"
+entry: "Garlic-Encryption"
 tags: ["kovri"]
-terms: ["Layered-Encryption"]
+terms: ["Garlic-Encryption", "Layered-Encryption"]
 summary: "TODO(anonimal): finish"
 ---
 

knowledge-base/moneropedia/garlic-routing.md

@@ -2,21 +2,21 @@
 layout: moneropedia
 entry: "Garlic Routing"
 tags: ["kovri"]
-terms: ["Garlic-Routing", "Garlic-Encryption"]
+terms: ["Garlic-Routing"]
 summary: "Routing technology as implemented in Kovri"
 ---
 
 ### The Basics
 
-The term *Garlic Routing* has a diverse history of varying interpretations.
+The term *@garlic-routing* has a diverse history of varying interpretations. As it currently stands, Monero defines *@garlic-routing* as the method in which @Kovri and @I2P create a @message-based anonymous overlay network of internet peers.
 
-As it currently stands, Monero defines *Garlic Routing* as the method in which @Kovri and @I2P create a @message-based anonymous overlay network of internet peers. The @layered-encryption of Garlic Routing is similar to the @layered-encryption of [Onion Routing](https://en.wikipedia.org/wiki/Onion_routing).
+The @Garlic-Encryption of @Garlic-Routing is similar to the @Layered-Encryption of [Onion Routing](https://en.wikipedia.org/wiki/Onion_routing) and effectively conceals the IP address of the sender and secures information sent from the sender to its @destination (and vice-versa).
 
 ### History
 
-In written form, the term *Garlic Routing* can be seen as early as June of 2000 in Roger Dingledine's [Free Haven Master's thesis](http://www.freehaven.net/papers.html) (Section 8.1.1) as derived from the term Onion Routing.
+In written form, the term *@garlic-routing* can be seen as early as June of 2000 in Roger Dingledine's [Free Haven Master's thesis](http://www.freehaven.net/papers.html) (Section 8.1.1) as derived from the term Onion Routing.
 
-As recent as October of 2016, [#tor-dev](https://oftc.net/WebChat/) has offered insight into the creation of the term *Garlic Routing*:
+As recent as October of 2016, [#tor-dev](https://oftc.net/WebChat/) has offered insight into the creation of the term *@garlic-routing*:
 
 [Nick Mathewson](https://en.wikipedia.org/wiki/The_Tor_Project,_Inc):
 >[I think that there was some attempt to come up with a plant whose structure resembled the 'leaky-pipe' topology of tor, but I don't believe we ever settled on one.]
@@ -29,13 +29,13 @@ Note: permission to use the aforementioned quotes were granted by Nick Mathewson
 
 ### In-depth Information
 
-In technical terms, for @Kovri and @I2P, *Garlic Routing* translates to any/all of the following:
+In technical terms, for @Kovri and @I2P, *@garlic-routing* translates to any/all of the following:
 
-- @Layered-Encryption (like Onion Routing)
+- @Layered-Encryption (similar to the @layered-encryption in Onion Routing)
 - Bundling multiple @messages together (garlic cloves)
 - ElGamal/AES @encryption
 
-Note: though [Tor](https://torproject.org/) uses layered @encryption, Tor does not use ElGamal and is not message-based.
+Note: though [Tor](https://torproject.org/) uses @layered-encryption, Tor does not use ElGamal and is not message-based.
 
 ### Notes
 

knowledge-base/moneropedia/kovri.md

@@ -45,7 +45,8 @@ Read [anonimal's FFS proposal](https://forum.getmonero.org/9/work-in-progress/86
 - @Destination
 - @Encryption
 - @Floodfill
-- @Garlic-routing
+- @Garlic-Encryption
+- @Garlic-Routing
 - @I2NP
 - @In-net
 - @Java-I2P