--- a/Solaris/manpages/Makefile	Fri Nov 24 16:16:16 2006 +0000
+++ b/Solaris/manpages/Makefile	Fri Nov 24 16:37:59 2006 +0000
@@ -19,7 +19,7 @@
 # For each package that contains man pages.
 #  - Ensure all relevant man pages for your package are located under the 
 #    correct man page section dir i.e.
-#    entities/sman1/sman1m/sman3/sman3tiff/sman4/sman5
+#    entities/man1/man1m/man3/man3tiff/man4/man5
 #  - Add Package name to PACKAGES Variable
 #    e.g. PACKAGES = \
 #             SUNWgnome-panel \
@@ -27,7 +27,7 @@
 #
 #  - Add two package specific variables 
 #      PACKAGE_PAGES - Full path of all manpages for this package
-#                      e.g.  SUNWgnome-panel_PAGES = sman1/gnome-panel.1 etc...
+#                      e.g.  SUNWgnome-panel_PAGES = man1/gnome-panel.1 etc...
 #      PACKAGE.PAGES - Assigned to $(PACKAGE_PAGES).
 #                      e.g.   SUNWgnome-panel.PAGES: $(SUNWgnome-panel_PAGES)
 #
@@ -111,7 +111,7 @@
 	SUNWgnome-removable-media	\
 	SUNWgnome-session		\
 	SUNWgnome-sys-suspend		\
-	SUNWgnome-system-tools	\
+	SUNWgnome-system-tools		\
 	SUNWgnome-system-monitor	\
 	SUNWgnome-terminal		\
 	SUNWgnome-text-editor		\
@@ -130,516 +130,516 @@
 all: TARBALLS
 
 SUNWTiff_PAGES =					\
