diff --git a/doc/pandoc-drop-man-blocks.hs b/doc/pandoc-drop-man-blocks.hs
index 627565de3..e360718b0 100755
--- a/doc/pandoc-drop-man-blocks.hs
+++ b/doc/pandoc-drop-man-blocks.hs
@@ -5,8 +5,8 @@ import Text.Pandoc.Builder
 import Text.Pandoc.JSON
 
 main :: IO ()
-main = toJSONFilter dropManonlyBlocks
+main = toJSONFilter dropManBlocks
 
-dropManonlyBlocks :: Block -> Block
-dropManonlyBlocks (Div ("",["manonly"],[]) _) = Plain []
-dropManonlyBlocks x = x
+dropManBlocks :: Block -> Block
+dropManBlocks (Div ("",["man"],[]) _) = Plain []
+dropManBlocks x = x
diff --git a/doc/pandoc-drop-web-blocks.hs b/doc/pandoc-drop-web-blocks.hs
index 1356769e5..8662d95e7 100755
--- a/doc/pandoc-drop-web-blocks.hs
+++ b/doc/pandoc-drop-web-blocks.hs
@@ -5,8 +5,8 @@ import Text.Pandoc.Builder
 import Text.Pandoc.JSON
 
 main :: IO ()
-main = toJSONFilter dropWebonlyBlocks
+main = toJSONFilter dropWebBlocks
 
-dropWebonlyBlocks :: Block -> Block
-dropWebonlyBlocks (Div ("",["webonly"],[]) _) = Plain []
-dropWebonlyBlocks x = x
+dropWebBlocks :: Block -> Block
+dropWebBlocks (Div ("",["web"],[]) _) = Plain []
+dropWebBlocks x = x
diff --git a/hledger-api/hledger-api.1.md b/hledger-api/hledger-api.1.md
index 14d636cf4..cc82befd1 100644
--- a/hledger-api/hledger-api.1.md
+++ b/hledger-api/hledger-api.1.md
@@ -2,7 +2,7 @@
 %
 % January 2016
 
-<div class="manonly">
+<div class="man">
 
 # NAME
 
@@ -20,7 +20,7 @@ using double-entry accounting and a simple, editable file format.
 hledger is inspired by and largely compatible with ledger(1).
 
 </div>
-<div class="webonly">
+<div class="web">
 <!-- * toc -->
 </div>
 
@@ -108,7 +108,7 @@ access.
 <!-- `-B --cost` -->
 <!-- : show amounts in their cost price's commodity -->
 
-<div class="manonly">
+<div class="man">
 
 # ENVIRONMENT
 
diff --git a/hledger-lib/hledger_csv.5.md b/hledger-lib/hledger_csv.5.md
index 6ffa283f8..4091778a6 100644
--- a/hledger-lib/hledger_csv.5.md
+++ b/hledger-lib/hledger_csv.5.md
@@ -2,7 +2,7 @@
 %
 % October 2015
 
-<div class="manonly">
+<div class="man">
 
 # NAME
 
@@ -11,7 +11,7 @@ hledger_csv - reading CSV files with hledger, and the CSV rules file format
 # DESCRIPTION
 
 </div>
-<div class="webonly">
+<div class="web">
 * toc
 </div>
 
diff --git a/hledger-lib/hledger_journal.5.md b/hledger-lib/hledger_journal.5.md
index d343828b8..ef9b09c71 100644
--- a/hledger-lib/hledger_journal.5.md
+++ b/hledger-lib/hledger_journal.5.md
@@ -2,7 +2,7 @@
 %
 % October 2015
 
-<div class="manonly">
+<div class="man">
 
 # NAME
 
@@ -11,7 +11,7 @@ hledger_journal - reference for hledger's journal file format
 # DESCRIPTION
 
 </div>
-<div class="webonly">
+<div class="web">
 * toc
 </div>
 
diff --git a/hledger-lib/hledger_timedot.5.md b/hledger-lib/hledger_timedot.5.md
index 611984440..1bc4bba2e 100644
--- a/hledger-lib/hledger_timedot.5.md
+++ b/hledger-lib/hledger_timedot.5.md
@@ -2,7 +2,7 @@
 %
 % February 2016
 
