--- a/hg.rst	Mon Oct 28 14:14:54 2013 +0200
+++ b/hg.rst	Fri Sep 19 19:55:16 2014 +0300
@@ -395,9 +395,28 @@
   http://mercurial.selenic.com/wiki/MercurialHosting
                 Free Hosting of Mercurial Repositories
 
-Merge or rebase uncommitted changes.
-====================================
-::
+Shelve/stash uncommitted changes.
+=================================
+
+Enable ``shelve`` extension::
+
+  [extensions]
+  shelve=
+
+and::
+
+  $ hg shelve
+  $ hg fetch
+  $ hg unshelve
+
+Or use MQ::
+
+  $ hg qnew tmp.patch
+  $ hg qpop
+  $ hg fetch
+  $ hg qpush
+
+Or with plain patch::
 
   $ hg diff > .diff   # save local changes
   $ hg revert -a