-	sman1/fax2ps.1					\
-	sman1/fax2tiff.1				\
-	sman1/gif2tiff.1				\
-	sman1/pal2rgb.1					\
-	sman1/ppm2tiff.1				\
-	sman1/ras2tiff.1				\
-	sman1/rgb2ycbcr.1				\
-	sman1/thumbnail.1				\
-	sman1/tiff2bw.1					\
-	sman1/tiff2ps.1					\
-	sman1/tiffcmp.1					\
-	sman1/tiffcp.1					\
-	sman1/tiffdither.1				\
-	sman1/tiffdump.1				\
-	sman1/tiffinfo.1				\
-	sman1/tiffmedian.1				\
-	sman1/tiffsplit.1				\
-	sman3/libtiff.3					\
-	sman3tiff/TIFFCheckTile.3tiff			\
-	sman3tiff/TIFFClientOpen.3tiff			\
-	sman3tiff/TIFFClose.3tiff			\
-	sman3tiff/TIFFComputeStrip.3tiff		\
-	sman3tiff/TIFFComputeTile.3tiff			\
-	sman3tiff/TIFFCurrentDirectory.3tiff		\
-	sman3tiff/TIFFCurrentRow.3tiff			\
-	sman3tiff/TIFFCurrentStrip.3tiff		\
-	sman3tiff/TIFFCurrentTile.3tiff			\
-	sman3tiff/TIFFDefaultStripSize.3tiff		\
-	sman3tiff/TIFFDefaultTileSize.3tiff		\
-	sman3tiff/TIFFError.3tiff			\
-	sman3tiff/TIFFFdOpen.3tiff			\
-	sman3tiff/TIFFFileName.3tiff			\
-	sman3tiff/TIFFFileno.3tiff			\
-	sman3tiff/TIFFFindCODEC.3tiff			\
-	sman3tiff/TIFFFlush.3tiff			\
-	sman3tiff/TIFFFlushData.3tiff			\
-	sman3tiff/TIFFGetBitRevTable.3tiff		\
-	sman3tiff/TIFFGetField.3tiff			\
-	sman3tiff/TIFFGetFieldDefaulted.3tiff		\
-	sman3tiff/TIFFGetMode.3tiff			\
-	sman3tiff/TIFFGetVersion.3tiff			\
-	sman3tiff/TIFFIsByteSwapped.3tiff		\
-	sman3tiff/TIFFIsMSB2LSB.3tiff			\
-	sman3tiff/TIFFIsTiled.3tiff			\
-	sman3tiff/TIFFIsUpSampled.3tiff			\
-	sman3tiff/TIFFLastDirectory.3tiff		\
-	sman3tiff/TIFFNumberOfStrips.3tiff		\
-	sman3tiff/TIFFNumberOfTiles.3tiff		\
-	sman3tiff/TIFFOpen.3tiff			\
-	sman3tiff/TIFFPrintDirectory.3tiff		\
-	sman3tiff/TIFFRGBAImage.3tiff			\
-	sman3tiff/TIFFRGBAImageBegin.3tiff		\
-	sman3tiff/TIFFRGBAImageEnd.3tiff		\
-	sman3tiff/TIFFRGBAImageGet.3tiff		\
-	sman3tiff/TIFFRGBAImageOK.3tiff			\
-	sman3tiff/TIFFRGBAImageOriented.3tiff		\
-	sman3tiff/TIFFRasterScanlineSize.3tiff		\
-	sman3tiff/TIFFReadBufferSetup.3tiff		\
-	sman3tiff/TIFFReadDirectory.3tiff		\
-	sman3tiff/TIFFReadEncodedStrip.3tiff		\
-	sman3tiff/TIFFReadEncodedTile.3tiff		\
-	sman3tiff/TIFFReadRGBAImage.3tiff		\
-	sman3tiff/TIFFReadRGBAStrip.3tiff		\
-	sman3tiff/TIFFReadRGBATile.3tiff		\
-	sman3tiff/TIFFReadRawStrip.3tiff		\
-	sman3tiff/TIFFReadRawTile.3tiff			\
-	sman3tiff/TIFFReadScanline.3tiff		\
-	sman3tiff/TIFFReadTile.3tiff			\
-	sman3tiff/TIFFRegisterCODEC.3tiff		\
-	sman3tiff/TIFFReverseBits.3tiff			\
-	sman3tiff/TIFFScanlineSize.3tiff		\
-	sman3tiff/TIFFSetDirectory.3tiff		\
-	sman3tiff/TIFFSetErrorHandler.3tiff		\
-	sman3tiff/TIFFSetField.3tiff			\
-	sman3tiff/TIFFSetSubDirectory.3tiff		\
-	sman3tiff/TIFFSetWarningHandler.3tiff		\
-	sman3tiff/TIFFStripSize.3tiff			\
-	sman3tiff/TIFFSwabArrayOfLong.3tiff		\
-	sman3tiff/TIFFSwabArrayOfShort.3tiff		\
-	sman3tiff/TIFFSwabLong.3tiff			\
-	sman3tiff/TIFFSwabShort.3tiff			\
-	sman3tiff/TIFFTileRowSize.3tiff			\
-	sman3tiff/TIFFTileSize.3tiff			\
-	sman3tiff/TIFFUnRegisterCODEC.3tiff		\
-	sman3tiff/TIFFVGetField.3tiff			\
-	sman3tiff/TIFFVGetFieldDefaulted.3tiff		\
-	sman3tiff/TIFFVSetField.3tiff			\
-	sman3tiff/TIFFVStripSize.3tiff			\
-	sman3tiff/TIFFVTileSize.3tiff			\
-	sman3tiff/TIFFWarning.3tiff			\
-	sman3tiff/TIFFWriteBufferSetup.3tiff		\
-	sman3tiff/TIFFWriteDirectory.3tiff		\
-	sman3tiff/TIFFWriteEncodedStrip.3tiff		\
-	sman3tiff/TIFFWriteEncodedTile.3tiff		\
-	sman3tiff/TIFFWriteRawStrip.3tiff		\
-	sman3tiff/TIFFWriteRawTile.3tiff		\
-	sman3tiff/TIFFWriteScanline.3tiff		\
-	sman3tiff/TIFFWriteTile.3tiff			\
-	sman3tiff/TIFFbuffer.3tiff			\
-	sman3tiff/TIFFcodec.3tiff			\
-	sman3tiff/TIFFmemory.3tiff			\
-	sman3tiff/TIFFquery.3tiff			\
-	sman3tiff/TIFFsize.3tiff			\
-	sman3tiff/TIFFstrip.3tiff			\
-	sman3tiff/TIFFswab.3tiff			\
-	sman3tiff/TIFFtile.3tiff			\
-	sman3tiff/_TIFFfree.3tiff			\
-	sman3tiff/_TIFFmalloc.3tiff			\
-	sman3tiff/_TIFFmemcmp.3tiff			\
-	sman3tiff/_TIFFmemcpy.3tiff			\
-	sman3tiff/_TIFFmemset.3tiff			\
-	sman3tiff/_TIFFrealloc.3tiff
+	man1/fax2ps.1					\
+	man1/fax2tiff.1					\
+	man1/gif2tiff.1					\
+	man1/pal2rgb.1					\
+	man1/ppm2tiff.1					\
+	man1/ras2tiff.1					\
+	man1/rgb2ycbcr.1				\
+	man1/thumbnail.1				\
+	man1/tiff2bw.1					\
+	man1/tiff2ps.1					\
+	man1/tiffcmp.1					\
+	man1/tiffcp.1					\
+	man1/tiffdither.1				\
+	man1/tiffdump.1					\
+	man1/tiffinfo.1					\
+	man1/tiffmedian.1				\
+	man1/tiffsplit.1				\
+	man3/libtiff.3					\
+	man3tiff/TIFFCheckTile.3tiff			\
+	man3tiff/TIFFClientOpen.3tiff			\
+	man3tiff/TIFFClose.3tiff			\
+	man3tiff/TIFFComputeStrip.3tiff			\
+	man3tiff/TIFFComputeTile.3tiff			\
+	man3tiff/TIFFCurrentDirectory.3tiff		\
+	man3tiff/TIFFCurrentRow.3tiff			\
+	man3tiff/TIFFCurrentStrip.3tiff			\
+	man3tiff/TIFFCurrentTile.3tiff			\
+	man3tiff/TIFFDefaultStripSize.3tiff		\
+	man3tiff/TIFFDefaultTileSize.3tiff		\
+	man3tiff/TIFFError.3tiff			\
+	man3tiff/TIFFFdOpen.3tiff			\
+	man3tiff/TIFFFileName.3tiff			\
+	man3tiff/TIFFFileno.3tiff			\
+	man3tiff/TIFFFindCODEC.3tiff			\
+	man3tiff/TIFFFlush.3tiff			\
+	man3tiff/TIFFFlushData.3tiff			\
+	man3tiff/TIFFGetBitRevTable.3tiff		\
+	man3tiff/TIFFGetField.3tiff			\
+	man3tiff/TIFFGetFieldDefaulted.3tiff		\
+	man3tiff/TIFFGetMode.3tiff			\
+	man3tiff/TIFFGetVersion.3tiff			\
+	man3tiff/TIFFIsByteSwapped.3tiff		\
+	man3tiff/TIFFIsMSB2LSB.3tiff			\
+	man3tiff/TIFFIsTiled.3tiff			\
+	man3tiff/TIFFIsUpSampled.3tiff			\
+	man3tiff/TIFFLastDirectory.3tiff		\
+	man3tiff/TIFFNumberOfStrips.3tiff		\
+	man3tiff/TIFFNumberOfTiles.3tiff		\
+	man3tiff/TIFFOpen.3tiff				\
+	man3tiff/TIFFPrintDirectory.3tiff		\
+	man3tiff/TIFFRGBAImage.3tiff			\
+	man3tiff/TIFFRGBAImageBegin.3tiff		\
+	man3tiff/TIFFRGBAImageEnd.3tiff			\
+	man3tiff/TIFFRGBAImageGet.3tiff			\
+	man3tiff/TIFFRGBAImageOK.3tiff			\
+	man3tiff/TIFFRGBAImageOriented.3tiff		\
+	man3tiff/TIFFRasterScanlineSize.3tiff		\
+	man3tiff/TIFFReadBufferSetup.3tiff		\
+	man3tiff/TIFFReadDirectory.3tiff		\
+	man3tiff/TIFFReadEncodedStrip.3tiff		\
+	man3tiff/TIFFReadEncodedTile.3tiff		\
+	man3tiff/TIFFReadRGBAImage.3tiff		\
+	man3tiff/TIFFReadRGBAStrip.3tiff		\
+	man3tiff/TIFFReadRGBATile.3tiff			\
+	man3tiff/TIFFReadRawStrip.3tiff			\
+	man3tiff/TIFFReadRawTile.3tiff			\
+	man3tiff/TIFFReadScanline.3tiff			\
+	man3tiff/TIFFReadTile.3tiff			\
+	man3tiff/TIFFRegisterCODEC.3tiff		\
+	man3tiff/TIFFReverseBits.3tiff			\
+	man3tiff/TIFFScanlineSize.3tiff			\
+	man3tiff/TIFFSetDirectory.3tiff			\
+	man3tiff/TIFFSetErrorHandler.3tiff		\
+	man3tiff/TIFFSetField.3tiff			\
+	man3tiff/TIFFSetSubDirectory.3tiff		\
+	man3tiff/TIFFSetWarningHandler.3tiff		\
+	man3tiff/TIFFStripSize.3tiff			\
+	man3tiff/TIFFSwabArrayOfLong.3tiff		\
+	man3tiff/TIFFSwabArrayOfShort.3tiff		\
+	man3tiff/TIFFSwabLong.3tiff			\
+	man3tiff/TIFFSwabShort.3tiff			\
+	man3tiff/TIFFTileRowSize.3tiff			\
+	man3tiff/TIFFTileSize.3tiff			\
+	man3tiff/TIFFUnRegisterCODEC.3tiff		\
+	man3tiff/TIFFVGetField.3tiff			\
+	man3tiff/TIFFVGetFieldDefaulted.3tiff		\
+	man3tiff/TIFFVSetField.3tiff			\
+	man3tiff/TIFFVStripSize.3tiff			\
+	man3tiff/TIFFVTileSize.3tiff			\
+	man3tiff/TIFFWarning.3tiff			\
+	man3tiff/TIFFWriteBufferSetup.3tiff		\
+	man3tiff/TIFFWriteDirectory.3tiff		\
+	man3tiff/TIFFWriteEncodedStrip.3tiff		\
+	man3tiff/TIFFWriteEncodedTile.3tiff		\
+	man3tiff/TIFFWriteRawStrip.3tiff		\
+	man3tiff/TIFFWriteRawTile.3tiff			\
+	man3tiff/TIFFWriteScanline.3tiff		\
+	man3tiff/TIFFWriteTile.3tiff			\
+	man3tiff/TIFFbuffer.3tiff			\
+	man3tiff/TIFFcodec.3tiff			\
+	man3tiff/TIFFmemory.3tiff			\
+	man3tiff/TIFFquery.3tiff			\
+	man3tiff/TIFFsize.3tiff				\
+	man3tiff/TIFFstrip.3tiff			\
+	man3tiff/TIFFswab.3tiff				\
+	man3tiff/TIFFtile.3tiff				\
+	man3tiff/_TIFFfree.3tiff			\
+	man3tiff/_TIFFmalloc.3tiff			\
+	man3tiff/_TIFFmemcmp.3tiff			\
+	man3tiff/_TIFFmemcpy.3tiff			\
+	man3tiff/_TIFFmemset.3tiff			\
+	man3tiff/_TIFFrealloc.3tiff
 SUNWTiff.PAGES: $(SUNWTiff_PAGES)
 
 SUNWevolution-exchange_PAGES =				\
