docs

getnikola · May 9, 2017 · af51b2f · af51b2f
1 parent d943072
commit af51b2f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/docs/manual.txt b/docs/manual.txt
@@ -1057,6 +1057,13 @@ chart
         'Others',  [14.2, 15.4, 15.3, 8.9, 9, 10.4]
         {{% /chart %}}{{% /raw %}}
 
+emoji
+    Insert an emoji. For example::
+
+        {{% emoji crying_face %}}
+
+    This generates a ``span`` with ``emoji`` CSS class, so you can style it with a nice font if you want.
+
 gist
     Show GitHub gists. If you know the gist's ID, this will show it in your site:
 

diff --git a/nikola/plugins/shortcode/emoji/data/LICENSE b/nikola/plugins/shortcode/emoji/data/LICENSE
@@ -19,3 +19,7 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+------------
+
+Coppied from https://github.com/shanraisshan/EmojiCodeSheet