-<div class="manonly">
+<div class="man">
 
 # NAME
 
@@ -11,7 +11,7 @@ hledger_timedot - time logging format
 # DESCRIPTION
 
 </div>
-<div class="webonly">
+<div class="web">
 * toc
 </div>
 
diff --git a/hledger-lib/hledger_timelog.5.md b/hledger-lib/hledger_timelog.5.md
index 182bee9ef..c0e4f84b6 100644
--- a/hledger-lib/hledger_timelog.5.md
+++ b/hledger-lib/hledger_timelog.5.md
@@ -2,7 +2,7 @@
 % 
 % October 2015
 
-<div class="manonly">
+<div class="man">
 
 # NAME
 
@@ -11,7 +11,7 @@ hledger_timelog - hledger's timelog file format
 # DESCRIPTION
 
 </div>
-<div class="webonly">
+<div class="web">
 <!-- * toc -->
 </div>
 
diff --git a/hledger-ui/hledger-ui.1.md b/hledger-ui/hledger-ui.1.md
index 751b92ebe..92da8475f 100644
--- a/hledger-ui/hledger-ui.1.md
+++ b/hledger-ui/hledger-ui.1.md
@@ -2,7 +2,7 @@
 %
 % October 2015
 
-<div class="manonly">
+<div class="man">
 
 # NAME
 
@@ -20,7 +20,7 @@ using double-entry accounting and a simple, editable file format.
 hledger is inspired by and largely compatible with ledger(1).
 
 </div>
-<div class="webonly">
+<div class="web">
 * toc
 
 <style>
@@ -41,7 +41,7 @@ hledger is inspired by and largely compatible with ledger(1).
 
 hledger-ui is hledger's curses-style interface.
 It reads a hledger journal file
-<div class="manonly">
+<div class="man">
 (~/.hledger.journal, $LEDGER_FILE, or -f FILE; see hledger(1) or hledger_journal(5))
 </div>
 and provides a simple full-screen console interface for viewing account balances and transactions.
@@ -230,7 +230,7 @@ This screen will appear if there is a problem, such as a parse error,
 when you press g to reload. Once you have fixed the problem described,
 press g again to reload and restore normal operation.
 
-<div class="manonly">
+<div class="man">
 
 # ENVIRONMENT
 
diff --git a/hledger-web/hledger-web.1.md b/hledger-web/hledger-web.1.md
index ed50201e7..75d99afa1 100644
--- a/hledger-web/hledger-web.1.md
+++ b/hledger-web/hledger-web.1.md
@@ -2,7 +2,7 @@
 %
 % October 2015
 
-<div class="manonly">
+<div class="man">
 
 # NAME
 
@@ -20,7 +20,7 @@ using double-entry accounting and a simple, editable file format.
 hledger is inspired by and largely compatible with ledger(1).
 
 </div>
-<div class="webonly">
+<div class="web">
 * toc
 </div>
 
@@ -144,7 +144,7 @@ The following common hledger options should also work:
 `-B --cost`
 : show amounts in their cost price's commodity
 
-<div class="manonly">
+<div class="man">
 
 # ENVIRONMENT
 
diff --git a/hledger/hledger.1.md b/hledger/hledger.1.md
index a6eed3e31..6d2ca2ed7 100644
--- a/hledger/hledger.1.md
+++ b/hledger/hledger.1.md
@@ -2,7 +2,7 @@
 %
 % October 2015
 
-<div class="manonly">
+<div class="man">
 
 # NAME
 
@@ -23,7 +23,7 @@ page is a quick reference and introduction; for more complete docs, see
 http://hledger.org/manual.
 
 </div>
-<div class="webonly">
+<div class="web">
 * toc
 </div>
 
@@ -491,7 +491,7 @@ $ hledger print desc:shop                 # show transactions with shop in the d
 $ hledger activity -W                     # show transaction counts per week as a bar chart
 ```
 
-<div class="manonly">
+<div class="man">
 
 # ENVIRONMENT