-	sman1/exchange-connector-setup.1
+	man1/exchange-connector-setup.1
 SUNWevolution-exchange.PAGES: $(SUNWevolution-exchange_PAGES)
 
 SUNWevolution_PAGES =		\
-	sman1/evolution.1	\
-	sman3/libebook-1.2.3	\
-	sman3/libecal-1.2.3
+	man1/evolution.1	\
+	man3/libebook-1.2.3	\
+	man3/libecal-1.2.3
 SUNWevolution.PAGES: $(SUNWevolution_PAGES)
 
 SUNWevolution-data-server_PAGES =	\
-	sman3/libedata-book-1.2.3	\
-	sman3/libedata-cal-1.2.3	\
-	sman3/libedataserver-1.2.3	\
-	sman3/libedataserverui-1.2.3
+	man3/libedata-book-1.2.3	\
+	man3/libedata-cal-1.2.3		\
+	man3/libedataserver-1.2.3	\
+	man3/libedataserverui-1.2.3
 SUNWevolution-data-server.PAGES: $(SUNWevolution-data-server_PAGES)
 
 SUNWfirefox_PAGES =	\
-	sman1/firefox.1
+	man1/firefox.1
 SUNWfirefox.PAGES: $(SUNWfirefox_PAGES)
 
 SUNWgnome-a11y-base-libs_PAGES =	\
