diff --git a/manual/manual.epub b/manual/manual.epub
index aa6519263..34823046d 100644
Binary files a/manual/manual.epub and b/manual/manual.epub differ
diff --git a/manual/manual.html b/manual/manual.html
index 3cfd82ec4..fa09d28e7 100644
--- a/manual/manual.html
+++ b/manual/manual.html
@@ -856,30 +856,36 @@ screen where you can enter your search query.</p>
 <img src="manual-search.jpg" alt="Search screen" />
 <figcaption aria-hidden="true">Search screen</figcaption>
 </figure>
-<h2 id="searching-for-a-fediverse-handle-or-profile-url">Searching for a
-fediverse handle or profile URL</h2>
+<p><strong>Hashtag categories</strong></p>
+<p>If you select <em>SHOW MORE</em> at the bottom of the search screen
+then this will show all recent hashtags, in alphabetical order. If you
+have the <em>editor</em> role then selecting a tag will then allow to to
+assign a category to it. In this way you can build up <em>hashtag
+categories</em> as a way to group tags together under subject headings.
+For example, <em>cake</em> might be under a <em>food</em> category.</p>
+<p><strong>Searching for a fediverse handle or profile URL</strong></p>
 <p>If you enter a fediverse handle or a URL corresponding to a profile
 then the system will try to find it. If successful then a summary of the
 found profile will be shown, and you will have the option to
 follow/unfollow or view the original upstream profile page. If you are
 already following then a different screen will be shown with more
 options available.</p>
-<h2 id="searching-your-posts">Searching your posts</h2>
+<p><strong>Searching your posts</strong></p>
 <p>To search your own posts prefix the search text with a single quote
 character.</p>
-<h2 id="searching-hashtags">Searching hashtags</h2>
+<p><strong>Searching hashtags</strong></p>
 <p>To search for a hashtag just enter it, complete with the hash
 prefix.</p>
-<h2 id="searching-shared-items">Searching shared items</h2>
+<p><strong>Searching shared items</strong></p>
 <p>To search for any shared items just enter the text that you want to
 search for.</p>
-<h2 id="searching-wanted-items">Searching wanted items</h2>
+<p><strong>Searching wanted items</strong></p>
 <p>To search for a wanted item then enter the text that you want to
 search for prefixed by a full stop (period) character.</p>
-<h2 id="searching-for-skills">Searching for skills</h2>
+<p><strong>Searching for skills</strong></p>
 <p>To search for accounts having a particular skill, prefix your search
 text with a star character.</p>
-<h2 id="searching-for-emojis">Searching for emojis</h2>
+<p><strong>Searching for emojis</strong></p>
 <p>To search for an emoji use its name prefixed by a colon
 character.</p>
 <h1 id="browsing-in-a-command-shell">Browsing in a command shell</h1>
diff --git a/manual/manual.md b/manual/manual.md
index 2609b7ede..95cdbde4e 100644
--- a/manual/manual.md
+++ b/manual/manual.md
@@ -610,25 +610,36 @@ To search, select the magnifying glass icon from the top right of the centre col
 
 ![Search screen](manual-search.jpg)
 
-## Searching for a fediverse handle or profile URL
+**Hashtag categories**
+
+If you select *SHOW MORE* at the bottom of the search screen then this will show all recent hashtags, in alphabetical order. If you have the *editor* role then selecting a tag will then allow to to assign a category to it. In this way you can build up *hashtag categories* as a way to group tags together under subject headings. For example, *cake* might be under a *food* category.
+
+**Searching for a fediverse handle or profile URL**
+
 If you enter a fediverse handle or a URL corresponding to a profile then the system will try to find it. If successful then a summary of the found profile will be shown, and you will have the option to follow/unfollow or view the original upstream profile page. If you are already following then a different screen will be shown with more options available.
 
-## Searching your posts
+**Searching your posts**
+
 To search your own posts prefix the search text with a single quote character.
 
-## Searching hashtags
+**Searching hashtags**
+
 To search for a hashtag just enter it, complete with the hash prefix.
 
-## Searching shared items
+**Searching shared items**
+
 To search for any shared items just enter the text that you want to search for.
 
-## Searching wanted items
+**Searching wanted items**
+
 To search for a wanted item then enter the text that you want to search for prefixed by a full stop (period) character.
 
-## Searching for skills
+**Searching for skills**
+
 To search for accounts having a particular skill, prefix your search text with a star character.
 
-## Searching for emojis
+**Searching for emojis**
+
 To search for an emoji use its name prefixed by a colon character.
 
 # Browsing in a command shell