-	sman3/libgailutil.3
+	man3/libgailutil.3
 SUNWgnome-a11y-base-libs.PAGES: $(SUNWgnome-a11y-base-libs_PAGES)
 
 SUNWgnome-a11y-gok_PAGES =			\
-	sman1/create-branching-keyboard.1	\
-	sman1/gok.1
+	man1/create-branching-keyboard.1	\
+	man1/gok.1
 SUNWgnome-a11y-gok.PAGES: $(SUNWgnome-a11y-gok_PAGES)
 
 SUNWgnome-a11y-libs_PAGES =		\
-	sman3/at-spi.3			\
-	sman3/libspi.3			\
-	sman3/libcspi.3
+	man3/at-spi.3			\
+	man3/libspi.3			\
+	man3/libcspi.3
 SUNWgnome-a11y-libs.PAGES: $(SUNWgnome-a11y-libs_PAGES)
 
 SUNWgnome-a11y-reader_PAGES =	\
-	sman1/orca.1
+	man1/orca.1
 SUNWgnome-a11y-reader.PAGES: $(SUNWgnome-a11y-reader_PAGES)
 
 SUNWgnome-a11y-poke_PAGES =	\
-	sman1/at-poke.1
+	man1/at-poke.1
 SUNWgnome-a11y-poke.PAGES: $(SUNWgnome-a11y-poke_PAGES)
 
 SUNWgnome-archive-mgr_PAGES =	\
-	sman1/file-roller.1
+	man1/file-roller.1
 SUNWgnome-archive-mgr.PAGES: $(SUNWgnome-archive-mgr_PAGES)
 
 SUNWgnome-audio_PAGES =			\
-	sman1/audiofile-config.1	\
-	sman1/esd-config.1		\
-	sman1/esdcat.1			\
-	sman1/esdctl.1			\
-	sman1/esdmon.1			\
-	sman1/esdplay.1			\
-	sman1/esdrec.1			\
-	sman1/esdsample.1		\
-	sman3/libaudiofile.3		\
-	sman3/libesd.3
+	man1/audiofile-config.1		\
+	man1/esd-config.1		\
+	man1/esdcat.1			\
+	man1/esdctl.1			\
+	man1/esdmon.1			\
+	man1/esdplay.1			\
+	man1/esdrec.1			\
+	man1/esdsample.1		\
+	man3/libaudiofile.3		\
+	man3/libesd.3
 SUNWgnome-audio.PAGES: $(SUNWgnome-audio_PAGES)
 
 SUNWgnome-base-libs_PAGES =			\
-	sman1/glib-genmarshal.1			\
-	sman1/glib-gettextize.1			\
-	sman1/glib-mkenums.1			\
-	sman1/gobject-query.1			\
-	sman1/gdk-pixbuf-csource.1		\
-	sman1/gdk-pixbuf-query-loaders.1	\
-	sman1/gtk-query-immodules-2.0.1		\
-	sman1/gtk-update-icon-cache.1		\
-	sman1/pango-querymodules.1		\
-	sman1/libart2-config.1			\
-	sman3/libatk-1.0.3			\
-	sman3/libcairo.3			\
-	sman3/libglib-2.0.3			\
-	sman3/libgmodule-2.0.3			\
-	sman3/libgobject-2.0.3			\
-	sman3/libgthread-2.0.3			\
-	sman3/libgdk-x11-2.0.3			\
-	sman3/libgdk_pixbuf-2.0.3		\
-	sman3/libgdk_pixbuf_xlib-2.0.3		\
-	sman3/libgtk-x11-2.0.3			\
-	sman3/libart_lgpl_2.3			\
-	sman3/libglade-2.0.3			\
-	sman3/libgnomecanvas-2.3		\
-	sman3/libpango-1.0.3			\
-	sman3/libpangocairo-1.0.3		\
-	sman3/libpangoft2-1.0.3			\
-	sman3/libpangoxft-1.0.3			\
-	sman3/libpangox-1.0.3			\
-	sman5/gnome-interfaces.5		\
+	man1/glib-genmarshal.1			\
+	man1/glib-gettextize.1			\
+	man1/glib-mkenums.1			\
+	man1/gobject-query.1			\
+	man1/gdk-pixbuf-csource.1		\
+	man1/gdk-pixbuf-query-loaders.1		\
+	man1/gtk-query-immodules-2.0.1		\
+	man1/gtk-update-icon-cache.1		\
+	man1/pango-querymodules.1		\
+	man1/libart2-config.1			\
+	man3/libatk-1.0.3			\
+	man3/libcairo.3				\
+	man3/libglib-2.0.3			\
+	man3/libgmodule-2.0.3			\
+	man3/libgobject-2.0.3			\
+	man3/libgthread-2.0.3			\
+	man3/libgdk-x11-2.0.3			\
+	man3/libgdk_pixbuf-2.0.3		\
+	man3/libgdk_pixbuf_xlib-2.0.3		\
+	man3/libgtk-x11-2.0.3			\
+	man3/libart_lgpl_2.3			\
+	man3/libglade-2.0.3			\
+	man3/libgnomecanvas-2.3			\
+	man3/libpango-1.0.3			\
+	man3/libpangocairo-1.0.3		\
+	man3/libpangoft2-1.0.3			\
+	man3/libpangoxft-1.0.3			\
+	man3/libpangox-1.0.3			\
+	man5/gnome-interfaces.5			\
 	entities/gnomecommon.ent
 SUNWgnome-base-libs.PAGES: $(SUNWgnome-base-libs_PAGES)
 
 SUNWgnome-calculator_PAGES =	\
-	sman1/gcalctool.1			\
-	sman1/gnome-calculator.1
+	man1/gcalctool.1			\
+	man1/gnome-calculator.1
 SUNWgnome-calculator.PAGES: $(SUNWgnome-calculator_PAGES)
 
 SUNWgnome-cd-burner_PAGES =		\
-	sman1/nautilus-cd-burner.1
+	man1/nautilus-cd-burner.1
 SUNWgnome-cd-burner.PAGES: $(SUNWgnome-cd-burner_PAGES)
 
 SUNWgnome-cd_PAGES =	\
-	sman1/sound-juicer.1
+	man1/sound-juicer.1
 SUNWgnome-cd.PAGES: $(SUNWgnome-cd_PAGES)
 
 SUNWgnome-character-map_PAGES =	\
-	sman1/charmap.1				\
-	sman1/gucharmap.1			\
-	sman1/gnome-character-map.1
+	man1/charmap.1				\
+	man1/gucharmap.1			\
+	man1/gnome-character-map.1
 SUNWgnome-character-map.PAGES: $(SUNWgnome-character-map_PAGES)
 
 SUNWgnome-common-devel_PAGES =	\
-	sman1/intltool-extract.1	\
-	sman1/intltool-merge.1		\
-	sman1/intltool-prepare.1	\
-	sman1/intltool-update.1		\
-	sman1/intltoolize.1		\
-	sman1/pkg-config.1
+	man1/intltool-extract.1		\
+	man1/intltool-merge.1		\
+	man1/intltool-prepare.1		\
+	man1/intltool-update.1		\
+	man1/intltoolize.1		\
+	man1/pkg-config.1
 SUNWgnome-common-devel.PAGES: $(SUNWgnome-common-devel_PAGES)
 
 SUNWgnome-component_PAGES =			\
-	sman1/orbit-idl-2.1			\
-	sman1/activation-client.1		\
-	sman1/orbit2-config.1			\
-	sman1/bonobo-slay.1			\
-	sman3/libORBit-2.3			\
-	sman3/libbonobo-activation.3		\
-	sman3/libIDL-2.3			\
-	sman3/libbonobo-2.3			\
-	sman3/libORBitCosNaming-2.3
+	man1/orbit-idl-2.1			\
+	man1/activation-client.1		\
+	man1/orbit2-config.1			\
+	man1/bonobo-slay.1			\
+	man3/libORBit-2.3			\
+	man3/libbonobo-activation.3		\
+	man3/libIDL-2.3				\
+	man3/libbonobo-2.3			\
+	man3/libORBitCosNaming-2.3
 SUNWgnome-component.PAGES: $(SUNWgnome-component_PAGES)
 
 SUNWgnome-config-editor_PAGES =	\
-	sman1/gconf-editor.1
+	man1/gconf-editor.1
 SUNWgnome-config-editor.PAGES: $(SUNWgnome-config-editor_PAGES)
 
 SUNWgnome-config_PAGES =	\
-	sman1/gconftool-2.1	\
-	sman3/libgconf-2.3
+	man1/gconftool-2.1	\
+	man3/libgconf-2.3
 SUNWgnome-config.PAGES: $(SUNWgnome-config_PAGES)
 
 SUNWgnome-crash-report_PAGES =	\
-	sman1/bug-buddy.1
+	man1/bug-buddy.1
 SUNWgnome-crash-report.PAGES: $(SUNWgnome-crash-report_PAGES)
 
 SUNWgnome-desktop-prefs_PAGES =				\
-	sman1/gnome-accessibility-keyboard-properties.1	\
-	sman1/gnome-background-properties.1		\
-	sman1/gnome-control-center.1			\
-	sman1/gnome-default-applications-properties.1	\
-	sman1/gnome-font-properties.1			\
-	sman1/gnome-keybinding-properties.1		\
-	sman1/gnome-keyboard-properties.1		\
-	sman1/gnome-mouse-properties.1			\
-	sman1/gnome-network-preferences.1		\
-	sman1/gnome-sound-properties.1			\
-	sman1/gnome-theme-manager.1			\
-	sman1/gnome-ui-properties.1			\
-	sman1/gnome-window-properties.1			\
-	sman1/gnome-at-properties.1			\
-	sman1/gnome-font-viewer.1
+	man1/gnome-accessibility-keyboard-properties.1	\
+	man1/gnome-background-properties.1		\
+	man1/gnome-control-center.1			\
+	man1/gnome-default-applications-properties.1	\
+	man1/gnome-font-properties.1			\
+	man1/gnome-keybinding-properties.1		\
+	man1/gnome-keyboard-properties.1		\
+	man1/gnome-mouse-properties.1			\
+	man1/gnome-network-preferences.1		\
+	man1/gnome-sound-properties.1			\
+	man1/gnome-theme-manager.1			\
+	man1/gnome-ui-properties.1			\
+	man1/gnome-window-properties.1			\
+	man1/gnome-at-properties.1			\
+	man1/gnome-font-viewer.1
 SUNWgnome-desktop-prefs.PAGES: $(SUNWgnome-desktop-prefs_PAGES)
 
 SUNWgnome-dialog_PAGES =	\
-	sman1/zenity.1		\
-	sman1/gdialog.1
+	man1/zenity.1		\
+	man1/gdialog.1
 SUNWgnome-dialog.PAGES: $(SUNWgnome-dialog_PAGES)
 
 SUNWgnome-display-mgr_PAGES =		\
-	sman1/gdmXnest.1		\
-	sman1/gdmXnestchooser.1		\
-	sman1/gdmflexiserver.1		\
-	sman1/gdmphotosetup.1		\
-	sman1/gdmthemetester.1		\
-	sman1/gdmdynamic.1		\
-	sman1m/gdm.1m			\
-	sman1m/gdmsetup.1m		\
-	sman1m/gdm-binary.1m		\
-	sman1m/gdm-restart.1m		\
-	sman1m/gdm-safe-restart.1m	\
-	sman1m/gdm-stop.1m
+	man1/gdmXnest.1			\
+	man1/gdmXnestchooser.1		\
+	man1/gdmflexiserver.1		\
+	man1/gdmphotosetup.1		\
+	man1/gdmthemetester.1		\
+	man1/gdmdynamic.1		\
+	man1m/gdm.1m			\
+	man1m/gdmsetup.1m		\
+	man1m/gdm-binary.1m		\
+	man1m/gdm-restart.1m		\
+	man1m/gdm-safe-restart.1m	\
+	man1m/gdm-stop.1m
 SUNWgnome-display-mgr.PAGES: $(SUNWgnome-display-mgr_PAGES)
 
 SUNWgnome-file-mgr_PAGES =				\
-	sman1/nautilus.1				\
-	sman1/nautilus-file-management-properties.1
+	man1/nautilus.1					\
+	man1/nautilus-file-management-properties.1
 SUNWgnome-file-mgr.PAGES: $(SUNWgnome-file-mgr_PAGES)
 
 SUNWgnome-gtksourceview_PAGES =	\
-	sman3/libgtksourceview-1.0.3
+	man3/libgtksourceview-1.0.3
 SUNWgnome-gtksourceview.PAGES: $(SUNWgnome-gtksourceview_PAGES)
 
 SUNWgnome-help-viewer_PAGES =	\
-	sman1/gnome-help.1	\
-	sman1/yelp.1
+	man1/gnome-help.1	\
+	man1/yelp.1
 SUNWgnome-help-viewer.PAGES: $(SUNWgnome-help-viewer_PAGES)
 
 SUNWgnome-hex-editor_PAGES =	\
-	sman1/ghex2.1
+	man1/ghex2.1
 SUNWgnome-hex-editor.PAGES: $(SUNWgnome-hex-editor_PAGES)
 
 SUNWgnome-im-client_PAGES =	\
-	sman1/gaim.1
+	man1/gaim.1
 SUNWgnome-im-client.PAGES: $(SUNWgnome-im-client_PAGES)
 
 SUNWgnome-img-viewer_PAGES =	\
-	sman1/eog.1
+	man1/eog.1
 SUNWgnome-img-viewer.PAGES: $(SUNWgnome-img-viewer_PAGES)
 
 SUNWgnome-libs_PAGES =					\
-	sman1/scrollkeeper-config.1			\
-	sman1/scrollkeeper-devel.1			\
-	sman1/scrollkeeper-extract.1			\
-	sman1/scrollkeeper-gen-seriesid.1		\
-	sman1/scrollkeeper-get-cl.1			\
-	sman1/scrollkeeper-get-content-list.1		\
-	sman1/scrollkeeper-get-extended-content-list.1	\
-	sman1/scrollkeeper-get-index-from-docpath.1	\
-	sman1/scrollkeeper-get-toc-from-docpath.1	\
-	sman1/scrollkeeper-get-toc-from-id.1		\
-	sman1/scrollkeeper-install.1			\
-	sman1/scrollkeeper-preinstall.1			\
-	sman1/scrollkeeper-rebuilddb.1			\
-	sman1/scrollkeeper-uninstall.1			\
-	sman1/scrollkeeper-update.1			\
-	sman1/scrollkeeper.1				\
-	sman1/gnome-open.1				\
-	sman3/libbonoboui-2.3				\
-	sman3/libgnome-2.3				\
-	sman3/libgnomeui-2.3
+	man1/scrollkeeper-config.1			\
+	man1/scrollkeeper-devel.1			\
+	man1/scrollkeeper-extract.1			\
+	man1/scrollkeeper-gen-seriesid.1		\
+	man1/scrollkeeper-get-cl.1			\
+	man1/scrollkeeper-get-content-list.1		\
+	man1/scrollkeeper-get-extended-content-list.1	\
+	man1/scrollkeeper-get-index-from-docpath.1	\
+	man1/scrollkeeper-get-toc-from-docpath.1	\
+	man1/scrollkeeper-get-toc-from-id.1		\
+	man1/scrollkeeper-install.1			\
+	man1/scrollkeeper-preinstall.1			\
+	man1/scrollkeeper-rebuilddb.1			\
+	man1/scrollkeeper-uninstall.1			\
+	man1/scrollkeeper-update.1			\
+	man1/scrollkeeper.1				\
+	man1/gnome-open.1				\
+	man3/libbonoboui-2.3				\
+	man3/libgnome-2.3				\
+	man3/libgnomeui-2.3
 SUNWgnome-libs.PAGES: $(SUNWgnome-libs_PAGES)
 
 SUNWgnome-media-apps_PAGES =			\
-	sman1/cddb-slave2-properties.1		\
-	sman1/gnome-sound-recorder.1		\
-	sman1/gnome-audio-profiles-properties.1	\
-	sman1/gnome-volume-control.1		\
-	sman1/gstreamer-properties.1		\
-	sman1/vumeter.1
+	man1/cddb-slave2-properties.1		\
+	man1/gnome-sound-recorder.1		\
+	man1/gnome-audio-profiles-properties.1	\
+	man1/gnome-volume-control.1		\
+	man1/gstreamer-properties.1		\
+	man1/vumeter.1
 SUNWgnome-media-apps.PAGES: $(SUNWgnome-media-apps_PAGES)
 
 SUNWgnome-media-player_PAGES =	\
-	sman1/rhythmbox.1
+	man1/rhythmbox.1
 SUNWgnome-media-player.PAGES: $(SUNWgnome-media-player_PAGES)
 
 SUNWgnome-media_PAGES =			\
-	sman1/gst-feedback.1		\
-	sman1/gst-inspect.1		\
-	sman1/gst-launch.1		\
-	sman1/gst-typefind.1		\
-	sman1/gst-xmlinspect.1		\
-	sman1/gst-xmllaunch.1		\
-	sman3/libgstreamer-0.10.3	\
-	sman3/libgstbase-0.10.3		\
-	sman5/gst-std-options.5
+	man1/gst-feedback.1		\
+	man1/gst-inspect.1		\
+	man1/gst-launch.1		\
+	man1/gst-typefind.1		\
+	man1/gst-xmlinspect.1		\
+	man1/gst-xmllaunch.1		\
+	man3/libgstreamer-0.10.3	\
+	man3/libgstbase-0.10.3		\
+	man5/gst-std-options.5
 SUNWgnome-media.PAGES: $(SUNWgnome-media_PAGES)
 
 SUNWgnome-menu-editor_PAGES =		\
-	sman1/alacarte.1
+	man1/alacarte.1
 SUNWgnome-menu-editor.PAGES: $(SUNWgnome-menu-editor_PAGES)
 
 SUNWgnome-panel_PAGES =				\
-	sman1/gnome-about.1			\
-	sman1/gnome-desktop-item-edit.1		\
-	sman1/gnome-panel.1			\
-	sman1/gnome-cleanup.1			\
-	sman3/libgnome-desktop-2.3		\
-	sman3/libpanel-applet-2.3		\
-	sman5/gnome-std-options.5
+	man1/gnome-about.1			\
+	man1/gnome-desktop-item-edit.1		\
+	man1/gnome-panel.1			\
+	man1/gnome-cleanup.1			\
+	man3/libgnome-desktop-2.3		\
+	man3/libpanel-applet-2.3		\
+	man5/gnome-std-options.5
 SUNWgnome-panel.PAGES: $(SUNWgnome-panel_PAGES)
 
 SUNWgnome-pilot_PAGES =			\
-	sman1/gpilot-install-file.1	\
-	sman1/gpilotd-control-applet.1
+	man1/gpilot-install-file.1	\
+	man1/gpilotd-control-applet.1
 SUNWgnome-pilot.PAGES: $(SUNWgnome-pilot_PAGES)
 
 SUNWgnome-print_PAGES =			\
-	sman1/gnome-printinfo.1		\
-	sman3/libgnomeprint-2.2.3	\
-	sman3/libgnomeprintui-2.2.3
+	man1/gnome-printinfo.1		\
+	man3/libgnomeprint-2.2.3	\
+	man3/libgnomeprintui-2.2.3
 SUNWgnome-print.PAGES: $(SUNWgnome-print_PAGES)
 
 SUNWgnome-removable-media_PAGES =	\
-	sman1/gnome-volcheck.1
+	man1/gnome-volcheck.1
 SUNWgnome-removable-media.PAGES: $(SUNWgnome-removable-media_PAGES)
 
 SUNWgnome-remote-desktop_PAGES = 	\
-	sman1/vino-server.1		\
-	sman1/vino-preferences.1
+	man1/vino-server.1		\
+	man1/vino-preferences.1
 SUNWgnome-remote-desktop.PAGES: $(SUNWgnome-remote-desktop_PAGES)
 
 SUNWgnome-session_PAGES =			\
-	sman1/gnome-session.1			\
-	sman1/gnome-session-properties.1	\
-	sman1/gnome-session-remove.1		\
-	sman1/gnome-session-save.1		\
-	sman1/gnome-wm.1			\
-	sman5/default.session.5
+	man1/gnome-session.1			\
+	man1/gnome-session-properties.1		\
+	man1/gnome-session-remove.1		\
+	man1/gnome-session-save.1		\
+	man1/gnome-wm.1				\
+	man5/default.session.5
 SUNWgnome-session.PAGES: $(SUNWgnome-session_PAGES)
 
 SUNWgnome-sys-suspend_PAGES =	\
-	sman1/gnome-sys-suspend.1
+	man1/gnome-sys-suspend.1
 SUNWgnome-sys-suspend.PAGES: $(SUNWgnome-sys-suspend_PAGES)
 
 SUNWgnome-system-tools_PAGES =	\
-	sman1/network-admin.1 \
-	sman1/services-admin.1 \
-	sman1/shares-admin.1 \
-	sman1/time-admin.1 \
-	sman1/users-admin.1
+	man1/network-admin.1 	\
+	man1/services-admin.1 	\
+	man1/shares-admin.1 	\
+	man1/time-admin.1 	\
+	man1/users-admin.1
 SUNWgnome-system-tools.PAGES: $(SUNWgnome-system-tools_PAGES)
 
 SUNWgnome-system-monitor_PAGES =	\
-	sman1/gnome-system-monitor.1
+	man1/gnome-system-monitor.1
 SUNWgnome-system-monitor.PAGES: $(SUNWgnome-system-monitor_PAGES)
 
 SUNWgnome-terminal_PAGES =	\
-	sman1/gnome-terminal.1	\
-	sman1/vte.1		\
-	sman3/libvte.3
+	man1/gnome-terminal.1	\
+	man1/vte.1		\
+	man3/libvte.3
 SUNWgnome-terminal.PAGES: $(SUNWgnome-terminal_PAGES)
 
 SUNWgnome-text-editor_PAGES =	\
-	sman1/gedit.1		\
-	sman1/gnome-text-editor.1
+	man1/gedit.1		\
+	man1/gnome-text-editor.1
 SUNWgnome-text-editor.PAGES: $(SUNWgnome-text-editor_PAGES)
 
 SUNWgnome-ui-designer_PAGES =	\
-	sman1/glade-2.1
+	man1/glade-2.1
 SUNWgnome-ui-designer.PAGES: $(SUNWgnome-ui-designer_PAGES)
 
 SUNWgnome-utils_PAGES =				\
-	sman1/gnome-dictionary.1		\
-	sman1/gnome-search-tool.1		\
-	sman1/gnome-panel-screenshot.1		\
-	sman1/gnome-screenshot.1
+	man1/gnome-dictionary.1			\
+	man1/gnome-search-tool.1		\
+	man1/gnome-panel-screenshot.1		\
+	man1/gnome-screenshot.1
 
 SUNWgnome-utils.PAGES: $(SUNWgnome-utils_PAGES)
 
 SUNWgnome-vfs_PAGES =			\
-	sman1/gnomevfs-cat.1		\
-	sman1/gnomevfs-copy.1		\
-	sman1/gnomevfs-info.1		\
-	sman1/gnomevfs-ls.1		\
-	sman1/gnomevfs-mkdir.1		\
-	sman1/update-mime-database.1	\
-	sman3/libgnomevfs-2.3		\
-	sman4/gnome-vfs-mime-magic.4	\
-	sman4/gnome-vfs.applications.4	\
-	sman4/gnome-vfs.keys.4		\
-	sman4/gnome-vfs.mime.4
+	man1/gnomevfs-cat.1		\
+	man1/gnomevfs-copy.1		\
+	man1/gnomevfs-info.1		\
+	man1/gnomevfs-ls.1		\
+	man1/gnomevfs-mkdir.1		\
+	man1/update-mime-database.1	\
+	man3/libgnomevfs-2.3		\
+	man4/gnome-vfs-mime-magic.4	\
+	man4/gnome-vfs.applications.4	\
+	man4/gnome-vfs.keys.4		\
+	man4/gnome-vfs.mime.4
 SUNWgnome-vfs.PAGES: $(SUNWgnome-vfs_PAGES)
 
 SUNWgnome-wm_PAGES =			\
-	sman1/metacity.1		\
-	sman1/metacity-message.1	\
-	sman1/metacity-theme-viewer.1
+	man1/metacity.1			\
+	man1/metacity-message.1		\
+	man1/metacity-theme-viewer.1
 SUNWgnome-wm.PAGES: $(SUNWgnome-wm_PAGES)
 
 SUNWjpg_PAGES =			\
-	sman1/cjpeg.1		\
-	sman1/djpeg.1		\
-	sman1/jpegtran.1	\
-	sman1/rdjpgcom.1	\
-	sman1/wrjpgcom.1	\
-	sman3/libjpeg.3
+	man1/cjpeg.1		\
+	man1/djpeg.1		\
+	man1/jpegtran.1		\
+	man1/rdjpgcom.1		\
+	man1/wrjpgcom.1		\
+	man3/libjpeg.3
 SUNWjpg.PAGES: $(SUNWjpg_PAGES)
 
 SUNWlibpopt_PAGES =	\
-	sman3/libpopt.3
+	man3/libpopt.3
 SUNWlibpopt.PAGES: $(SUNWlibpopt_PAGES)
 
 SUNWlibrsvg_PAGES =		\
-	sman1/rsvg.1		\
-	sman3/librsvg-2.3
+	man1/rsvg.1		\
+	man3/librsvg-2.3
 SUNWlibrsvg.PAGES: $(SUNWlibrsvg_PAGES)
 
 SUNWogg-vorbis_PAGES =		\
-	sman3/libogg.3		\
-	sman3/libvorbis.3
+	man3/libogg.3		\
+	man3/libvorbis.3
 SUNWogg-vorbis.PAGES: $(SUNWogg-vorbis_PAGES)
 
 SUNWpng_PAGES =			\
-	sman3/libpng.3		\
-	sman3/libpngpf.3	\
-	sman4/png.4
+	man3/libpng.3		\
+	man3/libpngpf.3		\
+	man4/png.4
 SUNWpng.PAGES: $(SUNWpng_PAGES)
 
 SUNWrealplayer_PAGES =	\
-	sman1/realplay.1
+	man1/realplay.1
 SUNWrealplayer.PAGES: $(SUNWrealplayer_PAGES)
 
 SUNWthunderbird_PAGES =	\
-	sman1/thunderbird.1
+	man1/thunderbird.1
 SUNWthunderbird.PAGES: $(SUNWthunderbird_PAGES)
 
 .SUFFIXES: -manpages-$(MANPAGE_VERSION).tar.gz .PAGES
@@ -708,7 +708,7 @@
 	@test -d check-used-manpages ||  mkdir -p "check-used-manpages"
 	@test -d check-all-manpages ||  mkdir -p "check-all-manpages"
 	@rm -f unused-manpages.txt
-	@cp entities/* sman*/* check-all-manpages
+	@cp entities/* man*/* check-all-manpages
 	@for package in $(PACKAGES); do \
 		$(MAKE) MAKE=\"$(MAKE)\" $$package.check-used; \
 	done