web-devel-2 r4617 - in trunk/content/projects/gup/hig: . images



Author: calum
Date: Mon Sep 29 23:05:52 2008
New Revision: 4617
URL: http://svn.gnome.org/viewvc/web-devel-2?rev=4617&view=rev

Log:
Update draft HIG to v2.3 from gnome-devel-docs branch,
so we have an online of it available.



Added:
   trunk/content/projects/gup/hig/images/controls-progress-indeterminate.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/controls-progress-time.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/controls-progress-typical.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/desktop-applications-menu.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/feedback-checklist-running.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/feedback-pointers-busy.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/icons-applications.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/icons-evolution.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/icons-floppy-dissected.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/icons-font-selection-good.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/icons-font-selection-poor.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/icons-gedit.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/icons-gnumeric.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/icons-hc-book-blur.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/icons-hc-book.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/icons-hc-cdrom-blur.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/icons-hc-cdrom.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/icons-hc-copy-blur.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/icons-hc-copy.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/icons-hc-metaphors.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/icons-lowcontrast-levels.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/icons-menu.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/icons-nautilus.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/icons-objects.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/icons-perspective-shelf.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/icons-perspective-table.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/icons-shut-down.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/icons-silhouette.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/icons-sodipodi.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/icons-style-aqua.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/icons-style-gnome.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/icons-style-java.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/icons-system-log.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/icons-toolbar.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/icons-underline-text.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/icons-word-processor.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/input-accesskeys-shortcuts.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/input-drag-cursor-copy.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/input-drag-cursor-link.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/input-drag-cursor-move.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/input-drag-cursor-nodrop.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/input-drag-cursor-query.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/input-drag-cursor.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/input-drag-select-files.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/input-drag-select-graphics.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/input-pointing-devices.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/menus-application.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/menus-bookmarks.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/menus-checkbox-group.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/menus-command-group.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/menus-dropdown.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/menus-edit.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/menus-file.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/menus-format.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/menus-go-browser.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/menus-go-document.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/menus-help.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/menus-insert.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/menus-popup.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/menus-radiobutton-group.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/menus-submenu.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/menus-view.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/menus-windows.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/toolbars-configure-menu.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/toolbars-labels-below.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/toolbars-labels-beside.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/toolbars-mail.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-button-label.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-colorblind-deutan.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-colorblind-normal.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-colorblind-tritan.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-large-icon-label.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-layout-annotated.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-layout-good.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-layout-poor.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-list-label.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-other-labels.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-palette-1.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-palette-10.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-palette-11.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-palette-12.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-palette-13.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-palette-14.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-palette-15.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-palette-16.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-palette-17.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-palette-18.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-palette-19.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-palette-2.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-palette-20.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-palette-21.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-palette-22.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-palette-23.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-palette-24.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-palette-25.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-palette-26.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-palette-27.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-palette-28.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-palette-29.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-palette-3.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-palette-30.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-palette-31.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-palette-32.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-palette-4.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-palette-5.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-palette-6.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-palette-7.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-palette-8.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-palette-9.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-palette.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-radiobutton-label.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-small-icon-label.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/visdes-textbox-label.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/windows-alert-authentication.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/windows-alert-buttons.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/windows-alert-confirmation.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/windows-alert-error.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/windows-alert-information.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/windows-alert-save.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/windows-alert-spacing.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/windows-alert-text.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/windows-assistant-first-page.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/windows-assistant-middle-page.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/windows-dialog-tabbed.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/windows-explicit-apply.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/windows-mdi.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/windows-preferences.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/windows-primary.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/windows-progress-checklist-done.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/windows-progress-checklist-start.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/windows-progress-checklist.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/windows-progress-copy-file.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/windows-progress.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/windows-properties.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/windows-sdi.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/windows-titlebar.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/windows-toolbox-large.png   (contents, props changed)
   trunk/content/projects/gup/hig/images/windows-toolbox-small.png   (contents, props changed)
Removed:
   trunk/content/projects/gup/hig/images/EvoToolbar.png
   trunk/content/projects/gup/hig/images/EvoToolbar.png.info
   trunk/content/projects/gup/hig/images/GaleonToolbar.png.info
   trunk/content/projects/gup/hig/images/GtkToolbar.png
   trunk/content/projects/gup/hig/images/GtkToolbar.png.info
   trunk/content/projects/gup/hig/images/GtkToolbar_browserdefault.png.info
   trunk/content/projects/gup/hig/images/GtkToolbar_gedit.png
   trunk/content/projects/gup/hig/images/GtkToolbar_gedit.png.info
   trunk/content/projects/gup/hig/images/GtkToolbar_productivitydefault.png.info
   trunk/content/projects/gup/hig/images/abiword-icon.png
   trunk/content/projects/gup/hig/images/abiword-icon.png.info
   trunk/content/projects/gup/hig/images/action-icon.png
   trunk/content/projects/gup/hig/images/action-icon.png.info
   trunk/content/projects/gup/hig/images/alert-button-order.png
   trunk/content/projects/gup/hig/images/alert-button-order.png.info
   trunk/content/projects/gup/hig/images/alert-spacing.png.info
   trunk/content/projects/gup/hig/images/alert-text.png.info
   trunk/content/projects/gup/hig/images/application-edit-menu.png
   trunk/content/projects/gup/hig/images/application-edit-menu.png.info
   trunk/content/projects/gup/hig/images/application-icons.png
   trunk/content/projects/gup/hig/images/application-icons.png.info
   trunk/content/projects/gup/hig/images/application-menubar.png
   trunk/content/projects/gup/hig/images/application-menubar.png.info
   trunk/content/projects/gup/hig/images/applications-menu.png.info
   trunk/content/projects/gup/hig/images/assistant-first-page.png.info
   trunk/content/projects/gup/hig/images/assistant-middle-page.png.info
   trunk/content/projects/gup/hig/images/authentication-alert.png
   trunk/content/projects/gup/hig/images/authentication-alert.png.info
   trunk/content/projects/gup/hig/images/browser-toolbar.png
   trunk/content/projects/gup/hig/images/browser-toolbar.png.info
   trunk/content/projects/gup/hig/images/busy-pointers.png
   trunk/content/projects/gup/hig/images/busy-pointers.png.info
   trunk/content/projects/gup/hig/images/caution.png
   trunk/content/projects/gup/hig/images/caution.png.info
   trunk/content/projects/gup/hig/images/checkbox-menu.png
   trunk/content/projects/gup/hig/images/checkbox-menu.png.info
   trunk/content/projects/gup/hig/images/checkbox_label.png
   trunk/content/projects/gup/hig/images/checkbox_label.png.info
   trunk/content/projects/gup/hig/images/checklist-window-done.png
   trunk/content/projects/gup/hig/images/checklist-window-done.png.info
   trunk/content/projects/gup/hig/images/checklist-window-in-progress.png
   trunk/content/projects/gup/hig/images/checklist-window-in-progress.png.info
   trunk/content/projects/gup/hig/images/checklist-window-start.png
   trunk/content/projects/gup/hig/images/checklist-window-start.png.info
   trunk/content/projects/gup/hig/images/colour_and_arrows.png
   trunk/content/projects/gup/hig/images/colour_and_arrows.png.info
   trunk/content/projects/gup/hig/images/colour_only.png
   trunk/content/projects/gup/hig/images/colour_only.png.info
   trunk/content/projects/gup/hig/images/command-menu.png
   trunk/content/projects/gup/hig/images/command-menu.png.info
   trunk/content/projects/gup/hig/images/confirmation-alert.png
   trunk/content/projects/gup/hig/images/confirmation-alert.png.info
   trunk/content/projects/gup/hig/images/controls-buttons.png.info
   trunk/content/projects/gup/hig/images/controls-check-box-ambiguous.png.info
   trunk/content/projects/gup/hig/images/controls-check-boxes-mixed.png.info
   trunk/content/projects/gup/hig/images/controls-check-boxes.png.info
   trunk/content/projects/gup/hig/images/controls-combo.png.info
   trunk/content/projects/gup/hig/images/controls-frames.png.info
   trunk/content/projects/gup/hig/images/controls-list-checkbox.png.info
   trunk/content/projects/gup/hig/images/controls-list.png.info
   trunk/content/projects/gup/hig/images/controls-locked.png.info
   trunk/content/projects/gup/hig/images/controls-notebook-list.png.info
   trunk/content/projects/gup/hig/images/controls-notebook-tabs.png.info
   trunk/content/projects/gup/hig/images/controls-notebook.png.info
   trunk/content/projects/gup/hig/images/controls-old-frames.png.info
   trunk/content/projects/gup/hig/images/controls-option-menu.png.info
   trunk/content/projects/gup/hig/images/controls-radio-button-mixed.png.info
   trunk/content/projects/gup/hig/images/controls-radio-buttons.png.info
   trunk/content/projects/gup/hig/images/controls-sensitivity.png.info
   trunk/content/projects/gup/hig/images/controls-slider-spinbox.png.info
   trunk/content/projects/gup/hig/images/controls-slider.png.info
   trunk/content/projects/gup/hig/images/controls-spin-box.png.info
   trunk/content/projects/gup/hig/images/controls-status-bar-interactive.png.info
   trunk/content/projects/gup/hig/images/controls-status-bar.png.info
   trunk/content/projects/gup/hig/images/controls-text-choose.png.info
   trunk/content/projects/gup/hig/images/controls-text-prompt.png.info
   trunk/content/projects/gup/hig/images/controls-text.png.info
   trunk/content/projects/gup/hig/images/controls-toggle-button-mixed.png.info
   trunk/content/projects/gup/hig/images/controls-toggle-buttons.png.info
   trunk/content/projects/gup/hig/images/controls-tree-checkbox.png.info
   trunk/content/projects/gup/hig/images/controls-tree.png.info
   trunk/content/projects/gup/hig/images/depend1.png
   trunk/content/projects/gup/hig/images/depend1.png.info
   trunk/content/projects/gup/hig/images/depend1a.png
   trunk/content/projects/gup/hig/images/depend1a.png.info
   trunk/content/projects/gup/hig/images/depend2.png
   trunk/content/projects/gup/hig/images/depend2.png.info
   trunk/content/projects/gup/hig/images/depend2a.png
   trunk/content/projects/gup/hig/images/depend2a.png.info
   trunk/content/projects/gup/hig/images/depend3.png
   trunk/content/projects/gup/hig/images/depend3.png.info
   trunk/content/projects/gup/hig/images/df.png
   trunk/content/projects/gup/hig/images/df.png.info
   trunk/content/projects/gup/hig/images/dragcursor-augmented.png
   trunk/content/projects/gup/hig/images/dragcursor-augmented.png.info
   trunk/content/projects/gup/hig/images/dragcursor-copy.png
   trunk/content/projects/gup/hig/images/dragcursor-copy.png.info
   trunk/content/projects/gup/hig/images/dragcursor-link.png
   trunk/content/projects/gup/hig/images/dragcursor-link.png.info
   trunk/content/projects/gup/hig/images/dragcursor-move.png
   trunk/content/projects/gup/hig/images/dragcursor-move.png.info
   trunk/content/projects/gup/hig/images/dragcursor-nodrop.png
   trunk/content/projects/gup/hig/images/dragcursor-nodrop.png.info
   trunk/content/projects/gup/hig/images/dragcursor-rmb.png
   trunk/content/projects/gup/hig/images/dragcursor-rmb.png.info
   trunk/content/projects/gup/hig/images/earthDeutan.png
   trunk/content/projects/gup/hig/images/earthDeutan.png.info
   trunk/content/projects/gup/hig/images/earthNorm.png
   trunk/content/projects/gup/hig/images/earthNorm.png.info
   trunk/content/projects/gup/hig/images/earthTritan.png
   trunk/content/projects/gup/hig/images/earthTritan.png.info
   trunk/content/projects/gup/hig/images/error-alert.png
   trunk/content/projects/gup/hig/images/error-alert.png.info
   trunk/content/projects/gup/hig/images/evolution-icon.png
   trunk/content/projects/gup/hig/images/evolution-icon.png.info
   trunk/content/projects/gup/hig/images/explicit-apply.png.info
   trunk/content/projects/gup/hig/images/file-menu.png
   trunk/content/projects/gup/hig/images/file-menu.png.info
   trunk/content/projects/gup/hig/images/floppy-dissected.png.info
   trunk/content/projects/gup/hig/images/fontsel-icon.png
   trunk/content/projects/gup/hig/images/fontsel-icon.png.info
   trunk/content/projects/gup/hig/images/fontsel-suggestion.png
   trunk/content/projects/gup/hig/images/fontsel-suggestion.png.info
   trunk/content/projects/gup/hig/images/gdiskfree-menu.png
   trunk/content/projects/gup/hig/images/gdiskfree-menu.png.info
   trunk/content/projects/gup/hig/images/gdiskfree.png
   trunk/content/projects/gup/hig/images/gdiskfree.png.info
   trunk/content/projects/gup/hig/images/gedit-icon.png
   trunk/content/projects/gup/hig/images/gedit-icon.png.info
   trunk/content/projects/gup/hig/images/generic-bookmarks-menu.png
   trunk/content/projects/gup/hig/images/generic-bookmarks-menu.png.info
   trunk/content/projects/gup/hig/images/generic-browser-go-menu.png
   trunk/content/projects/gup/hig/images/generic-browser-go-menu.png.info
   trunk/content/projects/gup/hig/images/generic-document-go-menu.png
   trunk/content/projects/gup/hig/images/generic-document-go-menu.png.info
   trunk/content/projects/gup/hig/images/generic-format-menu.png
   trunk/content/projects/gup/hig/images/generic-format-menu.png.info
   trunk/content/projects/gup/hig/images/generic-help-menu.png
   trunk/content/projects/gup/hig/images/generic-help-menu.png.info
   trunk/content/projects/gup/hig/images/generic-insert-menu.png
   trunk/content/projects/gup/hig/images/generic-insert-menu.png.info
   trunk/content/projects/gup/hig/images/generic-view-menu.png
   trunk/content/projects/gup/hig/images/generic-view-menu.png.info
   trunk/content/projects/gup/hig/images/generic-windows-menu.png
   trunk/content/projects/gup/hig/images/generic-windows-menu.png.info
   trunk/content/projects/gup/hig/images/gide-icon.png
   trunk/content/projects/gup/hig/images/gide-icon.png.info
   trunk/content/projects/gup/hig/images/glyph-icon.png
   trunk/content/projects/gup/hig/images/glyph-icon.png.info
   trunk/content/projects/gup/hig/images/gnome-http-url.png
   trunk/content/projects/gup/hig/images/gnome-http-url.png.info
   trunk/content/projects/gup/hig/images/gnome-package.png
   trunk/content/projects/gup/hig/images/gnome-package.png.info
   trunk/content/projects/gup/hig/images/gnome-text-x-readme.png
   trunk/content/projects/gup/hig/images/gnome-text-x-readme.png.info
   trunk/content/projects/gup/hig/images/gnumeric-icon.png
   trunk/content/projects/gup/hig/images/gnumeric-icon.png.info
   trunk/content/projects/gup/hig/images/highcontrast-book-blur.png
   trunk/content/projects/gup/hig/images/highcontrast-book-blur.png.info
   trunk/content/projects/gup/hig/images/highcontrast-book.png
   trunk/content/projects/gup/hig/images/highcontrast-book.png.info
   trunk/content/projects/gup/hig/images/highcontrast-cdrom-blur.png
   trunk/content/projects/gup/hig/images/highcontrast-cdrom-blur.png.info
   trunk/content/projects/gup/hig/images/highcontrast-cdrom.png
   trunk/content/projects/gup/hig/images/highcontrast-cdrom.png.info
   trunk/content/projects/gup/hig/images/highcontrast-copy-blur.png
   trunk/content/projects/gup/hig/images/highcontrast-copy-blur.png.info
   trunk/content/projects/gup/hig/images/highcontrast-copy.png
   trunk/content/projects/gup/hig/images/highcontrast-copy.png.info
   trunk/content/projects/gup/hig/images/highcontrast-metaphors.png
   trunk/content/projects/gup/hig/images/highcontrast-metaphors.png.info
   trunk/content/projects/gup/hig/images/highcontrast-theme.png
   trunk/content/projects/gup/hig/images/highcontrast-theme.png.info
   trunk/content/projects/gup/hig/images/highcontrastinverse-theme.png
   trunk/content/projects/gup/hig/images/highcontrastinverse-theme.png.info
   trunk/content/projects/gup/hig/images/icon-design-process-1.png.info
   trunk/content/projects/gup/hig/images/icon-design-process-10.png.info
   trunk/content/projects/gup/hig/images/icon-design-process-11.png.info
   trunk/content/projects/gup/hig/images/icon-design-process-12.png.info
   trunk/content/projects/gup/hig/images/icon-design-process-2.png.info
   trunk/content/projects/gup/hig/images/icon-design-process-3.png.info
   trunk/content/projects/gup/hig/images/icon-design-process-4.png.info
   trunk/content/projects/gup/hig/images/icon-design-process-5.png.info
   trunk/content/projects/gup/hig/images/icon-design-process-6.png.info
   trunk/content/projects/gup/hig/images/icon-design-process-7.png.info
   trunk/content/projects/gup/hig/images/icon-design-process-8.png.info
   trunk/content/projects/gup/hig/images/icon-design-process-9.png.info
   trunk/content/projects/gup/hig/images/icon-style-aqua.png
   trunk/content/projects/gup/hig/images/icon-style-aqua.png.info
   trunk/content/projects/gup/hig/images/icon-style-gnome.png
   trunk/content/projects/gup/hig/images/icon-style-gnome.png.info
   trunk/content/projects/gup/hig/images/icon-style-java.png
   trunk/content/projects/gup/hig/images/icon-style-java.png.info
   trunk/content/projects/gup/hig/images/icon_perspective_shelf.png
   trunk/content/projects/gup/hig/images/icon_perspective_shelf.png.info
   trunk/content/projects/gup/hig/images/icon_perspective_table.png
   trunk/content/projects/gup/hig/images/icon_perspective_table.png.info
   trunk/content/projects/gup/hig/images/icons_labels.png
   trunk/content/projects/gup/hig/images/icons_labels.png.info
   trunk/content/projects/gup/hig/images/important.png
   trunk/content/projects/gup/hig/images/important.png.info
   trunk/content/projects/gup/hig/images/information-alert.png
   trunk/content/projects/gup/hig/images/information-alert.png.info
   trunk/content/projects/gup/hig/images/installer-icon.png
   trunk/content/projects/gup/hig/images/installer-icon.png.info
   trunk/content/projects/gup/hig/images/label_above.png
   trunk/content/projects/gup/hig/images/label_above.png.info
   trunk/content/projects/gup/hig/images/label_below.png
   trunk/content/projects/gup/hig/images/label_below.png.info
   trunk/content/projects/gup/hig/images/label_left.png
   trunk/content/projects/gup/hig/images/label_left.png.info
   trunk/content/projects/gup/hig/images/label_right.png
   trunk/content/projects/gup/hig/images/label_right.png.info
   trunk/content/projects/gup/hig/images/large_icon_label.png
   trunk/content/projects/gup/hig/images/large_icon_label.png.info
   trunk/content/projects/gup/hig/images/layout1.png
   trunk/content/projects/gup/hig/images/layout1.png.info
   trunk/content/projects/gup/hig/images/layout2.png
   trunk/content/projects/gup/hig/images/layout2.png.info
   trunk/content/projects/gup/hig/images/layout_callouts.png
   trunk/content/projects/gup/hig/images/layout_callouts.png.info
   trunk/content/projects/gup/hig/images/levels-lowcontrast.png
   trunk/content/projects/gup/hig/images/levels-lowcontrast.png.info
   trunk/content/projects/gup/hig/images/list_control_label.png
   trunk/content/projects/gup/hig/images/list_control_label.png.info
   trunk/content/projects/gup/hig/images/log-icon.png
   trunk/content/projects/gup/hig/images/log-icon.png.info
   trunk/content/projects/gup/hig/images/lowcontrast-theme.png
   trunk/content/projects/gup/hig/images/lowcontrast-theme.png.info
   trunk/content/projects/gup/hig/images/manual-alert-spacing.png
   trunk/content/projects/gup/hig/images/manual-alert-spacing.png.info
   trunk/content/projects/gup/hig/images/manual-button-ordering.png
   trunk/content/projects/gup/hig/images/manual-button-ordering.png.info
   trunk/content/projects/gup/hig/images/mdi.png.info
   trunk/content/projects/gup/hig/images/menu-icons.png
   trunk/content/projects/gup/hig/images/menu-icons.png.info
   trunk/content/projects/gup/hig/images/mnemonics_and_shortcuts.png
   trunk/content/projects/gup/hig/images/mnemonics_and_shortcuts.png.info
   trunk/content/projects/gup/hig/images/nautilus-icon.png
   trunk/content/projects/gup/hig/images/nautilus-icon.png.info
   trunk/content/projects/gup/hig/images/note.png
   trunk/content/projects/gup/hig/images/note.png.info
   trunk/content/projects/gup/hig/images/object-icon.png
   trunk/content/projects/gup/hig/images/object-icon.png.info
   trunk/content/projects/gup/hig/images/object-icons.png
   trunk/content/projects/gup/hig/images/object-icons.png.info
   trunk/content/projects/gup/hig/images/object-menu.png
   trunk/content/projects/gup/hig/images/object-menu.png.info
   trunk/content/projects/gup/hig/images/object-menubar.png
   trunk/content/projects/gup/hig/images/object-menubar.png.info
   trunk/content/projects/gup/hig/images/other_labels.png
   trunk/content/projects/gup/hig/images/other_labels.png.info
   trunk/content/projects/gup/hig/images/palette-1.png.info
   trunk/content/projects/gup/hig/images/palette-10.png.info
   trunk/content/projects/gup/hig/images/palette-11.png.info
   trunk/content/projects/gup/hig/images/palette-12.png.info
   trunk/content/projects/gup/hig/images/palette-13.png.info
   trunk/content/projects/gup/hig/images/palette-14.png.info
   trunk/content/projects/gup/hig/images/palette-15.png.info
   trunk/content/projects/gup/hig/images/palette-16.png.info
   trunk/content/projects/gup/hig/images/palette-17.png.info
   trunk/content/projects/gup/hig/images/palette-18.png.info
   trunk/content/projects/gup/hig/images/palette-19.png.info
   trunk/content/projects/gup/hig/images/palette-2.png.info
   trunk/content/projects/gup/hig/images/palette-20.png.info
   trunk/content/projects/gup/hig/images/palette-21.png.info
   trunk/content/projects/gup/hig/images/palette-22.png.info
   trunk/content/projects/gup/hig/images/palette-23.png.info
   trunk/content/projects/gup/hig/images/palette-24.png.info
   trunk/content/projects/gup/hig/images/palette-25.png.info
   trunk/content/projects/gup/hig/images/palette-26.png.info
   trunk/content/projects/gup/hig/images/palette-27.png.info
   trunk/content/projects/gup/hig/images/palette-28.png.info
   trunk/content/projects/gup/hig/images/palette-29.png.info
   trunk/content/projects/gup/hig/images/palette-3.png.info
   trunk/content/projects/gup/hig/images/palette-30.png.info
   trunk/content/projects/gup/hig/images/palette-31.png.info
   trunk/content/projects/gup/hig/images/palette-32.png.info
   trunk/content/projects/gup/hig/images/palette-4.png.info
   trunk/content/projects/gup/hig/images/palette-5.png.info
   trunk/content/projects/gup/hig/images/palette-6.png.info
   trunk/content/projects/gup/hig/images/palette-7.png.info
   trunk/content/projects/gup/hig/images/palette-8.png.info
   trunk/content/projects/gup/hig/images/palette-9.png.info
   trunk/content/projects/gup/hig/images/pointingdevices.png
   trunk/content/projects/gup/hig/images/pointingdevices.png.info
   trunk/content/projects/gup/hig/images/popup-menu.png
   trunk/content/projects/gup/hig/images/popup-menu.png.info
   trunk/content/projects/gup/hig/images/preferences-window.png
   trunk/content/projects/gup/hig/images/preferences-window.png.info
   trunk/content/projects/gup/hig/images/primary-window.png
   trunk/content/projects/gup/hig/images/primary-window.png.info
   trunk/content/projects/gup/hig/images/progress-checklist-with-bar.png
   trunk/content/projects/gup/hig/images/progress-checklist-with-bar.png.info
   trunk/content/projects/gup/hig/images/progress-checklist.png.info
   trunk/content/projects/gup/hig/images/progress-indeterminate.png.info
   trunk/content/projects/gup/hig/images/progress-proportion.png
   trunk/content/projects/gup/hig/images/progress-proportion.png.info
   trunk/content/projects/gup/hig/images/progress-time.png.info
   trunk/content/projects/gup/hig/images/progress-typical-time.png
   trunk/content/projects/gup/hig/images/progress-typical-time.png.info
   trunk/content/projects/gup/hig/images/progress-window-copy.png
   trunk/content/projects/gup/hig/images/progress-window-copy.png.info
   trunk/content/projects/gup/hig/images/progress-window.png
   trunk/content/projects/gup/hig/images/progress-window.png.info
   trunk/content/projects/gup/hig/images/property-window.png
   trunk/content/projects/gup/hig/images/property-window.png.info
   trunk/content/projects/gup/hig/images/quit1.png
   trunk/content/projects/gup/hig/images/quit1.png.info
   trunk/content/projects/gup/hig/images/quit2.png
   trunk/content/projects/gup/hig/images/quit2.png.info
   trunk/content/projects/gup/hig/images/radio_button_label.png
   trunk/content/projects/gup/hig/images/radio_button_label.png.info
   trunk/content/projects/gup/hig/images/radiobutton-menu.png
   trunk/content/projects/gup/hig/images/radiobutton-menu.png.info
   trunk/content/projects/gup/hig/images/rubberband.png
   trunk/content/projects/gup/hig/images/rubberband.png.info
   trunk/content/projects/gup/hig/images/rubberband_dia.png
   trunk/content/projects/gup/hig/images/rubberband_dia.png.info
   trunk/content/projects/gup/hig/images/save1.png
   trunk/content/projects/gup/hig/images/save1.png.info
   trunk/content/projects/gup/hig/images/save2.png
   trunk/content/projects/gup/hig/images/save2.png.info
   trunk/content/projects/gup/hig/images/save_alert.png
   trunk/content/projects/gup/hig/images/save_alert.png.info
   trunk/content/projects/gup/hig/images/sdi.png.info
   trunk/content/projects/gup/hig/images/shutdown-icon.png
   trunk/content/projects/gup/hig/images/shutdown-icon.png.info
   trunk/content/projects/gup/hig/images/size-48x48.png
   trunk/content/projects/gup/hig/images/size-48x48.png.info
   trunk/content/projects/gup/hig/images/small_icon_label.png
   trunk/content/projects/gup/hig/images/small_icon_label.png.info
   trunk/content/projects/gup/hig/images/sodipodi-icon.png
   trunk/content/projects/gup/hig/images/sodipodi-icon.png.info
   trunk/content/projects/gup/hig/images/softwareupdateicon.png
   trunk/content/projects/gup/hig/images/softwareupdateicon.png.info
   trunk/content/projects/gup/hig/images/stock_save.png
   trunk/content/projects/gup/hig/images/stock_save.png.info
   trunk/content/projects/gup/hig/images/submenu.png.info
   trunk/content/projects/gup/hig/images/tabbed-dialog-box.png
   trunk/content/projects/gup/hig/images/tabbed-dialog-box.png.info
   trunk/content/projects/gup/hig/images/textbox_label.png
   trunk/content/projects/gup/hig/images/textbox_label.png.info
   trunk/content/projects/gup/hig/images/tip.png
   trunk/content/projects/gup/hig/images/tip.png.info
   trunk/content/projects/gup/hig/images/toolbar-icons.png
   trunk/content/projects/gup/hig/images/toolbar-icons.png.info
   trunk/content/projects/gup/hig/images/toolbar-silhouette.png
   trunk/content/projects/gup/hig/images/toolbar-silhouette.png.info
   trunk/content/projects/gup/hig/images/toolbox-small.png.info
   trunk/content/projects/gup/hig/images/toolbox.png
   trunk/content/projects/gup/hig/images/toolbox.png.info
   trunk/content/projects/gup/hig/images/underline-icon.png
   trunk/content/projects/gup/hig/images/underline-icon.png.info
   trunk/content/projects/gup/hig/images/view-toolbar.png
   trunk/content/projects/gup/hig/images/view-toolbar.png.info
   trunk/content/projects/gup/hig/images/warning.png
   trunk/content/projects/gup/hig/images/warning.png.info
   trunk/content/projects/gup/hig/images/window-title.png
   trunk/content/projects/gup/hig/images/window-title.png.info
   trunk/content/projects/gup/hig/images/ximian-palette.png
   trunk/content/projects/gup/hig/images/ximian-palette.png.info
Modified:
   trunk/content/projects/gup/hig/ChangeLog
   trunk/content/projects/gup/hig/hig-book.xml
   trunk/content/projects/gup/hig/hig-ch-checks.xml
   trunk/content/projects/gup/hig/hig-ch-controls.xml
   trunk/content/projects/gup/hig/hig-ch-credits.xml
   trunk/content/projects/gup/hig/hig-ch-desktop.xml
   trunk/content/projects/gup/hig/hig-ch-feedback.xml
   trunk/content/projects/gup/hig/hig-ch-icons-new.xml
   trunk/content/projects/gup/hig/hig-ch-icons.xml
   trunk/content/projects/gup/hig/hig-ch-input.xml
   trunk/content/projects/gup/hig/hig-ch-language.xml
   trunk/content/projects/gup/hig/hig-ch-layout.xml
   trunk/content/projects/gup/hig/hig-ch-menus.xml
   trunk/content/projects/gup/hig/hig-ch-principles.xml
   trunk/content/projects/gup/hig/hig-ch-toolbars.xml
   trunk/content/projects/gup/hig/hig-ch-whatsnew.xml
   trunk/content/projects/gup/hig/hig-ch-windows.xml
   trunk/content/projects/gup/hig/images/controls-buttons.png
   trunk/content/projects/gup/hig/images/controls-check-box-ambiguous.png
   trunk/content/projects/gup/hig/images/controls-check-boxes-mixed.png
   trunk/content/projects/gup/hig/images/controls-check-boxes.png
   trunk/content/projects/gup/hig/images/controls-combo.png
   trunk/content/projects/gup/hig/images/controls-frames.png
   trunk/content/projects/gup/hig/images/controls-list-checkbox.png
   trunk/content/projects/gup/hig/images/controls-list.png
   trunk/content/projects/gup/hig/images/controls-locked.png
   trunk/content/projects/gup/hig/images/controls-notebook-list.png
   trunk/content/projects/gup/hig/images/controls-notebook-tabs.png
   trunk/content/projects/gup/hig/images/controls-notebook.png
   trunk/content/projects/gup/hig/images/controls-old-frames.png
   trunk/content/projects/gup/hig/images/controls-option-menu.png
   trunk/content/projects/gup/hig/images/controls-radio-button-mixed.png
   trunk/content/projects/gup/hig/images/controls-radio-buttons.png
   trunk/content/projects/gup/hig/images/controls-sensitivity.png
   trunk/content/projects/gup/hig/images/controls-slider-spinbox.png
   trunk/content/projects/gup/hig/images/controls-slider.png
   trunk/content/projects/gup/hig/images/controls-spin-box.png
   trunk/content/projects/gup/hig/images/controls-status-bar-interactive.png
   trunk/content/projects/gup/hig/images/controls-status-bar.png
   trunk/content/projects/gup/hig/images/controls-text-choose.png
   trunk/content/projects/gup/hig/images/controls-text-prompt.png
   trunk/content/projects/gup/hig/images/controls-text.png
   trunk/content/projects/gup/hig/images/controls-toggle-buttons.png
   trunk/content/projects/gup/hig/images/controls-tree-checkbox.png
   trunk/content/projects/gup/hig/images/controls-tree.png

Modified: trunk/content/projects/gup/hig/hig-book.xml
==============================================================================
--- trunk/content/projects/gup/hig/hig-book.xml	(original)
+++ trunk/content/projects/gup/hig/hig-book.xml	Mon Sep 29 23:05:52 2008
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"; [
+<!ENTITY whatsnew SYSTEM "hig-ch-whatsnew.xml">
 <!ENTITY checks SYSTEM "hig-ch-checks.xml">
 <!ENTITY controls SYSTEM "hig-ch-controls.xml">
 <!ENTITY credits SYSTEM "hig-ch-credits.xml">
@@ -17,15 +18,25 @@
 <!ENTITY toolbars SYSTEM "hig-ch-toolbars.xml">
 <!ENTITY windows SYSTEM "hig-ch-windows.xml">
 <!ENTITY bibliography SYSTEM "hig-ch-bibliography.xml">
-<!ENTITY whatsnew SYSTEM "hig-ch-whatsnew.xml">
 ]>
 <book id="index">
 <bookinfo>
-    <author><firstname>The GNOME Usability Project</firstname></author>
+    <author role="maintainer"><firstname>The GNOME Usability Project</firstname></author>
 <copyright>
 <year>2002-2008</year>
-<holder>Calum Benson, Bryan Clark, Adam Elman, Seth Nickell, colin z robertson</holder>
+<holder>Calum Benson, Adam Elman, Seth Nickell, colin z robertson</holder>
 </copyright>
+<pubdate>2008-09-25</pubdate>
+<edition>2.2</edition>
+
+<abstract role="description">
+<para>This document tells you how to create applications that look right, behave
+properly, and fit into the GNOME user interface as a whole. It is written for
+interface designers, graphic artists and software developers who will be creating
+software for the GNOME environment. Both specific advice on making effective use
+of interface elements, and the philosophy and general design principles behind
+the GNOME interface are covered.</para>
+</abstract>
 
 <legalnotice>
   <para>
@@ -49,12 +60,12 @@
   </para>
 </legalnotice>
 
-<title>GNOME Human Interface Guidelines (Draft 2.1)</title>
+<title>GNOME Human Interface Guidelines 2.2</title>
 
 </bookinfo>
 
-&intro;
 &whatsnew;
+&intro;
 &principles;
 &desktop;
 &windows;

Modified: trunk/content/projects/gup/hig/hig-ch-checks.xml
==============================================================================
--- trunk/content/projects/gup/hig/hig-ch-checks.xml	(original)
+++ trunk/content/projects/gup/hig/hig-ch-checks.xml	Mon Sep 29 23:05:52 2008
@@ -67,7 +67,7 @@
 
 	<para>Test various GNOME themes to ensure that your application respects all the available settings.</para>
 
-	<para>Test your application with black and white, high contrast themes and confirm that all information is still conveyed correctly.  If you don&apos;t have a suitable high contrast GNOME theme available to test, print off some screenshots in black and white (not gray-scale) and make sure all the important information is still visibleâ this will approximate what a high contrast theme user will see.</para>
+	<para>Test your application with black and white, high contrast themes and confirm that all information is still conveyed correctly.  If you don&apos;t have a suitable high contrast GNOME theme available to test, print off some screenshots in black and white (not greyscale) and make sure all the important information is still visibleâ this will approximate what a high contrast theme user will see.</para>
       </sect2>
 
       <sect2>
@@ -97,7 +97,7 @@
 
 	<para>If you intend your application to be translated into different languages, show draft designs of your application to the <ulink url="http://developer.gnome.org/projects/gtp/contact.html";>GNOME Translation Team</ulink>.  They&apos;ll help you find potential translation problems, such as not leaving enough space for translated labels, shortcut keys that cause problems on a different keyboard layout, or using new terms in your app that are hard to translate.</para>
 
-	<para>If possible, try out your application with users from the locales you are targeting.  This will help you determine whether users understand how to use the application, if they perceive the graphics and colors the way you intended, and if there are words or images in the application that may cause offense to users of that locale. </para>
+	<para>If possible, try out your application with users from the locales you are targeting.  This will help you determine whether users understand how to use the application, if they perceive the graphics and colors the way you intended, and if there are words or images in the application that may cause offence to users of that locale. </para>
       </sect2>
 
     </sect1>

Modified: trunk/content/projects/gup/hig/hig-ch-controls.xml
==============================================================================
--- trunk/content/projects/gup/hig/hig-ch-controls.xml	(original)
+++ trunk/content/projects/gup/hig/hig-ch-controls.xml	Mon Sep 29 23:05:52 2008
@@ -51,8 +51,8 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/controls-sensitivity.png"
-          format="PNG" />
+          <imagedata depth="76" fileref="images/controls-sensitivity.png"
+          format="PNG" width="258" />
         </imageobject>
 
         <imageobject>
@@ -60,7 +60,8 @@
         </imageobject>
 
         <textobject>
-          <phrase>Screenshot showing the visual appearance of sensitive and insensitive check box controls</phrase>
+          <phrase>Screenshot showing the visual appearance of sensitive and
+          insensitive check box controls</phrase>
         </textobject>
       </mediaobject>
     </figure>
@@ -108,7 +109,7 @@
 
       <para>Your application needs to decide every time these controls are
       displayed whether or not they are available for editing, depending on
-      the writable state of the GConf key that holds its value. In the
+      the writeable state of the GConf key that holds its value. In the
       simplest case, your code for each control could look like that in the
       example below.</para>
 
@@ -135,8 +136,8 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata depth="283" fileref="images/controls-locked.png"
-            format="PNG" width="473" />
+            <imagedata depth="216" fileref="images/controls-locked.png"
+            format="PNG" width="475" />
           </imageobject>
 
           <imageobject>
@@ -144,7 +145,9 @@
           </imageobject>
 
           <textobject>
-            <phrase>Screenshot showing disabled proxy controls in a web browser&apos;s property dialog, under the caption &quot;Only the system administrator can change these settings&quot;</phrase>
+            <phrase>Screenshot showing disabled proxy controls in a web
+            browser&apos;s property dialog, under the caption &quot;Only the
+            system administrator can change these settings&quot;</phrase>
           </textobject>
         </mediaobject>
       </figure>
@@ -175,8 +178,8 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/controls-text.png"
-          format="PNG" />
+          <imagedata depth="153" fileref="images/controls-text.png"
+          format="PNG" width="545" />
         </imageobject>
 
         <imageobject>
@@ -184,7 +187,8 @@
         </imageobject>
 
         <textobject>
-          <phrase>Screenshot of part of a dialog, containing both single and multi-line entry fields</phrase>
+          <phrase>Screenshot of part of a dialog, containing both single and
+          multi-line entry fields</phrase>
         </textobject>
       </mediaobject>
     </figure>
@@ -215,7 +219,7 @@
         place the text cursor at the end of the existing text and highlight
         its contents (but don&apos;t overwrite the existing PRIMARY clipboard
         selection<!-- FIXME: is this currently possible?-->). This makes it
-        easy to immediately overwrite or append new text, the two most common
+        easy to immediately overtype or append new text, the two most common
         operations performed on entry fields.</para>
       </listitem>
 
@@ -231,8 +235,8 @@
 
       <listitem>
         <para>In an instant-apply <link linkend="windows-utility">property or
-        preference window</link>, validate and apply the contents of the entry field
-        when it loses focus or when the window is closed, but not after each keypress. 
+        preference window</link>, validate the contents of the entry field
+        when it loses focus or when the window is closed, not after each keypress. 
 	Exception: if the field accepts only a fixed
         number of characters, such as a hexadecimal color code, validate and
         apply the change as soon as that number of characters have been entered.</para>
@@ -248,8 +252,8 @@
 
           <mediaobject>
             <imageobject>
-              <imagedata fileref="images/controls-text-prompt.png"
-              format="PNG" />
+              <imagedata depth="31" fileref="images/controls-text-prompt.png"
+              format="PNG" width="130" />
             </imageobject>
 
             <imageobject>
@@ -258,7 +262,9 @@
             </imageobject>
 
             <textobject>
-              <phrase>A text entry field in which the user must input a time, with the label &quot;hh:mm&quot; beside it to indicate the required format</phrase>
+              <phrase>A text entry field in which the user must input a time,
+              with the label &quot;hh:mm&quot; beside it to indicate the
+              required format</phrase>
             </textobject>
           </mediaobject>
         </figure>
@@ -272,7 +278,7 @@
         provide a <link linkend="controls-spin-boxes">spinbox</link> or <link
         linkend="controls-sliders">slider</link> if the required input is one
         of a fixed range of integers, or provide access to a <ulink
-        url="http://developer.gnome.org/doc/API/2.0/gtk/GtkCalendar.html";>GtkCalendar</ulink>
+        url="http://developer.gnome.org/doc/API/2.0/gtk/gtkcalendar.html";>GtkCalendar</ulink>
         control if the user has to enter a valid date:</para>
 
         <figure>
@@ -281,8 +287,8 @@
 
           <mediaobject>
             <imageobject>
-              <imagedata fileref="images/controls-text-choose.png"
-              format="PNG" />
+              <imagedata depth="41" fileref="images/controls-text-choose.png"
+              format="PNG" width="298" />
             </imageobject>
 
             <imageobject>
@@ -291,7 +297,9 @@
             </imageobject>
 
             <textobject>
-              <phrase>A text entry field in which the user must input a date, with a button labeled &quot;Choose&quot; beside it that opens a GtkCalendar control to simplify the task</phrase>
+              <phrase>A text entry field in which the user must input a date,
+              with a button labelled &quot;Choose&quot; beside it that opens a
+              GtkCalendar control to simplify the task</phrase>
             </textobject>
           </mediaobject>
         </figure>
@@ -400,8 +408,8 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/controls-spin-box.png"
-          format="PNG" />
+          <imagedata depth="32" fileref="images/controls-spin-box.png"
+          format="PNG" width="204" />
         </imageobject>
 
         <imageobject>
@@ -409,7 +417,8 @@
         </imageobject>
 
         <textobject>
-          <phrase>A simple spin box used to specify the spacing between applets on a panel</phrase>
+          <phrase>A simple spin box used to specify the spacing between
+          applets on a panel</phrase>
         </textobject>
       </mediaobject>
     </figure>
@@ -448,14 +457,6 @@
         column of controls. In this case, ensure the right edges of the
         relevant controls are also aligned.</para>
       </listitem>
-      <listitem>
-        <para>In an instant-apply <link linkend="windows-utility">property or
-        preference window</link>, validate and apply the contents of a spin box
-        when a spin button is clicked, when it loses focus or when the window is closed, but not after each keypress. 
-	Exception: if the field accepts only a fixed
-        number of characters, such as a hexadecimal color code, validate and
-        apply the change as soon as that number of characters have been entered.</para>
-      </listitem>
     </itemizedlist>
   </sect1>
 
@@ -474,8 +475,8 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/controls-slider.png"
-          format="PNG" />
+          <imagedata depth="27" fileref="images/controls-slider.png"
+          format="PNG" width="208" />
         </imageobject>
 
         <imageobject>
@@ -483,7 +484,8 @@
         </imageobject>
 
         <textobject>
-          <phrase>A slider control used to change the stereo audio balance between left and right speakers</phrase>
+          <phrase>A slider control used to change the stereo audio balance
+          between left and right speakers</phrase>
         </textobject>
       </mediaobject>
     </figure>
@@ -537,9 +539,9 @@
 
           <mediaobject>
             <imageobject>
-              <imagedata
+              <imagedata depth="85"
               fileref="images/controls-slider-spinbox.png" format="PNG"
-               />
+              width="356" />
             </imageobject>
 
             <imageobject>
@@ -548,7 +550,8 @@
             </imageobject>
 
             <textobject>
-              <phrase>Three slider controls used to change RGB values, each with a spinbox beside them to facilitate direct numeric entry</phrase>
+              <phrase>Three slider controls used to change RGB values, each
+              with a spinbox beside them to facilitate direct numeric entry</phrase>
             </textobject>
           </mediaobject>
         </figure>
@@ -566,8 +569,8 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/controls-buttons.png"
-          format="PNG" />
+          <imagedata depth="47" fileref="images/controls-buttons.png"
+          format="PNG" width="190" />
         </imageobject>
 
         <imageobject>
@@ -616,7 +619,7 @@
         <para>Once a dialog is displayed, do not change its default button
         from one button to another. You may add or remove default status from
         the same button if it helps prevent user error, however. Changing the
-        default from one button to another can be confusing and inefficient,
+        default from one button to another can be confusing and inefficent,
         especially for users relying on assistive technologies.</para>
       </listitem>
 
@@ -667,18 +670,17 @@
   <sect1 id="controls-check-boxes">
     <title>Check Boxes</title>
 
-    <para>
-        A check box is a control used to turn something on and off.
-        Its state is shown by the presence or absence of a checkmark in the
-    labeled box.</para>
+    <para>Check boxes are used to show or change a setting. Its two states,
+    set and unset, are shown by the presence or absence of a checkmark in the
+    labelled box.</para>
 
     <figure>
       <title>A typical group of check boxes</title>
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/controls-check-boxes.png"
-          format="PNG" />
+          <imagedata depth="140" fileref="images/controls-check-boxes.png"
+          format="PNG" width="143" />
         </imageobject>
 
         <imageobject>
@@ -723,23 +725,6 @@
       </listitem>
 
       <listitem>
-        <para>
-            A check box should express a positive and useful state or action.
-            For example, a checked check box
-            <guilabel>Warn me whenever a disk is nearly full</guilabel>
-            is more obviously useful than an unchecked check box
-            <guilabel>Ignore disk-full warnings</guilabel>.
-            Don&#8217;t implement a check box with a label beginning with
-            <guilabel>Don&#8217;t</guilabel>, <guilabel>Do not</guilabel>,
-            <guilabel>Hide</guilabel>, or similar;
-            instead, reverse its function so that the label can be positive.
-            And avoid beginning check box labels with words like
-            <guilabel>Enable</guilabel> or <guilabel>Use</guilabel>;
-            instead, reword them to express their usefulness.
-        </para>
-      </listitem>
-      
-      <listitem>
         <para>Label check boxes to clearly indicate the effects of both their
         checked and unchecked states, for example, <guilabel>Show icons in
         menus</guilabel>. Where this proves difficult, consider using two
@@ -751,9 +736,9 @@
 
           <mediaobject>
             <imageobject>
-              <imagedata depth="92"
+              <imagedata depth="70"
               fileref="images/controls-check-box-ambiguous.png" format="PNG"
-              width="222" />
+              width="279" />
             </imageobject>
 
             <imageobject>
@@ -762,7 +747,11 @@
             </imageobject>
 
             <textobject>
-              <phrase>Two images: one showing a single check box ambiguously labeled &quot;Progress bar in left of statusbar&quot;, the other making the choice explicit with radio buttons labeled &quot;Left&quot; and &quot;Right&quot; under the heading &quot;Status bar progress indicator position:&quot;</phrase>
+              <phrase>Two images: one showing a single check box ambiguously
+              labelled &quot;Progress bar in left of statusbar&quot;, the other
+              making the choice explicit with radio buttons labelled
+              &quot;Left&quot; and &quot;Right&quot; under the heading &quot;Status
+              bar progress indicator position:&quot;</phrase>
             </textobject>
           </mediaobject>
         </figure>
@@ -791,9 +780,9 @@
 
           <mediaobject>
             <imageobject>
-              <imagedata depth="98"
+              <imagedata depth="170"
               fileref="images/controls-check-boxes-mixed.png" format="PNG"
-              width="300" />
+              width="223" />
             </imageobject>
 
             <imageobject>
@@ -802,17 +791,20 @@
             </imageobject>
 
             <textobject>
-              <phrase>Check boxes showing the Hidden, Readable and Writable states of two selected files in Nautilus. Both files are hidden, neither are writable, but one is readable. The Readable check box is therefore shown in its mixed state.</phrase>
+              <phrase>Check boxes showing the Hidden, Readable and Writeable
+              states of two selected files in Nautilus. Both files are hidden,
+              neither are writeable, but one is readable. The Readable check
+              box is therefore shown in its mixed state.</phrase>
             </textobject>
           </mediaobject>
         </figure>
 
         <para>In this example, both selected files are hidden (since their
         filenames start with &quot;.&quot;), and the emblems on their icons show
-        that neither file is writable, but one is readable. The
+        that neither file is writeable, but one is readable. The
         <guilabel>Readable</guilabel> check box is therefore shown in its
         mixed state. <remark>At time of writing, the exact visual appearance
-        of a mixed state check box in gtk was undecided.</remark></para>
+        of a mixed state check box in gtk was undecided</remark>.</para>
 
         <para>When a check box is in its mixed state:</para>
 
@@ -877,8 +869,8 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/controls-radio-buttons.png"
-          format="PNG" />
+          <imagedata depth="105" fileref="images/controls-radio-buttons.png"
+          format="PNG" width="352" />
         </imageobject>
 
         <imageobject>
@@ -948,9 +940,9 @@
 
           <mediaobject>
             <imageobject>
-              <imagedata depth="108"
+              <imagedata depth="105"
               fileref="images/controls-radio-button-mixed.png" format="PNG"
-              width="327" />
+              width="314" />
             </imageobject>
 
             <imageobject>
@@ -959,7 +951,11 @@
             </imageobject>
 
             <textobject>
-              <phrase>Radio buttons showing the Thick, Thin and Dashed drawing styles of two selected shapes in a drawing application. One shape is drawn in the thick style, the other in the dashed style. The Thick and Dashed radio buttons are therefore shown in their mixed state, and the Thin radio button is unset.</phrase>
+              <phrase>Radio buttons showing the Thick, Thin and Dashed drawing
+              styles of two selected shapes in a drawing application. One
+              shape is drawn in the thick style, the other in the dashed
+              style. The Thick and Dashed radio buttons are therefore shown in
+              their mixed state, and the Thin radio button is unset.</phrase>
             </textobject>
           </mediaobject>
         </figure>
@@ -967,14 +963,14 @@
         <!-- CB-Fig: Show context for drawing application.  -->
 
         <para><remark>At time of writing, the exact visual appearance of a
-        mixed state radio button in gtk was undecided.</remark>In this
+        mixed state radio button in gtk was undecided</remark>. In this
         situation, clicking any radio button in the group should set the
         clicked button, and unset all the others. Thereafter, the group should
         behave like a normal radio button groupâ there is no way to reset a
         radio button to its mixed state by clicking on it. Provide a
         <guibutton>Reset</guibutton> button or equivalent in the window that
         allows the previous mixed settings to be restored without closing the
-        window or canceling the dialog.</para>
+        window or cancelling the dialog.</para>
       </listitem>
 
       <listitem>
@@ -1019,8 +1015,8 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/controls-toggle-buttons.png"
-          format="PNG" />
+          <imagedata depth="46" fileref="images/controls-toggle-buttons.png"
+          format="PNG" width="137" />
         </imageobject>
 
         <imageobject>
@@ -1028,7 +1024,8 @@
         </imageobject>
 
         <textobject>
-          <phrase>A group of four toggle buttons representing a choice of measurement units: inches, centimeters, feet and meters</phrase>
+          <phrase>A group of four toggle buttons representing a choice of
+          measurement units: inches, centimeters, feet and meters</phrase>
         </textobject>
       </mediaobject>
     </figure>
@@ -1122,7 +1119,11 @@
             </imageobject>
 
             <textobject>
-              <phrase>Toggle buttons showing the Thick, Thin and Dashed drawing styles of two selected shapes in a drawing application. One shape is drawn in the thick style, the other in the dashed style. The Thick and Dashed toggle buttons are therefore shown in their mixed state, and the Thin toggle button is unset.</phrase>
+              <phrase>Toggle buttons showing the Thick, Thin and Dashed
+              drawing styles of two selected shapes in a drawing application.
+              One shape is drawn in the thick style, the other in the dashed
+              style. The Thick and Dashed toggle buttons are therefore shown
+              in their mixed state, and the Thin toggle button is unset.</phrase>
             </textobject>
           </mediaobject>
         </figure>
@@ -1141,8 +1142,7 @@
   <sect1 id="controls-option-menus">
     <title>Drop-down Lists</title>
 
-    <para>Drop-down lists (unfortunately called "combo boxes" in gtk+) are used 
-    to select from a mutually exclusive set of
+    <para>Drop-down lists are used to select from a mutually exclusive set of
     options. They can be useful when there is insufficient space in a window
     to use a group of radio buttons or a single-selection list, with which
     they are functionally equivalent.</para>
@@ -1153,8 +1153,8 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/controls-option-menu.png"
-          format="PNG" />
+          <imagedata depth="178" fileref="images/controls-option-menu.png"
+          format="PNG" width="377" />
         </imageobject>
 
         <imageobject>
@@ -1162,7 +1162,9 @@
         </imageobject>
 
         <textobject>
-          <phrase>Two images, one of a drop-down list displaying its current setting, and the other showing its popup menu of available choices when clicked on</phrase>
+          <phrase>Two images, one of a drop-down list displaying its current
+          setting, and the other showing its popup menu of available choices
+          when clicked on</phrase>
         </textobject>
       </mediaobject>
     </figure>
@@ -1203,7 +1205,21 @@
       <listitem>
         <para>Use <link linkend="layout-capitalization">sentence
         capitalization</link> for drop-down list items, for example
-	<guimenuitem>Switched movement</guimenuitem></para>
+        <guilabel>Switched movement</guilabel></para>
+      </listitem>
+
+      <!-- CB-Ed: Change guilabel to something less literal-seeming: Menu item. -->
+
+      <listitem>
+        <para>Assign an access key to every drop-down list item. Ensure each
+        access key is unique within the enclosing window or dialog, not just
+        within the menu.</para>
+      </listitem>
+
+      <listitem>
+        <para>Do not assign shortcut keys to drop-down list items by default. The
+        user may assign their own shortcut keys in the usual way if they wish,
+        however.</para>
       </listitem>
 
       <listitem>
@@ -1238,7 +1254,7 @@
       <listitem>
         <para>the contents of the hidden part of the menu are obvious from its
         label and the one selected item. For example, if you have an option
-        menu labeled &quot;Month:&quot; with the item &quot;January&quot;
+        menu labelled &quot;Month:&quot; with the item &quot;January&quot;
         selected, the user might reasonably infer that the menu contains the
         12 months of the year without having to look.</para>
       </listitem>
@@ -1255,8 +1271,8 @@
 
     <!-- How odd, the whole point of a combo box is that it's a combination of a text field and a list... as such, therefore there is no such thing as an 'uneditable combo box' :o)  -->
 
-    <para>Drop-down combination boxes (called "combo box entries" in gtk+) combine a text entry field and a dropdown list of
-    predefined values. Selecting one of the predefined values sets the entry
+    <para>Drop-down combination boxes combine a text entry field and a dropdown list of
+    pre-defined values. Selecting one of the pre-defined values sets the entry
     field to that value.</para>
 
     <figure>
@@ -1264,8 +1280,8 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/controls-combo.png"
-          format="PNG" />
+          <imagedata depth="200" fileref="images/controls-combo.png"
+          format="PNG" width="304" />
         </imageobject>
 
         <imageobject>
@@ -1273,7 +1289,9 @@
         </imageobject>
 
         <textobject>
-          <phrase>Two images, one of a drop-down combination box entry field displaying its current selection, and the other showing its dropdown list of available choices when clicked on</phrase>
+          <phrase>Two images, one of a drop-down combination box entry field displaying its
+          current selection, and the other showing its dropdown list of
+          available choices when clicked on</phrase>
         </textobject>
       </mediaobject>
     </figure>
@@ -1286,7 +1304,7 @@
       <listitem>
         <para>Only use a drop-down combination box instead of a list, drop-down list or radio
         button group when it is important that the user be able to enter a new
-        value that is not already amongst the list of predefined choices.</para>
+        value that is not already amongst the list of pre-defined choices.</para>
       </listitem>
 
       <listitem>
@@ -1334,38 +1352,53 @@
   <sect1 id="controls-scrollbars">
     <title>Scrollbars</title>
 
-    <para>Often the visual representation of an object, such as a document 
-    or a list, will not fit within
-    the space allocated to its viewer control. In these cases, scrollbars can be attached
-    to the viewer control.  These allow the user to alter the horizontal or vertical
-    position of the viewport onto the object, and thus
-    the portion of the object that is visible.
-    </para>
+    <para>Often an object (such as a document or a list) will not be fit within
+    the confines of its viewer control. In these cases a scrollbar can be affixed
+    to the viewer control. The scrollbar alters which part of the object is
+    currently visible inside the viewer control: it slides the view across the object
+    in one axis (horizontal or vertical).</para>
 
     <itemizedlist>
       <title>Guidelines</title>
 
       <listitem>
-        <para>Only display scrollbars when they are required. If
-        an object fits entirely inside the viewer control, don&apos;t draw scrollbars. If you are
-        using a GtkScrolledWindow, use <function>gtk_scrolled_window_set_policy</function>
-        to set the scrollbar display policy to GTK_POLICY_AUTOMATIC.</para>
+        <para>Only display scrollbars when they are required for sliding the view. If
+        an object fits inside the viewer control, don&apos;t draw scrollbars. If you are
+        using a GtkScrolledWindow, call <function>gtk_scrolled_window_set_policy</function>
+        setting the appropriate axis (or axes) to GTK_POLICY_AUTOMATIC.</para>
+      </listitem>
+
+      <listitem>
+        <para>Do <emphasis>not</emphasis> use scrollbars as a replacement for a 
+        <link linkend="controls-sliders">slider</link>. Scrollbars should only be
+        used affixed to a view that they actively alter, not used as a generic
+        continuous input control.</para>
       </listitem>
 
       <listitem>
-	      <para>Affix scrollbars to the right or bottom edges only of a viewer control.  Make the scrollbar the full height or width of the control.
-        </para>
+        <para>Affix scrollbars to the right side of a viewer control (to slide the view
+        vertically), or to the bottom side (to slide the view horizontally). Do <emphasis>not</emphasis>
+        affix scrollbars on the top or left sides of a viewer control.</para>
       </listitem>
 
       <listitem>
-	      <para>Update the view in real time as the user drags a scrollbar. 
-        Any delay will
-        negatively impact a user's ability to navigate the content.
-	</para></listitem>
+        <para>Scrollbars should be aligned in both directions with the view they are
+        affixed to on the axis they control. In other words, horizontal scrollbars
+        should span the full length of the viewer control, and vertical scrollbars
+        should span the full height of the viewer control.</para>
+      </listitem>
+
       <listitem>
-        <para>Don't use a scrollbar as a replacement for a 
-        <link linkend="controls-sliders">slider</link>.
-        </para>
+        <para>If both horizontal and vertical scrollbars are acting upon a view,
+        alignment will require that small rectangle in the lower right corner where
+        the horizontal and vertical scrollbars meet will be blank. This is OK.</para>
+      </listitem>
+       
+      <listitem>
+        <para>Scrollbars should affect the view to which they are affixed in realtime:
+        as the user drags or clicks the view should change. Time lag will be
+        disconcerting and negatively impact a users ability to navigate content inside
+        the view.</para>
       </listitem>
     </itemizedlist>
   </sect1>
@@ -1388,8 +1421,8 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/controls-list.png"
-          format="PNG" />
+          <imagedata depth="149" fileref="images/controls-list.png"
+          format="PNG" width="179" />
         </imageobject>
 
         <imageobject>
@@ -1397,7 +1430,8 @@
         </imageobject>
 
         <textobject>
-          <phrase>Picture of list control containing two unsorted columns of text</phrase>
+          <phrase>Picture of list control containing two unsorted columns of
+          text</phrase>
         </textobject>
       </mediaobject>
     </figure>
@@ -1463,11 +1497,6 @@
       </listitem>
 
       <listitem>
-	      <para>Right align columns that contain only numbers, as this
-		      makes them easier to compare.</para>
-      </listitem> 
-
-      <listitem>
         <para>Consider using a check box list for multiple-selection lists, as
         these make it more obvious that multiple selection is possible:</para>
 
@@ -1476,9 +1505,9 @@
 
           <mediaobject>
             <imageobject>
-              <imagedata 
+              <imagedata depth="133"
               fileref="images/controls-list-checkbox.png" format="PNG"
-              />
+              width="160" />
             </imageobject>
 
             <imageobject>
@@ -1487,7 +1516,10 @@
             </imageobject>
 
             <textobject>
-              <phrase>Picture of list control with two columns. The first column consists of check boxes showing whether or not the corresponding item in the second column is selected for further action.</phrase>
+              <phrase>Picture of list control with two columns. The first
+              column consists of check boxes showing whether or not the
+              corresponding item in the second column is selected for further
+              action.</phrase>
             </textobject>
           </mediaobject>
         </figure>
@@ -1522,8 +1554,8 @@
 	      <listitem><para>
 		Indicate which column is currently sorted by showing an
 		upward or downward facing arrow in its header:</para>
-	  <informaltable frame="none">
-            <tgroup colsep="0" rowsep="0" align="left" cols="2">
+	  <informaltable frame="all">
+            <tgroup align="left" cols="2">
                 <thead>
 	              <row>
 		      <entry>Sort Order</entry>
@@ -1581,7 +1613,7 @@
     <title>Trees</title>
 
     <para>A tree control allows the user to inspect, manipulate or select from
-    a hierarchical list of items. Trees may have one or more columns, and
+    a hierarchichal list of items. Trees may have one or more columns, and
     contain text, graphics, simple controls, or a combination of all three.</para>
 
     <tip>
@@ -1602,8 +1634,8 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/controls-tree.png"
-          format="PNG" />
+          <imagedata depth="277" fileref="images/controls-tree.png"
+          format="PNG" width="343" />
         </imageobject>
 
         <imageobject>
@@ -1611,7 +1643,8 @@
         </imageobject>
 
         <textobject>
-          <phrase>Picture of tree control showing months of the year as top level nodes, and public holidays in those months as their children</phrase>
+          <phrase>Picture of tree control showing months of the year as top
+          level nodes, and public holidays in those months as their children</phrase>
         </textobject>
       </mediaobject>
     </figure>
@@ -1654,11 +1687,6 @@
         technologies can describe the use of the column to visually impaired
         users.</para>
       </listitem>
-      
-      <listitem>
-	      <para>Right align columns that contain only numbers, as this
-		      makes them easier to compare.</para>
-      </listitem> 
 
       <listitem>
         <para>Consider using a check box tree for multiple-selection trees, as
@@ -1669,9 +1697,9 @@
 
           <mediaobject>
             <imageobject>
-              <imagedata 
+              <imagedata depth="297"
               fileref="images/controls-tree-checkbox.png" format="PNG"
-              />
+              width="349" />
             </imageobject>
 
             <imageobject>
@@ -1680,7 +1708,10 @@
             </imageobject>
 
             <textobject>
-              <phrase>Picture of tree control with two columns. The first column consists of check boxes showing whether or not the corresponding item in the second column is selected for further action.</phrase>
+              <phrase>Picture of tree control with two columns. The first
+              column consists of check boxes showing whether or not the
+              corresponding item in the second column is selected for further
+              action.</phrase>
             </textobject>
           </mediaobject>
         </figure>
@@ -1718,16 +1749,16 @@
 
     <para>A tabbed notebook control is a convenient way of presenting related
     information in the same window, without having to display it all at the
-    same time. It is analogous to the divider tabs in a ring binder or a file
+    same time. It is analagous to the divider tabs in a ring binder or a file
     cabinet.</para>
 
     <figure>
-      <title>A typical notebook control with four tabs</title>
+      <title>A typical notebook control with three tabs</title>
 
       <mediaobject>
         <imageobject>
-          <imagedata depth="247" fileref="images/controls-notebook.png"
-          format="PNG" width="379" />
+          <imagedata depth="270" fileref="images/controls-notebook.png"
+          format="PNG" width="341" />
         </imageobject>
 
         <imageobject>
@@ -1735,7 +1766,7 @@
         </imageobject>
 
         <textobject>
-          <phrase>Picture of notebook control with four tabs</phrase>
+          <phrase>Picture of notebook control with three tabs</phrase>
         </textobject>
       </mediaobject>
     </figure>
@@ -1793,9 +1824,9 @@
 
           <mediaobject>
             <imageobject>
-              <imagedata depth="77"
+              <imagedata depth="92"
               fileref="images/controls-notebook-tabs.png" format="PNG"
-              width="420" />
+              width="475" />
             </imageobject>
 
             <imageobject>
@@ -1804,7 +1835,10 @@
             </imageobject>
 
             <textobject>
-              <phrase>Side-by-side comparison of one notebook whose tabs are all the same width, and one whose tabs are only wide enough to accommodate the tab labels. The latter takes up around 33% less screen space.</phrase>
+              <phrase>Side-by-side comparison of one notebook whose tabs are
+              all the same width, and one whose tabs are only wide enough to
+              accommodate the tab labels. The latter takes up around 33% less
+              screen space.</phrase>
             </textobject>
           </mediaobject>
         </figure>
@@ -1832,12 +1866,13 @@
     example:</para>
 
     <figure id="controls-too-many-tabs">
-      <title>Use of list control where there would be too many tabs to fit comfortably in a notebook</title>
+      <title>Use of list control where there would be too many tabs to fit
+      comfortably in a notebook</title>
 
       <mediaobject>
         <imageobject>
-          <imagedata depth="191" fileref="images/controls-notebook-list.png"
-          format="PNG" width="390" />
+          <imagedata depth="200" fileref="images/controls-notebook-list.png"
+          format="PNG" width="370" />
         </imageobject>
 
         <imageobject>
@@ -1845,7 +1880,11 @@
         </imageobject>
 
         <textobject>
-          <phrase>Part of a window including a list control with 7 items, each item representing a category of settings such as &quot;Appearance&quot; and &quot;Navigation&quot;. The controls in the rest of the window change depending on which item is selected in the list.</phrase>
+          <phrase>Part of a window including a list control with 7 items, each
+          item representing a category of settings such as
+          &quot;Appearance&quot; and &quot;Navigation&quot;. The controls in the
+          rest of the window change depending on which item is selected in the
+          list.</phrase>
         </textobject>
       </mediaobject>
     </figure>
@@ -1857,7 +1896,7 @@
 	<sect2 id="controls-tab-status">
 	  <title>Status Indicators</title>
 	  <remark>This section needs more concrete recommendations, it's currently (almost) taken verbatim from Sebastian's patch in bug #72101.</remark>
-	  <para>In some tabbed windows, such as preference windows, it might be desirable to indicate the status of a particular tab. This can be used to notify the user that a web page that is still loading or has been loaded, a new message is waiting in a particular instant messaging conversation, or that a document has not been saved. Such a status indicator should be an icon that is placed directly to the left of the tab label. Additionally, the tab label's color might be changed to indicate a certain status. Do not simply rely on a different coloring scheme for status indication.</para>
+	  <para>In some tabbed windows, such as preference windows, it might be desirable to indicate the status of a particular tab. This can be used to notify the user that a web page that is still loading or has been loaded, a new message is waiting in a particular instant messasing conversation, or that a document has not been saved. Such a status indicator should be an icon that is placed directly to the left of the tab label. Additionally, the tab label's color might be changed to indicate a certain status. Do not simply rely on a different coloring scheme for status indication.</para>
 	</sect2>
   </sect1>
 
@@ -1906,11 +1945,11 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/progress-time.png" format="PNG" />
+            <imagedata width="386" fileref="images/controls-progress-time.png" format="PNG" depth="38"/>
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/progress-time.eps" format="EPS" />
+            <imagedata fileref="images/controls-progress-time.eps" format="EPS" />
           </imageobject>
 
           <textobject>
@@ -1941,11 +1980,11 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/progress-typical-time.png" format="PNG" />
+            <imagedata depth="32" fileref="images/controls-progress-typical.png" format="PNG" width="385" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/progress-proportion.eps" format="EPS" />
+            <imagedata fileref="images/controls-progress-typical.eps" format="EPS" />
           </imageobject>
 
           <textobject>
@@ -1981,17 +2020,19 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata depth="141" fileref="images/progress-indeterminate.png"
-            format="PNG" width="236" />
+            <imagedata depth="210" fileref="images/controls-progress-indeterminate.png"
+            format="PNG" width="409" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/progress-indeterminate.eps"
+            <imagedata fileref="images/controls-progress-indeterminate.eps"
             format="EPS" />
           </imageobject>
 
           <textobject>
-            <phrase>A simple &apos;indeterminate time&apos; progress dialog, showing a slider moving back and forth until the operation is complete</phrase>
+            <phrase>A simple &apos;indeterminate time&apos; progress dialog,
+            showing a slider moving back and forth until the operation is
+            complete</phrase>
           </textobject>
         </mediaobject>
       </figure>
@@ -2014,8 +2055,8 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata depth="103" fileref="images/controls-status-bar.png"
-          format="PNG" width="297" />
+          <imagedata depth="53" fileref="images/controls-status-bar.png"
+          format="PNG" width="244" />
         </imageobject>
 
         <imageobject>
@@ -2023,7 +2064,9 @@
         </imageobject>
 
         <textobject>
-          <phrase>A statusbar at the bottom of a document window, showing current zoom level and a status message indicating that the document has been modified since it was last saved</phrase>
+          <phrase>A statusbar at the bottom of a document window, showing
+          current zoom level and a status message indicating that the document
+          has been modified since it was last saved</phrase>
         </textobject>
       </mediaobject>
     </figure>
@@ -2092,7 +2135,7 @@
         use the following conventions:</para>
 
         <itemizedlist>
-          <!--<listitem><para>Raised or button-like appearance for areas that respond to a click</para></listitem>-->
+          <!--<listitem><para>Raised or button-like appearance for areas that respond to a single click</para></listitem>-->
 
           <listitem>
             <para>Inlaid appearance for areas that respond to a double click</para>
@@ -2117,9 +2160,9 @@
 
           <mediaobject>
             <imageobject>
-              <imagedata depth="80"
+              <imagedata depth="58"
               fileref="images/controls-status-bar-interactive.png"
-              format="PNG" width="459" />
+              format="PNG" width="461" />
             </imageobject>
 
             <imageobject>
@@ -2128,7 +2171,9 @@
             </imageobject>
 
             <textobject>
-              <phrase>A statusbar with a text panel that responds to a double click, a button that responds to a click, and a non-interactive progress area</phrase>
+              <phrase>A statusbar with a text panel that responds to a double
+              click, a button that responds to a single click, and a
+              non-interactive progress area</phrase>
             </textobject>
           </mediaobject>
         </figure>
@@ -2140,7 +2185,7 @@
 
       <listitem>
         <para>Provide a drag handle in the bottom right corner of the status
-        bar of resizable windows. Subclasses of GtkStatusbar should use the
+        bar of resizeable windows. Subclasses of GtkStatusbar should use the
         drag handle provided by that class. A reimplementation of a status
         bar, which is discouraged, should also reimplement the GtkStatusbar
         drag handle in both appearance and function.</para>
@@ -2152,13 +2197,13 @@
     <title>Frames and Separators</title>
 
     <para>A frame is a box with a title that you can draw around controls to
-    organize them into functional groups. A separator is a single horizontal
+    organise them into functional groups. A separator is a single horizontal
     or vertical line that you can use to divide windows into functional
     groups.</para>
 
     <para>Frames with a border around their perimeter have traditionally been
     used for denoting groups of related controls. This is advantageous because
-    it physically separates dissimilar controls, and also avoids repetition of
+    it physically seperates disimilar controls, and also avoids repitition of
     the frame&apos;s label in individual member control labels. Unfortunately,
     they add visual noise that can both make a window appear more complex than
     it really is, and reduce the ability to quickly scan window elements.</para>
@@ -2173,8 +2218,8 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata depth="321" fileref="images/controls-frames.png"
-          format="PNG" width="297" />
+          <imagedata depth="256" fileref="images/controls-frames.png"
+          format="PNG" width="288" />
         </imageobject>
 
         <imageobject>
@@ -2192,7 +2237,7 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/controls-old-frames.png" format="PNG" />
+          <imagedata depth="275" fileref="images/controls-old-frames.png" format="PNG" width="296"/>
         </imageobject>
 
         <imageobject>
@@ -2215,7 +2260,7 @@
         window, consider carefully if you really need it. It is usually better
         to do without, if the groups can be separated by space alone. Do not
         use frames and separators to compensate for poor control layout or
-        alignment.</para>
+        alignnment.</para>
       </listitem>
 
       <listitem>
@@ -2233,9 +2278,4 @@
 
     </itemizedlist>
   </sect1>
-
-  <sect1 id="controls-disclosure">
-	  <title>Disclosure Triangles</title>
-	  <para>TODO: Write some stuff about disclosure widgets.</para>
-  </sect1>
 </chapter>

Modified: trunk/content/projects/gup/hig/hig-ch-credits.xml
==============================================================================
--- trunk/content/projects/gup/hig/hig-ch-credits.xml	(original)
+++ trunk/content/projects/gup/hig/hig-ch-credits.xml	Mon Sep 29 23:05:52 2008
@@ -8,12 +8,23 @@
       <para>
 	<itemizedlist>
 	  <listitem><para>Calum Benson, <email>calum benson sun com</email></para></listitem>
-          <listitem><para>Bryan Clark, <email>bclark redhat com</email></para></listitem>
-	  <listitem><para>Seth Nickell, <email>snickell redhat com</email></para></listitem>
+          <listitem><para>Bryan Clark, <email>clarkbw gnome org</email></para></listitem>
+	  <listitem><para>Seth Nickell, <email>seth gnome org</email></para></listitem>
 	</itemizedlist>
       </para>
     </sect1>
 
+    <sect1 id="credits-figures">
+	<title>Additional Illustrations</title>
+	<para>
+	  <itemizedlist>
+	  	<listitem><para>Mihai Anca,</para><email>ropiku gmail com</email></listitem>
+		<listitem><para>Denis Anisimov,</para><email>genius s146 net ru</email></listitem>
+		<listitem><para>Wouter Bron,</para><email>wousser gmail com</email></listitem>
+	  </itemizedlist>
+	</para>
+    </sect1>
+
     <sect1 id="credits-inactive-authors">
       <title>Retired/Inactive Authors</title>
       <para>

Modified: trunk/content/projects/gup/hig/hig-ch-desktop.xml
==============================================================================
--- trunk/content/projects/gup/hig/hig-ch-desktop.xml	(original)
+++ trunk/content/projects/gup/hig/hig-ch-desktop.xml	Mon Sep 29 23:05:52 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- :xml.root=hig-book.xml: -->
 
 <chapter id="desktop-integration">
   <title>Desktop Integration</title>
@@ -11,14 +10,13 @@
     </orderedlist>
 	Do not add launchers or other icons to the desktop when your application is installed.  The desktop is the user&apos;s space, and is reserved for icons that they explicitly request or add themselves.
   </para>
-  
   <sect1 id="desktop-application-menu">
     <title>Placing Entries in the Applications Menu</title>
     
 	<figure><title>The Applications menu</title>
 	  <mediaobject>
-	    <imageobject><imagedata fileref="images/applications-menu.png" format="PNG"/></imageobject>
-	    <imageobject><imagedata fileref="images/applications-menu.eps" format="EPS"/></imageobject>
+	    <imageobject><imagedata fileref="images/desktop-applications-menu.png" format="PNG" width="160" depth="365"/></imageobject>
+	    <imageobject><imagedata fileref="images/desktop-applications-menu.eps" format="EPS"/></imageobject>
 	    <textobject><phrase>Screenshot of the open Applications menu on the GNOME menu panel</phrase></textobject>
 	  </mediaobject>
 	</figure>
@@ -51,9 +49,9 @@
 
 	    <example>
 		<title>Including functional description in menu names</title>
-		<informaltable frame="none">
+		<informaltable frame="all">
 			
-			<tgroup colsep="0" rowsep="0" cols="2" align="left">
+			<tgroup cols="2" align="left">
 			  <thead>
 				<row>
 		      			<entry>Original menu item</entry>
@@ -77,9 +75,9 @@
 	<para>Do not include words like &quot;GNOME&quot;, &quot;X Window System&quot;, &quot;GTK+&quot; or other platform details in <guimenu>Application</guimenu> menu names. The user probably already knows what platform they are using, and if they don&apos;t, then application names are not the right place to inform them.</para>
 	<example>
 		<title>Removing non-essential information from menu names</title>
-		<informaltable frame="none">
+		<informaltable frame="all">
 			
-			<tgroup colsep="0" rowsep="0" cols="2" align="left">
+			<tgroup cols="2" align="left">
 			  <thead>
 				<row>
 		      			<entry>Original menu item</entry>
@@ -105,9 +103,9 @@
 	
 	<example>
 		<title>Removing technical jargon from menu names</title>
-		<informaltable frame="none">
+		<informaltable frame="all">
 			
-			<tgroup colsep="0" rowsep="0" cols="2" align="left">
+			<tgroup cols="2" align="left">
 			  <thead>
 				<row>
 		      			<entry>Original menu item</entry>
@@ -144,9 +142,9 @@
 	    <para>If your application&apos;s proper name is already descriptive of its functionality, and not just suggestive, use the format: <replaceable>Application Name</replaceable></para>
 	<example>
 		<title>Using application&apos;s name as menu name</title>
-		<informaltable frame="none">
+		<informaltable frame="all">
 			
-			<tgroup colsep="0" rowsep="0" cols="2" align="left">
+			<tgroup cols="2" align="left">
 			  <thead>
 				<row>
 		      			<entry>Application name</entry>
@@ -173,9 +171,9 @@
 
 	<example>
 		<title>Using functional description in menu names</title>
-		<informaltable frame="none">
+		<informaltable frame="all">
 			
-			<tgroup colsep="0" rowsep="0" cols="2" align="left">
+			<tgroup cols="2" align="left">
 			  <thead>
 				<row>
 		      			<entry>Application name</entry>
@@ -220,10 +218,10 @@
 	    <para>A few applications, particularly games, do not have appropriate functional descriptions (but note that many games do). In this case, use <replaceable>Application Name</replaceable> as the menu name.</para>
 
 	<example>
-		<title>Using application&apos;s name as menu name where no functional description exists</title>
-		<informaltable frame="none">
+		<title>Using applicaton&apos;s name as menu name where no functional description exists</title>
+		<informaltable frame="all">
 			
-			<tgroup colsep="0" rowsep="0" cols="2" align="left">
+			<tgroup cols="2" align="left">
 			  <thead>
 				<row>
 		      			<entry>Application name</entry>
@@ -268,9 +266,9 @@
 
 	<example>
 		<title>GenericName and Name</title>
-		<informaltable frame="none">
+		<informaltable frame="all">
 			
-			<tgroup colsep="0" rowsep="0" cols="2" align="left">
+			<tgroup cols="2" align="left">
 			  <thead>
 				<row>
 		      			<entry>GenericName</entry>
@@ -316,9 +314,9 @@
 
 	<example>
 		<title>Example tooltips for GNOME applications</title>
-		<informaltable frame="none">
+		<informaltable frame="all">
 			
-			<tgroup colsep="0" rowsep="0" cols="2" align="left">
+			<tgroup cols="2" align="left">
 			  <thead>
 				<row>
 		      			<entry>Application</entry>
@@ -363,9 +361,9 @@
 
 	<example>
 		<title>Example descriptions for GConf Keys from gnome-terminal</title>
-		<informaltable frame="none">
+		<informaltable frame="all">
 			
-			<tgroup colsep="0" rowsep="0" cols="3" align="left">
+			<tgroup cols="3" align="left">
 			  <thead>
 				<row>
 					<entry>Key</entry>
@@ -395,134 +393,102 @@
     
     <para>The document type (MIME) database allows users to specify their preferred applications for opening different types of document. This is the mechanism by which Nautilus, Evolution and other applications decide which application to run when they encounter a document they cannot open themselves.</para>
 
-    <para>It is important for users to be able to double click on documents they see on the desktop, such as files and email messages, and have them launch in their favorite application.  Therefore, your GNOME application should associate itself at install-time with all the document types it can handle. Technical details on doing this can be found in the <ulink url="http://developer.gnome.org/doc/API/gnome-vfs";><citetitle>GnomeVFS API reference</citetitle></ulink>.</para>
+    <para>It is important for users to be able to double-click on documents they see on the desktop, such as files and email messages, and have them launch in their favorite application.  Therefore, your GNOME application should associate itself at install-time with all the document types it can handle. Technical details on doing this can be found in the <ulink url="http://developer.gnome.org/doc/API/gnome-vfs";><citetitle>GnomeVFS API reference</citetitle></ulink>.</para>
 
     <!-- FIXME: need to cover things like the preferred list and when an application should add itself to the preferred list -->
 
   </sect1>
 
-  <sect1 id="desktop-application-startup">
-  	<title>Application Startup</title>
-	<para><remark>Basically need to make these points in this section: If an application is going to take a few seconds to start up, chances are you want to get on with something else while it's starting.  Even if it's a well-behaved splash screen, that usually still means having to move or dismiss a window that's popped up in the way of what you were doing, which is always annoying. And of course, if the app isn't going to take a few seconds to start up, you don't need a splash screen anyway :)  Also, splash screens are usually quite colourful, which is poor for accessibility.</remark></para>
-
-	<itemizedlist><title>Guidelines</title>
-		<listitem><para>Do not show a splash screen, but instead make proper use of the GNOME startup notification library to provide startup feedback.</para></listitem>
-		<listitem><para>Show the main window of your application as early as possible, even if all its controls are disabled until the application is fully initialized.  If further initialization is likely to take several seconds, consider showing some kind of progress indicator within the application window.</para></listitem>
-	</itemizedlist>
-  </sect1>
-  
   <sect1 id="desktop-notification-area">
 	<title>Using the Status Notification Area</title>
-	
-	<para>The status notification area on the panel is used to notify the user of non-critical events, such as the arrival of new email, and to monitor the status of background activities, such as a laptop battery charging.  Recent versions of the GNOME desktop (2.12 or newer) can also pop up a small transient &quot;balloon&quot; attached to a notification icon, to give additional information and interaction choices related to an event.</para>
+	<para>
+	 Using the status notification area applications can notify the user of non-critical events (for example, arrival of new email, or a chat &apos;buddy&apos; having logged on), and expose the status of active system processes (for example, a printing document, or a laptop's battery charging).</para>
 
-		<warning><para>The utility of the notification area decreases rapidly when more than four icons are displayed at the same time. Icons that appear only temporarily, in response to specific events, are therefore preferable.</para></warning>
-	
 	<para>Following the guidelines in this section will help to clarify the difference in the user&apos;s mind between information presented in the notification area, and controls and information presented on other parts of the panel.</para>
 
-	<sect2 id="desktop-notification-appropriate-use">
-		<title>Appropriate Uses for the Notification Area</title>
-	
-		<para>There are three acceptable uses for the notification area:</para>
-	
-		<itemizedlist>
-		
-			<listitem><para>Displaying a transient icon in response to an event (e.g. arrival of new mail in a monitored folder).  Clicking the icon opens the most appropriate window to deal with the event (e.g. Inbox). The icon is removed when the state prior to the event is restored (e.g. no more unread mail in monitored folders).</para></listitem>
-		
-			<listitem><para>Displaying an icon for the duration of a background activity (e.g. while a document is being printed).  The icon is removed when the activity successfully completes, or replaced with a suitable error icon if the activity fails (optional tooltip or balloon to explain problem).  Clicking the error icon (or balloon) opens the most appropriate window for the user to rectify the problem.</para></listitem>
-		
-			<listitem><para>Displaying an ever-present icon to monitor a continuous background activity, such as a laptop battery being charged.  Continous notification icon presence should always be controllable by a user preference. Only core GNOME applications may have this preference turned on by default; other applications should turn it off by default. <remark>Standard way of presenting this option would be nice.</remark></para></listitem>
-		
-		</itemizedlist>
-	
-		<para>In particular, you should probably use an applet instead of using a notification icon if:</para>
-		
-		<itemizedlist>
-			<listitem><para>your notification icon would need to be shown all the time, or would benefit from being shown all the time</para></listitem>
-		</itemizedlist>
-		
-		<para><emphasis>and:</emphasis></para>	
-		
-		<itemizedlist>
-			<listitem><para>clicking your notification icon would do anything other than opening a window or dialog box <emphasis>directly</emphasis> associated with the icon or the event that caused it to appear <remark>(example?)</remark>, or</para></listitem>
-			<listitem><para>multiple instances of the icon would either be required, or could be considered useful (for example, a clock-- a user might want to display a separate clock for each of multiple timezones)</para></listitem>
-		</itemizedlist>
-		
-		<para>Because the notification area is itself a panel applet, remember that the user may not have it on their desktop at all.  Above all, therefore, only use notification icons to provide redundant, non-critical information.</para>
+		<warning><para>The utility of the notification area decreases rapidly when more than about four icons are always present. For this reason, icons that appear only temporarily in response to events are preferable.</para></warning>
+
+	<sect2 id="desktop-notification-or-applet"><title>Notification Area or Panel Applet?</title>
+	<para>
+	You should probably write an applet instead of using the notification area if:</para>
+	<itemizedlist>
+		<listitem><para>clicking your notification area icon does anything other than opening a window directly associated with the icon (e.g. a mail folder window for a new mail icon, or a print queue window for printer notification icon), or </para></listitem>
+		<listitem><para>there are icon-specific options on its context menu for doing anything other than that</para></listitem> 
+		<listitem><para>your application would ever need to display more than one notification icon at the same time</para></listitem>
+	</itemizedlist>
 	</sect2>
 
-	<sect2 id="desktop-notification-appearance">
-	<title>Icon Appearance</title>
-	
+	<sect2><title>Icon Appearance</title>
+	<itemizedlist><title>Guidelines</title>
+		<listitem><para>Use table perspective for icons representing physical devices, with the light source above and to the left of the represented object.  For example, a printer icon during printing. See <xref linkend="icon_style_perspective"/> for more about table perspective.</para></listitem>
+		<listitem><para>Use shelf perspective, with overhead lighting, for all other icons. For example, an envelope shown when new mail arrives. See <xref linkend="icon_style_perspective"/> for more about shelf perspective.</para></listitem>	
+		<listitem><para>For monitors or progress bars that change over
+time, such as a battery charge monitor, clearly delimit the border of the area.</para></listitem>
+
+		</itemizedlist>
+
 		<itemizedlist><title>Guidelines</title>
-		
-			<remark>Need some examples here.  There have been suggestions in the past that notification icons should have a more muted colour scheme (possibly just B&amp;W) than other objects on the panel-- good idea?</remark>
-			
-			<listitem><para>Use table perspective for icons representing physical devices, for example a printer icon shown during printing, with the light source above and to the left of the represented object. See <xref linkend="icon_style_perspective"/> for more about table perspective.</para></listitem>
-			
-			<listitem><para>Use a flat, unshaded image for status monitors that take the form of a chart or graph, such as a CPU usage monitor.  Clearly delimit the borders of the chart area.</para></listitem>
-			
-			<listitem><para>Use shelf perspective, with overhead lighting, for all other icons. For example, an envelope shown when new mail arrives. See <xref linkend="icon_style_perspective"/> for more about shelf perspective.</para></listitem>
-			
+			<listitem><para>Only core GNOME programs may perpetually display an icon in the status area.</para></listitem>
+			<listitem><para>Non-core programs for which a perpetual icon may be useful must default to not perpetually showing the icon. Users may select to enable a perpetual icon for the application as a preference. <remark>Standard way of presenting this option would be nice.</remark></para></listitem>
 		</itemizedlist>
 
 	</sect2>
 
-	<sect2 id="desktop-notification-animation">
-	<title>Icon Animation</title>
-	
-	<para>As with any part of the desktop, animation must be used sparingly to be effective, and redundantly to be accessible.</para>
+	<sect2 id="notification-area-animation">
+	<title>Animation</title>
 	
 	<itemizedlist><title>Guidelines</title>
-		
-		<listitem><para>To avoid distracting the user, do not update notification icons that are monitoring a background activity any more than once per second by default.  For any such icons that are perpetually shown, make the exact update frequency a user preference.</para></listitem>
-		
-		<listitem><para>Do not animate notification icons that are not monitoring the status of a background activity.</para></listitem>
-		
-		<!-- Methinks all situations where blinking might have been useful should be replaced by potentially-a11y-and-resource-friendlier libnotify balloons... have moved those potential guidelines down to that section, and reworded accordingly. CFB-->
-		 		
-		<listitem><para>Do not rely on animation, or any other change of appearance within a notification icon, as a means of alerting the user to a particular event.  <!-- commenting out until it exists...  -Seth The notification area respects the global desktop "no animation" preference for accessibility reasons. <remark>Note: This doesn&apos;t exist yet but it&apos;s on the list...</remark> --></para></listitem>
+		<listitem><para>Icons should not usually appear animated. They may change to
+indicate a change of state, but should not do so when that change
+is occurs regularly rapidly. A battery status indicator would
+usually change slowly, therefore an icon is appropriate. By contrast,
+a load meter would always be changing, therefore it should use a flat
+image.</para></listitem>
+<!--		<listitem><para>Icons are permitted to blink under a few conditions.
+ An icon may blink for n (=5?) seconds when first displayed
+   if showing the icon is not caused by user action.
+   A printing-in-progress icon would be shown because the user
+   is printing a document, therefore it should not blink.
+   An incoming email or personal message (IM) would be shown
+   because something has changed absent the user, therefore it
+   may blink.</para></listitem>
+
+ 		<listitem><para>A icon may blink for n seconds if its conditions for initially
+   blinking recur. For example, an incoming email icon which was
+   shown and blinked when a message arrived and which has remained
+   visible may blink again when another message arrives.</para></listitem>
+-->
+ 		<listitem><para>Any icon may blink to indicate an error in deference to showing
+   an alert. For example, a printing-in-progress icon may blink when
+   there is a paper jam, but not when the printer is on fire - that
+   should show an alert.
+   </para></listitem>
+		<listitem><para>Do not rely on blinking or animation as a means of alerting the user to any particular event.  <!-- commenting out until it exists...  -Seth The notification area respects the global desktop "no animation" preference for accessibility reasons. <remark>Note: This doesn&apos;t exist yet but it&apos;s on the list...</remark> --></para></listitem>
 		</itemizedlist>
 
 	</sect2>
 	
-	<sect2 id="desktop-notification-interaction">
+	<sect2 id="notification-icon-interaction">
 	<title>Interaction</title>
-		<para>All notification icons should respond to user interaction in a consistent way, similar to that for panel applets.</para>
-		
+		<para>Icons should respond to the these user actions.
+(Keypresses apply only when the icon has focus, of course)</para>
 		<itemizedlist><title>Guidelines</title>
-  			<listitem><para>Perform the icon&apos;s default action when the user clicks the icon, or presses the <keysym>Space</keysym> key when it is focused.  In general, an icon&apos;s default action should be to open a relevant window or dialog box, or to raise and focus that window or dialog box if it is already open but not focused.  Examples of such windows and dialogs include:
+  			<listitem><para>Double-click or <keysym>Space</keysym> key
+     should perform the icon&apos;s default action.  Normally this should open a window with relevant data, for example:
 			<itemizedlist>
-     				<listitem><para>the printer queue window, for a &quot;printing in progress&quot; icon</para></listitem>
-     				<listitem><para>the default mail application&apos;s Inbox window, for an incoming email icon</para></listitem>
-     				<listitem><para>the message window, for an incoming instant message icon</para></listitem>
-			</itemizedlist></para>
-			<para>If the icon&apos;s associated window or dialog box is already raised and focused, close it when the user clicks the icon, or presses the <keysym>Space</keysym> key when the icon is focused.  All windows associated with notification icons should be dismissable in this way, except for explicit apply dialog boxes. Those should always be dismissed by clicking their action or cancel buttons.</para></listitem> 
-  		
-			<listitem><para>Present a context menu, containing at least the icon&apos;s default action, when the user right clicks the icon or presses <keycombo><keycap>Shift</keycap><keycap>F10</keycap></keycombo> when the icon is focused.</para></listitem>
-
-		<listitem><para>If the icon&apos;s properties, or the properties of its associated application or document may be altered, include a <guimenuitem>Properties</guimenuitem> menu item in its context menu, and show its property panel in response to <keycombo><keycap>Alt</keycap><keycap>Enter</keycap></keycombo> when the icon is focused.</para></listitem>
-
-		<!--<listitem><para>Follow normal tooltip conventions for notification icons.</para></listitem>  Kind of meaningless... -->
-		</itemizedlist>
-	</sect2>
-	
-	<sect2 id="desktop-notification-balloon">
-	<title>Notification Balloons</title>
-		<para><remark>FIXME: guidelines for appearance and interaction with libnotify-type balloons. All the guidelines shown here now are very early thoughts.</remark></para>
-		
-		<itemizedlist><title>Random Thoughts</title>
-		
-			<listitem><para><remark>If an icon has displayed a balloon that is no longer visible, subsequently mousing over the icon should perhaps cause the last message to appear as a tooltip?</remark></para></listitem>
-			
-			<listitem><para><remark>Need to think about notifications in the context of accessibility.  The notification spec allows for notifications to be shown in different ways, perhaps we need to do something different for users relying on screenreaders or desktop magnification?</remark></para></listitem>
-			
-			<listitem><para><remark>An icon may show a balloon to indicate an error in deference to showing an alert. For example, a printing-in-progress icon may show a balloon when there is a paper jam, but not when the printer is on fire - that should show an alert.</remark></para></listitem>
-		
-			<listitem><para><remark>A balloon may be show when the icon is first displayed, if the icon&apos;s appearance is not the direct result of a user action. For example, the icon for an incoming email or instant message may be accompanied by a balloon.  However, the appearance of a printing-in-progress icon would not be accompanied by a balloon, because its appearance was caused by the user choosing to print a document.</remark></para></listitem>
+     				<listitem><para>the printer queue for a printing-in-progress icon.</para></listitem>
+     				<listitem><para>the inbox for an incoming email iconi</para></listitem>
+     				<listitem><para>the message for an incoming message</para></listitem>
+			</itemizedlist></para></listitem>
+  		<listitem><para>Right-click or <keycombo><keycap>Shift</keycap><keycap>F10</keycap></keycombo>
+     should present a menu for the icon containing at least
+     the icon&apos;s default action.</para></listitem>
+
+		<listitem><para>If the icon&apos;s properties may be altered, it should
+  have a menu item <guimenuitem>Properties</guimenuitem> in its menu,
+ nd show its property panel in response to Alt+Enter.</para></listitem>
 
-			<listitem><para><remark>An icon may show a balloon if it has previously shown a balloon, and the condition recurs. For example, an incoming email icon which has remained visible, and was originally accompanied by a transient balloon, may show another balloon when another message arrives.</remark></para></listitem>
-		
+		<listitem><para>Icons should obey normal tooltip conventions.</para></listitem>
 		</itemizedlist>
 	</sect2>
  </sect1>

Modified: trunk/content/projects/gup/hig/hig-ch-feedback.xml
==============================================================================
--- trunk/content/projects/gup/hig/hig-ch-feedback.xml	(original)
+++ trunk/content/projects/gup/hig/hig-ch-feedback.xml	Mon Sep 29 23:05:52 2008
@@ -67,7 +67,7 @@
 
       <listitem>
         <para>When performing extended operations, they prevent users from
-        doing other work or canceling the extended operation.</para>
+        doing other work or cancelling the extended operation.</para>
       </listitem>
 
       <listitem>
@@ -82,8 +82,8 @@
       </listitem>
     </itemizedlist>
 
-    <para>Sometimes you can improve the responsiveness of an application
-    without speeding up its code. For tips on
+    <para>You can sometimes possible to improve an application&apos;s
+    responsiveness without speeding up the application&apos;s code. For tips on
     how to make such improvements, see <xref
     linkend="feedback-responding-to-user" />.</para>
   </sect1>
@@ -97,10 +97,10 @@
     to save a file. The table below shows the maximum acceptable response
     delay for typical interface events.</para>
 
-    <table frame="none">
+    <table frame="all">
       <title>Maximum acceptable response times for typical events</title>
 
-      <tgroup colsep="0" rowsep="0" align="left" cols="2">
+      <tgroup align="left" cols="2">
         <thead>
           <row>
             <entry>UI Event</entry>
@@ -178,7 +178,7 @@
       <listitem>
         <para>Verify that your application takes no longer than 10 seconds to
         accept and process all user input to any taskâincluding user input to
-        each step of a multi-step task, such as a wizard.</para>
+        each step of a multistep task, such as a wizard.</para>
       </listitem>
     </itemizedlist>
   </sect1>
@@ -295,16 +295,16 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata depth="28" fileref="images/busy-pointers.png"
+            <imagedata depth="28" fileref="images/feedback-pointers-busy.png"
             format="PNG" width="58" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/busy-pointers.eps" format="EPS" />
+            <imagedata fileref="images/feedback-pointers-busy.eps" format="EPS" />
           </imageobject>
 
           <textobject>
-            <phrase>Busy pointer (watch) and busy-interactive pointer (arrow  with watch attached)</phrase>
+            <phrase>Busy pointer (left) and busy-interactive pointer (right)</phrase>
           </textobject>
         </mediaobject>
       </figure>
@@ -365,7 +365,7 @@
           <itemizedlist>
             <listitem>
               <para>Opening a new window, particularly when an operation is
-              short, can needlessly disrupt the user&apos;s work-flow.</para>
+              short, can needlessly disrupt the user&apos;s workflow.</para>
             </listitem>
 
             <listitem>
@@ -389,11 +389,22 @@
         <title>Checklist Windows</title>
 
         <para>A checklist window shows the sequence of stages in an operation.
-        See <xref linkend="progress-window-checklists" />.<figure><title>A
-        Checklist Window</title><mediaobject><imageobject><imagedata
-        fileref="images/checklist-window-in-progress.png" format="PNG" /></imageobject><textobject>
-        <phrase>A checklist window showing a sequence of steps</phrase>
-        </textobject></mediaobject></figure></para>
+        See <xref linkend="progress-window-checklists" />.
+	
+	<figure><title>A Checklist Window</title>
+	
+	<mediaobject>
+		<imageobject><imagedata
+        fileref="images/feedback-checklist-running.png" format="PNG" width="336" depth="220" /></imageobject>
+	<textobject><phrase>A
+        checklist window showing a sequence of steps</phrase></textobject>
+	
+	<imageobject>
+            <imagedata fileref="images/feedback-checklist-running.eps" format="EPS" />
+          </imageobject>
+        </mediaobject>
+	  
+	  </figure></para>
       </sect3>
     </sect2>
   </sect1>
@@ -429,10 +440,10 @@
     animations&quot; means progress animations displayed somewhere other than
     in a dedicated status areaâ typically, in an alert box.</para>
 
-    <table frame="none">
+    <table frame="all">
       <title>Visual feedback types for operations that take at least 1 second</title>
 
-      <tgroup colsep="0" rowsep="0" align="left" cols="4">
+      <tgroup align="left" cols="4">
         <thead>
           <row>
             <entry>Typical Duration &gt; 5 seconds?</entry>
@@ -562,7 +573,7 @@
       <listitem>
         <para>Place a <guibutton>Stop</guibutton> or <guibutton>Cancel</guibutton>
         button, which can also be activated by pressing <keycap>Esc</keycap>,
-        near the progress animation for the interruptible command.</para>
+        near the progress animation for the interruptable command.</para>
       </listitem>
 
       <listitem>

Modified: trunk/content/projects/gup/hig/hig-ch-icons-new.xml
==============================================================================
--- trunk/content/projects/gup/hig/hig-ch-icons-new.xml	(original)
+++ trunk/content/projects/gup/hig/hig-ch-icons-new.xml	Mon Sep 29 23:05:52 2008
@@ -7,10 +7,10 @@
   <para>Icons are small graphics that represent objects (applications, files) or actions (&quot;Create new,&quot; &quot;Save&quot;) in a user&apos;s desktop environment. They come in standard default sizes of 48x48, 32x32, 24x24 and 16x16. Icons are originally designed on a 48x48 canvas, then automatically scaled-down in GNOME to appear in context-dependent sizes.</para>
   <para>Glyphs are graphics are usually, but not always, smaller than what are formally considered icons. They do not have default sizes. They don&apos;t initiate actions or represent objects, but usually represent the state or distinguishing attribute of an object in a larger set of objects. A sort indicator in a table component, a tree turner in a navigation tree, alarm badges on object icons and emblems in Nautilus are all glyphs.</para>
   <para>The first graphic in each category is the original size in which it was designed. The object icon represents a jar file, The action icon represents a &quot;save as&quot; action in a toolbar or menu and the glyph represents one property (&quot;important&quot;) of a directory object in Nautilus.</para>
-  <table frame="none">
+  <table frame="topbot">
     <title>Different Types of Icons</title>
 
-    <tgroup colsep="0" rowsep="0" cols="3" colsep="0" rowsep="0" align="left">
+    <tgroup cols="3" colsep="0" rowsep="0" align="left">
       <tbody>
       <row valign="top">
         <entry>Object Icon</entry>
@@ -34,9 +34,9 @@
   <sect1 id="icons-style">
     <title>Style</title>
     
-    <para>All of these graphics should be designed with a global desktop look and feel in mind. GNOME uses a soft, three-dimensional look that is exemplified in the stock icons. This style is achieved by using antialiasing, shading and highlighting techniques. A simple icon design tutorial by Jakub Steiner of Ximian, focusing on gradient and alpha channel use in the GIMP (GNU Image Manipulation Tool), can be found here: http://www.ximian.com/devzone/tutorials/icon-design/</para>
-    <para>Components of an icon style can be broken down into several categories such as perspective, dimensionality, lighting effects and palette. These components play an important part in giving a group of icons a collectively distinctive look. For instance, the Java Look and Feel, or &quot;metal,&quot; is recognizable by its use of a primary eight-color palette, interior highlighting and diagonal gradients. The Macintosh Look and Feel, or &quot;aqua,&quot; is recognizable by its use of a cool palette based on blue, lighting effects mimicking reflectivity and antialiasing. The GNOME look and feel currently being developed exhibits a thirty-two color palette, soft drop shadows and a mix between cartoonish and photorealistic graphics.</para>
-    <table frame="none">
+    <para>All of these graphics should be designed with a global desktop look and feel in mind. GNOME uses a soft, three-dimentional look that is exemplified in the stock icons. This style is achieved by using antialiasing, shading and highlighting techniques. A simple icon design tutorial by Jakub Steiner of Ximian, focusing on gradient and alpha channel use in the GIMP (GNU Image Manipulation Tool), can be found here: http://www.ximian.com/devzone/tutorials/icon-design/</para>
+    <para>Components of an icon style can be broken down into several categories such as perspective, dimentionality, lighting effects and palette. These components play an important part in giving a group of icons a collectively distinctive look. For instance, the Java Look and Feel, or &quot;metal,&quot; is recognizable by its use of a primary eight-color palette, interior highlighting and diagonal gradients. The Macintosh Look and Feel, or &quot;aqua,&quot; is recognizable by its use of a cool palette based on blue, lighting effects mimicking reflectivity and antialiasing. The GNOME look and feel currently being developed exhibits a thirty-two color palette, soft drop shadows and a mix between cartoonish and photorealistic graphics.</para>
+    <table frame="topbot">
       <title>Different icon styles</title>
 
       <tgroup cols="3" colsep="0" rowsep="0" align="center">
@@ -59,8 +59,8 @@
     <para>For the GNO  ME Look and Feel, the following should be observed:</para>
     <itemizedlist>
       <listitem>
-        <formalpara><title>Perspective</title><para>Flush perspective (as if you were looking at a three-dimensional object at eye-level) is useful for designing graphics representing actions because these usually appear in toolbar buttons and express a &quot;shelved&quot; metaphor. However, angled perspective can be used for variation, particularly for icons representing objects (such as application icons) or for central image components within a bounding component using the flush perspective.</para></formalpara>
-        <table frame="none">
+        <formalpara><title>Perspective</title><para>Flush perspective (as if you were looking at a three-dimentional object at eye-level) is useful for designing graphics representing actions because these usually appear in toolbar buttons and express a &quot;shelved&quot; metaphor. However, angled perspective can be used for variation, particularly for icons representing objects (such as application icons) or for central image components within a bounding component using the flush perspective.</para></formalpara>
+        <table frame="topbot">
           <title>Different perspectives</title>
           <tgroup cols="3" colsep="0" rowsep="0" align="left">
             <tbody>
@@ -94,7 +94,7 @@
   </sect1>
   <sect1 id="icons-context">
     <title>Context</title>
-    <table frame="none">
+    <table frame="topbot">
       <title>Different perspectives</title>
       <tgroup cols="5" colsep="0" rowsep="0" align="left">
         <tbody>
@@ -122,21 +122,21 @@
         </tbody>
       </tgroup>
     </table>
-    <para>FIXME - I left a lot of these rows off the end. It seems pretty wacky to list all these. Not sure I agree with the way &quot;contexts&quot; are presented anyway. Its sort of confusing.</para>
-    <para>FIXME - There&apos;s a whole accessibility section missing here</para>
+    <para>FIXME - I left a lot of these rows off the end. It seems pretty whacky to list all these. Not sure I agree with the way &quot;contexts&quot; are presented anyway. Its sort of confusing.</para>
+    <para>FIXME - There&apos;s a whole accesibility section missing here</para>
   </sect1>
   <sect1 id="icons-dos-and-donts">
     <title>Do&apos;s and Don&apos;ts</title>
     <itemizedlist>
-      <listitem><formalpara><title>DO make icons easily scannable</title><para>Toolbar and menu icons are downsized to exactly one-half of their original icon sizes and appear in groups; their small sizes and other shared characters can make it difficult for users to scan for a particular icon quickly. Therefore, it&apos;s doubly necessary in this context to make sure that each icon is visually distinct from another. One way to achieve this is by giving icons distinct (e.g., irregular versus perfectly square) outlines.</para></formalpara></listitem>
+      <listitem><formalpara><title>DO make icons easily scannable</title><para>Toolbar and menu icons are downsized to exactly one-half of their original icon sizes and appear in groups; their small sizes and other shared charactics can make it difficult for users to scan for a particular icon quickly. Therefore, it&apos;s doubly necessary in this context to make sure that each icon is visually distinct from another. One way to achieve this is by giving icons distinct (e.g., irregular versus perfectly square) outlines.</para></formalpara></listitem>
       <listitem><formalpara><title>DO denote categories</title><para>I have some strong disagreements with this one. Specifically I think the sheet of paper thing for document icons is altogether unhelpful. It violates &quot;DO make icons easily scannable&quot; up the wazoo. The contexts in which documents appear in the file manager already categories them to a large extent. Its ok to have some sort of weak categorization/theme in the icon, but that sheet of paper gets old quick</para></formalpara></listitem>
-      <listitem><formalpara><title>DO opt for simplicity</title><para>Icons are often viewed in smaller sizes than ones they were originally created in; keep in mind that your icons need to be recognizable when reduced to 24x24 or even 16x16. If a user has to spend more than a second or two looking at the icon to recognize what it&apos;s representing, then the metaphor used in the icon is too complex.</para></formalpara></listitem>
+      <listitem><formalpara><title>DO opt for simplictiy</title><para>Icons are often viewed in smaller sizes than ones they were originally created in; keep in mind that your icons need to be recognizable when reduced to 24x24 or even 16x16. If a user has to spend more than a second or two looking at the icon to recognize what it&apos;s representing, then the metaphor used in the icon is too complex.</para></formalpara></listitem>
       <listitem><formalpara><title>DO use stock icons</title><para>GTK provides many stock icons, and you should use these whenever you provide a toolbar button for one of the functions they represent. This establishes consistent language across applications, and makes it easier for users to search for items on the toolbar. FIXME - provide info on viewing these</para></formalpara></listitem>
       <listitem><formalpara><title>DO NOT use stock icons for anything other than their intended purpose.</title><para>This will make your application inconsistent with others, and could easily confuse your users, as well as weakening the effectiveness of the stock icon in other applications.</para></formalpara></listitem>
-      <listitem><formalpara><title>DO NOT use text as the distinguishing feature of an icon</title><para>I disagree with how mildly this point is worded. The reason is not solely internationalization, and I entirely disagree with the use of file extensions such as &quot;GIF&quot; and &quot;JPG&quot; in the icons. If this information is really useful (I think it is not and should be discouraged) it should be automatically overlaid by the file manager based on the *actual* extension of the file. This is just more visual noise.</para></formalpara></listitem>
+      <listitem><formalpara><title>DO NOT use text as the distinguishing feature of an icon</title><para>I disagree with how mildly this point is worded. The reason is not soley internationalization, and I entirely disagree with the use of file extensions such as &quot;GIF&quot; and &quot;JPG&quot; in the icons. If this information is really useful (I think it is not and should be discouraged) it should be automatically overlaid by the file manager based on the *actual* extension of the file. This is just more visual noise.</para></formalpara></listitem>
       <listitem><formalpara><title>DO NOT represent body parts in icons</title><para>these may be offensive to certain cultures, and in actual use frequently do not succeed in conveying meaning.</para></formalpara></listitem>
       <listitem><formalpara><title>DO NOT base icon designs on idioms or product names</title><para>Instead, base designs on a product&apos;s functionality, which will pose less internationalization problems and be easier to recognize for new users. For example, the Nautilus icon is that of a nautilus shell, which does not make its functionality (file browsing) explicit.</para></formalpara></listitem>
-      <listitem><formalpara><title>DO NOT use violent imagery</title><para>Just as words like &quot;kill&quot; and &quot;slay&quot; are inappropriate in interfaces, violent or destructive icons (such as an explosive detonation switch) should be avoided.</para></formalpara></listitem>
+      <listitem><formalpara><title>DO NOT use violent imagery</title><para>Just as words like &quot;kill&quot; and &quot;slay&quot; are inappropriate in interfaces, violent or destructive icons (such as an explosive detonation swtich) should be avoided.</para></formalpara></listitem>
     </itemizedlist>
   </sect1>
 </chapter>

Modified: trunk/content/projects/gup/hig/hig-ch-icons.xml
==============================================================================
--- trunk/content/projects/gup/hig/hig-ch-icons.xml	(original)
+++ trunk/content/projects/gup/hig/hig-ch-icons.xml	Mon Sep 29 23:05:52 2008
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- :xml.root=hig-book.xml: -->
 
 <chapter id="icons">
   <title>Icons</title>
   <para>Icons are a graphical metaphor presenting a visual image that the user associates with a particular object, state or operation. When a user sees a good icon they are immediately reminded of the item it represents, whether that be an application in the panel menu or the &quot;right aligned&quot; state in a word processor toolbar.</para>
   <para>
     <itemizedlist>
-      <listitem><para>Icons can assist the user in rapidly scanning a large number of objects to select the desired item. Particularly after a user is accustomed to an icon&apos;s appearance, they can identify it more rapidly than a text label.</para></listitem>
+      <listitem><para>Icons can assist the user in rapidly scanning a large number of objects to select the desired item. Particularly after a user is acustomed to an icon&apos;s appearance, they can identify it more rapidly than a text label.</para></listitem>
       <listitem><para>Icons can augment text by providing visual suggestions to accompany the descriptive text. Some things are easier to communicate with a picture, even a very small one.</para></listitem>
       <listitem><para>Icons can compactly represent a large number of objects when there is insufficient space to display textual descriptions (such as in a toolbar).</para></listitem>
     </itemizedlist>
@@ -15,9 +14,9 @@
   <sect1 id="icons-style">
     <title>Style</title>
     
-    <para>GNOME uses a soft, three-dimensional look. This style is achieved by using antialiasing, shading and highlighting techniques. The <ulink url="http://www.gimp.org/tutorials/Creating_Icons/";><citetitle>Gnome Icons</citetitle></ulink> tutorial details how one of GNOME&apos;s leading artists creates some of these effects.</para>
-    <para>Components of an icon style can be broken down into several categories such as perspective, dimensionality, lighting effects and palette. These components play an important part in giving a group of icons a collectively distinctive look. For instance, the Java Look and Feel is recognizable by its use of a primary eight-color palette, interior highlighting and diagonal gradients. The Macintosh Aqua style is recognizable by its use of a cool palette based on blue, lighting effects mimicking reflectivity and antialiasing. The GNOME style exhibits a subdued thirty-two color palette, soft drop shadows and a mix between cartoonish and photorealistic graphics.</para>
-    <table frame="none" pgwide="1">
+    <para>GNOME uses a soft, three-dimensional look. This style is achieved by using antialiasing, shading and highlighting techniques. The <ulink url="http://developer.ximian.com/articles/tutorials/icons/";><citetitle>Gnome Icons</citetitle></ulink> tutorial details how one of GNOME&apos;s leading artists creates some of these effects.</para>
+    <para>Components of an icon style can be broken down into several categories such as perspective, dimentionality, lighting effects and palette. These components play an important part in giving a group of icons a collectively distinctive look. For instance, the Java Look and Feel is recognizable by its use of a primary eight-color palette, interior highlighting and diagonal gradients. The Macintosh Aqua style is recognizable by its use of a cool palette based on blue, lighting effects mimicking reflectivity and antialiasing. The GNOME style exhibits a subdued thirty-two color palette, soft drop shadows and a mix between cartoonish and photorealistic graphics.</para>
+    <table frame="topbot" pgwide="1">
       <title>A globe in different icon styles</title>
       
       <tgroup cols="3" colsep="0" rowsep="0" align="center">
@@ -29,25 +28,25 @@
 	  </row>
 	</thead>
 	<tbody>
-	  <row valign="top">
+	  <row valign="middle">
 	    <entry>
 	      <mediaobject>
-		<imageobject><imagedata fileref="images/icon-style-java.png" format="PNG"/></imageobject>
-		<imageobject><imagedata fileref="images/icon-style-java.eps" format="EPS"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-style-java.png" format="PNG"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-style-java.eps" format="EPS"/></imageobject>
 		<textobject><phrase>Java globe</phrase></textobject>
 	      </mediaobject>
 	    </entry>
 	    <entry>
 	      <mediaobject>
-		<imageobject><imagedata fileref="images/icon-style-aqua.png" format="PNG"/></imageobject>
-		<imageobject><imagedata fileref="images/icon-style-aqua.eps" format="EPS"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-style-aqua.png" format="PNG"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-style-aqua.eps" format="EPS"/></imageobject>
 		<textobject><phrase>Aqua globe</phrase></textobject>
 	      </mediaobject>
 	    </entry>
 	    <entry>
 	      <mediaobject>
-		<imageobject><imagedata fileref="images/icon-style-gnome.png" format="PNG"/></imageobject>
-		<imageobject><imagedata fileref="images/icon-style-gnome.eps" format="EPS"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-style-gnome.png" format="PNG"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-style-gnome.eps" format="EPS"/></imageobject>
 		<textobject><phrase>GNOME globe</phrase></textobject>
 	      </mediaobject>
 	    </entry>
@@ -66,8 +65,8 @@
       <figure>
 	<title>Illustration of the table perspective</title>
 	<mediaobject>
-	  <imageobject><imagedata fileref="images/icon_perspective_table.png" format="PNG"/></imageobject>
-	  <imageobject><imagedata fileref="images/icon_perspective_table.eps" format="EPS"/></imageobject>
+	  <imageobject><imagedata fileref="images/icons-perspective-table.png" format="PNG"/></imageobject>
+	  <imageobject><imagedata fileref="images/icons-perspective-table.eps" format="EPS"/></imageobject>
 	  <textobject><phrase>illustration of the table perspective</phrase></textobject>
 	</mediaobject>
       </figure>
@@ -78,8 +77,8 @@
       <figure>
 	<title>Illustration of the shelf perspective</title>
 	<mediaobject>
-	  <imageobject><imagedata fileref="images/icon_perspective_shelf.png" format="PNG"/></imageobject>
-	  <imageobject><imagedata fileref="images/icon_perspective_shelf.eps" format="EPS"/></imageobject>
+	  <imageobject><imagedata fileref="images/icons-perspective-shelf.png" format="PNG"/></imageobject>
+	  <imageobject><imagedata fileref="images/icons-perspective-shelf.eps" format="EPS"/></imageobject>
 	  <textobject><phrase>illustration of the shelf perspective</phrase></textobject>
 	</mediaobject>
       </figure>
@@ -101,16 +100,16 @@
     <sect2 id="icon_style_palette">
       <title>Palette</title>
       <remark>FIXME: need to flesh out a little?</remark>
-      <para>Icons should use colors based on the basic thirty-two color palette, darkening or lightening the colors to achieve the desired look. See <xref linkend="Palette"/></para>
+      <para>Icons should use colors based on the basic thirty-two color palette, darkening or lightening the colours to achieve the desired look. See <xref linkend="Palette"/></para>
     </sect2>
 
   </sect1>
 
   <sect1 id="icons-types">
     <title>Kinds of Icons</title>
-    <table frame="none" pgwide="1" id="icon_specifications">
+    <table frame="all" pgwide="1" id="icon_specifications">
       <title>Specifications for different kinds of icons used within GNOME</title>
-      <tgroup cols="4" colsep="0" rowsep="0" align="center">
+      <tgroup cols="4" colsep="1" rowsep="1" align="center">
 	<thead>
 	  <row>
 	    <entry>Icon Type</entry>
@@ -128,8 +127,8 @@
 	    <entry>Upper Left</entry>
 	    <entry>
 	      <mediaobject>
-		<imageobject><imagedata fileref="images/object-icons.png" format="PNG"/></imageobject>
-		<imageobject><imagedata fileref="images/object-icons.eps" format="EPS"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-objects.png" format="PNG"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-objects.eps" format="EPS"/></imageobject>
 		<textobject><phrase>variety of object icons</phrase></textobject>
 	      </mediaobject>
 	    </entry>
@@ -141,8 +140,8 @@
 	    <entry>Upper Left</entry>
 	    <entry>	
 	      <mediaobject>
-		<imageobject><imagedata fileref="images/application-icons.png" format="PNG"/></imageobject>
-		<imageobject><imagedata fileref="images/application-icons.eps" format="EPS"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-applications.png" format="PNG"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-applications.eps" format="EPS"/></imageobject>
 		<textobject><phrase>variety of application icons</phrase></textobject>
 	      </mediaobject>
 	    </entry>
@@ -154,8 +153,8 @@
 	    <entry>Overhead</entry>
 	    <entry>
 	      <mediaobject>
-		<imageobject><imagedata fileref="images/toolbar-icons.png" format="PNG"/></imageobject>
-		<imageobject><imagedata fileref="images/toolbar-icons.eps" format="EPS"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-toolbar.png" format="PNG"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-toolbar.eps" format="EPS"/></imageobject>
 		<textobject><phrase>variety of toolbar icons</phrase></textobject>
 	      </mediaobject>
 	    </entry>
@@ -167,8 +166,8 @@
 	    <entry>Overhead</entry>
 	    <entry>
 	      <mediaobject>
-		<imageobject><imagedata fileref="images/menu-icons.png" format="PNG"/></imageobject>
-		<imageobject><imagedata fileref="images/menu-icons.eps" format="EPS"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-menu.png" format="PNG"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-menu.eps" format="EPS"/></imageobject>
 		<textobject><phrase>variety of menu icons</phrase></textobject>
 	      </mediaobject>
 	    </entry>
@@ -199,9 +198,9 @@
       <para>The idea of a toolbar as a shelf filled with tools should be reflected in toolbar icons. Toolbar icons should have the perspective of being viewed head on, as if they were actually sitting on a shelf at eye-level. Some design guides refer to this perspective as &quot;flush&quot;.</para>
       <itemizedlist>
 	<listitem><para>Ensure that toolbar icons which will be used together are easy to visually distinguish. Try to <link linkend="icon_design_silhouettes">make the icons&apos; silhouettes distinct</link> from one another.</para></listitem>
-	<listitem><para>While most user&apos;s will view toolbar icons at 24x24 pixels, it is important to include a &quot;large print&quot; set of icons at 48x48 pixels for accessibility reasons.</para></listitem>
+	<listitem><para>While most user&apos;s will view toolbar icons at 24x24 pixels, it is important to include a &quot;large print&quot; set of icons at 48x48 pixels for accesibility reasons.</para></listitem>
 	<listitem><para>Often, you will not have to design any toolbar icons yourself as GTK provides a wide variety of stock icons. You should use these whenever representing one of their intended items. This establishes consistent language across applications, and makes it easier for users to search for items on the toolbar. Do not use stock toolbar icons for anything other than their intended purpose, however, as this will make your application inconsistent with others, and could easily confuse your users.</para>
-	<para>To browse the available stock icons, install the development packages for GTK version 2.x and run <command>gtk-demo</command>. Double click on <guimenuitem>Stock Item and Icon Browser</guimenuitem> to activate the stock icon browser. Note that icons vary in available resolution, so the images presented in the icon browser should not be taken as indicative of the maximum quality of an image. To view the images in PNG format, look in the GTK 2 source code under <filename class="directory">gtk/stock-icons</filename>.</para></listitem>
+	<para>To browse the available stock icons, install the development packages for GTK version 2.x and run <command>gtk-demo</command>. Double click on <guimenuitem>Stock Item and Icon Browser</guimenuitem> to activate the stock icon browser. Note that icons vary in available resolution, so the images presented in the icon browser should not be taken as indicative of the maximuum quality of an image. To view the images in PNG format, look in the GTK 2 source code under <filename class="directory">gtk/stock-icons</filename>.</para></listitem>
       </itemizedlist>
     </sect2>
 
@@ -226,16 +225,16 @@
 	<figure>
 	  <title>A functionally suggestive icon for a word processor</title>
 	  <mediaobject>
-	    <imageobject><imagedata fileref="images/abiword-icon.png" format="PNG"/></imageobject>
-	    <imageobject><imagedata fileref="images/abiword-icon.eps" format="EPS"/></imageobject>
-	    <textobject><phrase>A document with a pen writing on it</phrase></textobject>
+	    <imageobject><imagedata fileref="images/icons-word-processor.png" format="PNG"/></imageobject>
+	    <imageobject><imagedata fileref="images/icons-word-processor.eps" format="EPS"/></imageobject>
+	    <textobject><phrase>A document with a pencil writing on it</phrase></textobject>
 	  </mediaobject>
 	</figure>
 	<figure>
 	  <title>A functionally suggestive icon for underline</title>
 	  <mediaobject>
-	    <imageobject><imagedata fileref="images/underline-icon.png" format="PNG"/></imageobject>
-	    <imageobject><imagedata fileref="images/underline-icon.eps" format="EPS"/></imageobject>
+	    <imageobject><imagedata fileref="images/icons-underline-text.png" format="PNG"/></imageobject>
+	    <imageobject><imagedata fileref="images/icons-underline-text.eps" format="EPS"/></imageobject>
 	    <textobject><phrase>An underlined character</phrase></textobject>
 	  </mediaobject>
 	</figure>
@@ -246,11 +245,11 @@
 	  <para>It is important to make it easy to visually distinguish icons that will be used together, for example toolbar icons and document icons. The human visual system is excellent at making rapid distinctions between items based on shape, thus a good way to help your users sort through a large number of icons is to use different shapes. You can see the shape of an icon most clearly by turning it into a silhouette: blacken all areas of the icon which are not transparent.</para>
 	</formalpara>
 	<example>
-	  <title>Distinct silhouettes from the Nautilus Crux theme</title>
+	  <title>Distinct silhouettes from the GNOME icon theme</title>
 	  <mediaobject>
-	    <imageobject><imagedata fileref="images/toolbar-silhouette.png" format="PNG"/></imageobject>
-	    <imageobject><imagedata fileref="images/toolbar-silhouette.eps" format="EPS"/></imageobject>
-	    <textobject><phrase>Silhouettes of the various toolbar icons</phrase></textobject>
+	    <imageobject><imagedata fileref="images/icons-silhouette.png" format="PNG"/></imageobject>
+	    <imageobject><imagedata fileref="images/icons-silhouette.eps" format="EPS"/></imageobject>
+	    <textobject><phrase>Silhouettes of various toolbar icons</phrase></textobject>
 	  </mediaobject>
 	</example>
       </listitem>
@@ -359,13 +358,13 @@
 	<listitem>
 	  <formalpara>
 	    <title>Avoid name suggestive icons</title>
-	    <para>Some icons, such as the Nautilus icon, do not suggest the program&apos;s purpose, but instead suggest the program&apos;s name. This is less desirable than a functionally suggestive icon, because an extra layer of abstraction is added (rather than associating file management with an icon representing files, they have to associate file management with nautilus with an image of a nautilus shell). Additionally it makes it difficult for new users who may not know what &quot;Nautilus&quot; is, and hence will not recognize a shell icon as the file manager.</para>
+	    <para>Some icons, such as the original Nautilus file manager icon, do not suggest the program&apos;s purpose, but instead suggest the program&apos;s name. This is less desirable than a functionally suggestive icon, because an extra layer of abstraction is added (rather than associating file management with an icon representing files, they have to associate file management with nautilus with an image of a nautilus shell). Additionally it makes it difficult for new users who may not know what &quot;Nautilus&quot; is, and hence will not recognize a shell icon as the file manager.</para>
 	  </formalpara>
 	  <figure>
-	    <title>A name suggestive icon for Nautilus</title>
+	    <title>The original, name suggestive icon for Nautilus</title>
 	    <mediaobject>
-	      <imageobject><imagedata fileref="images/nautilus-icon.png" format="PNG"/></imageobject>
-	      <imageobject><imagedata fileref="images/nautilus-icon.eps" format="EPS"/></imageobject>
+	      <imageobject><imagedata fileref="images/icons-nautilus.png" format="PNG"/></imageobject>
+	      <imageobject><imagedata fileref="images/icons-nautilus.eps" format="EPS"/></imageobject>
 	      <textobject><phrase>A picture of a nautilus shell</phrase></textobject>
 	    </mediaobject>
 	  </figure>
@@ -373,27 +372,28 @@
 	<listitem>
 	  <formalpara>
 	    <title>Do <emphasis>not</emphasis> include meaningful text in icons</title>
-	    <para>Icons which contain the text of the program name in the icon. They effectively contain no metaphor or picture for the user to identify with, and are probably harder to read than the accompanying caption. Since icons draw the eyes, an icon that is harder to identify than text is potentially worse than no icon at all. Hence &quot;text icons&quot; should not be used. Moreover, text should be avoided in icons because it makes the icons difficult to translate. If there is text in icons it should not form words in your native language, a good metric for ensuring that the particular text is not lending to the meaning of the icon.</para>
+	    <para>Icons that contain the text of the program name in the icon. They effectively contain no metaphor or picture for the user to identify with, and are probably harder to read than the accompanying caption. Since icons draw the eyes, an icon that is harder to identify than text is potentially worse than no icon at all. Hence &quot;text icons&quot; should not be used. Moreover, text should be avoided in icons because it makes the icons difficult to translate. If there is text in icons it should not form words in your native language, a good metric for ensuring that the particular text is not lending to the meaning of the icon.</para>
 	  </formalpara>
 	  <figure>
-	    <title>Text in the old GEdit icon</title>
+	    <title>Text in the original GEdit icon</title>
 	    <mediaobject>
-	      <imageobject><imagedata fileref="images/gedit-icon.png" format="PNG"/></imageobject>
-	      <imageobject><imagedata fileref="images/gedit-icon.eps" format="EPS"/></imageobject>
-	      <textobject><phrase>The GEdit icon</phrase></textobject>
+	      <imageobject><imagedata fileref="images/icons-gedit.png" format="PNG"/></imageobject>
+	      <imageobject><imagedata fileref="images/icons-gedit.eps" format="EPS"/></imageobject>
+	      <textobject><phrase>The original GEdit icon, a rectangle containing the word &quot;GEdit&quot;.</phrase></textobject>
 	    </mediaobject>
 	  </figure>
 	</listitem>
 	<listitem>
 	  <formalpara>
 	    <title>Do <emphasis>not</emphasis> rely on information your users will not have</title>
-	    <para>Random icons appear to have no association with the program (except perhaps some odd connection in the mind of the developer). These icons should <emphasis>never</emphasis> be used and will likely serve to confuse the user more than help them. The icon&apos;s purpose should not be to &quot;look pretty&quot;; this is merely a very desirable side effect. The sodipodi logo is a squirrel, which they show as their icon. However, because the logo has no obvious connection <emphasis>to a user</emphasis>, it is a poor icon. Make sure that you are not relying on information that users won&apos;t necessarily posses.</para>
+	    <para>Random icons appear to have no association with the application (except perhaps some odd connection in the mind of the developer). These icons should <emphasis>never</emphasis> be used and will likely serve to confuse the user more than help them. The icon&apos;s purpose should not be to &quot;look pretty&quot;; this is merely a very desirable side effect.</para>
+	    <para>The SodiPodi project logo is a squirrel, which is used as the application icon. However, because the logo has no obvious connection <emphasis>to a user</emphasis>, it is a poor icon. Make sure that you are not relying on information that users won&apos;t necessarily possess.</para>
 	  </formalpara>
 	  <figure>
 	    <title>A seemingly random icon for SodiPodi</title>
 	    <mediaobject>
-	      <imageobject><imagedata fileref="images/sodipodi-icon.png" format="PNG"/></imageobject>
-	      <imageobject><imagedata fileref="images/sodipodi-icon.eps" format="EPS"/></imageobject>
+	      <imageobject><imagedata fileref="images/icons-sodipodi.png" format="PNG"/></imageobject>
+	      <imageobject><imagedata fileref="images/icons-sodipodi.eps" format="EPS"/></imageobject>
 	      <textobject><phrase>A squirrel</phrase></textobject>
 	    </mediaobject>
 	  </figure>
@@ -401,24 +401,24 @@
 	<listitem id="icon_problems_extraneous_information">
 	  <formalpara>
 	    <title>Do <emphasis>not</emphasis> include extraneous information</title>
-	    <para>Remember that icons will often be viewed in a smaller form. Too much information may render the icon unintelligible when it is shrunk in size (e.g. to be placed on a panel, or in the tasklist). Too much information also makes it easier for users confuse the purpose of the application. For example, in user testing many users thought the Evolution icon would launch a word processor. They were misled by the pencil and the paper, which could be seen as extraneous information: it is implicit that the mail program will allow you to write messages as well as receive them. A better icon might have been a simple envelope. Foremost in the icon designer&apos;s mind should be a consideration of the minimal visual elements necessary to express the purpose of the program.</para>
+	    <para>Remember that icons will often be viewed in a smaller form. Too much information may render the icon unintelligible when it is shrunk in size (e.g. to be placed on a panel, or in the tasklist). Too much information also makes it easier for users confuse the purpose of the application. For example, in user testing many users thought an older version of the Evolution icon (below) would launch a word processor. They were misled by the pencil and the paper, which could be seen as extraneous information: it is implicit that the mail program will allow you to write messages as well as receive them. A better icon might have been a simple envelope. Foremost in the icon designer&apos;s mind should be a consideration of the minimal visual elements necessary to express the purpose of the program.</para>
 	  </formalpara>
 	  <figure>
 	    <title>Extraneous information - the Evolution icon</title>
 	    <mediaobject>
-	      <imageobject><imagedata fileref="images/evolution-icon.png" format="PNG"/></imageobject>
-	      <imageobject><imagedata fileref="images/evolution-icon.eps" format="EPS"/></imageobject>
+	      <imageobject><imagedata fileref="images/icons-evolution.png" format="PNG"/></imageobject>
+	      <imageobject><imagedata fileref="images/icons-evolution.eps" format="EPS"/></imageobject>
 	      <textobject><phrase>The Evolution icon</phrase></textobject>
 	    </mediaobject>
 	  </figure>
 	  <para>
-	    The Gnumeric icon is a great icon except for the introduction of extra visual noise. The extra sheet of paper with the &apos;g&apos; on it behind the spreadsheet and chart adds no significant value to the icon and provides extra visual distraction. In this case the contribution of the extraneous element to the appearance of the icon is negative. Simple well balanced icons look more attractive than cluttered icons. An improved icon might contain only the spreadsheet and chart; larger because they can use all of the space in the icon, and hence more visually distinct.
+	    This Gnumeric icon (below) is a great icon except for the introduction of extra visual noise. The extra sheet of paper with the &apos;g&apos; on it behind the spreadsheet and chart adds no significant value to the icon and provides extra visual distraction. In this case the contribution of the extraneous element to the appearance of the icon is negative. Simple, well-balanced icons look more attractive than cluttered icons. An improved icon might contain only the spreadsheet and chart; larger because they can use all of the space in the icon, and hence more visually distinct.
 	  </para>
 	  <figure>
 	    <title>Extraneous information - the old Gnumeric icon</title>
 	    <mediaobject>
-	      <imageobject><imagedata fileref="images/gnumeric-icon.png" format="PNG"/></imageobject>
-	      <imageobject><imagedata fileref="images/gnumeric-icon.eps" format="EPS"/></imageobject>
+	      <imageobject><imagedata fileref="images/icons-gnumeric.png" format="PNG"/></imageobject>
+	      <imageobject><imagedata fileref="images/icons-gnumeric.eps" format="EPS"/></imageobject>
 	      <textobject><phrase>The Gnumeric icon</phrase></textobject>
 	    </mediaobject>
 	  </figure>
@@ -431,16 +431,16 @@
 	  <figure>
 	    <title>Using body parts - the font selector icon</title>
 	    <mediaobject>
-	      <imageobject><imagedata fileref="images/fontsel-icon.png" format="PNG"/></imageobject>
-	      <imageobject><imagedata fileref="images/fontsel-icon.eps" format="EPS"/></imageobject>
-	      <textobject><phrase>The Font Selector Icon</phrase></textobject>
+	      <imageobject><imagedata fileref="images/icons-font-selection-poor.png" format="PNG"/></imageobject>
+	      <imageobject><imagedata fileref="images/icons-font-selection-poor.eps" format="EPS"/></imageobject>
+	      <textobject><phrase>The original Font Selector Icon</phrase></textobject>
 	    </mediaobject>
 	  </figure>	    
 	  <figure>
 	    <title>A better icon for the Font Selector</title>
 	    <mediaobject>
-	      <imageobject><imagedata fileref="images/fontsel-suggestion.png" format="PNG"/></imageobject>
-	      <imageobject><imagedata fileref="images/fontsel-suggestion.eps" format="EPS"/></imageobject>
+	      <imageobject><imagedata fileref="images/icons-font-selection-good.png" format="PNG"/></imageobject>
+	      <imageobject><imagedata fileref="images/icons-font-selection-good.eps" format="EPS"/></imageobject>
 	      <textobject><phrase>A simple replacement icon showing an ornate &quot;Aa&quot;</phrase></textobject>
 	    </mediaobject>
 	  </figure>
@@ -453,8 +453,8 @@
 	  <figure>
 	    <title>Word play - System Log Monitor icon</title>
 	    <mediaobject>
-	      <imageobject><imagedata fileref="images/log-icon.png" format="PNG"/></imageobject>
-	      <imageobject><imagedata fileref="images/log-icon.eps" format="EPS"/></imageobject>
+	      <imageobject><imagedata fileref="images/icons-system-log.png" format="PNG"/></imageobject>
+	      <imageobject><imagedata fileref="images/icons-system-log.eps" format="EPS"/></imageobject>
 	      <textobject><phrase>A tree log</phrase></textobject>
 	    </mediaobject>
 	  </figure>
@@ -467,8 +467,8 @@
 	  <figure>
 	    <title>Destructive-looking Shutdown icon</title>
 	    <mediaobject>
-	      <imageobject><imagedata fileref="images/shutdown-icon.png" format="PNG"/></imageobject>
-	      <imageobject><imagedata fileref="images/shutdown-icon.eps" format="EPS"/></imageobject>
+	      <imageobject><imagedata fileref="images/icons-shut-down.png" format="PNG"/></imageobject>
+	      <imageobject><imagedata fileref="images/icons-shut-down.eps" format="EPS"/></imageobject>
 	      <textobject><phrase>An explosive detonation button</phrase></textobject>
 	    </mediaobject>
 	  </figure>
@@ -491,37 +491,18 @@
 	       <listitem><para>a high contrast large print theme</para></listitem>
 	       <listitem><para>an inverse high contrast large print theme</para></listitem>
 	       <listitem><para>a low contrast theme</para></listitem>
-	       <listitem><para>a low contrast, large print theme</para></listitem>
+	       <listitem><para>a low contrast,large print theme</para></listitem>
        </itemizedlist>
        <para>To be considered fully accessible, all icons in your application
 	       must be replaced by a suitable alternative when one of these
-	       themes is used.<remark>The HighContrastLargePrint, HighContrastLargePrintInverse and LowContrastLargePrint <emphasis>icon</emphasis> themes are deprecated as of GNOME 2.12.  New icons need only be added to the HighContrast, HighContrastInverse and LowContrast themes.</remark></para>
-
-	<tip><title>Adding icons to accessible themes</title>
-	<para>When you have designed high and low contrast versions of all
-	your icons, submit them to the gnome-themes module maintainers for
-	inclusion in the appropriate themes.<remark>Pending discussion on XDG about possibility of applications being able to install HighContrast and HighContrastInverse icons themselves.</remark></para></tip>
-
+	       themes is used.</para>
+	<tip><title>Low Contrast Icons</title>
+	<para>Low contrast icon themes were deprecated in GNOME 2.22. It is no longer necessary to deliver low contrast icon equivalents. </para></tip>
        <sect2 id="icons-design-highcontrast">
 	<title>High Contrast Icons</title>
 	<para>
-		High contrast icons, in conjunction with a high contrast theme, benefit users with reduced visual acuity.  A high contrast icon has these characteristics:</para>
-	<itemizedlist>
-		<listitem><para>Drawn only in black and white, with an external white border (black for inverse high contrast icons).  One additional color may be used, but only if it is essential to the meaning of the icon.</para></listitem>
-		<listitem><para>Simple visual style, typically comprising only a single symbol</para></listitem>
-		<listitem><para>All lines and borders at least 4 pixels wide (at 48x48 pixels)</para></listitem>
-	</itemizedlist>
-	 <figure>
-		 <title>Part of application window rendered in high contrast, large print theme</title>
-	         <mediaobject>
-			 <imageobject><imagedata fileref="images/highcontrast-theme.png" format="PNG"/></imageobject>
-			 <imageobject><imagedata fileref="images/highcontrast-theme.eps" format="EPS"/></imageobject>
-			 <textobject><phrase>Part of gedit window rendered in high contrast, large print theme</phrase></textobject>
-								               </mediaobject>
-									             </figure>
-
-	<para>This style allows high contrast icons to be distinguishable when viewed by a user with reduced visual acuity. Below is an approximation of what well-designed high contrast icons look like when viewed by such a user.</para>
-    <table frame="none" pgwide="0.5">
+		High contrast icons are greatly simplified versions of an application's existing regular icons. They are drawn with two colors, black and white, and thicker borders. This style allows high contrast icons to be distinguishable when viewed by a user with a visual impairment. Below is an approximation of what well-designed high contrast icons look like when viewed by someone with a visual impairment.</para>
+    <table frame="topbot" pgwide="1">
 	    <title>Simulation of low vision user viewing high contrast icons</title>
       
       <tgroup cols="3" colsep="0" rowsep="0" align="center">
@@ -537,15 +518,15 @@
 		<entry>Book</entry>
 	    <entry>
 	      <mediaobject>
-		<imageobject><imagedata fileref="images/highcontrast-book.png" format="PNG"/></imageobject>
-		<imageobject><imagedata fileref="images/highcontrast-book.eps" format="EPS"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-hc-book.png" format="PNG"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-hc-book.eps" format="EPS"/></imageobject>
 		<textobject><phrase>Book icon</phrase></textobject>
 	      </mediaobject>
 	    </entry>
 	    <entry>
 	      <mediaobject>
-		<imageobject><imagedata fileref="images/highcontrast-book-blur.png" format="PNG"/></imageobject>
-		<imageobject><imagedata fileref="images/highcontrast-book-blur.eps" format="EPS"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-hc-book-blur.png" format="PNG"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-hc-book-blur.eps" format="EPS"/></imageobject>
 		<textobject><phrase>Blurred Book icon</phrase></textobject>
 	      </mediaobject>
 	    </entry>
@@ -554,15 +535,15 @@
 		<entry>CD-ROM</entry>
 	    <entry>
 	      <mediaobject>
-		<imageobject><imagedata fileref="images/highcontrast-cdrom.png" format="PNG"/></imageobject>
-		<imageobject><imagedata fileref="images/highcontrast-cdrom.eps" format="EPS"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-hc-cdrom.png" format="PNG"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-hc-cdrom.eps" format="EPS"/></imageobject>
 		<textobject><phrase>CD-ROM icon</phrase></textobject>
 	      </mediaobject>
 	    </entry>
 	    <entry>
 	      <mediaobject>
-		<imageobject><imagedata fileref="images/highcontrast-cdrom-blur.png" format="PNG"/></imageobject>
-		<imageobject><imagedata fileref="images/highcontrast-cdrom-blur.eps" format="EPS"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-hc-cdrom-blur.png" format="PNG"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-hc-cdrom-blur.eps" format="EPS"/></imageobject>
 		<textobject><phrase>Blurred CD-ROM icon</phrase></textobject>
 	      </mediaobject>
 	    </entry>
@@ -571,15 +552,15 @@
 		<entry>Copy</entry>
 	    <entry>
 	      <mediaobject>
-		<imageobject><imagedata fileref="images/highcontrast-copy.png" format="PNG"/></imageobject>
-		<imageobject><imagedata fileref="images/highcontrast-copy.eps" format="EPS"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-hc-copy.png" format="PNG"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-hc-copy.eps" format="EPS"/></imageobject>
 		<textobject><phrase>Copy icon</phrase></textobject>
 	      </mediaobject>
 	    </entry>
 	    <entry>
 	      <mediaobject>
-		<imageobject><imagedata fileref="images/highcontrast-copy-blur.png" format="PNG"/></imageobject>
-		<imageobject><imagedata fileref="images/highcontrast-copy-blur.eps" format="EPS"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-hc-copy-blur.png" format="PNG"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-hc-copy-blur.eps" format="EPS"/></imageobject>
 		<textobject><phrase>Blurred Copy icon</phrase></textobject>
 	      </mediaobject>
 	    </entry>
@@ -594,18 +575,18 @@
 	 <figure>
 		 <title>Simplified representation of metaphors for high contrast icons</title>
 	         <mediaobject>
-			 <imageobject><imagedata fileref="images/highcontrast-metaphors.png" format="PNG"/></imageobject>
-			 <imageobject><imagedata fileref="images/highcontrast-metaphors.eps" format="EPS"/></imageobject>
+			 <imageobject><imagedata fileref="images/icons-hc-metaphors.png" format="PNG"/></imageobject>
+			 <imageobject><imagedata fileref="images/icons-hc-metaphors.eps" format="EPS"/></imageobject>
 			 <textobject><phrase>Comparison of photorealistic style of regular icons with the simpler, line-art style of high contrast icons</phrase></textobject>
 								               </mediaobject>
 									             </figure>
 
-	<para>High contrast icons are most easily created in a vector drawing application. Black and white shapes are layered to create a simplified icon. The process feels like layering black and white pieces of construction paper, as if you were assembling a collage.</para>
+	<para>High contrast icons are created in a vector drawing program. Black and white shapes are layered to create a simplified icon. The process feels like layering black and white pieces of construction paper, as if you were assembling a collage.</para>
 	 <figure>
 		<title>Layered technique for high contrast icons</title>
 	         <mediaobject>
-			 <imageobject><imagedata fileref="images/floppy-dissected.png" format="PNG"/></imageobject>
-		             <imageobject><imagedata fileref="images/floppy-dissected.eps" format="EPS"/></imageobject>
+			 <imageobject><imagedata fileref="images/icons-floppy-dissected.png" format="PNG"/></imageobject>
+		             <imageobject><imagedata fileref="images/icons-floppy-dissected.eps" format="EPS"/></imageobject>
 			     <textobject><phrase>Exploded view of layers used in high contrast floppy disk icon</phrase></textobject>
 								               </mediaobject>
 									             </figure>
@@ -614,52 +595,26 @@
 		<para>Often shapes from existing high contrast icons can be resized and reused to more quickly build up a new icon.</para></tip>
 
 	<tip><title>Don't forget the border!</title>
-		<para>Design high contrast icons over a temporary background color so you don't forget to draw the external white border.</para></tip>
-
-
-
-	<sect3 id="icons-design-highcontrastinverse">
-	<title>High contrast inverse icons</title>
-	<para>High contrast inverse icons serve the same purpose as high contrast icons, but are easier to see for some users.  Create a high contrast inverse icon simply by inverting the pixel values of the equivalent high contrast icon, for example in GIMP.</para>
-	 <figure>
-		 <title>Part of application window rendered in high contrast inverse, large print theme</title>
-	         <mediaobject>
-			 <imageobject><imagedata fileref="images/highcontrastinverse-theme.png" format="PNG"/></imageobject>
-			 <imageobject><imagedata fileref="images/highcontrastinverse-theme.eps" format="EPS"/></imageobject>
-			 <textobject><phrase>Part of gedit window rendered in high contrast inverse, large print theme</phrase></textobject>
-								               </mediaobject>
-									             </figure>
-
-	</sect3>
+		<para>It is useful to design high contrast icons over a temporary background color so you don't forget to draw the external white border.</para></tip>
      </sect2>
-
      <sect2 id="icons-design-lowcontrast">
 	     <title>Low Contrast Icons</title>
-	     <para>Low contrast icons and themes are useful to users who are particularly sensitive to light, to the extent that they find even a high contrast inverse theme uncomfortable to use.  In low contrast icons, the colors are compressed towards the middle value range, so they do not contain any large luminance values (the 'V' in HSV).  That is, dark colors are lightened, and light colors are darkened.</para>
-	 <figure>
-		 <title>Part of application window rendered in low contrast theme</title>
-	         <mediaobject>
-			 <imageobject><imagedata fileref="images/lowcontrast-theme.png" format="PNG"/></imageobject>
-			 <imageobject><imagedata fileref="images/lowcontrast-theme.eps" format="EPS"/></imageobject>
-			 <textobject><phrase>Part of gedit window rendered in low contrast theme</phrase></textobject>
-								               </mediaobject>
-									             </figure>
+
+		<tip><title>Low Contrast Icons</title>
+		<para>Low contrast icon themes were deprecated in GNOME 2.22. It is no longer necessary to deliver low contrast icon equivalents. </para></tip>
 	     <para>
-		     Low contrast icons are generated from the existing regular icons by adjusting the levels. In GIMP, use these values in the Levels dialog:</para>
-	<itemizedlist>
-		<listitem><para>Input: 100, 1.25, 200</para></listitem>
-		<listitem><para>Output: 100, 160</para></listitem>
-	</itemizedlist>
-	
+		     The goal of low contrast themes is to eliminate, as much as possible, light values (e.g. a large 'V' value in HSV). To achieve this, the colors in low contrast icons are compressed toward the middle value range, i.e. dark colors are lightened and light colors are darkened.
+	     </para>
+	     <para>
+		     Low contrast icons are generated from the existing regular icons by adjusting the levels in GIMP. The Input Levels are set to 100, 1.25, 200 and the Output Levels are set to 100, 160, as shown in the Levels dialog below. Large numbers of regular icons can be quickly converted to low contrast by using GIMP's scripting facilities.</para>
 	      <figure>
 	        <title>Levels dialog in GIMP showing correct levels for generating low contrast icons</title>
 		<mediaobject>
-		  <imageobject><imagedata fileref="images/levels-lowcontrast.png" format="PNG"/></imageobject>
-                  <imageobject><imagedata fileref="images/levels-lowcontrast.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/icons-lowcontrast-levels.png" format="PNG"/></imageobject>
+                  <imageobject><imagedata fileref="images/icons-lowcontrast-levels.eps" format="EPS"/></imageobject>
 		  <textobject><phrase>Levels dialog in GIMP showing input levels set to 100, 1.25, 200, and output levels set to 100 and 160.</phrase></textobject>
 		 </mediaobject>
 	      </figure>
-<tip><title>Batch conversion</title><para>Large numbers of regular icons can be quickly converted to low contrast by using GIMP's scripting facilities.  A <ulink url="http://cvs.gnome.org/viewcvs/gnome-themes/low-contrast-preset.scm?view=markup";>script</ulink> to do this is provided in the gnome-themes module.<remark>There are some suggestions that it would be a better for a low contrast theme engine to do this on the fly.</remark></para></tip>
 
      </sect2>
   </sect1>

Modified: trunk/content/projects/gup/hig/hig-ch-input.xml
==============================================================================
--- trunk/content/projects/gup/hig/hig-ch-input.xml	(original)
+++ trunk/content/projects/gup/hig/hig-ch-input.xml	Mon Sep 29 23:05:52 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- :xml.root=hig-book.xml: -->
 
 <chapter id="input">
 <title>User Input</title>
@@ -11,8 +10,8 @@
 
 	<figure> <title>A plethora of pointing devices: mouse, trackball, foot-operated mouse, joystick, trackpad, and a finger-mounted pointing device.</title>
 	  <mediaobject>
-	  <imageobject><imagedata fileref="images/pointingdevices.png" format="PNG" width="480" depth="80"/></imageobject>
-	  <imageobject><imagedata fileref="images/pointingdevices.eps" format="EPS"/></imageobject>
+	  <imageobject><imagedata fileref="images/input-pointing-devices.png" format="PNG" width="480" depth="80"/></imageobject>
+	  <imageobject><imagedata fileref="images/input-pointing-devices.eps" format="EPS"/></imageobject>
 	  <textobject><phrase>Pictures of different types of pointing device, including mouse, trackball, foot-operated mouse and joystick.</phrase></textobject>
 	  </mediaobject>
 	</figure>
@@ -35,9 +34,9 @@
 	  
 	  <listitem><para>Your application uses the middle button to paste the current PRIMARY (usually the last-highlighted) selection at the pointer position, as follows:</para>
 	    
-	    <table frame='none'>
+	    <table frame='all'>
 	      <title>Effect of modifier keys on a <mousebutton>middle button</mousebutton> transfer operation</title>
-	      <tgroup colsep="0" rowsep="0" cols='2' align='left'>
+	      <tgroup cols='2' align='left'>
 		<thead>
 		  <row>
 		    <entry>Modifier</entry>
@@ -72,7 +71,7 @@
 
 	<listitem><para><keycombo><keycap>Ctrl</keycap><mousebutton>scrollwheel-up</mousebutton></keycombo> should zoom into the window or control under the mouse pointer, and <keycombo><keycap>Ctrl</keycap><mousebutton>scrollwheel-down</mousebutton></keycombo> should zoom out.  Zooming in this way should not move keyboard focus to the window or control being zoomed.</para></listitem>
 
-	<listitem><para>Do not depend on input from the middle or right mouse buttons. As well as being physically more difficult to click, some pointing devices and many assistive technology devices only support or emulate the left mouse button.  Some assistive technologies may not even emulate the mouse at all, but generate keyboard events instead.</para></listitem>
+	<listitem><para>Do not depend on input from the middle or right mouse buttons. As well as being physically more difficult to click, some pointing devices and many assistive technology devices only support or emulate the left mouse button.  Some assistive technologies may noteven emulate the mouse at all, but generate keyboard events instead.</para></listitem>
 
 	<listitem><para>Ensure that every operation in your application that can be done with the mouse can also be done with the keyboard.  The only exceptions to this are actions where fine motor control is an essential part of the task. For example, controlling movement in some types of action games, or freehand painting in an image-editing application.</para></listitem>
 
@@ -82,7 +81,7 @@
 
 	<listitem><para>Do not require the use of multiple (triple- or quadruple-) clicking actions for any operations, unless you also provide an accessible alternative method of performing the same action.</para></listitem>
 
-	<listitem><para>Allow all mouse operations to be canceled before their completion. Pressing the Esc key should cancel any mouse operation in progress, such as dragging and dropping a file in a file manager, or drawing a shape in a drawing application.</para></listitem>
+	<listitem><para>Allow all mouse operations to be cancelled before their completion. Pressing the Esc key should cancel any mouse operation in progress, such as dragging and dropping a file in a file manager, or drawing a shape in a drawing application.</para></listitem>
 
 	<listitem><para>Do not assign any actions exclusively to the middle button of a three-button mouse, as not all mice have one.</para></listitem>
 
@@ -102,9 +101,9 @@
 	<para>For controls or windows that contain a number of objects that the
 user can select, either singly or multiply, ensure the following mechanisms are in place to allow selections to be made using either the mouse or the keyboard.</para>
 	
-	<table frame='none' pgwide='1'>
+	<table frame='all' pgwide='1'>
 	  <title>Standard mouse and keyboard selection mechanisms</title>
-	  <tgroup colsep="0" rowsep="0" cols='3' align='left'>
+	  <tgroup cols='3' align='left'>
 	    <thead>
 	      <row>
 		<entry></entry>
@@ -131,7 +130,7 @@
 	      <row>
 		<entry>Move focus</entry>
 		<entry>Click appropriate item to select it</entry>
-		<entry><para>Cursor keys, <keycap>Home</keycap>, <keycap>End</keycap>, <keycap>PageUp</keycap>, and <keycap>PageDown</keycap> move focus and selection simultaneously.</para>
+		<entry>Cursor keys, <keycap>Home</keycap>, <keycap>End</keycap>, <keycap>PageUp</keycap>, and <keycap>PageDown</keycap> move focus and selection simultaneously.
 		<para><keycombo><keycap>Ctrl</keycap><keysym>cursor keys</keysym></keycombo>, <keycombo><keycap>Ctrl</keycap><keycap>Home</keycap></keycombo>,<keycombo><keycap>Ctrl</keycap><keycap>End</keycap></keycombo>, <keycombo><keycap>Ctrl</keycap><keycap>PageUp</keycap></keycombo>, and <keycombo><keycap>Ctrl</keycap><keycap>PageDown</keycap></keycombo> move focus without affecting current selection.</para></entry>
 	      </row>
 	      <row>
@@ -185,14 +184,14 @@
 
 	<figure> <title>Examples illustrating dynamic selection highlighting during bounding box selection.  In the first example, the folder color and label highlighting changes to indicate selection.  In the second, selection is indicated by the addition of resizing handles to selected objects.</title>
 	  <mediaobject>
-	    <imageobject><imagedata fileref="images/rubberband.png" format="PNG" width="542" depth="143"/></imageobject>
-	    <imageobject><imagedata fileref="images/rubberband.eps" format="EPS"/></imageobject>
+	    <imageobject><imagedata fileref="images/input-drag-select-files.png" format="PNG" width="509" depth="166"/></imageobject>
+	    <imageobject><imagedata fileref="images/input-drag-select-files.eps" format="EPS"/></imageobject>
 	    <textobject><phrase>Example illustrating dynamic selection highlighting during bounding box selection</phrase></textobject>
 	  </mediaobject>
 
 	  <mediaobject>
-	    <imageobject><imagedata fileref="images/rubberband_dia.png" format="PNG" width="598" depth="147"/></imageobject>
-	    <imageobject><imagedata fileref="images/rubberband_dia.eps" format="EPS"/></imageobject>
+	    <imageobject><imagedata fileref="images/input-drag-select-graphics.png" format="PNG" width="598" depth="147"/></imageobject>
+	    <imageobject><imagedata fileref="images/input-drag-select-graphics.eps" format="EPS"/></imageobject>
 	    <textobject><phrase>Example illustrating dynamic selection highlighting during bounding box selection</phrase></textobject>
 	  </mediaobject>
 	  
@@ -223,8 +222,8 @@
 		<figure>
 		<title>Example of copy pointer augmented by an icon representing the file being copied</title>
 		<mediaobject>
-		<imageobject><imagedata fileref="images/dragcursor-augmented.png" format="PNG" width="168" depth="97"/></imageobject>
-		<imageobject><imagedata fileref="images/dragcursor-augmented.eps" format="EPS"/></imageobject>
+		<imageobject><imagedata fileref="images/input-drag-cursor.png" format="PNG" width="101" depth="129"/></imageobject>
+		<imageobject><imagedata fileref="images/input-drag-cursor.eps" format="EPS"/></imageobject>
 		<textobject><phrase>Copy pointer superimposed on icon representing a file being copied, to form a "copy file" pointer</phrase></textobject>
 		</mediaobject>
 		</figure>
@@ -254,7 +253,7 @@
 
 	<listitem><para>When an item is being dragged within or into a scrollable window, support automatic scrolling of that window when the mouse is moved near its edges.</para></listitem>
 	
-	<listitem><para>Pop up a menu when the user attempts to drop multiple objects on a target that only accepts single objects.  On the menu, list all the objects being dragged, and a <guimenuitem>Cancel</guimenuitem> item.</para></listitem>
+	<listitem><para>Pop up a menu when the user attemps to drop multiple objects on a target that only accepts single objects.  On the menu, list all the objects being dragged, and a <guimenuitem>Cancel</guimenuitem> item.</para></listitem>
 
 	<!-- CFB commenting this one out for now because it doesn't mean much the way it's written, and we'd ideally like to aim for more consistency than this anyway
 	
@@ -272,9 +271,9 @@
       	<sect4 id="drag-drop-modifiers"><title>Keyboard Modifiers</title>
       	<para>Allow the user to force the behavior of a drag and drop operation by holding the <keycap>Ctrl</keycap>, <keycap>Shift</keycap> or both keys throughout.  If the user changes modifier keys after they have started the drag, change the mouse pointer immediately and perform the new action when the mouse button is released.</para>
 
-	<table frame='none'>
+	<table frame='all'>
 	  <title>Effect of modifier keys during a drag and drop operation</title>
-	  <tgroup colsep="0" rowsep="0" cols='2' align='left'>
+	  <tgroup cols='2' align='left'>
 	    <thead>
 	      <row>
 		<entry>Modifier</entry>
@@ -312,9 +311,9 @@
 	  
 	  <para>Use the default GTK drag and drop pointers for the standard transfer operations listed below.  This consistency helps ensure the user will know exactly what to expect when they release the mouse button.  If you have to design a pointer for a non-standard transfer action not listed here, follow the style of the standard pointers.</para>
 
-	  <table frame='none'>
+	  <table frame='all'>
 	    <title>Mouse Pointers for Drag and Drop</title>
-	    <tgroup colsep="0" rowsep="0" cols='2' align='left'>
+	    <tgroup cols='2' align='left'>
 	      <thead>
 		<row>
 		  <entry>Pointer Shape</entry>
@@ -326,8 +325,8 @@
 		<row>
 		  <entry>
 	            <mediaobject>
-		      <imageobject><imagedata fileref="images/dragcursor-move.png" format="PNG" width="32" depth="32"/></imageobject>
-		      <imageobject><imagedata fileref="images/dragcursor-move.eps" format="EPS"/></imageobject>
+		      <imageobject><imagedata fileref="images/input-drag-cursor-move.png" format="PNG" width="31" depth="32"/></imageobject>
+		      <imageobject><imagedata fileref="images/input-drag-cursor-move.eps" format="EPS"/></imageobject>
 	              <textobject><phrase>"Move" pointer</phrase></textobject>
 	             </mediaobject>
                   </entry>
@@ -338,8 +337,8 @@
 		<row>
 		  <entry>
                     <mediaobject>
-		      <imageobject><imagedata fileref="images/dragcursor-copy.png" format="PNG" width="32" depth="32"/></imageobject>
-		      <imageobject><imagedata fileref="images/dragcursor-copy.eps" format="EPS"/></imageobject>
+		      <imageobject><imagedata fileref="images/input-drag-cursor-copy.png" format="PNG" width="33" depth="30"/></imageobject>
+		      <imageobject><imagedata fileref="images/input-drag-cursor-copy.eps" format="EPS"/></imageobject>
 	              <textobject><phrase>"Copy" pointer</phrase></textobject>
 	             </mediaobject>
                   </entry>
@@ -348,19 +347,19 @@
 		<row>
 		  <entry>
                     <mediaobject>
-		      <imageobject><imagedata fileref="images/dragcursor-link.png" format="PNG" width="32" depth="32"/></imageobject>
-		      <imageobject><imagedata fileref="images/dragcursor-link.eps" format="EPS"/></imageobject>
+		      <imageobject><imagedata fileref="images/input-drag-cursor-link.png" format="PNG" width="37" depth="33"/></imageobject>
+		      <imageobject><imagedata fileref="images/input-drag-cursor-link.eps" format="EPS"/></imageobject>
 	              <textobject><phrase>"Link" pointer</phrase></textobject>
 	             </mediaobject>
                   </entry>
-		  <entry>Link selection.  A link to the selection will be inserted at the drop location.  How the link appears will be application-dependent, it may be a hyperlink, an icon, or a duplicate of the original selection, for example.</entry>
+		  <entry>Link selection.  A link to the selection will be inserted at the drop location.  How the link appears will be application-dependent, it may be a hyperlink, an icon, or a duplicate of the orignal selection, for example.</entry>
 		</row>
 
 		<row>
 		  <entry>
                     <mediaobject>
-		      <imageobject><imagedata fileref="images/dragcursor-rmb.png" format="PNG" width="32" depth="32"/></imageobject>
-		      <imageobject><imagedata fileref="images/dragcursor-rmb.eps" format="EPS"/></imageobject>
+		      <imageobject><imagedata fileref="images/input-drag-cursor-query.png" format="PNG" width="28" depth="32"/></imageobject>
+		      <imageobject><imagedata fileref="images/input-drag-cursor-query.eps" format="EPS"/></imageobject>
 	              <textobject><phrase>"Query drop" pointer</phrase></textobject>
 	             </mediaobject>
                    </entry>
@@ -370,8 +369,8 @@
 		<row>
 		  <entry>
                      <mediaobject>
-		      <imageobject><imagedata fileref="images/dragcursor-nodrop.png" format="PNG" width="32" depth="32"/></imageobject>
-		      <imageobject><imagedata fileref="images/dragcursor-nodrop.eps" format="EPS"/></imageobject>
+		      <imageobject><imagedata fileref="images/input-drag-cursor-nodrop.png" format="PNG" width="28" depth="32"/></imageobject>
+		      <imageobject><imagedata fileref="images/input-drag-cursor-nodrop.eps" format="EPS"/></imageobject>
 	              <textobject><phrase>"Can't drop here" pointer</phrase></textobject>
 	             </mediaobject>
 </entry>
@@ -398,7 +397,7 @@
 	    <listitem><para>Clicking the right button <emphasis>anywhere</emphasis> within the applet's enclosing window must display either the popup menu for the whole applet, or the popup menu for the control under the mouse pointer.  Do not have &quot;dead areas&quot; in your applet that do not respond to a right click.</para></listitem>
 	    
 	    <listitem><para>Do not use the middle button for anything except dragging the applet to a new location.  Middle-clicking and dragging anywhere within the applet window must move the applet, do not require a drag bar or similar device.</para>
-		<para><keycombo action="other" otheraction="drag"><keycap>Ctrl</keycap><mousebutton> left button</mousebutton></keycombo> <action>drag</action> should copy the applet, if moving to another panel; unmodified drag or <keycombo action="other" otheraction="drag"><keycap>Shift</keycap><mousebutton> left button</mousebutton></keycombo> <action>drag</action> should move the applet, if moving to another panel.  If moving within same panel, <keycap>Ctrl</keycap>=switched movement, <keycap>Shift</keycap>=push movement, <keycap>Alt</keycap>=free movement.</para></listitem>
+		<para><keycombo action="other" otheraction="drag"><keycap>Ctrl</keycap><mousebutton>left button</mousebutton></keycombo> <action>drag</action> should copy the applet, if moving to another panel; unmodified drag or <keycombo action="other" otheraction="drag"><keycap>Shift</keycap><mousebutton>left button</mousebutton></keycombo> <action>drag</action> should move the applet, if moving to another panel.  If moving within same panel, <keycap>Ctrl</keycap>=switched movement, <keycap>Shift</keycap>=push movement, <keycap>Alt</keycap>=free movement.</para></listitem>
 
 	  </itemizedlist>
 	  
@@ -422,8 +421,8 @@
 	<figure>
 	  <title>Dialog and menu, with some of their access and shortcut keys indicated</title>
 	  <mediaobject>
-	  <imageobject><imagedata fileref="images/mnemonics_and_shortcuts.png" format="PNG" width="484" depth="272"/></imageobject>
-	  <imageobject><imagedata fileref="images/mnemonics_and_shortcuts.eps" format="EPS"/></imageobject>
+	  <imageobject><imagedata fileref="images/input-accesskeys-shortcuts.png" format="PNG" width="497" depth="399"/></imageobject>
+	  <imageobject><imagedata fileref="images/input-accesskeys-shortcuts.eps" format="EPS"/></imageobject>
 	  <textobject><phrase>Screenshot of a dialog and a menu with some of their access keys and shortcut keys highlighted</phrase></textobject>
 	  </mediaobject>
 	</figure>
@@ -464,7 +463,7 @@
       <sect2 id="choosing-access-keys">
 	<title>Choosing Access Keys</title>
 
-	<para>Give all labeled components an access key (underlined letter), with the exception of toolbar controls which would use up too many access key combinations.</para>
+	<para>Give all labelled components an access key (underlined letter), with the exception of toolbar controls which would use up too many access key combinations.</para>
 
 <!-- Consensus was against giving OK and Cancel additional access keys, but they have them anyway and Owen refuses to remove them...
 
@@ -514,12 +513,10 @@
 	  <listitem><para>Choose new shortcut keys to be as mnemonic as possible, as these will be easier to learn and remember.  For example, <keycombo><keycap>Ctrl</keycap><keycap>E</keycap></keycombo> would be a good shortcut for a menu item called <guimenuitem>Edit Page</guimenuitem>.</para></listitem>
 
 	  <listitem><para>Use <keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap><keycap>letter</keycap></keycombo> for functions that reverse or extend another function.  For example, <keycombo><keycap>Ctrl</keycap><keycap>Z</keycap></keycombo> and <keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap><keycap>Z</keycap></keycombo> for <guimenuitem>Undo</guimenuitem> and <guimenuitem>Redo</guimenuitem>.
-	  
-	<note><title>Unicode entry shortcut</title>
-	<para>Note that you cannot use <keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap><keycap>U</keycap></keycombo> for your own purposes, as this shortcut is used to enter unicode characters in text fields. If you need compatability with releases prior to GNOME 2.16, you should not use <keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap><keycap>A-thru-F</keycap></keycombo> or <keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap><keycap>0-thru-9</keycap></keycombo> for the same reason.</para></note>
+	<note><title>Unicode entry shortcuts</title><para>Note that you cannot use <keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap><keycap>A-thru-F</keycap></keycombo> or <keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap><keycap>0-thru-9</keycap></keycombo> for your own purposes, as these combinations are used to enter unicode characters in text fields.</para></note>
 	</para></listitem>
 	  
-	  <listitem><para>Do not use <keycombo><keycap>Ctrl</keycap><keycap>number</keycap></keycombo> or numbered function keys as shortcut keys, unless the number has some obvious relevance to the action.  For example, <keycombo><keycap>Ctrl</keycap><keycap>2</keycap></keycombo> and <keycombo><keycap>Ctrl</keycap><keycap>3</keycap></keycombo> may be acceptable shortcut keys for <menuchoice><guimenu>View</guimenu><guimenuitem>2D View</guimenuitem></menuchoice> and <menuchoice><guimenu>View</guimenu><guimenuitem>3D View</guimenuitem></menuchoice> in a 3D modeling application.</para></listitem>
+	  <listitem><para>Do not use <keycombo><keycap>Ctrl</keycap><keycap>number</keycap></keycombo> or numbered function keys as shortcut keys, unless the number has some obvious relevance to the action.  For example, <keycombo><keycap>Ctrl</keycap><keycap>2</keycap></keycombo> and <keycombo><keycap>Ctrl</keycap><keycap>3</keycap></keycombo> may be acceptable shortcut keys for <menuchoice><guimenu>View</guimenu><guimenuitem>2D View</guimenuitem></menuchoice> and <menuchoice><guimenu>View</guimenu><guimenuitem>3D View</guimenuitem></menuchoice> in a 3D modelling application.</para></listitem>
 	  	  
 	  <listitem><para>Do not use <keycombo><keycap>Alt</keycap><keycap>key</keycap></keycombo> combinations for shortcut keys, as these may conflict with window manager or menu access keys.</para></listitem>
 
@@ -536,9 +533,9 @@
 
 	<para>If your application uses any of the standard functions listed in the following tables, use the recommended standard keyboard shortcut for that function.</para>
 	
-	<table frame='none' pgwide='1'>
+	<table frame='all' pgwide='1'>
 	  <title>Standard GNOME application shortcut keys and access keys - File menu</title>
-	  <tgroup colsep="0" rowsep="0" cols='3' align='left'>
+	  <tgroup cols='3' align='left'>
 	    <thead>
 	      <row>
 		<entry>Function</entry>
@@ -581,9 +578,9 @@
 	  </tgroup>
 	</table>
 
-	<table frame='none' pgwide='1'>
+	<table frame='all' pgwide='1'>
 	  <title>Standard GNOME application shortcut keys and access keys - Edit menu</title>
-	  <tgroup colsep="0" rowsep="0" cols='3' align='left'>
+	  <tgroup cols='3' align='left'>
 	    <thead>
 	      <row>
 		<entry>Function</entry>
@@ -699,9 +696,9 @@
 	
 	
 
-	<table frame='none' pgwide='1'>
+	<table frame='all' pgwide='1'>
 	  <title>Standard GNOME application shortcut keys and access keys - View menu</title>
-	  <tgroup colsep="0" rowsep="0" cols='3' align='left'>
+	  <tgroup cols='3' align='left'>
 	    <thead>
 	      <row>
 		<entry>Function</entry>
@@ -748,9 +745,9 @@
 		<para>If your application requires both <menuchoice><guimenu>View</guimenu><guimenuitem>Reload</guimenuitem></menuchoice> and <menuchoice><guimenu>View</guimenu><guimenuitem>Refresh</guimenuitem></menuchoice> menu items, use <keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap><keycap>R</keycap></keycombo> as the shortcut for <guimenuitem>Reload</guimenuitem>.</para>
 	</note>
 	
-	<table frame='none' pgwide='1'>
+	<table frame='all' pgwide='1'>
 	  <title>Standard GNOME application shortcut keys and access keys - Bookmarks menu</title>
-	  <tgroup colsep="0" rowsep="0" cols='3' align='left'>
+	  <tgroup cols='3' align='left'>
 	    <thead>
 	      <row>
 		<entry>Function</entry>
@@ -777,9 +774,9 @@
 		<para>If your application requires both <menuchoice><guimenu>Format</guimenu><guimenuitem>Bold</guimenuitem></menuchoice> and <menuchoice><guimenu>Bookmarks</guimenu><guimenuitem>Edit Bookmarks...</guimenuitem></menuchoice> menu items, use <keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap><keycap>D</keycap></keycombo> as the shortcut for <guimenuitem>Edit Bookmarks</guimenuitem>.</para>
 	</note>
 
-	<table frame='none' pgwide='1'>
+	<table frame='all' pgwide='1'>
 	  <title>Standard GNOME application shortcut keys and access keys - Go menu</title>
-	  <tgroup colsep="0" rowsep="0" cols='3' align='left'>
+	  <tgroup cols='3' align='left'>
 	    <thead>
 	      <row>
 		<entry>Function</entry>
@@ -819,9 +816,9 @@
 	</table>
 
 	
-	<table frame='none' pgwide='1'>
+	<table frame='all' pgwide='1'>
 	  <title>Standard GNOME application shortcut keys and access keys - Format menu</title>
-	  <tgroup colsep="0" rowsep="0" cols='3' align='left'>
+	  <tgroup cols='3' align='left'>
 	    <thead>
 	      <row>
 		<entry>Function</entry>
@@ -854,9 +851,9 @@
 	</note>
 -->
 
-	<table frame='none' pgwide='1'>
+	<table frame='all' pgwide='1'>
 	  <title>Standard GNOME application shortcut keys and access keys - Help menu</title>
-	  <tgroup colsep="0" rowsep="0" cols='3' align='left'>
+	  <tgroup cols='3' align='left'>
 	    <thead>
 	      <row>
 		<entry>Function</entry>
@@ -893,9 +890,9 @@
 	<title>Standard Window Manager Shortcut Keys</title>
 	<para>The following shortcut keys are used by many window managers, and should not normally be over-ridden by your application.</para>
 
-<table frame='none' pgwide='1'>
+<table frame='all' pgwide='1'>
 	  <title>Standard window manager shortcut keys and access keys</title>
-	  <tgroup colsep="0" rowsep="0" cols='3' align='left'>
+	  <tgroup cols='3' align='left'>
 	    <thead>
 	      <row>
 		<entry>Function</entry>
@@ -978,9 +975,9 @@
 	<title>Standard Widget Navigation Shortcut Keys</title>
 	<para>The following shortcut keys are reserved for keyboard navigation use by the various widgets used in GNOME, and should not normally be over-ridden by your application.</para>
 
-	<table frame='none' pgwide='1'>
+	<table frame='all' pgwide='1'>
 	  <title>Standard GNOME keyboard navigation keys for widgets</title>
-	  <tgroup colsep="0" rowsep="0" cols='2' align='left'>
+	  <tgroup cols='2' align='left'>
 	    <thead>
 	      <row>
 		<entry>Key</entry>
@@ -1033,12 +1030,8 @@
 		<entry>Select/move to first item in selected widget</entry>
 	      </row>
 	      <row>
-	      	<entry><keycap>PageUp</keycap>, <keycap>PageDown</keycap></entry>
-		<entry>Scroll selected view by one page up/down</entry>
-	      </row>
-	      <row>
-	      	<entry><keycombo><keycap>Ctrl</keycap><keycap>PageUp</keycap></keycombo>, <keycombo><keycap>Ctrl</keycap><keycap>PageDown</keycap></keycombo></entry>
-		<entry>Scroll selected view by one page left/right</entry>
+		<entry><keycap>PageUp</keycap>, <keycombo><keycap>Ctrl</keycap><keycap>PageUp</keycap></keycombo>, <keycap>PageDown</keycap>, <keycombo><keycap>Ctrl</keycap><keycap>PageDown</keycap></keycombo></entry>
+		<entry>Scroll selected view by one page up/left/down/right</entry>
 	      </row>
  	      </tbody>
 	  </tgroup>
@@ -1051,9 +1044,9 @@
 	  
 	  <para>The following emacs-style navigation shortcut keys are still available in GNOME 2.0 text entry fields (by selecting the "emacs" scheme in the GNOME <guilabel>Keyboard Shortcuts</guilabel> preferences dialog), but are disabled by default.  Since some users will still want to use them, do not over-ride them for your own purposes in any situations where a text entry control has focus.</para>
 
-	  <table frame='none' pgwide='1'>
+	  <table frame='all' pgwide='1'>
 	    <title>Emacs-style navigation keys for widgets</title>
-	    <tgroup colsep="0" rowsep="0" cols='2' align='left'>
+	    <tgroup cols='2' align='left'>
 	      <thead>
 		<row>
 		  <entry>Key</entry>
@@ -1122,13 +1115,13 @@
 
 	<para>Panels have been fully keyboard navigable since GNOME 2.0.  Since your panel application can gain keyboard focus, you must ensure that it is also keyboard navigable.</para>
 
-	<para>The rules for panel application keyboard navigation are mostly the same as those for any other window.  However, there is one important difference:</para>
+	<para>The rules for panel application keyboard navigation are mostly the same as those for any other window.  However, there is one imporant difference:</para>
 
 	<itemizedlist>
 	  <listitem><para>Do <emphasis>not</emphasis> use the the <keycap>Tab</keycap> key as the means of moving focus between controls in a panel application.  Use the arrow keys for this purpose instead.</para></listitem>
 	</itemizedlist>
 
-	<para>When an object on a panel has focus, the <keycap>Tab</keycap> key normally moves focus to the next object on the panel.  If your panel application also used <keycap>Tab</keycap> for its own internal navigation, the user would have to press <keycombo><keycap>Ctrl</keycap><keycap>Tab</keycap></keycombo> to move focus out of your panel application instead.  This inconsistency would be detrimental to the user experience.</para>
+	<para>When an object on a panel has focus, the <keycap>Tab</keycap> key normally moves focus to the next object on the panel.  If your panel application also used <keycap>Tab</keycap> for its own internal navigation, the user would have to press <keycombo><keycap>Ctrl</keycap><keycap>Tab</keycap></keycombo> to move focus out of your panel application instead.  This inconsistency would be detremental to the user experience.</para>
 	
       </sect2>
       

Modified: trunk/content/projects/gup/hig/hig-ch-language.xml
==============================================================================
--- trunk/content/projects/gup/hig/hig-ch-language.xml	(original)
+++ trunk/content/projects/gup/hig/hig-ch-language.xml	Mon Sep 29 23:05:52 2008
@@ -4,14 +4,14 @@
   <chapter id="language">
     <title>Language</title>
 
-    <para>Consistent labeling creates a familiar environment that the user can navigate comfortably. The more familiar the environment, the easier task of finding information.</para>
+    <para>Consistent labelling creates a familiar environment that the user can navigate comfortably. The more familiar the environment, the easier task of finding information.</para>
 
     <sect1 id="language-labels">
       <title>Labels</title>
       
       <sect2 id="language-controls"> 
 	<title>Controls</title> 
-	<para>Clear, consistent and concise labeling of controls helps users to work out the purpose of a window or dialog they have never seen before. To a visually-impaired user, clear labels are even more important. A user who relies on a screenreader has no assistance from icons, layout, or spacing to work out what the controls do, so clear labeling is essential.</para>
+	<para>Clear, consistent and concise labelling of controls helps users to work out the purpose of a window or dialog they have never seen before. To a visually-impaired user, clear labels are even more important. A user who relies on a screenreader has no assistance from icons, layout, or spacing to work out what the controls do, so clear labelling is essential.</para>
 	
 	<itemizedlist><title>Guidelines</title> 
 	  <listitem><para>Keep labels short.  This:
@@ -27,7 +27,7 @@
 	  
 	  <listitem><para>Do not include text in windows that describes <emphasis>how</emphasis> to use the interface, for example <guilabel>You can install a new theme by dropping it here</guilabel>.  As well as adding visual clutter, descriptive labels can also conflict with information provided in documentation.</para></listitem> 
 	  
-	  <listitem><para>Use standard terms.  You can find a list of standard user interface terms in the <ulink url="http://developer.gnome.org/documents/style-guide/wordlist.html";>GNOME Documentation Style Guide, Recommended Terminology</ulink>.</para></listitem> 
+	  <listitem><para>Use standard terms.  You can find a list of standard user interface terms in the <ulink url="http://developer.gnome.org/documents/style-guide/wordlist.html";>GNOME Documentation Style Guide, Recommended Terminology</ulink>..</para></listitem> 
 	  
 	  <listitem><para>Apply standard capitalization rules.  See <xref linkend="layout-capitalization"/> for guidelines about capitalization of user interface labels </para></listitem> 
 	</itemizedlist>
@@ -98,8 +98,8 @@
 
 
     <sect1 id="language-help">
-      <title>On-line Help</title>
-	<para>Writing on-line help is a specialized task, and is therefore not covered in any depth here.  Refer to the <ulink url="http://developer.gnome.org/documents/style-guide/index.html";>GNOME Documentation Styleguide</ulink> for guidance on writing clear, consistent and helpful documentation for your application.</para>
+      <title>Online Help</title>
+	<para>Writing online help is a specialized task, and is therefore not covered in any depth here.  Refer to the <ulink url="http://developer.gnome.org/documents/style-guide/index.html";>GNOME Documentation Styleguide</ulink> for guidance on writing clear, consistent and helpful documentation for your application.</para>
     </sect1>
 
   </chapter>

Modified: trunk/content/projects/gup/hig/hig-ch-layout.xml
==============================================================================
--- trunk/content/projects/gup/hig/hig-ch-layout.xml	(original)
+++ trunk/content/projects/gup/hig/hig-ch-layout.xml	Mon Sep 29 23:05:52 2008
@@ -35,15 +35,15 @@
 
       <figure><title>The basic GNOME 32-color palette</title>
 	<mediaobject>
-	  <imageobject><imagedata fileref="images/ximian-palette.png" format="PNG"/></imageobject>
-	  <imageobject><imagedata fileref="images/ximian-palette.eps" format="EPS"/></imageobject>
+	  <imageobject><imagedata fileref="images/visdes-palette.png" format="PNG"/></imageobject>
+	  <imageobject><imagedata fileref="images/visdes-palette.eps" format="EPS"/></imageobject>
 	  <textobject><phrase>The basic GNOME 32-color palette</phrase></textobject>
 	</mediaobject>
       </figure>
       
       <table frame="none"> 
 	<title>RGB and hexadecimal values for the basic palette</title> 
-	<tgroup cols="8" colsep="0" rowsep="0" align="left">
+	<tgroup cols="8" colsep="1" rowsep="0" align="left">
 	  <thead> 
 	    <row rowsep="1" valign="top"> 
 	      <entry>Color</entry> 
@@ -59,15 +59,15 @@
 	  <tbody valign="middle">
 	    <row>
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-1.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-1.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-1.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-1.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
-	      <entry>Basic 3D Highlight</entry>
+	      <entry>Basic 3D Hilight</entry>
 	      <entry>234 232 227</entry>
 	      <entry>#EAE8E3 </entry>
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-2.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-2.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-2.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-2.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Basic 3D Medium</entry>
 	      <entry>186 181 171</entry>
@@ -75,15 +75,15 @@
 	    </row>
 	    <row> 
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-3.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-3.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-3.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-3.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Basic 3D Dark</entry>
 	      <entry>128 125 116</entry>
 	      <entry>#807D74 </entry>
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-4.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-4.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-4.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-4.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>3D Shadow</entry>
 	      <entry>86 82 72</entry>
@@ -91,15 +91,15 @@
 	    </row>
 	    <row> 
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-5.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-5.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-5.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-5.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
-	      <entry>Green Highlight</entry>
+	      <entry>Green Hilight</entry>
 	      <entry>197 210 200</entry>
 	      <entry>#C5D2C8 </entry>
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-6.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-6.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-6.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-6.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Green Medium</entry>
 	      <entry>131 166 127</entry>
@@ -107,15 +107,15 @@
 	    </row>
 	    <row> 
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-7.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-7.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-7.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-7.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Green Dark</entry>
 	      <entry>93 117 85</entry>
 	      <entry>#5D7555 </entry>
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-8.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-8.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-8.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-8.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Green Shadow</entry>
 	      <entry>68 86 50</entry>
@@ -123,15 +123,15 @@
 	    </row>
 	    <row> 
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-9.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-9.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-9.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-9.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
-	      <entry>Red Highlight</entry>
+	      <entry>Red Hilight</entry>
 	      <entry>224 182 175</entry>
 	      <entry>#E0B6AF </entry>
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-10.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-10.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-10.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-10.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Red Medium</entry>
 	      <entry>193 102 90</entry>
@@ -139,15 +139,15 @@
 	    </row>
 	    <row> 
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-11.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-11.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-11.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-11.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Red Dark</entry>
 	      <entry>136 70 49</entry>
 	      <entry>#884631 </entry>
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-12.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-12.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-12.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-12.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Red Shadow</entry>
 	      <entry>102 56 34</entry>
@@ -155,15 +155,15 @@
 	    </row>
 	    <row> 
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-13.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-13.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-13.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-13.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
-	      <entry>Purple Highlight</entry>
+	      <entry>Purple Hilight</entry>
 	      <entry>173 167 200</entry>
 	      <entry>#ADA7C8 </entry>
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-14.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-14.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-14.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-14.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Purple Medium</entry>
 	      <entry>136 127 163</entry>
@@ -171,15 +171,15 @@
 	    </row>
 	    <row> 
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-15.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-15.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-15.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-15.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Purple Dark</entry>
 	      <entry>98 91 129</entry>
 	      <entry>#625B81 </entry>
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-16.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-16.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-16.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-16.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Purple Shadow</entry>
 	      <entry>73 64 102</entry>
@@ -187,15 +187,15 @@
 	    </row>
 	    <row> 
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-17.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-17.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-17.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-17.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
-	      <entry>Blue Highlight</entry>
+	      <entry>Blue Hilight</entry>
 	      <entry>157 184 210</entry>
 	      <entry>#9DB8D2 </entry>
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-18.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-18.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-18.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-18.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Blue Medium</entry>
 	      <entry>117 144 174</entry>
@@ -203,15 +203,15 @@
 	    </row>
 	    <row> 
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-19.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-19.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-19.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-19.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Blue Dark</entry>
 	      <entry>75 105 131</entry>
 	      <entry>#4B6983 </entry>
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-20.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-20.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-20.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-20.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Blue Shadow</entry>
 	      <entry>49 78 108</entry>
@@ -219,15 +219,15 @@
 	    </row>
 	    <row> 
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-21.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-21.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-21.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-21.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
-	      <entry>Face Skin Highlight</entry>
+	      <entry>Face Skin Hilight</entry>
 	      <entry>239 224 205</entry>
 	      <entry>#EFE0CD </entry>
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-22.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-22.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-22.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-22.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Face Skin Medium</entry>
 	      <entry>224 195 158</entry>
@@ -235,15 +235,15 @@
 	    </row>
 	    <row> 
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-23.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-23.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-23.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-23.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Face Skin Dark</entry>
 	      <entry>179 145 105</entry>
 	      <entry>#B39169 </entry>
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-24.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-24.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-24.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-24.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Face Skin Shadow</entry>
 	      <entry>130 102 71</entry>
@@ -251,15 +251,15 @@
 	    </row>
 	    <row> 
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-25.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-25.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-25.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-25.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Accent Red</entry>
 	      <entry>223 66 30</entry>
 	      <entry>#DF421E </entry>
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-26.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-26.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-26.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-26.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Accent Red Dark</entry>
 	      <entry>153 0 0</entry>
@@ -267,15 +267,15 @@
 	    </row>
 	    <row> 
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-27.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-27.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-27.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-27.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Accent Yellow</entry>
 	      <entry>238 214 128</entry>
 	      <entry>#EED680 </entry>
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-28.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-28.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-28.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-28.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Accent Yellow Dark</entry>
 	      <entry>209 148 12</entry>
@@ -283,15 +283,15 @@
 	    </row>
 	    <row> 
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-29.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-29.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-29.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-29.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Accent Green </entry>
 	      <entry>70 160 70</entry>
 	      <entry>#46A046 </entry>
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-30.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-30.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-30.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-30.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Accent Green Dark</entry>
 	      <entry>38 199 38</entry>
@@ -299,15 +299,15 @@
 	    </row>
 	    <row> 
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-31.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-31.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-31.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-31.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>White</entry>
 	      <entry>255 255 255</entry>
 	      <entry>#ffffff </entry>
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-32.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-32.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-32.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-32.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Black</entry>
 	      <entry>0 0 0</entry>
@@ -326,33 +326,33 @@
 
       <para>An estimated 11% of the world population has some sort of color-blindness.  Those affected typically have trouble distinguishing between certain hues such as red and green (deuteranopia or protanopia), or blue and yellow (tritanopia). Therefore it is necessary to allow the user to customize colors in any part of your application that conveys important information. This means that your application must effectively convey information using just the colors from any theme that the user chooses<!--, and that attributes such as hue and brightness are adjustable in your application's preferences dialog -->.</para>
       
-      <para>A useful tool for reviewing information about color-blindness and checking legibility of images for color-blind users is <ulink url="http://www.vischeck.com/";>Vischeck</ulink>, an on-line tool that simulates the way an image or a website might appear to a user who has deuteranopia, protanopia, or tritanopia. </para>
+      <para>A useful tool for reviewing information about color-blindness and checking legibility of images for color-blind users is <ulink url="http://www.vischeck.com/";>Vischeck</ulink>, an online tool that simulates the way an image or a website might appear to a user who has deuteranopia, protanopia, or tritanopia. </para>
 
       <figure><title>How the earth looks to a user with normal color vision (left), deuteranopia (middle), and tritanopia (right). (Images from <ulink url="http://www.vischeck.com";>http://www.vischeck.com</ulink>).</title>
 	
 	<informaltable frame="none">
-	  <tgroup colsep="0" rowsep="0" cols="3" align="center">
+	  <tgroup cols="3" align="center">
 	    <tbody valign="top">
 	      <row>
 		<entry>
 	          <mediaobject>
-		    <imageobject><imagedata fileref="images/earthNorm.png" format="PNG"/></imageobject>
-		    <imageobject><imagedata fileref="images/earthNorm.eps" format="EPS"/></imageobject>
+		    <imageobject><imagedata fileref="images/visdes-colorblind-normal.png" format="PNG"/></imageobject>
+		    <imageobject><imagedata fileref="images/visdes-colorblind-normal.eps" format="EPS"/></imageobject>
 		    <textobject><phrase>Photo of earth as a normally-sighted user would see it</phrase></textobject>
 		  </mediaobject>
 	        </entry>
 		
 		<entry>
 	          <mediaobject>
-		    <imageobject><imagedata fileref="images/earthDeutan.png" format="PNG"/></imageobject>
-		    <imageobject><imagedata fileref="images/earthDeutan.eps" format="EPS"/></imageobject>
+		    <imageobject><imagedata fileref="images/visdes-colorblind-deutan.png" format="PNG"/></imageobject>
+		    <imageobject><imagedata fileref="images/visdes-colorblind-deutan.eps" format="EPS"/></imageobject>
 		    <textobject><phrase>Photo of earth as a user with red-green color-blindness would see it</phrase></textobject>
 		  </mediaobject>
 	        </entry>
 		<entry>
 	          <mediaobject>
-		    <imageobject><imagedata fileref="images/earthTritan.png" format="PNG"/></imageobject>
-		    <imageobject><imagedata fileref="images/earthTritan.eps" format="EPS"/></imageobject>
+		    <imageobject><imagedata fileref="images/visdes-colorblind-tritan.png" format="PNG"/></imageobject>
+		    <imageobject><imagedata fileref="images/visdes-colorblind-tritan.eps" format="EPS"/></imageobject>
 		    <textobject><phrase>Photo of earth as a user with blue-yellow color-blindness would see it</phrase></textobject>
 		  </mediaobject>
 	        </entry>
@@ -401,21 +401,21 @@
       <figure id="improved-layout-figure"><title>Improved window layout</title>
 	
 	<informaltable frame="none">
-	  <tgroup colsep="0" rowsep="0" cols="2" align="center">
+	  <tgroup cols="2" align="center">
 	    <tbody valign="top">
 	      <row>
 		<entry>
 	          <mediaobject>
-		    <imageobject><imagedata fileref="images/layout1.png" format="PNG"/></imageobject>
-		    <imageobject><imagedata fileref="images/layout1.eps" format="EPS"/></imageobject>
+		    <imageobject><imagedata fileref="images/visdes-layout-poor.png" format="PNG"/></imageobject>
+		    <imageobject><imagedata fileref="images/visdes-layout-poor.eps" format="EPS"/></imageobject>
 		    <textobject><phrase>Initial layout with poor alignment and limited use of white space</phrase></textobject>
 		  </mediaobject>
 	        </entry>
 		
 		<entry>
 	          <mediaobject>
-		    <imageobject><imagedata fileref="images/layout2.png" format="PNG"/></imageobject>
-		    <imageobject><imagedata fileref="images/layout2.eps" format="EPS"/></imageobject>
+		    <imageobject><imagedata fileref="images/visdes-layout-good.png" format="PNG"/></imageobject>
+		    <imageobject><imagedata fileref="images/visdes-layout-good.eps" format="EPS"/></imageobject>
 		    <textobject><phrase>Improved layout with fewer alignment points, frames removed to relieve clutter, and clearer grouping with use of white space</phrase></textobject>
 		  </mediaobject>
 	        </entry>
@@ -438,8 +438,8 @@
       <figure id="layout-callouts-figure"><title>Layout specifications</title>
 	
 	<mediaobject>
-	  <imageobject><imagedata fileref="images/layout_callouts.png" format="PNG"/></imageobject>
-	  <imageobject><imagedata fileref="images/layout_callouts.eps" format="EPS"/></imageobject>
+	  <imageobject><imagedata fileref="images/visdes-layout-annotated.png" format="PNG"/></imageobject>
+	  <imageobject><imagedata fileref="images/visdes-layout-annotated.eps" format="EPS"/></imageobject>
 	  <textobject><phrase>Improved layout with fewer alignment points, frames removed to relieve clutter, and clearer grouping with use of white space</phrase></textobject>
 	</mediaobject>
       </figure>
@@ -458,6 +458,8 @@
 
     </sect2>
 
+<!-- 
+I'm commenting out this section for the HIG 2.8 release pending "still needs more work" -Seth
 
     <sect2 id="layout-window-size">
 	<title>Size</title>
@@ -491,6 +493,7 @@
 
 	</sect2>
 
+-->
 
     <sect2 id="window-layout-spacing">
       <title>Spacing and Alignment</title>
@@ -508,7 +511,7 @@
 	<listitem><para>Indent group members 12 pixels to denote hierarchy and association.</para></listitem>
 	<listitem><para>Minimize the number of alignment points in your window. An alignment point is an imaginary vertical or horizontal line through your window that touches the edge of one or more labels or controls in the window.</para></listitem>
 
-	<listitem><para>Right-justification within groups or the overall window (as indicated by the line labeled "justification" in <xref linkend="layout-callouts-figure"/> is pleasing to the eye, but not crucial.</para></listitem>
+	<listitem><para>Right-justification within groups or the overall window (as indicated by the line labelled "justification" in <xref linkend="layout-callouts-figure"/> is pleasing to the eye, but not crucial.</para></listitem>
 	
 	<listitem><para>Lay out components left-to-right, top-to-bottom. Generally, the first element the user is meant to encounter should be in the top-left, and the last in the bottom right. Keep in mind that when localized for non-western locales, interfaces may be reversed so that they read from right to left.</para></listitem>
 	
@@ -562,9 +565,9 @@
 
       <para>Use spacing and alignment of text uniformly throughout your application. A basic rule of thumb is to put space between user interface components in increments of 6 pixels, going up as the relationship between related elements becomes more distant.</para>
 
-      <table frame="none" id="label-placement-example">
+      <table id="label-placement-example">
 	<title>Alignment and spacing for different Text elements</title>
-	<tgroup colsep="0" rowsep="0" cols="3" align="left">
+	<tgroup cols="3" align="left">
 	  <thead>
 	    <row>
 	      <entry>Element</entry>
@@ -576,11 +579,11 @@
 	  <tbody>
 	    <row>
 	      <entry>Large Icons (file browser)</entry>
-	      <entry>Horizontally centered and (6 pixels, if specification necessary) below large icons</entry>
-	      <entry align="center">
+	      <entry>Horizontally centered with and (6 pixels, if specification necessary)below large icon</entry>
+	      <entry align="center" valign="middle">
 		<mediaobject>
-		  <imageobject><imagedata fileref="images/large_icon_label.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/large_icon_label.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-large-icon-label.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-large-icon-label.eps" format="EPS"/></imageobject>
 		  <textobject><phrase>Large icon with text label centered below</phrase></textobject>
 		</mediaobject>
 	      </entry>
@@ -588,11 +591,11 @@
 	    
 	    <row>
 	      <entry>Small icons (toolbar)</entry>
-	      <entry>Vertically centered and (6 pixels, if specification necessary) to the right of small icons</entry>
-	      <entry align="center">
+	      <entry>Vertically centered with and (6 pixels, if specification necessary) to the right of small icons</entry>
+	      <entry align="center" valign="middle">
 		<mediaobject>
-		  <imageobject><imagedata fileref="images/small_icon_label.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/small_icon_label.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-small-icon-label.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-small-icon-label.eps" format="EPS"/></imageobject>
 		  <textobject><phrase>Small icon with text label to the right</phrase></textobject>
 		</mediaobject>
 	      </entry>
@@ -600,11 +603,11 @@
 	    
 	    <row>
 	      <entry>List control label</entry>
-	      <entry>6 pixels above and horizontally left aligned with the list control or 12 pixels to the left of and horizontally top aligned with list control</entry>
-	      <entry align="center">
+	      <entry>6 pixels above and horizontally left aligned with list control or 12 pixels to the left of and horizontally top aligned with list control</entry>
+	      <entry align="center" valign="middle">
 		<mediaobject>
-		  <imageobject><imagedata fileref="images/list_control_label.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/list_control_label.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-list-label.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-list-label.eps" format="EPS"/></imageobject>
 		  <textobject><phrase>List control with text label horizontally aligned above</phrase></textobject>
 		</mediaobject>
 	      </entry>
@@ -612,11 +615,11 @@
 
 	    <row>
 	      <entry>Radio button and check box labels</entry>
-	      <entry>6 pixels to the right of and vertically center aligned with the radio button</entry>
-	      <entry align="center">
+	      <entry>6 pixels to the right of and vertically center aligned with radio button</entry>
+	      <entry align="center" valign="middle">
 		<mediaobject>
-		  <imageobject><imagedata fileref="images/radio_button_label.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/radio_button_label.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-radiobutton-label.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-radiobutton-label.eps" format="EPS"/></imageobject>
 		  <textobject><phrase>Radio button with text label to its right</phrase></textobject>
 		</mediaobject>
 	      </entry>
@@ -624,12 +627,12 @@
 	    </row>
 
 	    <row> 
-	      <entry>Textfield labels</entry>
-	      <entry>6 pixels to the left of and vertically center aligned with the textfield control</entry>
-	      <entry align="center">
+	      <entry>Text field labels</entry>
+	      <entry>6 pixels to the left of and vertically center aligned with textfield control</entry>
+	      <entry align="center" valign="middle">
 		<mediaobject>
-		  <imageobject><imagedata fileref="images/textbox_label.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/textbox_label.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-textbox-label.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-textbox-label.eps" format="EPS"/></imageobject>
 		  <textobject><phrase>Textbox with text label to its left</phrase></textobject>
 		</mediaobject>
 	      </entry>
@@ -638,10 +641,10 @@
 	    <row>
 	      <entry>Button labels</entry>
 	      <entry>12 pixels of padding to either side of centered text (and any accompanying graphic). If appearing in a group of buttons, longest button label sets button size, center all other button labels and accompanying graphics in same-sized buttons</entry>
-	      <entry align="center">
+	      <entry align="center" valign="middle">
 		<mediaobject>
-		  <imageobject><imagedata fileref="images/icons_labels.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/icons_labels.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-button-label.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-button-label.eps" format="EPS"/></imageobject>
 		  <textobject><phrase>Buttons with centered text</phrase></textobject>
 		</mediaobject>
 	      </entry>
@@ -649,10 +652,10 @@
 	    <row> 
 	      <entry>Other component labels (e.g., spin boxes, text fields </entry>
 	      <entry>12 pixels between the longest text label and its associated component, all other text labels in component grouping left aligned with the longest label. All labels vertically center aligned with associated components</entry>
-	      <entry  align="center">
+	      <entry  align="center" valign="middle">
 		<mediaobject>
-		  <imageobject><imagedata fileref="images/other_labels.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/other_labels.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-other-labels.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-other-labels.eps" format="EPS"/></imageobject>
 		  <textobject><phrase>Drop-down list with label to its left</phrase></textobject>
 		</mediaobject>
 	      </entry>
@@ -670,7 +673,7 @@
 	<remark>GJM: This is just wrong. Glade may have an "auto" target for labels with mnemonics that
 	works this way, but it isn't part of GTK+. Adding the next listitem, though it could be better written.</remark>
 	-->
-	<listitem><para>Ensure that a label with an access key is associated with the control it labels.</para></listitem>
+	<listitem><para>Ensure that a label with a mnemonic is associated with the control it labels.</para></listitem>
 
 	<listitem><para>Left-align components and labels, unless all the labels in a group have very different lengths. If they do, right-align the labels instead, to ensure that no controls end up too far away from their corresponding labels.</para></listitem>
 
@@ -741,8 +744,9 @@
 	of user interface element. 
       </para>
 
-      <table frame="none"> 
-	<title>Capitalization Style Guidelines for User Interface Elements</title> 
+      <table frame="topbot"> 
+	<title>Capitalization Style Guidelines for User Interface
+	  Elements</title> 
 	<tgroup cols="2" colsep="0" rowsep="0" align="left">
 	  <thead>
 	    <row rowsep="1" valign="top"> 

Modified: trunk/content/projects/gup/hig/hig-ch-menus.xml
==============================================================================
--- trunk/content/projects/gup/hig/hig-ch-menus.xml	(original)
+++ trunk/content/projects/gup/hig/hig-ch-menus.xml	Mon Sep 29 23:05:52 2008
@@ -1,356 +1,299 @@
 <?xml version="1.0" encoding="UTF-8"?>
+  <chapter id="menus">
+    <title>Menus</title>
 
-<!-- :xml.root=hig-book.xml: -->
+<remark> Tear| off menus? (These are controlled by gconf in 2.0, so nothing app developer needs to do?)</remark>
+<remark> Menu bar position </remark>
+<remark> Menu bar hiding </remark>
 
-<chapter id="menus">
-  <title>Menus</title>
+    <para>Menus present the whole range of an application's commands to the user, and often a subset of its preferences.  When designing a new application, place common menu items in the same locations as they appear in other applications, as this makes it much easier for the user to learn.</para>
   
-  <remark> Tear-off menus? (These are controlled by gconf in 2.0, so nothing app developer needs to do?)</remark>
-  <remark> Menu bar position </remark>
-  <remark> Menu bar hiding </remark>
-  
-  <para>Menus present the whole range of an application's commands to the user, and often a subset of its preferences.  When designing a new application, place common menu items in the same locations as they appear in other applications, as this makes it much easier for the user to learn.</para>
-  
-  <para>In most applications, only primary windows should have a menubar. <link linkend="windows-utility">Utility windows</link> and <link linkend="windows-dialog">dialogs</link> should be simple enough that their functions can be provided by controls such as buttons placed within the window.</para>
-  
-  <para>Occasionally, however, a utility window or dialog is so complex that there would be too many such controls. In this case, you may use a menubar provided that:</para>
-  <itemizedlist>
-    <listitem>
-      <para>the menus follow the same standard layout as described in <xref linkend="menus-standard"/></para>
-    </listitem>
-    <listitem>
-      <para>the window does not include a dialog button area or any buttons that dismiss it, such as <guibutton>OK</guibutton>, <guibutton>Close</guibutton> or <guibutton>Cancel</guibutton>.  Place these commands on the <guimenu>File</guimenu> menu or equivalent instead.</para>
-    </listitem>
-  </itemizedlist>
-  <itemizedlist>
-    <title>Guidelines</title>
-    <listitem>
-      <para>Label menu items with verbs for commands and adjectives for settings, according to the rules in <xref linkend="layout-capitalization"/>.</para>
-    </listitem>
-    <listitem>
-      <para>Make a menu item insensitive when its command is unavailable. For example, the <menuchoice><guimenu>Edit</guimenu><guimenuitem>Copy</guimenuitem></menuchoice> item, which issues the command to copy selected data to the clipboard, should not be active when there is no data selected.</para>
-    </listitem>
-    <listitem>
-      <para>Provide an access key for every menu item.  You may use the same access key on different menus in your application, but avoid duplicating access keys on the same menu.  Note that unlike other controls, once a menu is displayed, its access keys may be used by just typing the letter; it is not necessary to press the <keysym>Alt</keysym> key at the same time.</para>
-    </listitem>
-    <listitem>
-      <para>Design your menu structure to avoid more than one level of submenus.  Deep menu hierarchies are harder to memorize and physically difficult to navigate.</para>
-    </listitem>
-    <listitem>
-      <para>Do not have menus with less than three items on them (except the standard <guimenu>Help</guimenu> menu, which has only two items by default).  If you have a submenu with fewer than three items on it, move them into their parent menu.  If you have a top-level menu with fewer than three items on it, find another suitable menu to add them to, or find suitable items from other menus to add to it.</para>
-    </listitem>
-  </itemizedlist>
-  
-  <sect1 id="menus-menubar">
-    <title>The Menubar</title>
-    <figure id="example-menu-bar">
-      <title>A typical menubar</title>
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="images/application-menubar.png" format="PNG"/>
-        </imageobject>
-        <imageobject>
-          <imagedata fileref="images/application-menubar.eps" format="EPS"/>
-        </imageobject>
-        <textobject>
-          <phrase>A typical application menubar, showing File, Edit, View, Insert, Format, Go, Bookmarks, Tools, Windows and Help menus</phrase>
-        </textobject>
-      </mediaobject>
-    </figure>
-  
-    <para>The menubar provides a number of drop-down menus.  Only the menu titles are displayed, until the user clicks on one of them.</para>
-    <para>The menubar is normally visible at all times and is always accessible from the keyboard, so make all the commands available in your application available on the menubar.</para>
-    
-    <note>
-      <title>Full screen mode</title>
-      <para>When your application is running in full screen mode, hide the menubar by default.  However, make its menus and items accessible from the keyboard as usual. Pressing <keycap>ESC</keycap> should cause the application to leave full screen mode. A <guibutton>Leave Fullscreen</guibutton> button should be placed in the upper right hand corner of the window. The button should disappear after the mouse is unused for 5 seconds, and should appear again when the moused is moved. Alternately, in applications where the mouse is used frequently in full screen mode, all but a two pixel row of the button may be slid off the top of the screen. The button should slide back on the screen when the mouse moves near it.</para>
-    </note>
-    
+    <para>In most applications, only primary windows should have a menubar. <link linkend="windows-utility">Utility windows</link> and <link linkend="windows-dialog">dialogs</link> should be simple enough that their functions can be provided by controls such as buttons placed within the window.</para>
+
+    <para>Occasionally, however, a utility window or dialog is so complex that there would be too many such controls. In this case, you may use a menubar provided that:</para>
+
     <itemizedlist>
-      <title>Guidelines</title>
-      <listitem>
-        <para>Provide a menubar in each primary application window, containing at least a <guimenu>File</guimenu> and a <guimenu>Help</guimenu> menu.</para>
-      </listitem>
-      <listitem>
-        <para>Organize menu titles in the standard order--; see <xref linkend="menus-standard"/></para>
-      </listitem>
-      <listitem>
-        <para>Do not disable menu titles. Allow the user to explore the menu, even though there might be no available items on it at that time.</para>
-      </listitem>
-      <listitem>
-        <para>Menu titles on a menubar are single words with their first letter capitalized.  Do not use spaces in menu titles, as this makes them easily-mistaken for two separate menu titles.  Do not use compound words (such as <guimenu>WindowOptions</guimenu>) or hyphens (such as <guimenu>Window-Options</guimenu>) to circumvent this guideline.</para>
-      </listitem>
-      <listitem>
-        <para>Do not provide a mechanism for hiding the menubar, as this may be activated accidentally. Some users will not be able to figure out how to get the menu bar back in this case.</para>
-      </listitem>
+      <listitem><para>the menus follow the same standard layout as described in <xref linkend="menus-standard" /></para></listitem>
+      <listitem><para>the window does not include a dialog button area or any buttons that dismiss it, such as <guibutton>OK</guibutton>, <guibutton>Close</guibutton> or <guibutton>Cancel</guibutton>.  Place these commands on the <guimenu>File</guimenu> menu or equivalent instead.</para></listitem>
     </itemizedlist>
-  </sect1>
-  <sect1 id="menus-types">
-    <title>Types of Menu</title>
-    <sect2 id="menu-type-drop-down">
-      <title>Drop-down Menus</title>
-      <figure id="drop-down-menu">
-        <title>A typical drop-down menu</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="images/generic-view-menu.png" format="PNG"/>
-          </imageobject>
-          <imageobject>
-            <imagedata fileref="images/generic-view-menu.eps" format="EPS"/>
-          </imageobject>
-          <textobject>
-            <phrase>Screenshot of a typical drop-down menu</phrase>
-          </textobject>
-        </mediaobject>
+
+	<itemizedlist><title>Guidelines</title>
+      <listitem><para>Label menu items with verbs for commands and adjectives for settings, according to the rules in <xref linkend="layout-capitalization"/>.</para></listitem>
+
+	<listitem><para>Make a menu item insensitive when its command is unavailable. For example, the <menuchoice><guimenu>Edit</guimenu> <guimenuitem>Copy</guimenuitem></menuchoice> item, which issues the command to copy selected data to the clipboard, should not be active when there is no data selected.</para></listitem>
+
+    <listitem><para>Provide an access key for every menu item.  You may use the same access key on different menus in your application, but avoid duplicating access keys on the same menu.  Note that unlike other controls, once a menu is displayed, its access keys may be used by just typing the letter; it is not necessary to press the <keysym>Alt</keysym> key at the same time.</para></listitem>
+
+      <listitem><para>Design your menu structure to avoid more than one level of submenus.  Deep menu hierarchies are harder to memorize and physically difficult to navigate.</para></listitem>
+
+	<listitem><para>Do not have menus with less than three items on them (except the standard <guimenu>Help</guimenu> menu, which has only two items by default).  If you have a submenu with fewer than three items on it, move them into their parent menu.  If you have a top-level menu with fewer than three items on it, find another suitable menu to add them to, or find suitable items from other menus to add to it.</para></listitem>
+
+	</itemizedlist>
+
+
+	<sect1 id="menus-menubar">
+	  <title>The Menubar</title>
+
+	<figure id="example-menu-bar">
+	<title>A typical menubar</title>
+	<mediaobject>
+	<imageobject><imagedata fileref="images/menus-application.png" width="454" depth="27" format="PNG"/></imageobject>
+	<imageobject><imagedata fileref="images/menus-application.eps" format="EPS"/></imageobject>
+	<textobject><phrase>A typical application menubar, showing File, Edit, View, Insert, Format, Go, Bookmarks, Tools, Windows and Help menus</phrase></textobject>
+	</mediaobject>
       </figure>
-      <para>A drop-down menu appears when the user clicks on its title in a menubar, or focuses the title and presses <keycap>Return</keycap>.</para>
-      <itemizedlist>
-        <title>Guidelines</title>
-        <listitem>
-          <para>Only place items on a menu that relate to that menu's title.</para>
-        </listitem>
-        <listitem>
-          <para>Organize menu items in the standard order--; see <xref linkend="menus-standard"/>.  For application-specific items where there is no standard order, arrange in numerical or other logical order (for example, <guimenuitem>50%</guimenuitem>, <guimenuitem>100%</guimenuitem>, <guimenuitem>200%</guimenuitem>), task order (for example, <guimenuitem>Compile</guimenuitem> followed by <guimenuitem>Debug</guimenuitem>) or by expected frequency of use.</para>
-        </listitem>
-        <listitem>
-          <para>Limit top-level menus to a maximum of about 15 items. If you have any more items than this, consider moving a functionally-related subset of the items into a submenu or a new top-level menu.</para>
-        </listitem>
-        <listitem>
-          <para>Do not add or remove individual menu items while the application is running, make them insensitive instead. Entire menus may be added or removed from the menubar at runtime, however, for example in component-based applications.</para>
-        </listitem>
-        <listitem>
-          <para>Immediately update menu items that are edited directly or indirectly by the user, such as those on the <guisubmenu>Open Recent</guisubmenu> submenu and the <guimenu>Bookmarks</guimenu> menu.</para>
-        </listitem>
-      </itemizedlist>
-      <remark> CB-Ed: As in JLFDG AT p. 33, perhaps provide a table of common access keys, or "mnemonics." </remark>
-      <remark> CFB: the keyboard navigation chapter already does so </remark>
-    </sect2>
-    <sect2 id="menu-type-submenu">
-      <title>Submenus</title>
-      <figure id="submenu">
-        <title>A drop-down menu with a submenu</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="images/submenu.png" format="PNG"/>
-          </imageobject>
-          <imageobject>
-            <imagedata fileref="images/submenu.eps" format="EPS"/>
-          </imageobject>
-          <textobject>
-            <phrase>Screenshot of a drop-down menu with a submenu</phrase>
-          </textobject>
-        </mediaobject>
+
+	  <para>The menubar provides a number of drop-down menus.  Only the menu titles are displayed, until the user clicks on one of them.</para>
+
+	<para>The menubar is normally visible at all times and is always accessible from the keyboard, so make all the commands available in your application available on the menubar.</para>
+
+	<note><title>Full screen mode</title><para>When your application is running in full screen mode, hide the menubar by default.  However, make its menus and items accessible from the keyboard as usual. Pressing <keycap>ESC</keycap> should cause the application to leave full screen mode. A <guibutton>Leave Fullscreen</guibutton> button should be placed in the upper right hand corner of the window. The button should disappear after the mouse is unused for 5 seconds, and should appear again when the moused is moved. Alternately, in applications where the mouse is used frequently in full screen mode, all but a two pixel row of the button may be slid off the top of the screen. The button should slide back on the screen when the mouse moves near it.</para></note>
+
+	<itemizedlist><title>Guidelines</title>
+
+		<listitem><para>Provide a menubar in each primary application window, containing at least a <guimenu>File</guimenu> and a <guimenu>Help</guimenu> menu.</para></listitem>
+
+      		<listitem><para>Organize menu titles in the standard orderâ see <xref linkend="menus-standard"/></para></listitem>
+
+		 <listitem><para>Do not disable menu titles. Allow the user to explore the menu, even though there might be no available items on it at that time.</para></listitem>
+
+		  <listitem><para>Menu titles on a menubar are single words with their first letter capitalized.  Do not use spaces in menu titles, as this makes them easily-mistaken for two separate menu titles.  Do not use compound words (such as <guimenu>WindowOptions</guimenu>) or hyphens (such as <guimenu>Window-Options</guimenu>) to circumvent this guideline.</para></listitem>
+
+		<listitem><para>Do not provide a mechanism for hiding the menubar, as this may be activated accidentally. Some users will not be able to figure out how to get the menu bar back in this case.</para></listitem>
+	
+	</itemizedlist>
+
+	</sect1>
+
+   <sect1 id="menus-types">
+      <title>Types of Menu</title>
+
+
+	<sect2 id="menu-type-drop-down">
+	  <title>Drop-down Menus</title>
+	<figure id="drop-down-menu">
+	<title>A typical drop-down menu</title>
+	<mediaobject>
+	  <imageobject><imagedata fileref="images/menus-dropdown.png" format="PNG" width="166" depth="300"/></imageobject>
+	  <imageobject><imagedata fileref="images/menus-dropdown.eps" format="EPS"/></imageobject>
+	  <textobject><phrase>Screenshot of a typical drop-down menu</phrase></textobject>
+	</mediaobject>
+      </figure>
+
+	  <para>A drop-down menu appears when the user clicks on its title in a menubar, or focuses the title and presses <keycap>Return</keycap>.</para>
+
+<remark> CB-Ed/Fig: Define "post," as no-brainer-ish as it may seem, and also add a figure to show what it means.  A simple menu being shown at the user clicking on a menu title on a menubar, or "posted," makes sense.  </remark>
+<remark> CFB: I've just reworded everything to avoid the use of "post" </remark>
+
+    <itemizedlist><title>Guidelines</title>
+
+	<listitem><para>Only place items on a menu that relate to that menu's title.</para></listitem>
+
+      <listitem><para>Organize menu items in the standard orderâ see <xref linkend="menus-standard" />.  For application-specific items where there is no standard order, arrange in numerical or other logical order (for example, <guimenuitem>50%</guimenuitem>, <guimenuitem>100%</guimenuitem>, <guimenuitem>200%</guimenuitem>), task order (for example, <guimenuitem>Compile</guimenuitem> followed by <guimenuitem>Debug</guimenuitem>) or by expected frequency of use.</para></listitem>
+
+      <listitem><para>Limit top-level menus to a maximum of about 15 items. If you have any more items than this, consider moving a functionally-related subset of the items into a submenu or a new top-level menu.</para></listitem>
+
+      <listitem><para>Do not add or remove individual menu items while the application is running, make them insensitive instead. Entire menus may be added or removed from the menubar at runtime, however, for example in component-based applications.</para></listitem>
+
+      <listitem><para>Immediately update menu items that are edited directly or indirectly by the user, such as those on the <guisubmenu>Open Recent</guisubmenu> submenu and the <guimenu>Bookmarks</guimenu> menu.</para></listitem>
+
+
+    </itemizedlist>
+  <remark> CB-Ed: As in JLFDG AT p. 33, perhaps provide a table of common access keys, or "mnemonics." </remark>
+  <remark> CFB: the keyboard navigation chapter already does so </remark>
+
+
+	</sect2>
+
+	<sect2 id="menu-type-submenu">
+	  <title>Submenus</title>
+
+	<figure id="submenu">
+	<title>A drop-down menu with a submenu</title>
+	<mediaobject>
+	  <imageobject><imagedata fileref="images/menus-submenu.png" format="PNG" width="352" depth="264"/></imageobject>
+	  <imageobject><imagedata fileref="images/menus-submenu.eps" format="EPS"/></imageobject>
+	  <textobject><phrase>Screenshot of a drop-down menu with a submenu</phrase></textobject>
+	</mediaobject>
       </figure>
-      <para>A submenu appears when the user clicks its title, which is indicated by a small arrow symbol beside its label.  You can save space on long menus by grouping related commands onto a single submenu.</para>
-      <itemizedlist>
-        <title>Guidelines</title>
-        <listitem>
-          <para>Use submenus sparingly, as they are physically difficult to navigate and make it harder to find and reach the items they contain.</para>
-        </listitem>
-        <listitem>
-          <para>Do not create submenus with fewer than three items, unless the items are added dynamically (for example the <menuchoice><guimenu>File</guimenu><guimenuitem>New Tab</guimenuitem></menuchoice> submenu in <application>gnome-terminal</application>).</para>
-        </listitem>
-        <listitem>
-          <para>Do not nest submenus within submenus.  More than two levels of hierarchy are difficult to memorize and navigate.</para>
-        </listitem>
-      </itemizedlist>
-      <remark> CB-Ed/Fig: In JLFDG AT, p. 41, the Most Recently Used (MRU) list is recommended to contain no more than 10 items. Add a figure here, with callouts to point out this rule, among others, if any are developed.  </remark>
-    </sect2>
-    <sect2 id="menu-type-popup">
-      <title>Popup Menus</title>
-      <figure id="popup-menu">
-        <title>A popup menu for a mail folder</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="images/popup-menu.png" format="PNG"/>
-          </imageobject>
-          <imageobject>
-            <imagedata fileref="images/popup-menu.eps" format="EPS"/>
-          </imageobject>
-          <textobject>
-            <phrase>Screenshot of a popup menu for a mail folder, listing the actions that can be performed on that folder</phrase>
-          </textobject>
-        </mediaobject>
+
+	  <para>A submenu appears when the user clicks its title, which is indicated by a small arrow symbol beside its label.  You can save space on long menus by grouping related commands onto a single submenu.</para>
+
+	<itemizedlist><title>Guidelines</title>
+
+		<listitem><para>Use submenus sparingly, as they are physically difficult to navigate and make it harder to find and reach the items they contain.</para></listitem>
+
+		<listitem><para>Do not create submenus with fewer than three items, unless the items are added dynamically (for example the <menuchoice><guimenu>File</guimenu><guimenuitem>New Tab</guimenuitem></menuchoice> submenu in <application>gnome-terminal</application>).</para></listitem>
+
+		<listitem><para>Do not nest submenus within submenus.  More than two levels of hierarchy are difficult to memorize and navigate.</para></listitem>
+		
+	</itemizedlist>
+
+<remark> CB-Ed/Fig: In JLFDG AT, p. 41, the Most Recently Used (MRU) list is recommended to contain no more than 10 items. Add a figure here, with callouts to point out this rule, among others, if any are developed.  </remark> 
+
+	</sect2>
+
+	<sect2 id="menu-type-popup">
+	  <title>Popup Menus</title>
+
+	<figure id="popup-menu">
+	<title>A popup menu for a mail folder</title>
+	<mediaobject>
+	  <imageobject><imagedata fileref="images/menus-popup.png" format="PNG" width="251" depth="233"/></imageobject>
+	  <imageobject><imagedata fileref="images/menus-popup.eps" format="EPS"/></imageobject>
+	  <textobject><phrase>Screenshot of a popup menu for a mail folder, listing the actions that can be performed on that folder</phrase></textobject>
+	</mediaobject>
       </figure>
-      <para>Popup menus provide shortcuts to those menu items that are applicable only to the currently selected object.  As such, they are sometimes known as "context menus" or "shortcut menus".  A popup menu is shown when the user right-clicks on an object, or selects the object and presses <keycombo><keycap>Shift</keycap><keycap>F10</keycap></keycombo>.</para>
-      <para>Popup menus are used primarily by intermediate and advanced users.  Even some users who have used graphical desktops for many years do not know about popup menus until somebody shows them.</para>
-      <itemizedlist>
-        <title>Guidelines</title>
-        <listitem>
-          <para>Provide a popup menu for every object, selectable part, and text input target such as entry fields.</para>
-        </listitem>
-        <listitem>
-          <para>Provide the same popup menu for all objects of the same type.  If the properties of the selected instance make any of an object's popup menu items temporarily inappropriate, make those items insensitive rather than hiding them.</para>
-        </listitem>
-        <listitem>
-          <para>Provide an access key for each item.  Do not show keyboard shortcuts in popup menus however; doing so decreases their readability and spatial efficiency.</para>
-        </listitem>
-        <listitem>
-          <para>Since the user may not be aware of their presence, do not provide functions that are only accessible from popup menus unless you are confident that your target users will know how to use popup menus.</para>
-          <remark>But see http://bugzilla.mozilla.org/show_bug.cgi?id=34357</remark>
-        </listitem>
-        <listitem>
-          <para>Order items on a popup menu as follows:</para>
-          <itemizedlist>
-            <listitem>
-              <para>the double-click action for object, when it exists</para>
-            </listitem>
-            <listitem>
-              <para>other commands and settings in expected frequency-of-use order</para>
-            </listitem>
-            <listitem>
-              <para>transfer commands such as <command>Cut</command>, <command>Copy</command>, and <command>Paste</command></para>
-            </listitem>
-            <listitem>
-              <para><guimenuitem>Input Methods</guimenuitem>, where applicable. <guimenuitem>Input Methods</guimenuitem> is provided by GTK+ for supporting alternatives to the keyboard for input (such as used for Japanese, Chinese, and some accessibility technologies).</para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
-        <listitem>
-          <para>Popup menus need to be as simple as possible to maximize their efficiency.  Do not place more than about ten items on a popup menu, and do avoid submenus.</para>
-        </listitem>
-      </itemizedlist>
-      <remark> CB-Ed: In the previous note, define the Input Methods menu and why it is an exception, for scalability reasons (other items may fall into the same category).  It also sounds like a pretty low-level command; should this be exposed to the user? </remark>
-      <remark> SN-Ed: No, it should not be exposed to the user. I'm not really sure what possessed the GTK guys to put this in every right click menu for text boxes. I suppose in this case having it be a submenu is good (if they insist on it existing) because it makes it maximally invisible </remark>
-      <remark> GJM: To make this worse, they've added "Insert Unicode control character".</remark>
-    </sect2>
-  </sect1>
-  <sect1 id="menus-design">
-    <title>Designing a Menu</title>
-    <sect2 id="menu-grouping">
-      <title>Grouping Menu Items</title>
-      <figure id="menu-separators">
-        <title>Items grouped on a menu with separators</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="images/generic-view-menu.png" format="PNG"/>
-          </imageobject>
-          <imageobject>
-            <imagedata fileref="images/generic-view-menu.eps" format="EPS"/>
-          </imageobject>
-          <textobject>
-            <phrase>Screenshot of a menu divided into five logical groups with menu separators</phrase>
-          </textobject>
-        </mediaobject>
+
+	<para>Popup menus provide shortcuts to those menu items that are applicable only to the currently selected object.  As such, they are sometimes known as &quot;context menus&quot; or &quot;shortcut menus&quot;.  A popup menu is shown when the user right-clicks on an object, or selects the object and presses <keycombo><keycap>Shift</keycap><keycap>F10</keycap></keycombo>.</para>
+
+	<para>Be aware that popup menus are used primarily by intermediate and advanced users.  Even some users who have used graphical desktops for many years do not know about popup menus until somebody shows them.</para>
+
+	<itemizedlist><title>Guidelines</title>
+		<listitem><para>Provide a popup menu for every object, selectable part, and text input target such as entry fields.</para></listitem>
+		<listitem><para>Provide an access key for each item.  However, to enhance their spatial efficiency and readability, do not show keyboard shortcuts in popup menus.</para></listitem>
+		
+		<listitem><para>Since the user may not be aware of their presence, do not provide functions that are only accessible from popup menus unless you are confident that your target users will know how to use popup menus.</para>
+		<remark>But see http://bugzilla.mozilla.org/show_bug.cgi?id=34357</remark>
+		</listitem>
+
+		<listitem><para>Order items on a popup menu as follows:</para>
+		<itemizedlist>
+			<listitem><para>the double-click action for object, when it exists</para></listitem>
+			<listitem><para>other commands and settings in expected frequency-of-use order</para></listitem>
+			<listitem><para>transfer commands such as <command>Cut</command>, <command>Copy</command>, and <command>Paste</command></para></listitem>
+			<listitem><para><guimenuitem>Input Methods</guimenuitem>, where applicable. <guimenuitem>Input Methods</guimenuitem> is provided by GTK+ for supporting alternatives to the keyboard for input (such as used for Japanese, Chinese, and some accessibility technologies).</para></listitem>
+		</itemizedlist>
+		</listitem>
+
+	 	<listitem><para>Popup menus need to be as simple as possible to maximize their efficiency.  Do not place more than about ten items on a popup menu, and do avoid submenus.</para></listitem>
+
+	</itemizedlist>
+
+<remark> CB-Ed: In the previous note, define the Input Methods menu and why it is an exception, for scalability reasons (other items may fall into the same category).  It also sounds like a pretty low-level command; should this be exposed to the user? </remark>
+<remark> SN-Ed: No, it should not be exposed to the user. I'm not really sure what possessed the GTK guys to put this in every right click menu for text boxes. I suppose in this case having it be a submenu is good (if they insist on it existing) because it makes it maximally invisible </remark>
+<remark> GJM: To make this worse, they've added "Insert Unicode control character".</remark>
+	</sect2>
+	</sect1>
+
+	<sect1 id="menus-design">
+	<title>Designing a Menu</title>
+
+	<sect2 id="menu-grouping">
+	  <title>Grouping Menu Items</title>
+
+	<figure id="menu-separators">
+	<title>Items grouped on a menu with separators</title>
+	<mediaobject>
+	  <imageobject><imagedata fileref="images/menus-dropdown.png" format="PNG" width="166" depth="300"/></imageobject>
+	  <imageobject><imagedata fileref="images/menus-dropdown.eps" format="EPS"/></imageobject>
+	  <textobject><phrase>Screenshot of a menu divided into five logical groups with menu separators</phrase></textobject>
+	</mediaobject>
       </figure>
-      <para>Menu separators are the horizontal dividing lines that visually separate groups of related items on a drop-down menu, submenu, or popup menu.  For example, the separators in <xref linkend="menu-separators"/> divide the menu into five functionally-related groups.  Good use of separators helps to "chunk" the information on a menu and make it easier to scan and memorize.</para>
-      <itemizedlist>
-        <title>Guidelines</title>
-        <listitem>
-          <para>The best size for a group is around 2-5 items.  Single-item groups are best placed at the top or bottom of a menu, otherwise try to group them with other single items of the same type on the same menu.</para>
-        </listitem>
-        <listitem>
-          <para>Order items within a group logically, numerically, in task order or by expected frequency of use, as appropriate.</para>
-        </listitem>
-        <listitem>
-          <para>Only place one type of menu item in each group--; <link linkend="menu-item-type-command">command</link>, <link linkend="menu-item-type-mutable">mutable</link>, <link linkend="menu-item-type-check">check box</link> or <link linkend="menu-item-type-radio">radio button</link>.  For example, do not place commands (such as <menuchoice><guimenu>View</guimenu><guimenuitem>Reload</guimenuitem></menuchoice>) and settings (such as <menuchoice><guimenu>View</guimenu><guimenuitem>Toolbar</guimenuitem></menuchoice>) in the same group.</para>
-        </listitem>
-      </itemizedlist>
-    </sect2>
-    <sect2 id="menu-item-types">
-      <title>Types of menu item</title>
-      <sect3 id="menu-item-type-command">
-        <title>Command Items</title>
-        <figure id="command-items-figure">
-          <title>A group of command items on a menu</title>
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="images/command-menu.png" format="PNG"/>
-            </imageobject>
-            <imageobject>
-              <imagedata fileref="images/command-menu.eps" format="EPS"/>
-            </imageobject>
-            <textobject>
-              <phrase>Screenshot of a group on a menu containing only command items: Save, Save As, and Revert</phrase>
-            </textobject>
-          </mediaobject>
-        </figure>
-        <para>Command items are menu items that initiate a command or perform an action, such as <guimenuitem>Save</guimenuitem>, <guimenuitem>Print</guimenuitem> or <guimenuitem>Quit</guimenuitem>. They may act on the currently active document in a document based application, or on the application itself.</para>
-        <itemizedlist>
-          <title>Guidelines</title>
-          <listitem>
-            <para>Provide a keyboard shortcut for standard or frequently used command items.  See <xref linkend="shortcuts"/> for more information on choosing shortcut keys.</para>
-          </listitem>
-<!-- <para>Shortcuts consist of the <keysym>Control</keysym> key and an alphanumeric key, or of one of the keys <keysym>F1</keysym>-<keysym>F12</keysym>, <keysym>Insert</keysym>, <keysym>Delete</keysym>, <keysym>Home</keysym>, <keysym>End</keysym>, <keysym>Page Up</keysym> or <keysym>Page Down</keysym>. The <keysym>Shift</keysym> key may be used as an additional modifier for commands which are related to or the opposite of the command accessed without the <keysym>Shift</keysym> key.  See <xref linkend="shortcuts"/> for more information.</para> -->
-          <listitem>
-            <para>Do not remove command items from the menu when they are unavailable, make them insensitive instead.  This allows the user to infer what functionality the application provides even if it is not currently available, and keeping the menu structure static makes it easier to memorize.</para>
-          </listitem>
-          <listitem>
-            <para>Label the menu item with a trailing ellipsis ("...")  only if the command requires further input from the user before it can be performed. Do not add an ellipsis to items that only present a confirmation dialog (such as <guimenuitem>Delete</guimenuitem>), or that do not <emphasis>require</emphasis> further input (such as <guimenuitem>Properties</guimenuitem>, <guimenuitem>Preferences</guimenuitem> or <guimenuitem>About</guimenuitem>).</para>
-          </listitem>
-        </itemizedlist>
-        <remark>
+
+	  <para>Menu separators are the horizontal dividing lines that visually separate groups of related items on a drop-down menu, submenu, or popup menu.  For example, the separators in <xref linkend="menu-separators"/> divide the menu into five functionally-related groups.  Good use of separators helps to &quot;chunk&quot; the information on a menu and make it easier to scan and memorize.</para>
+	  
+	  <itemizedlist><title>Guidelines</title>
+
+	    <listitem><para>The best size for a group is around 2-5 items.  Single-item groups are best placed at the top or bottom of a menu, otherwise try to group them with other single items of the same type on the same menu.</para></listitem>
+
+	    <listitem><para>Order items within a group logically, numerically, in task order or by expected frequency of use, as appropriate.</para></listitem>
+
+	    <listitem><para>Only place one type of menu item in each groupâ <link linkend="menu-item-type-command">command</link>, <link linkend="menu-item-type-mutable">mutable</link>, <link linkend="menu-item-type-check">check box</link> or <link linkend="menu-item-type-radio">radio button</link>.  For example, do not place commands (such as <menuchoice><guimenu>View</guimenu><guimenuitem>Reload</guimenuitem></menuchoice>) and settings (such as. <menuchoice><guimenu>View</guimenu><guimenuitem>Toolbar</guimenuitem></menuchoice>) in the same group.</para></listitem>
+
+	    </itemizedlist>	  
+	</sect2>
+
+	<sect2 id="menu-item-types">
+	<title>Types of menu item</title>
+	
+	<sect3 id="menu-item-type-command">
+	  <title>Command Items</title>
+
+	<figure id="command-items-figure"><title>A group of command items on a menu</title>
+	  <mediaobject>
+	    <imageobject><imagedata fileref="images/menus-command-group.png" format="PNG" width="253" depth="105"/></imageobject>
+	    <imageobject><imagedata fileref="images/menus-command-group.eps" format="EPS"/></imageobject>
+	    <textobject><phrase>Screenshot of a group on a menu containing only command items: Save, Save As, and Revert</phrase></textobject>
+	  </mediaobject>
+	</figure>
+
+	  <para>Command items are menu items that initiate a command or perform an action, such as <guimenuitem>Save</guimenuitem>, <guimenuitem>Print</guimenuitem> or <guimenuitem>Quit</guimenuitem>. They may act on the currently active document in a document based application, or on the application itself.</para>
+
+	<itemizedlist><title>Guidelines</title>
+
+		<listitem><para>Provide a keyboard shortcut for standard or frequently used command items.  See <xref linkend="shortcuts"/> for more information on choosing shortcut keys.</para></listitem>
+	  <!-- <para>Shortcuts consist of the <keysym>Control</keysym> key and an alphanumeric key, or of one of the keys <keysym>F1</keysym>-<keysym>F12</keysym>, <keysym>Insert</keysym>, <keysym>Delete</keysym>, <keysym>Home</keysym>, <keysym>End</keysym>, <keysym>Page Up</keysym> or <keysym>Page Down</keysym>. The <keysym>Shift</keysym> key may be used as an additional modifier for commands which are related to or the opposite of the command accessed without the <keysym>Shift</keysym> key.  See <xref linkend="shortcuts"/> for more information.</para> -->
+	  
+	<listitem><para>Do not remove command items from the menu when they are unavailable, make them insensitive instead.  This allows the user to infer what functionality the application provides even if it is not currently available, and keeping the menu structure static makes it easier to memorize.</para></listitem>
+
+	  <listitem><para>Label the menu item with a trailing ellipsis ("...")  only if the command requires further input from the user before it can be performed. Do not add an ellipsis to items that only present a confirmation dialog (such as <guimenuitem>Delete</guimenuitem>), or that do not <emphasis>require</emphasis> further input (such as <guimenuitem>Properties</guimenuitem>, <guimenuitem>Preferences</guimenuitem> or <guimenuitem>About</guimenuitem>).</para></listitem>
+
+	</itemizedlist>
+	<remark>
 	  Should we reserve <keysym>Alt</keysym> as a modifier for window manager operations? Should we state this here?
 	</remark>
-        <remark> CB-Ed/Fig: Figure would be nice here. </remark>
-      </sect3>
-      <sect3 id="menu-item-type-mutable">
-        <title>Mutable Command Items</title>
-        <para>A mutable command item changes its label when selected.  For example, <menuchoice><guimenu>View</guimenu><guimenuitem>Reload</guimenuitem></menuchoice> in a browser may change to <guimenuitem>Stop</guimenuitem> to allow the user to interrupt the operation if it is taking a long time.</para>
-        <para>Note that mutable menu items can be problematic because the user never sees the menu item changing, so it is not obvious that a different function has become available. </para>
-        <itemizedlist>
-          <title>Guidelines</title>
-          <listitem>
-            <para>If your mutable menu items are <link linkend="menu-item-type-command">command items</link>, and you have sufficient space on your menu, consider providing two adjacent menu items for the commands instead.  Then make the items sensitive or insensitive as the situation demands.  This also makes it easier for the user to tell when different shortcuts are available for each of the commands, for example <keycombo><keycap>Ctrl</keycap><keycap>R</keycap></keycombo> for <guimenuitem>Reload</guimenuitem>, and <keycap>Esc</keycap> for <guimenuitem>Stop</guimenuitem>.</para>
-          </listitem>
-          <listitem>
-            <para>Do not use mutable menu items to toggle a two-state setting (for example, <guimenuitem>Show Toolbar</guimenuitem> and <guimenuitem>Hide Toolbar</guimenuitem>).  Present such items as a single <link linkend="menu-item-type-check">check box item</link> instead.</para>
-          </listitem>
-        </itemizedlist>
-      </sect3>
-      <sect3 id="menu-item-type-check">
-        <title>Checkbox Items</title>
-        <figure id="checkbox-items-figure">
-          <title>A group of check box items on a menu</title>
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="images/checkbox-menu.png" format="PNG"/>
-            </imageobject>
-            <imageobject>
-              <imagedata fileref="images/checkbox-menu.eps" format="EPS"/>
-            </imageobject>
-            <textobject>
-              <phrase>Screenshot of group on a View menu containing three check box items: toolbar, statusbar and fullscreen</phrase>
-            </textobject>
-          </mediaobject>
-        </figure>
-        <para>A check box menu item shows the current state of a two-state setting, and allows the user to toggle it by selecting the menu item.</para>
-        <itemizedlist>
-          <title>Guidelines</title>
-          <listitem>
-            <para>Use a check box menu item only when it is obvious from the label what the set and unset states mean.  This usually means that the two states are logical or natural opposites, such as "on" and "off".  If this is not the case, use two <link linkend="menu-item-type-radio">radio button items</link> instead.</para>
-          </listitem>
-          <listitem>
-            <para>Never change the label of a check box menu item in response to the user selecting the item.</para>
-          </listitem>
-        </itemizedlist>
-      </sect3>
-      <sect3 id="menu-item-type-radio">
-        <title>Radio Button Items</title>
-        <figure id="radiobutton-items-figure">
-          <title>A group of radiobutton items on a menu</title>
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="images/radiobutton-menu.png" format="PNG"/>
-            </imageobject>
-            <imageobject>
-              <imagedata fileref="images/radiobutton-menu.eps" format="EPS"/>
-            </imageobject>
-            <textobject>
-              <phrase>Screenshot of group on a menu containing two radiobutton items: view as icons, and view as list</phrase>
-            </textobject>
-          </mediaobject>
-        </figure>
-        <para>Radio button menu items show which of two or more mutually-exclusive settings are currently selected, and allow the user to choose a different setting by selecting its menu item.</para>
-        <itemizedlist>
-          <listitem>
-            <para>If you need to offer a choice of two mutually-exclusive settings to the user,  use a group of two radio button items instead of a single check box menu item if the settings are not clearly opposites.  For example, represent <guimenuitem>View as Icons</guimenuitem> and <guimenu>View as List</guimenu> as two radio button items.</para>
-          </listitem>
-          <listitem>
-            <para>Never change the label of a radio button menu item in response to the user selecting or deselecting the item.</para>
-          </listitem>
-        </itemizedlist>
-        <remark>
+
+
+<remark> CB-Ed/Fig: Figure would be nice here. </remark>
+	</sect3>
+
+	<sect3 id="menu-item-type-mutable">
+	  <title>Mutable Command Items</title>
+	  <para>A mutable command item changes its label when selected.  For example, <menuchoice><guimenu>View</guimenu><guimenuitem>Reload</guimenuitem></menuchoice> in a browser may change to <guimenuitem>Stop</guimenuitem> to allow the user to interrupt the operation if it is taking a long time.</para>
+
+	  <para>Note that mutable menu items can be problematic because the user never sees the menu item changing, so it is not obvious that a different function has become available. </para>
+
+	<itemizedlist><title>Guidelines</title>
+		<listitem><para>If your mutable menu items are <link linkend="menu-item-type-command">command items</link>, and you have sufficient space on your menu, consider providing two adjacent menu items for the commands instead.  Then make the items sensitive or insensitive as the situation demands.  This also makes it easier for the user to tell when different shortcuts are available for each of the commands, for example <keycombo><keycap>Ctrl</keycap><keycap>R</keycap></keycombo> for <guimenuitem>Reload</guimenuitem>, and <keycap>Esc</keycap> for <guimenuitem>Stop</guimenuitem>.</para></listitem>
+
+		<listitem><para>Do not use mutable menu items to toggle a two-state setting (for example, <guimenuitem>Show Toolbar</guimenuitem> and <guimenuitem>Hide Toolbar</guimenuitem>).  Present such items as a single <link linkend="menu-item-type-check">check box item</link> instead.</para></listitem>
+	</itemizedlist>
+
+	</sect3>
+	<sect3 id="menu-item-type-check">
+	  <title>Checkbox Items</title>
+
+	<figure id="checkbox-items-figure"><title>A group of check box items on a menu</title>
+	  <mediaobject>
+	    <imageobject><imagedata fileref="images/menus-checkbox-group.png" format="PNG" width="231" depth="112"/></imageobject>
+	    <imageobject><imagedata fileref="images/menus-checkbox-group.eps" format="EPS"/></imageobject>
+	    <textobject><phrase>Screenshot of group on a View menu containing four check box items: Main Toolbar, Side Pane, Location Bar and Status Bar</phrase></textobject>
+	  </mediaobject>
+	</figure>
+
+	  <para>A check box menu item shows the current state of a two-state setting, and allows the user to toggle it by selecting the menu item.</para>
+
+	<itemizedlist><title>Guidelines</title>
+	  
+	  	<listitem><para>Use a check box menu item only when it is obvious from the label what the set and unset states mean.  This usually means that the two states are logical or natural opposites, such as &quot;on&quot; and &quot;off&quot;.  If this is not the case, use two <link linkend="menu-item-type-radio">radio button items</link> instead.</para></listitem>
+		  <listitem><para>Never change the label of a check box menu item in response to the user selecting the item.</para></listitem>
+
+	</itemizedlist>
+
+	</sect3>
+	<sect3 id="menu-item-type-radio">
+	  <title>Radio Button Items</title>
+
+	<figure id="radiobutton-items-figure"><title>A group of radiobutton items on a menu</title>
+	  <mediaobject>
+	    <imageobject><imagedata fileref="images/menus-radiobutton-group.png" format="PNG" width="167" depth="117"/></imageobject>
+	    <imageobject><imagedata fileref="images/menus-radiobutton-group.eps" format="EPS"/></imageobject>
+	    <textobject><phrase>Screenshot of group on a menu containing three radiobutton items: view as icons, view as list and view details</phrase></textobject>
+	  </mediaobject>
+	</figure>
+
+	  <para>Radio button menu items show which of two or more mutually-exclusive settings are currently selected, and allow the user to choose a different setting by selecting its menu item.</para>
+
+	<itemizedlist>
+
+	  	<listitem><para>If you need to offer a choice of two mutually-exclusive settings to the user,  use a group of two radio button items instead of a single check box menu item if the settings are not clearly opposites.  For example, represent <guimenuitem>View as Icons</guimenuitem> and <guimenu>View as List</guimenu> as two radio button items.</para></listitem>
+
+	  <listitem><para>Never change the label of a radio button menu item in response to the user selecting or deselecting the item.</para></listitem>
+
+	</itemizedlist>
+
+<remark>
 	Adam notes that this whole section can be a significant source of
 	nastiness in a UI. We need explicit recommendations here on how to
 	represent different states of a toggled menu item via icons in the UI.
@@ -363,1342 +306,1146 @@
 	  difficult to establish the current system state by looking at
 	  the menu.
 </remark>
-      </sect3>
-    </sect2>
-  </sect1>
-  <sect1 id="menus-standard">
-    <title>Standard Menus</title>
-    <para>Most applications have many functions in common, such as <guimenu>Cut</guimenu>, <guimenu>Copy</guimenu>, <guimenu>Paste</guimenu> and <guimenu>Quit</guimenu>.  To aid learning and memorability, these menu items, and the menus on which they appear, must appear with the same labels and in the same order in every application.  The same commands must also behave the same way in different applications, to avoid surprising the user.</para>
-    <para>This section details the most common menus, menu items and their behaviors.  You will not need all of these menus or menu items in every application you write, but do preserve the order of the menu titles and of the menu items that you do use.</para>
-    <itemizedlist>
-      <title>Guidelines</title>
-      <listitem>
-        <para>Place application-specific menus after the <guimenu>Format</guimenu> menu and before the <guimenu>Go</guimenu> menu</para>
-      </listitem>
-      <listitem>
-        <para>Place application-specific menu items towards the middle of a standard menu, unless they logically fit with one of the standard groups already on the menu.</para>
-      </listitem>
-    </itemizedlist>
+
+	</sect3>
+	
+      </sect2>
+
+    </sect1>
+
+    <sect1 id="menus-standard">
+      <title>Standard Menus</title>
+      <para>Most applications have many functions in common, such as <guimenu>Cut</guimenu>, <guimenu>Copy</guimenu>, <guimenu>Paste</guimenu> and <guimenu>Quit</guimenu>.  To aid learning and memorability, these menu items, and the menus on which they appear, must appear with the same labels and in the same order in every application.  The same commands must also behave the same way in different applications, to avoid surprising the user.</para>
+
+	<para>This section details the most common menus, menu items and their behaviors.  You will not need all of these menus or menu items in every application you write, but do preserve the order of the menu titles and of the menu items that you do use.</para>
+
+	<itemizedlist><title>Guidelines</title>
+		<listitem><para>Place application-specific menus after the <guimenu>Format</guimenu> menu and before the <guimenu>Go</guimenu> menu</para></listitem>
+
+		<listitem><para>Place application-specific menu items towards the middle of a standard menu, unless they logically fit with one of the standard groups already on the menu.</para></listitem>
+
+	</itemizedlist>
+
+        
     <remark>What is the best way to present menus given the known variants? Multiple shots? Segments?</remark>
-    <figure id="generic-menu-bar">
-      <title>A menubar showing all the standard menu titles in their correct order</title>
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="images/application-menubar.png" format="PNG"/>
-        </imageobject>
-        <imageobject>
-          <imagedata fileref="images/application-menubar.eps" format="EPS"/>
-        </imageobject>
-        <textobject>
-          <simplelist type="horiz" columns="9">
-            <member>
-              <guimenu><accel>F</accel>ile</guimenu>
-            </member>
-            <member>
-              <guimenu><accel>E</accel>dit</guimenu>
-            </member>
-            <member>
-              <guimenu><accel>V</accel>iew</guimenu>
-            </member>
-            <member>
-              <guimenu><accel>I</accel>nsert</guimenu>
-            </member>
-            <member>
-              <guimenu>For<accel>m</accel>at</guimenu>
-            </member>
-            <member>
-              <guimenu><accel>G</accel>o</guimenu>
-            </member>
-            <member>
-              <guimenu><accel>B</accel>ookmarks</guimenu>
-            </member>
-<!--<member><guimenu><accel>T</accel>ools</guimenu></member>-->
-            <member>
-              <guimenu><accel>W</accel>indows</guimenu>
-            </member>
-            <member>
-              <guimenu><accel>H</accel>elp</guimenu>
-            </member>
-          </simplelist>
-        </textobject>
-      </mediaobject>
-    </figure>
-    <sect2 id="the-file-menu">
-      <title>File</title>
-      <para>The <guimenu>File</guimenu> menu contains commands that operate on the current document. It is the left-most item in the menubar because of its importance and frequency of use, and because it is a relevant menu in many applications. Historically, because most applications already had this menu, and because the distinction between closing documents and closing windows became blurred over time, the <guimenu>File</guimenu> menu has also become the standard location for <guimenuitem>Quit</guimenuitem>.</para>
-      
-      <para>The items on the <guimenu>File</guimenu> menu are generally ordered by locality, closest first.  That is, items to save or load from file, followed by printing, followed by sending to a remote user.  Try to maintain this ordering if you have to add new items to the menu.</para>
-      
-      <para>If your application does not operate on documents, name this item for the type of object it displays.  For example, many games should have a <guimenu>Game</guimenu> instead of a <guimenu>File</guimenu> menu.  However, place the <guimenuitem>Quit</guimenuitem> menu item last on this menu nonetheless.</para>
-      <remark>GJM: Quit should be deprecated. Close is often sufficient; especially when the application saves state as it should.</remark>
+
+      <figure id="generic-menu-bar">
+	<title>A menubar showing all the standard menu titles in their correct order</title>
+	<mediaobject>
+	  <imageobject><imagedata fileref="images/menus-application.png" width="454" depth="27" format="PNG"/></imageobject>
+	  <imageobject><imagedata fileref="images/menus-application.eps" format="EPS"/></imageobject>
+	  <textobject>
+	    <simplelist type="horiz" columns="9">
+	      <member><guimenu><accel>F</accel>ile</guimenu></member>
+	      <member><guimenu><accel>E</accel>dit</guimenu></member>
+	      <member><guimenu><accel>V</accel>iew</guimenu></member>
+	      <member><guimenu><accel>I</accel>nsert</guimenu></member>
+	      <member><guimenu>For<accel>m</accel>at</guimenu></member>
+	      <member><guimenu><accel>G</accel>o</guimenu></member>
+	      <member><guimenu><accel>B</accel>ookmarks</guimenu></member>
+	      <!--<member><guimenu><accel>T</accel>ools</guimenu></member>-->
+	      <member><guimenu><accel>W</accel>indows</guimenu></member>
+	      <member><guimenu><accel>H</accel>elp</guimenu></member>
+	    </simplelist>
+	  </textobject>
+	</mediaobject>
+      </figure>
       
-<figure id="generic-file-menu">
-        <title>A generic File menu</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="images/file-menu.png" format="PNG"/>
-          </imageobject>
-          <imageobject>
-            <imagedata fileref="images/file-menu.eps" format="EPS"/>
-          </imageobject>
-          <textobject>
-            <literallayout><guimenu>File</guimenu><guimenuitem><accel>N</accel>ew                  Ctrl+N</guimenuitem><guimenuitem><accel>O</accel>pen...              Ctrl+O</guimenuitem><!--<guimenuitem>Recent <accel>F</accel>iles              &gt; </guimenuitem>-->
+      <sect2 id="the-file-menu">
+	<title>File</title>
+		<para>The <guimenu>File</guimenu> menu contains commands that operate on the current document. It is the left-most item in the menubar because of its importance and frequency of use, and because it is a relevant menu in many applications. Historically, because most applications already had this menu, and because the distinction between closing documents and closing windows became blurred over time, the <guimenu>File</guimenu> menu has also become the standard location for <guimenuitem>Quit</guimenuitem>.</para>
+
+		  <para>The items on the <guimenu>File</guimenu> menu are generally ordered by locality, closest first.  That is, items to save or load from file, followed by printing, followed by sending to a remote user.  Try to maintain this ordering if you have to add new items to the menu.</para>
+
+	        <para>If your application does not operate on documents, name this item for the type of object it displays.  For example, many games should have a <guimenu>Game</guimenu> instead of a <guimenu>File</guimenu> menu.  However, place the <guimenuitem>Quit</guimenuitem> menu item last on this menu nonetheless.</para>
+		
+<remark>GJM: Quit should be deprecated. Close is often sufficient; especially when
+the application saves state as it should.</remark>
+
+	<figure id="generic-file-menu"><title>A generic File menu</title>
+	<mediaobject>
+	  <imageobject><imagedata fileref="images/menus-file.png" width="290" depth="454" format="PNG"/></imageobject>
+	  <imageobject><imagedata fileref="images/menus-file.eps" format="EPS"/></imageobject>
+	  <textobject>
+<literallayout>
+<guimenu>File</guimenu>
+<guimenuitem><accel>N</accel>ew                  Ctrl+N</guimenuitem>
+<guimenuitem><accel>O</accel>pen...              Ctrl+O</guimenuitem>
+<!--<guimenuitem>Recent <accel>F</accel>iles              &gt; </guimenuitem>-->
 ---
-<guimenuitem><accel>S</accel>ave                 Ctrl+S</guimenuitem><guimenuitem>Save <accel>A</accel>s...     Shift+Ctrl+S</guimenuitem><guimenuitem>Sa<accel>v</accel>e a Copy...               </guimenuitem><guimenuitem><accel>R</accel>evert                     </guimenuitem>
+<guimenuitem><accel>S</accel>ave                 Ctrl+S</guimenuitem>
+<guimenuitem>Save <accel>A</accel>s...     Shift+Ctrl+S</guimenuitem>
+<guimenuitem>Sa<accel>v</accel>e a Copy...               </guimenuitem>
+<guimenuitem><accel>R</accel>evert                     </guimenuitem>
 ---
-<guimenuitem>Page Set<accel>u</accel>p                 </guimenuitem><guimenuitem>Print Previe<accel>w</accel>  Shift+Ctrl+P</guimenuitem><guimenuitem><accel>P</accel>rint...             Ctrl+P</guimenuitem><guimenuitem><accel>S</accel>end To...              Ctrl+M</guimenuitem>
+<guimenuitem>Page Set<accel>u</accel>p                 </guimenuitem>
+<guimenuitem>Print Previe<accel>w</accel>  Shift+Ctrl+P</guimenuitem>
+<guimenuitem><accel>P</accel>rint...             Ctrl+P</guimenuitem>
+<guimenuitem><accel>S</accel>end To...              Ctrl+M</guimenuitem>
 ---
 <guimenuitem>Proper<accel>t</accel>ies                 </guimenuitem>
 ---
-<guimenuitem><accel>1</accel>. Recent Document                 </guimenuitem><guimenuitem><accel>2</accel>. Recent Document                </guimenuitem><guimenuitem><accel>3</accel>. Recent Document                </guimenuitem><guimenuitem><accel>4</accel>. Recent Document                </guimenuitem>
+<guimenuitem><accel>1</accel>. Recent Document                 </guimenuitem>
+<guimenuitem><accel>2</accel>. Recent Document                </guimenuitem>
+<guimenuitem><accel>3</accel>. Recent Document                </guimenuitem>
+<guimenuitem><accel>4</accel>. Recent Document                </guimenuitem>
 ---
-<guimenuitem><accel>C</accel>lose               Ctrl+W</guimenuitem><guimenuitem><accel>Q</accel>uit                 Ctrl+Q</guimenuitem></literallayout>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <sect3>
-        <title>Creation and Opening Operations</title>
-        <remark>Adam noted in the last review that we don't make any suggestions for applications  that do not edit document/files. In an OOUI, the Game
+<guimenuitem><accel>C</accel>lose               Ctrl+W</guimenuitem>
+<guimenuitem><accel>Q</accel>uit                 Ctrl+Q</guimenuitem>
+</literallayout>
+	    </textobject>
+	  </mediaobject>
+	</figure>
+
+        
+	<sect3>
+	  <title>Creation and Opening Operations</title>
+	<remark>Adam noted in the last review that we don't make any suggestions for applications  that do not edit document/files. In an OOUI, the Game
 	  menu would have items such as (modulo phraeseology) Open New Game, Open Game Settings, High Scores.</remark>
-        <remark>&gt;For non-game UI there would be at the very least, Open as ... and Open Settings.</remark>
-        <table frame="none">
-          <title>Creation and Opening operation menu items </title>
-          <tgroup colsep="0" rowsep="0" cols="3" align="left">
-            <thead>
-              <row>
-                <entry>Label</entry>
-                <entry>Shortcut</entry>
-                <entry>Description</entry>
-              </row>
-            </thead>
-            <tbody valign="top">
-              <row>
-                <entry>
-                  <guimenuitem><accel>N</accel>ew</guimenuitem>
-                </entry>
-                <entry>
-                  <keycombo>
-                    <keycap>Ctrl</keycap>
-                    <keycap>N</keycap>
-                  </keycombo>
-                </entry>
-                <entry>Creates a new document. Open a new primary window, with the title <replaceable>Document name</replaceable>, containing a blank document.  How this window is displayed, e.g. as a tab or a separate window, is up to the window manager.
+	<remark>>For non-game UI there would be at the very least, Open as ... and Open Settings.</remark>
+
+	<table frame="all"> 
+	  <title>Creation and Opening operation menu items </title> 
+
+	  <tgroup cols="3" align="left">
+	    <thead> 
+	      <row> 
+		<entry>Label</entry> 
+		<entry>Shortcut</entry>
+		<entry>Description</entry>
+		</row>
+	      </thead>
+	    <tbody valign="top">
+	      <row>
+	      	<entry><guimenuitem><accel>N</accel>ew</guimenuitem></entry>
+	       <entry><keycombo><keycap>Ctrl</keycap><keycap>N</keycap></keycombo></entry>
+		<entry>Creates a new document. Open a new primary window, with the title <replaceable>Document name</replaceable>, containing a blank document.  How this window is displayed, e.g. as a tab or a separate window, is up to the window manager.
 			<para>If your application can create a number of different types of document, you can make the <guimenuitem><accel>N</accel>ew</guimenuitem> item a submenu, containing a menu item for each type. Label these items <guimenuitem>New <replaceable>document type</replaceable></guimenuitem>, make the first entry in the submenu the most commonly used document type, and give it the <keycombo><keycap>Ctrl</keycap><keycap>N</keycap></keycombo> shortcut.</para>
 			<para>Note: A blank document will not necessarily be completely blank. For example, a document created from a template may already contain some data.<!-- FIXME: More on templates --></para>
 		</entry>
-              </row>
-              <row>
-                <entry>
-                  <guimenuitem><accel>O</accel>pen...</guimenuitem>
-                </entry>
-                <entry>
-                  <keycombo>
-                    <keycap>Ctrl</keycap>
-                    <keycap>O</keycap>
-                  </keycombo>
-                </entry>
-                <entry>Opens an existing document in a new window. Present the user with a standard Open File dialog <!-- Ref this elsewhere --> from which they can choose an existing file. If the chosen file is already open in the application, raise that window instead of opening a new one. <!-- If the current window contains a blank untitled document then replace it with the selected file. Otherwise open the file in a new window. -->
-		<remark>If your application provides more than two ways to open an object, place all the Open ... items in a submenu, including Recent Files. This keeps the menu less cluttered and in some ways presents a better interface as the list of recent files is presented in the same menu, and near, the regular open commands. Users hate having to go to the bottom of the file menu to open recent files; the cause of this is that, in the workplace, it is far more common to sort out other peoples already written and saved crap than it is to have to write your own. Most of the users of office application, surveyed in both card sorts and on-line presentations of speculative menus, do not want or do not even notice when the New... items are absent.</remark>
-		  <remark>&gt;Problem to be solved. It may be desirable to open a second read-only view of the same document. How should this be provided? Non-OOUI are particularly nasty in this regard, as in many others. A "Clone Window" command seems quite nasty.</remark>
-		  <remark>&gt;As I noted in the first review, the blank window should be kept available; in an OOUI this is a more obvious a way of working.</remark>
+		</row>
+
+		<row>
+		      <entry><guimenuitem><accel>O</accel>pen...</guimenuitem></entry>
+	      		<entry><keycombo><keycap>Ctrl</keycap><keycap>O</keycap></keycombo></entry>
+			<entry>Opens an existing document in a new window. Present the user with a standard Open File dialog <!-- Ref this elsewhere --> from which they can choose an existing file. If the chosen file is already open in the application, raise that window instead of opening a new one. <!-- If the current window contains a blank untitled document then replace it with the selected file. Otherwise open the file in a new window. -->
+		<remark>If your application provides more than two ways to open an object, place all the Open ... items in a submenu, including Recent Files. This keeps the menu less cluttered and in some ways presents a better inteface as the list of recent files is presented in the same menu, and near, the regular open commands. Users hate having to go to the bottom of the file menu to open recent files; the cause of this is that, in the workplace, it is far more common to sort out other peoples already written and saved crap than it is to have to write your own. Most of the users of office application, surveyed in both card sorts and online presentations of speculative menus, do not want or do not even notice when the New... items are absent.</remark>
+		  <remark>>Problem to be solved. It may be desirable to open a second read-only view of the same document. How should this be provided? Non-OOUI are particularly nasty in this regard, as in many others. A "Clone Window" command seems quite nasty.</remark>
+		  <remark>>As I noted in the first review, the blank window should be kept available; in an OOUI this is a more obvious a way of working.</remark>
 			</entry>
-              </row>
-	      <!-- I think this is totally broken, I'm moving back to having recent files on the main menu itself. -Seth
-	      <row>
+		</row>
+
+	  <!-- I think this is totally broken, I'm moving back to having recent files on the main menu itself. -Seth
+		<row>
 			<entry>Recent Files</entry>
 			<entry>none</entry>	
 			<entry>Allows the user to open a recently used file. The application should maintain a history of recently opened documents and these should be accessible via a submenu. Selecting one of these files should open that file in the same way that <guimenuitem><accel>O</accel>pen</guimenuitem> does.
 			<para>Provide at least ten of the most recent files in the menu; fewer only according to user preferences or absence of recent files.</para>
 			</entry>
 		</row>
-		-->
-            </tbody>
-          </tgroup>
-        </table>
-      </sect3>
-      <sect3>
-        <title>Saved State Operations</title>
-        <remark>This section needs a review with an eye to what can actually be done programmatically.</remark>
-        <table frame="none">
-          <title>Saved State Operation menu items</title>
-          <tgroup colsep="0" rowsep="0" cols="3" align="left">
-            <thead>
-              <row>
-                <entry>Label</entry>
-                <entry>Shortcut</entry>
-                <entry>Description</entry>
-              </row>
-            </thead>
-            <tbody valign="top">
-              <row>
-                <entry>
-                  <guimenuitem><accel>S</accel>ave</guimenuitem>
-                </entry>
-                <entry>
-                  <keycombo>
-                    <keycap>Ctrl</keycap>
-                    <keycap>S</keycap>
-                  </keycombo>
-                </entry>
-                <entry>Saves the document with its current filename. If the document already has a filename associated with it, save the document immediately without any further interaction from the user. If there are any additional options involved in saving a file (eg. DOS or UNIX-style line endings in a text file), prompt for these first time the document is saved, but subsequently use the same values each time until the user changes them.
+	  -->
+		</tbody>
+		</tgroup>
+	</table>
+	</sect3>
+
+
+	<sect3>
+	  <title>Saved State Operations</title>
+	    <remark>This section needs a review with an eye to what can actually be done programmatically.</remark>
+
+	<table>
+	  <title>Saved State Operation menu items</title>
+	  <tgroup cols="3" align="left">
+	    <thead> 
+	      <row> 
+		<entry>Label</entry> 
+		<entry>Shortcut</entry>
+		<entry>Description</entry>
+		</row>
+	      </thead>
+	    <tbody valign="top">
+	      <row>
+		<entry><guimenuitem><accel>S</accel>ave</guimenuitem></entry>
+		<entry><keycombo><keycap>Ctrl</keycap><keycap>S</keycap></keycombo></entry>
+		<entry>Saves the document with its current filename. If the document already has a filename associated with it, save the document immediately without any further interaction from the user. If there are any additional options involved in saving a file (eg. DOS or UNIX-style line endings in a text file), prompt for these first time the document is saved, but subsequently use the same values each time until the user changes them.
 		<para>If the document has no current filename or is read-only, selecting this item should be the same as selecting <guimenuitem>Save As</guimenuitem>.</para>
 		</entry>
-              </row>
-              <row>
-                <entry>
-                  <guimenuitem>Save <accel>A</accel>s...</guimenuitem>
-                </entry>
-                <entry>
-                  <keycombo>
-                    <keycap>Shift</keycap>
-                    <keycap>Ctrl</keycap>
-                    <keycap>S</keycap>
-                  </keycombo>
-                </entry>
-                <entry>Saves the document with a new filename. Present the user with the standard Save As dialog, and save the file with the chosen file name. <!-- FIXME: errors, additional information--></entry>
-              </row>
-              <row>
-                <entry>
-                  <guimenuitem>S<accel>a</accel>ve a Copy...</guimenuitem>
-                </entry>
-                <entry>None</entry>
-                <entry>Prompts the user to enter a filename, with which a copy of the document is then saved.  Do not alter either the view or the filename of the original document.  All subsequent changes are still made to the original document until the user specifies otherwise, for example by choosing the <guimenuitem>Save As</guimenuitem> command.
+		</row>
+
+		<row>
+		      <entry><guimenuitem>Save <accel>A</accel>s...</guimenuitem></entry>
+	      		<entry><keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap><keycap>S</keycap></keycombo></entry>
+			<entry>Saves the document with a new filename. Present the user with the standard Save As dialog, and save the file with the chosen file name. <!-- FIXME: errors, additional information--></entry>
+
+		</row>
+		<row>
+	      		<entry><guimenuitem>S<accel>a</accel>ve a Copy...</guimenuitem></entry>
+	      		<entry>None</entry>
+			<entry>Prompts the user to enter a filename, with which a copy of the document is then saved.  Do not alter either the view or the filename of the original document.  All subsequent changes are still made to the original document until the user specifies otherwise, for example by choosing the <guimenuitem>Save As</guimenuitem> command.
 		<para> Like the <guimenuitem>Save As</guimenuitem> dialog, the <guimenuitem>Save a Copy</guimenuitem> dialog may present different ways to save the data. For example, an image may be saved in a native format or as a PNG.</para></entry>
-              </row>
-              <row>
-                <entry>
-                  <guimenuitem><accel>R</accel>evert</guimenuitem>
-                </entry>
-                <entry>None</entry>
-                <entry>Reverts the document to the last saved state. Present the user with a warning that all changes will be lost, and offer the option of canceling before reloading the file.</entry>
-              </row>
-              <row>
-                <entry>
-                  <guimenuitem>Save <accel>V</accel>ersion...</guimenuitem>
-                </entry>
-                <entry>None</entry>
-                <entry>An alternative to the <guimenuitem>Save a Copy</guimenuitem> command.  Only use this item in conjunction with the <guimenuitem>Restore Version</guimenuitem>.  <remark>Unless we can describe exactly what this ought to do, should we remove it for now?</remark>command.</entry>
-              </row>
-              <row>
-                <entry>
-                  <guimenuitem>R<accel>e</accel>store Version...</guimenuitem>
-                </entry>
-                <entry>None</entry>
-                <entry>Prompts the user for a version of the current document to be restored. Present the user with with a warning that all changes will be lost, and offer the option of cancelling before restoring the version. Only use this item in conjunction with the <guimenuitem>Save Version</guimenuitem> command.</entry>
-              </row>
-              <row>
-                <entry>
-                  <guimenuitem><accel>V</accel>ersions...</guimenuitem>
-                </entry>
-                <entry>None</entry>
-                <entry>An alternative to the <guimenuitem>Save Version</guimenuitem> and <guimenuitem>Restore Version</guimenuitem> commands. Use this when more utilities, such as a diff, are available.</entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
-      </sect3>
-      <sect3>
-        <title>Export Operations</title>
-        <table frame="none">
-          <title>Export Operation menu items</title>
-          <tgroup colsep="0" rowsep="0" cols="3" align="left">
-            <thead>
-              <row>
-                <entry>Label</entry>
-                <entry>Shortcut</entry>
-                <entry>Description</entry>
-              </row>
-            </thead>
-            <tbody valign="top">
-              <row>
-                <entry>
-                  <guimenuitem>Page Set<accel>u</accel>p...</guimenuitem>
-                </entry>
-                <entry>None</entry>
-                <entry>Allows the user to control print-related settings. Present the user with a dialog allowing the user to set such options as portrait or landscape format, margins, and so on. <remark>We should have a standard dialog for this.</remark></entry>
-              </row>
-              <row>
-                <entry>
-                  <guimenuitem>Print Previe<accel>w</accel></guimenuitem>
-                </entry>
-                <entry>
-                  <keycombo>
-                    <keycap>Shift</keycap>
-                    <keycap>Ctrl</keycap>
-                    <keycap>P</keycap>
-                  </keycombo>
-                </entry>
-                <entry>Shows the user what the printed document will look like. Present a new window containing an accurate representation of the appearance of the document as it would be printed.  The libgnomeprintui library provides a standard Print Preview window that you should use if possible.</entry>
-              </row>
-              <row>
-                <entry>
-                  <guimenuitem><accel>P</accel>rint...</guimenuitem>
-                </entry>
-                <entry>
-                  <keycombo>
-                    <keycap>Ctrl</keycap>
-                    <keycap>P</keycap>
-                  </keycombo>
-                </entry>
-                <entry>Prints the current document. Present the user with a dialog allowing them to set options like the page range to be printed, the printer to be used, and so on. The dialog must contain a button labeled <guibutton>Print</guibutton> that starts printing and closes the dialog.  The <filename>libgnomeprintui</filename> library provides a standard Print dialog that you should use if possible.</entry>
-              </row>
-              <row>
-                <entry>
-                  <guimenuitem>S<accel>e</accel>nd To...</guimenuitem>
-                </entry>
-                <entry>
-                  <keycombo>
-                    <keycap>Ctrl</keycap>
-                    <keycap>M</keycap>
-                  </keycombo>
-                </entry>
-                <entry>Provides the user a means to attach or send the current document as an email or email attachment<!-- (launch $MAILER -a $ATTACHMENT)-->, depending on its format.
+	      </row>
+
+	    <row>
+	      	<entry><guimenuitem><accel>R</accel>evert</guimenuitem></entry>
+	      <entry>None</entry>
+		<entry>Reverts the document to the last saved state. Present the user with a warning that all changes will be lost, and offer the option of cancelling before reloading the file.</entry>
+
+		</row>
+
+		<row>
+		      <entry><guimenuitem>Save <accel>V</accel>ersion...</guimenuitem></entry>
+	      		<entry>None</entry>
+			<entry>An alternative to the <guimenuitem>Save a Copy</guimenuitem> command.  Only use this item in conjunction with the <guimenuitem>Restore Version</guimenuitem>.  <remark>Unless we can describe exactly what this ought to do, should we remove it for now?</remark>command.</entry>
+	      </row>
+
+		<row>
+		      <entry><guimenuitem>R<accel>e</accel>store Version...</guimenuitem></entry>
+	      		<entry>None</entry>
+			<entry>Prompts the user for a version of the current document to be restored. Present the user with with a warning that all changes will be lost, and offer the option of cancelling before restoring the version. Only use this item in conjunction with the <guimenuitem>Save Version</guimenuitem> command.</entry>
+		</row>
+	
+		<row>
+		      <entry><guimenuitem><accel>V</accel>ersions...</guimenuitem></entry>
+	      		<entry>None</entry>
+			<entry>An alternative to the <guimenuitem>Save Version</guimenuitem> and <guimenuitem>Restore Version</guimenuitem> commands. Use this when more utilities, such as a diff, are available.</entry>
+	      </row>
+
+		</tbody>
+		</tgroup>
+
+	</table>
+	</sect3>
+
+	<sect3>
+	  <title>Export Operations</title>
+
+	<table>
+	  <title>Export Operation menu items</title>
+	  <tgroup cols="3" align="left">
+	    <thead> 
+	      <row> 
+		<entry>Label</entry> 
+		<entry>Shortcut</entry>
+		<entry>Description</entry>
+		</row>
+	      </thead>
+	    <tbody valign="top">
+	      <row>
+	      	<entry><guimenuitem>Page Set<accel>u</accel>p</guimenuitem></entry>
+		<entry>None</entry>
+	      	<entry>Allows the user to control print-related settings. Present the user with a dialog allowing the user to set such options as portrait or landscape format, margins, and so on. <remark>We should have a standard dialog for this.</remark></entry>
+	      </row>
+
+		<row>
+		      <entry><guimenuitem>Print Previe<accel>w</accel></guimenuitem></entry>
+	      		<entry><keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap><keycap>P</keycap></keycombo></entry>
+			<entry>Shows the user what the printed document will look like. Present a new window containing an accruate represenation of the appearance of the document as it would be printed.  The libgnomeprintui library provides a standard Print Preview window that you should use if possible.</entry>
+		</row>
+
+	    <row>
+	    	<entry><guimenuitem><accel>P</accel>rint...</guimenuitem></entry>
+		<entry><keycombo><keycap>Ctrl</keycap><keycap>P</keycap></keycombo></entry>
+	        <entry>Prints the current document. Present the user with a dialog allowing them to set options like the page range to be printed, the printer to be used, and so on. The dialog must contain a button labelled <guibutton>Print</guibutton> that starts printing and closes the dialog.  The <filename>libgnomeprintui</filename> library provides a standard Print dialog that you should use if possible.</entry>
+	    </row>
+
+	    <row>
+	      <entry><guimenuitem>S<accel>e</accel>nd To...</guimenuitem></entry>
+		<entry><keycombo><keycap>Ctrl</keycap><keycap>M</keycap></keycombo></entry>
+	      <entry>Provides the user a means to attach or send the current document as an email or email attachment<!-- (launch $MAILER -a $ATTACHMENT)-->, depending on its format.
 		<para>You may provide more than one <guimenuitem>Send</guimenuitem> item depending on which options are available. If there are more than two such items, move them into a submenu. For example, if only <guimenuitem>Send by Email</guimenuitem> and <guimenuitem>Send by Fax</guimenuitem> are available, leave them on the top-level menu  If there is a third option, such as <guimenuitem>Send by FTP</guimenuitem>, place all the options in a <guimenuitem>Send</guimenuitem> submenu.</para>
 	      </entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
-      </sect3>
-      <sect3>
-        <title>File Properties</title>
-        <table frame="none">
-          <title>Properties menu items</title>
-          <tgroup colsep="0" rowsep="0" cols="3" align="left">
-            <thead>
-              <row>
-                <entry>Label</entry>
-                <entry>Shortcut</entry>
-                <entry>Description</entry>
-              </row>
-            </thead>
-            <tbody valign="top">
-              <row>
-                <entry>
-                  <guimenuitem>Proper<accel>t</accel>ies</guimenuitem>
-                </entry>
-                <entry>
-                  <keycombo>
-                    <keycap>Alt</keycap>
-                    <keycap>Return</keycap>
-                  </keycombo>
-                </entry>
-                <entry>Opens the document's <guilabel>Properties</guilabel> window.  This may contain editable information, such as the document author's name, or read-only information, such as the number of words in the document, or a combination of both. The <keycombo><keycap>Alt</keycap><keycap>Return</keycap></keycombo> shortcut should not be provided where <keycap>Return</keycap> is most frequently used to insert a new line.</entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
-      </sect3>
-      <sect3>
-        <title>Closing Operations</title>
-        <table frame="none">
-          <title>Closing Operation menu items</title>
-          <tgroup colsep="0" rowsep="0" cols="3" align="left">
-            <thead>
-              <row>
-                <entry>Label</entry>
-                <entry>Shortcut</entry>
-                <entry>Description</entry>
-              </row>
-            </thead>
-            <tbody valign="top">
-              <row>
-                <entry>
-                  <guimenuitem><accel>C</accel>lose</guimenuitem>
-                </entry>
-                <entry>
-                  <keycombo>
-                    <keycap>Ctrl</keycap>
-                    <keycap>W</keycap>
-                  </keycombo>
-                </entry>
-                <entry>Closes the current document. If it has unsaved changes, present the user with a <link linkend="alerts-confirmation">confirmation alert</link> giving the option to save changes, discard them, or cancel the action without closing or saving the document.
+	    </row>
+	</tbody>
+	</tgroup>
+	</table>
+	</sect3>
+	
+	<sect3>
+	  <title>File Properties</title>
+	<table>
+	  <title>Properties menu items</title>
+	  <tgroup cols="3" align="left">
+	    <thead> 
+	      <row> 
+		<entry>Label</entry> 
+		<entry>Shortcut</entry>
+		<entry>Description</entry>
+		</row>
+	      </thead>
+	    <tbody valign="top">
+	      <row>
+		<entry><guimenuitem>Proper<accel>t</accel>ies</guimenuitem></entry>
+		<entry><keycombo><keycap>Alt</keycap><keycap>Return</keycap></keycombo></entry>
+	        <entry>Opens the document's <guilabel>Properties</guilabel> window.  This may contain editable information, such as the document author's name, or read-only information, such as the number of words in the document, or a combination of both. The <keycombo><keycap>Alt</keycap><keycap>Return</keycap></keycombo> shortcut should not be provided where <keycap>Return</keycap> is most frequently used to insert a new line.</entry>
+	    </row>
+	  </tbody>
+	</tgroup>
+	</table>
+	</sect3>
+	
+
+	<sect3>
+	  <title>Closing Operations</title>
+	<table>
+	  <title>Closing Operation menu items</title>
+	  <tgroup cols="3" align="left">
+	    <thead> 
+	      <row> 
+		<entry>Label</entry> 
+		<entry>Shortcut</entry>
+		<entry>Description</entry>
+		</row>
+	      </thead>
+	    <tbody valign="top">
+	      <row>
+		<entry><guimenuitem><accel>C</accel>lose</guimenuitem></entry>
+		<entry><keycombo><keycap>Ctrl</keycap><keycap>W</keycap></keycombo></entry>
+	        <entry>Closes the current document. If it has unsaved changes, present the user with a <link linkend="alerts-confirmation">confirmation alert</link> giving the option to save changes, discard them, or cancel the action without closing or saving the document.
 		<para>If the window you are closing is the last open document in the application, the correct action depends on your application type:</para>
-		<itemizedlist><listitem><para>Single document interface: close the application</para></listitem><listitem><para>Controlled single document interface: leave only the control window open</para></listitem><listitem><para>Multiple document interface: close the current document and create a new blank document</para></listitem></itemizedlist>		
+		<itemizedlist>
+			<listitem><para>Single document interface: close the application</para></listitem>
+			<listitem><para>Controlled single document interface: leave only the control window open</para></listitem>
+			<listitem><para>Multiple document interface: close the current document and create a new blank document</para></listitem>
+		</itemizedlist>		
 		  <remark>As mentioned on the usability list, Control+W is an Emacs shortcut for Cut. This has already proven deleterious for some users so we should consider dropping the shortcut.  But see also <ulink url="http://bugzilla.gnome.org/show_bug.cgi?id=76761";>http://bugzilla.gnome.org/show_bug.cgi?id=76761</ulink></remark>
 	      </entry>
-              </row>
-              <row>
-                <entry>
-                  <guimenuitem><accel>Q</accel>uit</guimenuitem>
-                </entry>
-                <entry>
-                  <keycombo>
-                    <keycap>Ctrl</keycap>
-                    <keycap>Q</keycap>
-                  </keycombo>
-                </entry>
-                <entry>
-                  <para>Closes the application. If there are unsaved changes in any open documents, present the user with a <link linkend="alerts-confirmation">confirmation alert</link> for each affected document, giving the option to save the changes, discard them, or cancel. If there are no unsaved changes, close the application immediately without presenting any further messages or dialogs.</para>
-<!-- This para in response to bug #73618-->
-                  <para>In particular, non-document based applications, for example a game or a calculator, should save their state and exit immediately.  This state should be restored the next time the application is started.</para>
-                  <remark>Kathy had suggested not providing a shortcut key to Quit. I can find no discussion of this. (And I think it should go away.)</remark>
-                </entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
-      </sect3>
-    </sect2>
-    <sect2 id="menu-standard-edit">
-      <title>Edit</title>
-      <para>The <guimenu>Edit</guimenu> menu contains items relating to editing both the document (clipboard handling, search and replace, and inserting special objects) and the user's preferences.  Preferences are edited here rather than on a <guimenu>Settings</guimenu> menu, because:</para>
-      <itemizedlist>
-        <listitem>
-          <para>most applications' preferences windows are accessed via a single menu item, and single-item menus offer poor usability</para>
-        </listitem>
-        <listitem>
-          <para>most applications already contain a suitable <guimenu>Edit</guimenu> menu.</para>
-        </listitem>
-      </itemizedlist>
-      <remark>I think we should move to a MacOS/X concept of having an "AppName" menu that contains things like preferences, about, quit, etc. -Seth</remark>
-      <figure id="generic-edit-menu">
-        <title>A generic Edit menu</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="images/application-edit-menu.png" format="PNG"/>
-          </imageobject>
-          <imageobject>
-            <imagedata fileref="images/application-edit-menu.eps" format="EPS"/>
-          </imageobject>
-          <textobject>
-            <literallayout class="monospaced"><guimenu><accel>E</accel>dit</guimenu><guimenuitem><accel>U</accel>ndo                 Ctrl+Z</guimenuitem><guimenuitem><accel>R</accel>edo           Shift+Ctrl+Z</guimenuitem>
+	    </row>
+	    
+	    <row>
+	      <entry><guimenuitem><accel>Q</accel>uit</guimenuitem></entry>
+		<entry><keycombo><keycap>Ctrl</keycap><keycap>Q</keycap></keycombo></entry>
+	      <entry><para>Closes the application. If there are unsaved changes in any open documents, present the user with a <link linkend="alerts-confirmation">confirmation alert</link> for each affected document, giving the option to save the changes, discard them, or cancel. If there are no unsaved changes, close the application immediately without presenting any further messages or dialogs.</para>
+		<!-- This para in response to bug #73618--><para>In particular, non-document based applications, for example a game or a calculator, should save their state and exit immediately.  This state should be restored the next time the application is started.</para> 
+		  <remark>Kathy had suggested not providing a shortcut key to Quit. I can find no discussion of this. (And I think it should go away.)</remark>
+	      </entry>
+	    </row>
+	  </tbody>
+	</tgroup>
+	</table>
+	</sect3>
+	
+      </sect2>
+      <sect2 id="menu-standard-edit">
+	<title>Edit</title>
+
+	<para>The <guimenu>Edit</guimenu> menu contains items relating to editing both the document (clipboard handling, search and replace, and inserting special objects) and the user's preferences.  Preferences are edited here rather than on a <guimenu>Settings</guimenu> menu, because:</para>
+
+	<itemizedlist>
+		<listitem><para>most applications' preferences windows are accessed via a single menu tem, and single-item menus offer poor usability</para></listitem>
+		<listitem><para>most applications already contain a suitable <guimenu>Edit</guimenu> menu.</para></listitem>
+	</itemizedlist>
+
+	<remark>I think we should move to a MacOS/X concept of having an "AppName" menu that contains things like preferences, about, quit, etc. -Seth</remark>
+
+	<figure id="generic-edit-menu">
+	  <title>A generic Edit menu</title>
+	  <mediaobject>
+	    <imageobject><imagedata fileref="images/menus-edit.png" width="226" depth="417" format="PNG"/></imageobject>
+	    <imageobject><imagedata fileref="images/menus-edit.eps" format="EPS"/></imageobject>
+	    <textobject>
+<literallayout class="monospaced">
+<guimenu><accel>E</accel>dit</guimenu>
+<guimenuitem><accel>U</accel>ndo                 Ctrl+Z</guimenuitem>
+<guimenuitem><accel>R</accel>edo           Shift+Ctrl+Z</guimenuitem>
 -
-<guimenuitem>Cu<accel>t</accel>                  Ctrl+X</guimenuitem><guimenuitem><accel>C</accel>opy                 Ctrl+C</guimenuitem><guimenuitem><accel>P</accel>aste                Ctrl+V</guimenuitem><guimenuitem>Paste <accel>S</accel>pecial...                Shift+Ctrl+V</guimenuitem><guimenuitem><accel>D</accel>elete               Del</guimenuitem><guimenuitem><accel>S</accel>elect All           Ctrl+A</guimenuitem><guimenuitem>Du<accel>p</accel>licate           Ctrl+U</guimenuitem><guimenuitem>Dese<accel>l</accel>ect All   Shift+Ctrl+A</guimenuitem>
+<guimenuitem>Cu<accel>t</accel>                  Ctrl+X</guimenuitem>
+<guimenuitem><accel>C</accel>opy                 Ctrl+C</guimenuitem>
+<guimenuitem><accel>P</accel>aste                Ctrl+V</guimenuitem>
+<guimenuitem>Paste <accel>S</accel>pecial...                Shift+Ctrl+V</guimenuitem>
+<guimenuitem><accel>D</accel>elete               Del</guimenuitem>
+<guimenuitem><accel>S</accel>elect All           Ctrl+A</guimenuitem>
+<guimenuitem>Du<accel>p</accel>licate           Ctrl+U</guimenuitem>
+<guimenuitem>Dese<accel>l</accel>ect All   Shift+Ctrl+A</guimenuitem>
 -
-<guimenuitem><accel>F</accel>ind...              Ctrl+F</guimenuitem><guimenuitem>Find Ne<accel>x</accel>t            Ctrl+G</guimenuitem><guimenuitem>Find Pre<accel>v</accel>ious  Shift+Ctrl+G</guimenuitem><guimenuitem>R<accel>e</accel>place...              Ctrl+R</guimenuitem>
+<guimenuitem><accel>F</accel>ind...              Ctrl+F</guimenuitem>
+<guimenuitem>Find Ne<accel>x</accel>t            Ctrl+G</guimenuitem>
+<guimenuitem>Find Pre<accel>v</accel>ious  Shift+Ctrl+G</guimenuitem>
+<guimenuitem>R<accel>e</accel>place...              Ctrl+R</guimenuitem>
 -
 <guimenuitem><accel>I</accel>nsert...              </guimenuitem>
 -
-<guimenuitem>Pr<accel>e</accel>ferences</guimenuitem></literallayout>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <sect3>
-        <title>Modification History</title>
-        <para>Document-based applications should maintain a history of modifications to a document and the state of the document between each action. The <guimenuitem>Undo</guimenuitem> and <guimenuitem>Redo</guimenuitem> commands move backwards and forwards through this history.</para>
-        <remark>We'd like to see the action name included on the Undo/Redo menu items, but this is currently not easy to do in gtk.</remark>
-        <table frame="none">
-          <title>Modification History menu items </title>
-          <tgroup colsep="0" rowsep="0" cols="3" align="left">
-            <thead>
-              <row>
-                <entry>Label</entry>
-                <entry>Shortcut</entry>
-                <entry>Description</entry>
-              </row>
-            </thead>
-            <tbody valign="top">
-              <row>
-                <entry>
-                  <guimenuitem><accel>U</accel>ndo <replaceable>action</replaceable></guimenuitem>
-                </entry>
-                <entry>
-                  <keycombo>
-                    <keycap>Ctrl</keycap>
-                    <keycap>Z</keycap>
-                  </keycombo>
-                </entry>
-                <entry>Undoes the effect of the previous action in the undo history list. Revert the document to its state before the previous action was performed. If your application supports undo, and the user undoes all changes since it was last saved, treat the document as unmodified.
+<guimenuitem>Pr<accel>e</accel>ferences</guimenuitem>
+</literallayout>
+	    </textobject>
+	  </mediaobject>
+	</figure>
+
+
+	<sect3>
+	  <title>Modification History</title>
+	  <para>Document-based applications should maintain a history of modifications to a document and the state of the document between each action. The <guimenuitem>Undo</guimenuitem> and <guimenuitem>Redo</guimenuitem> commands move backwards and forwards through this history.</para>
+
+	<remark>We'd like to see the action name included on the Undo/Redo menu items, but this is currently not easy to do in gtk.</remark>
+
+	<table frame="all"> 
+	  <title>Modification History menu items </title> 
+
+	  <tgroup cols="3" align="left">
+	    <thead> 
+	      <row> 
+		<entry>Label</entry> 
+		<entry>Shortcut</entry>
+		<entry>Description</entry>
+		</row>
+	      </thead>
+	    <tbody valign="top">
+	      <row>
+	  	<entry><guimenuitem><accel>U</accel>ndo <replaceable>action</replaceable></guimenuitem></entry>
+	       <entry><keycombo><keycap>Ctrl</keycap><keycap>Z</keycap></keycombo></entry>
+		<entry>Undoes the effect of the previous action in the undo history list. Revert the document to its state before the previous action was performed. If your application supports undo, and the user undoes all changes since it was last saved, treat the document as unmodified.
 		<para>Note: provide a separate <guimenuitem>Undo</guimenuitem> and <guimenuitem>Redo</guimenuitem> menu item even if your application only supports one level of undo.</para></entry>
-              </row>
-              <row>
-                <entry>
-                  <guimenuitem><accel>R</accel>edo <replaceable>action</replaceable></guimenuitem>
-                </entry>
-                <entry>
-                  <keycombo>
-                    <keycap>Shift</keycap>
-                    <keycap>Ctrl</keycap>
-                    <keycap>Z</keycap>
-                  </keycombo>
-                </entry>
-                <entry>Performs the next action in the undo history list, after the user has moved backwards through the list with the <guimenuitem>Undo</guimenuitem> command.  Move the user one step forwards again, restoring the document to the state it was in after that action was originally performed.
+	      </row>
+
+		<row>
+	      	  <entry><guimenuitem><accel>R</accel>edo <replaceable>action</replaceable></guimenuitem></entry>
+			<entry><keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap><keycap>Z</keycap></keycombo></entry>
+	      		<entry>Performs the next action in the undo history list, after the user has moved backwards through the list with the <guimenuitem>Undo</guimenuitem> command.  Move the user one step forwards again, restoring the document to the state it was in after that action was originally performed.
 			<para>Note: provide a separate <guimenuitem>Undo</guimenuitem> and <guimenuitem>Redo</guimenuitem> menu item even if your application only supports one level of undo.</para></entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
-      </sect3>
-      <sect3>
-        <title>Manipulating Selected Data</title>
-        <table frame="none">
-          <title>Selected Data Manipulation menu items </title>
-          <tgroup colsep="0" rowsep="0" cols="3" align="left">
-            <thead>
-              <row>
-                <entry>Label</entry>
-                <entry>Shortcut</entry>
-                <entry>Description</entry>
-              </row>
-            </thead>
-            <tbody valign="top">
-              <row>
-                <entry>
-                  <guimenuitem>Cu<accel>t</accel></guimenuitem>
-                </entry>
-                <entry>
-                  <keycombo>
-                    <keycap>Ctrl</keycap>
-                    <keycap>X</keycap>
-                  </keycombo>
-                </entry>
-                <entry>Removes the selected content and places it onto the clipboard. Visually, remove the content from the document in the same manner as <guimenuitem><accel>D</accel>elete</guimenuitem>.</entry>
-              </row>
-              <row>
-                <entry>
-                  <guimenuitem><accel>C</accel>opy</guimenuitem>
-                </entry>
-                <entry>
-                  <keycombo>
-                    <keycap>Ctrl</keycap>
-                    <keycap>C</keycap>
-                  </keycombo>
-                </entry>
-                <entry>Copies the selected content onto the clipboard.</entry>
-              </row>
-              <row>
-                <entry>
-                  <guimenuitem><accel>P</accel>aste</guimenuitem>
-                </entry>
-                <entry>
-                  <keycombo>
-                    <keycap>Ctrl</keycap>
-                    <keycap>V</keycap>
-                  </keycombo>
-                </entry>
-                <entry>Inserts the contents of the clipboard into the document.  If there is no current selection, use the caret as the insertion point.  If there is a current selection, replace it with the clipboard contents.</entry>
-              </row>
-              <row>
-                <entry>
-                  <guimenuitem>Paste <accel>S</accel>pecial...</guimenuitem>
-                </entry>
-                <entry>
-                  <keycombo>
-                    <keycap>Shift</keycap>
-                    <keycap>Ctrl</keycap>
-                    <keycap>V</keycap>
-                  </keycombo>
-                </entry>
-                <entry>Inserts a non-default representation of the clipboard contents into the document.  Open a dialog presenting a list of the available formats from which the user can select.  For example, if the clipboard contains a PNG file copied from a file manager, the image may be embedded in the document, or a link to the file inserted so that changes to the image on disk are always reflected in the document.</entry>
-              </row>
-              <row>
-                <entry>
-                  <guimenuitem>Du<accel>p</accel>licate</guimenuitem>
-                </entry>
-                <entry>
-                  <keycombo>
-                    <keycap>Ctrl</keycap>
-                    <keycap>U</keycap>
-                  </keycombo>
-                </entry>
-                <entry>Creates a duplicate copy of the selected object.  Do not prompt for a name for the duplicate object, but give it a sensible default (for example, <filename>Copy of ShoppingList.abw</filename>) and allow the user to change it later.  Place the duplicate copy as near the original as possible without overlapping it, even if this means breaking the current sort order within the container, so the user sees it immediately.</entry>
-              </row>
-              <row>
-                <entry>
-                  <guimenuitem><accel>D</accel>elete</guimenuitem>
-                </entry>
-                <entry>
-                  <keycap>Delete</keycap>
-                </entry>
-                <entry>Removes the selected content without placing it on the clipboard.
+	      </row>
+		</tbody>
+		</tgroup>
+	</table>
+	</sect3>
+
+	<sect3>
+	  <title>Manipulating Selected Data</title>
+
+	<table frame="all"> 
+	  <title>Selected Data Manipulation menu items </title> 
+
+	  <tgroup cols="3" align="left">
+	    <thead> 
+	      <row> 
+		<entry>Label</entry> 
+		<entry>Shortcut</entry>
+		<entry>Description</entry>
+		</row>
+	      </thead>
+	    <tbody valign="top">
+	      <row>
+		<entry><guimenuitem>Cu<accel>t</accel></guimenuitem></entry>
+	      	<entry><keycombo><keycap>Ctrl</keycap><keycap>X</keycap></keycombo></entry>
+		<entry>Removes the selected content and places it onto the clipboard. Visually, remove the content from the document in the same manner as <guimenuitem><accel>D</accel>elete</guimenuitem>.</entry>
+	      </row>
+
+		<row>
+	    		<entry><guimenuitem><accel>C</accel>opy</guimenuitem></entry>
+	      		<entry><keycombo><keycap>Ctrl</keycap><keycap>C</keycap></keycombo></entry>
+			<entry>Copies the selected content onto the clipboard.</entry>
+	      </row>
+	    
+	    <row>
+		<entry><guimenuitem><accel>P</accel>aste</guimenuitem></entry>
+	      <entry><keycombo><keycap>Ctrl</keycap><keycap>V</keycap></keycombo></entry>
+		<entry>Inserts the contents of the clipboard into the document.  If there is no current selection, use the caret as the insertion point.  If there is a current selection, replace it with the clipboard contents.</entry>
+	    </row>
+	    
+	    <row>
+		<entry><guimenuitem>Paste <accel>S</accel>pecial...</guimenuitem></entry>
+	      <entry><keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap><keycap>V</keycap></keycombo></entry>
+		<entry>Inserts a non-default representation of the clipboard contents into the document.  Open a dialog presenting a list of the available formats from which the user can select.  For example, if the clipboard contains a PNG file copied from a file manager, the image may be embedded in the document, or a link to the file inserted so that changes to the image on disk are always reflected in the document.</entry>
+	    </row>
+
+	    <row>
+		<entry><guimenuitem>Du<accel>p</accel>licate</guimenuitem></entry>
+	      <entry><keycombo><keycap>Ctrl</keycap><keycap>U</keycap></keycombo></entry>
+		<entry>Creates a duplicate copy of the selected object.  Do not prompt for a name for the duplicate object, but give it a sensible default (for example, <filename>Copy of ShoppingList.abw</filename>) and allow the user to change it later.  Place the duplicate copy as near the original as possible without overlapping it, even if this means breaking the current sort order within the container, so the user sees it immediately.</entry>
+	    </row>
+
+		<row>
+			<entry><guimenuitem><accel>D</accel>elete</guimenuitem></entry>
+		      <entry><keycap>Delete</keycap></entry>
+			<entry>Removes the selected content without placing it on the clipboard.
 		      <remark>Should Delete be provided on a menu? The command is as obvious as using the arrow keys to move about.</remark></entry>
-              </row>
-              <row>
-                <entry>
-                  <guimenuitem>Select <accel>A</accel>ll</guimenuitem>
-                </entry>
-                <entry>
-                  <keycombo>
-                    <keycap>Ctrl</keycap>
-                    <keycap>A</keycap>
-                  </keycombo>
-                </entry>
-                <entry>Selects all content in the current document.</entry>
-              </row>
-              <row>
-                <entry>
-                  <guimenuitem><accel>D</accel>eselect All</guimenuitem>
-                </entry>
-                <entry>
-                  <keycombo>
-                    <keycap>Shift</keycap>
-                    <keycap>Ctrl</keycap>
-                    <keycap>A</keycap>
-                  </keycombo>
-                </entry>
-                <entry>Deselects all content in the current document. Only provide this item in situations when no other method of undoing selection is possible or apparent to the user.  For example, in complex graphics applications where selection and deselection is not usually possible simply by using the cursor keys.
-		<para>Note: Do not provide <guimenuitem>Deselect All</guimenuitem> in text entry fields, as <keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap><keysym>hex digit</keysym></keycombo> is used to enter Unicode characters so its shortcut will not work.</para></entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
-      </sect3>
-      <sect3>
-        <title>Searching and Replacing</title>
-        <table frame="none">
-          <title>Search and Replace menu items </title>
-          <tgroup colsep="0" rowsep="0" cols="3" align="left">
-            <thead>
-              <row>
-                <entry>Label</entry>
-                <entry>Shortcut</entry>
-                <entry>Description</entry>
-              </row>
-            </thead>
-            <tbody valign="top">
-              <row>
-                <entry>Find...</entry>
-                <entry>
-                  <keycombo>
-                    <keycap>Ctrl</keycap>
-                    <keycap>F</keycap>
-                  </keycombo>
-                </entry>
-                <entry>Opens a window or dialog allowing the user to search for specific content in the current document.  Highlight each match in-place.
+	      </row>
+
+		<row>
+		      <entry><guimenuitem>Select <accel>A</accel>ll</guimenuitem></entry>
+	      		<entry><keycombo><keycap>Ctrl</keycap><keycap>A</keycap></keycombo></entry>
+			<entry>Selects all content in the current document.</entry>
+	    	</row>
+	    
+		<row>
+		  <entry><guimenuitem><accel>D</accel>eselect All</guimenuitem></entry>
+	      	  <entry><keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap><keycap>A</keycap></keycombo></entry>
+		<entry>Deselects all content in the current document. Only provide this item in situations when no other method of undoing selection is possible or apparent to the user.  For example, in complex graphics applications where selection and deselection is not usually possible simply by using the cursor keys.
+		<para>Note: Do not provide <guimenuitem>Deselect All</guimenuitem> in text entry fields, as <keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap><keysym>hex digit</keysym></keycombo> is used to enter unicode characters so its shortcut will not work.</para></entry>
+	      </row>
+
+	    </tbody>
+	  </tgroup>
+	 </table>
+	</sect3>
+
+	<sect3>
+	  <title>Searching and Replacing</title>
+
+	<table frame="all"> 
+	  <title>Search and Replace menu items </title> 
+
+	  <tgroup cols="3" align="left">
+	    <thead> 
+	      <row> 
+		<entry>Label</entry> 
+		<entry>Shortcut</entry>
+		<entry>Description</entry>
+		</row>
+	      </thead>
+	    <tbody valign="top">
+	      <row>
+	      <entry>Find...</entry>
+	      <entry><keycombo><keycap>Ctrl</keycap><keycap>F</keycap></keycombo></entry>
+		<entry>Opens a window or dialog allowing the user to search for specific content in the current document.  Highlight each match in-place.
 		<para>If the command allows the user to search for content in places other than the current document, for example other open documents, other documents on disk, or a remote network location, label this item <guimenuitem>Search</guimenuitem> instead of <guimenuitem>Find</guimenuitem>.</para></entry>
-              </row>
-              <row>
-                <entry>
-                  <guimenuitem>Find Ne<accel>x</accel>t</guimenuitem>
-                </entry>
-                <entry>
-                  <keycombo>
-                    <keycap>Ctrl</keycap>
-                    <keycap>G</keycap>
-                  </keycombo>
-                </entry>
-                <entry>Selects the next instance of the last Find term in the current document.  <remark>What to do if there is no next instance?  Disable the menu item, which could be confusing, or pop up an annoying alert saying 'no matches found'?</remark></entry>
-              </row>
-              <row>
-                <entry>
-                  <guimenuitem>Find Pre<accel>v</accel>ious</guimenuitem>
-                </entry>
-                <entry>
-                  <keycombo>
-                    <keycap>Shift</keycap>
-                    <keycap>Ctrl</keycap>
-                    <keycap>G</keycap>
-                  </keycombo>
-                </entry>
-                <entry>Selects the previous instance of the last Find term in the current document.</entry>
-              </row>
-              <row>
-                <entry>
-                  <guimenuitem><accel>R</accel>eplace...</guimenuitem>
-                </entry>
-                <entry>
-                  <keycombo>
-                    <keycap>Ctrl</keycap>
-                    <keycap>H</keycap>
-                  </keycombo>
-                </entry>
-                <entry>Opens a window or dialog allowing the user to search for specific content in the current document, and replace each occurrence with new content. 	    
+	      </row>
+
+	    <row>
+	      <entry><guimenuitem>Find Ne<accel>x</accel>t</guimenuitem></entry>
+	      <entry><keycombo><keycap>Ctrl</keycap><keycap>G</keycap></keycombo></entry>
+	      <entry>Selects the next instance of the last Find term in the current document.  <remark>What to do if there is no next instance?  Disable the menu item, which could be confusing, or pop up an annoying alert saying 'no matches found'?</remark></entry>
+	      </row>
+
+		<row>
+		      <entry><guimenuitem>Find Pre<accel>v</accel>ious</guimenuitem></entry>
+	      		<entry><keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap><keycap>G</keycap></keycombo></entry>
+			<entry>Selects the previous instance of the last Find term in the current document.</entry>
+	      </row>
+
+		<row>
+		      <entry><guimenuitem><accel>R</accel>eplace...</guimenuitem></entry>
+	      		<entry><keycombo><keycap>Ctrl</keycap><keycap>H</keycap></keycombo></entry>
+			<entry>Opens a window or dialog allowing the user to search for specific content in the current document, and replace each occurrence with new content. 	    
 		 	<remark>Replace is not always descriptive of what the user may do with the utility window. Formatting a section is also a possibility. Ideally, these would all be merged into a simple utility window</remark>
 		</entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
-      </sect3>
-      <sect3>
-        <title>Inserting Special Objects</title>
-        <para>Where applicable, provide items on the <guimenu>Edit</guimenu> menu that insert special objects such as images, links, GUI controls or the current date and time. </para>
-        <para>If you have two or less types of object that can be inserted, add them as individual items to this menu, for example <guimenuitem>Insert Image</guimenuitem>, or <guimenuitem>Insert External Link</guimenuitem>.  If you have between three and six types, place them on an <menuchoice><guimenu>Edit</guimenu><guimenuitem>Insert</guimenuitem></menuchoice> submenu.  If you have more than six, add a separate <link linkend="menu-standard-insert"><guimenu>Insert</guimenu> menu</link> to the menubar.</para>
-      </sect3>
-      <sect3>
-        <title>User Preferences</title>
-        <table frame="none">
-          <title>User Preferences menu items</title>
-          <tgroup colsep="0" rowsep="0" cols="3" align="left">
-            <thead>
-              <row>
-                <entry>Label</entry>
-                <entry>Shortcut</entry>
-                <entry>Description</entry>
-              </row>
-            </thead>
-            <tbody valign="top">
-              <row>
-                <entry>
-                  <guimenuitem>Pr<accel>e</accel>ferences</guimenuitem>
-                </entry>
-                <entry>None</entry>
-                <entry>Opens a <link linkend="preference-windows">preferences window</link> allowing the user to change preferences for the whole application.  Changes will apply to all running and subsequent instances of the application.</entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
-      </sect3>
-    </sect2>
-    <sect2 id="menu-standard-view">
-      <title>View</title>
-      <para>The <guimenu>View</guimenu> menu contains only items that affect the user's view of the current document.  Do not place any items on the <guimenu>View</guimenu> menu that affect the content of the current document.  (Exception: <menuchoice><guimenu>View</guimenu><guimenuitem>Reload</guimenuitem></menuchoice> may change the current contents if, for example, the document is a webpage that has been recently updated on the server).</para>
-      <figure id="generic-view-menu">
-        <title>A generic View menu</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="images/generic-view-menu.png" format="PNG"/>
-          </imageobject>
-          <imageobject>
-            <imagedata fileref="images/generic-view-menu.eps" format="EPS"/>
-          </imageobject>
-          <textobject>
-            <literallayout class="monospaced"><guimenu><accel>V</accel>iew</guimenu><guimenuitem><accel>T</accel>oolbar</guimenuitem><guimenuitem><accel>S</accel>tatusbar</guimenuitem>
+	      </row>
+		</tbody>
+		</tgroup>
+	</table>
+	</sect3>
+
+
+	<sect3>
+	  <title>Inserting Special Objects</title>
+	  <para>Where applicable, provide items on the <guimenu>Edit</guimenu> menu that insert special objects such as images, links, GUI controls or the current date and time. </para>
+
+	<para>If you have up to three types of object that can be inserted, add them as individual items to this menu, for example <guimenuitem>Insert Image</guimenuitem>, or <guimenuitem>Insert External Link</guimenuitem>.  If you have between three and six types, place them on an <menuchoice><guimenu>Edit</guimenu><guimenuitem>Insert</guimenuitem></menuchoice> submenu.  If you have more than six, add a separate <link linkend="menu-standard-insert"><guimenu>Insert</guimenu> menu</link> to the menubar.</para>
+
+	</sect3>
+
+
+	<sect3>
+	  <title>User Preferences</title>
+
+	<table>
+	<title>User Preferences menu items</title>
+	 <tgroup cols="3" align="left">
+	    <thead> 
+	      <row> 
+		<entry>Label</entry> 
+		<entry>Shortcut</entry>
+		<entry>Description</entry>
+		</row>
+	      </thead>
+	    <tbody valign="top">
+	      <row>
+		      <entry><guimenuitem>Pr<accel>e</accel>ferences</guimenuitem></entry>
+	      		<entry>None</entry>
+			<entry>Opens a <link linkend="preference-windows">preferences window</link> allowing the user to change preferences for the whole application.  Changes will apply to all running and subsequent instances of the application.</entry>
+		</row>
+		</tbody>
+		</tgroup>
+	</table>
+	</sect3>
+
+      </sect2>
+      <sect2 id="menu-standard-view">
+	<title>View</title>
+	<para>The <guimenu>View</guimenu> menu contains only items that affect the user's view of the current document.  Do not place any items on the <guimenu>View</guimenu> menu that affect the the content of the current document.  (Exception: <menuchoice><guimenu>View</guimenu><guimenuitem>Reload</guimenuitem></menuchoice> may change the current contents if, for example, the document is a webpage that has been recently updated on the server).</para>
+
+	<figure id="generic-view-menu">
+	  <title>A generic View menu</title>
+	  <mediaobject>
+	    <imageobject><imagedata fileref="images/menus-view.png" width="166" depth="300" format="PNG"/></imageobject>
+	    <imageobject><imagedata fileref="images/menus-view.eps" format="EPS"/></imageobject>
+	    <textobject>
+	      <literallayout class="monospaced">
+<guimenu><accel>V</accel>iew</guimenu>
+<guimenuitem><accel>T</accel>oolbar</guimenuitem>
+<guimenuitem><accel>S</accel>tatusbar</guimenuitem>
 ---
-<guimenuitem><accel>I</accel>cons</guimenuitem><guimenuitem><accel>L</accel>ist</guimenuitem><guimenuitem><accel>D</accel>etails</guimenuitem>
+<guimenuitem><accel>I</accel>cons</guimenuitem>
+<guimenuitem><accel>L</accel>ist</guimenuitem>
+<guimenuitem><accel>D</accel>etails</guimenuitem>
 ---
-<guimenuitem><accel>S</accel>ort By...</guimenuitem><guimenuitem><accel>F</accel>ilter...</guimenuitem>
+<guimenuitem><accel>S</accel>ort By...</guimenuitem>
+<guimenuitem><accel>F</accel>ilter...</guimenuitem>
 ---
-<guimenuitem><accel>Z</accel>oom in       Ctrl++</guimenuitem><guimenuitem>Zoom <accel>O</accel>ut  Ctrl+-</guimenuitem><guimenuitem><accel>N</accel>ormal Size   Ctrl+=</guimenuitem><guimenuitem><accel>B</accel>est Fit    </guimenuitem>
+<guimenuitem><accel>Z</accel>oom in       Ctrl++</guimenuitem>
+<guimenuitem>Zoom <accel>O</accel>ut  Ctrl+-</guimenuitem>
+<guimenuitem><accel>N</accel>ormal Size   Ctrl+=</guimenuitem>
+<guimenuitem><accel>B</accel>est Fit    </guimenuitem>
 ---
-<guimenuitem><accel>R</accel>efresh     Ctrl+R</guimenuitem></literallayout>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <sect3>
-        <title>Toolbar and Statusbar</title>
-        <table frame="none">
-          <title>Toolbar and Statusbar menu items</title>
-          <tgroup colsep="0" rowsep="0" cols="3" align="left">
-            <thead>
-              <row>
-                <entry>Label</entry>
-                <entry>Shortcut</entry>
-                <entry>Description</entry>
-              </row>
-            </thead>
-            <tbody valign="top">
-              <row>
-                <entry>
-                  <guimenuitem><accel>T</accel>oolbar</guimenuitem>
-                </entry>
-                <entry>None</entry>
-                <entry>Shows or hides the application's toolbar.  This is a <link linkend="menu-item-type-check">check box menu item</link>. Include this item in every application that has a single toolbar.  See <xref linkend="toolbars-controlling-display"/> for information on how to deal with multiple toolbars.</entry>
-              </row>
-<!-- Suggest removing this for now, see bug #????
+<guimenuitem><accel>R</accel>efresh     Ctrl+R</guimenuitem>
+
+	      </literallayout>
+	    </textobject>
+	  </mediaobject>
+	</figure>
+
+
+	<sect3>
+	<title>Toolbar and Statusbar</title>
+	<table>
+	<title>Toolbar and Statusbar menu items</title>
+	 <tgroup cols="3" align="left">
+	    <thead> 
+	      <row> 
+		<entry>Label</entry> 
+		<entry>Shortcut</entry>
+		<entry>Description</entry>
+		</row>
+	      </thead>
+	    <tbody valign="top">
+	      <row>
+	 	      <entry><guimenuitem><accel>T</accel>oolbar</guimenuitem></entry>
+	      		<entry>None</entry>
+			<entry>Shows or hides the application's toolbar.  This is a <link linkend="menu-item-type-check">check box menu item</link>. Include this item in every application that has a single toolbar.  See <xref linkend="toolbars-controlling-display"/> for information on how to deal with multiple toolbars.</entry>
+		</row>
+
+		<!-- Suggest removing this for now, see bug #????
 		<row>
 			<entry><guimenuitem><accel>S</accel>tatusbar</guimenuitem></entry>
 			<entry>None</entry>
 			<entry>Shows or hides the application's statusbar.  This is a <link linkend="menu-item-type-check">check box menu item</link>.  Include this item in every application that has a statusbar.</entry>
 		</row>
 		-->
-            </tbody>
-          </tgroup>
-        </table>
-      </sect3>
-      <sect3>
-        <title>Content Presentation</title>
-        <table frame="none">
-          <title>Content Presentation menu items</title>
-          <tgroup colsep="0" rowsep="0" cols="3" align="left">
-            <thead>
-              <row>
-                <entry>Label</entry>
-                <entry>Shortcut</entry>
-                <entry>Description</entry>
-              </row>
-            </thead>
-            <tbody valign="top">
-              <row>
-                <entry>
-                  <guimenuitem><accel>I</accel>cons</guimenuitem>
-                </entry>
-                <entry>None</entry>
-                <entry>Shows the contents of the selected container as rows and columns of large icons, each with its name underneath.  This is a <link linkend="menu-item-type-radio">radio button menu item</link>.</entry>
-              </row>
-              <row>
-                <entry>
-                  <guimenuitem><accel>L</accel>ist</guimenuitem>
-                </entry>
-                <entry>None</entry>
-                <entry>Shows the contents of the selected container as a list of small icons, possibly in multiple columns, each with its name on its right-hand side.  This is a <link linkend="menu-item-type-radio">radio button menu item</link>.</entry>
-              </row>
-              <row>
-                <entry>
-                  <guimenuitem><accel>D</accel>etails</guimenuitem>
-                </entry>
-                <entry>None</entry>
-                <entry>Shows the contents of the selected container as single column of small icons, each with its name on its right-hand side.  Additional columns give extra information about the object each icon represents, for example the size and modification date of files in a file manager.  This is a <link linkend="menu-item-type-radio">radio button menu item</link>.
-			<para>If your application has no need for both <guimenu>List</guimenu> and <guimenu>Details</guimenu> modes, use the <guimenu>List</guimenu> item for whichever of the two modes you support.</para></entry>
-              </row>
-              <row>
-                <entry>
-                  <guimenuitem>S<accel>o</accel>rt By...</guimenuitem>
-                </entry>
-                <entry>None</entry>
-                <entry>Sorts the contents of an container by user-specified criteria.  Open a dialog allowing the user to choose from predefined sort keys (for example, Name, Size, or Modification Date in a file manager), or to specify their own if applicable.</entry>
-              </row>
-              <row>
-                <entry>
-                  <guimenuitem><accel>F</accel>ilter...</guimenuitem>
-                </entry>
-                <entry>None</entry>
-                <entry>Hides objects that are not of interest to the user.  Open a dialog allowing the user to choose from a list of types of object they want to display, or to enter their own criteria (for example, a regular expression matched against a particular property of the objects).</entry>
-              </row>
-              <row>
-                <entry>
-                  <guimenuitem><accel>Z</accel>oom In</guimenuitem>
-                </entry>
-                <entry>
-                  <keycombo>
-                    <keycap>Ctrl</keycap>
-                    <keycap>+</keycap>
-                  </keycombo>
-                </entry>
-                <entry>Zooms into the document.  Make the center of the new view the same as the center of the previous view. <remark>Should probably encourage apps to support Ctrl+= as well.</remark></entry>
-              </row>
-              <row>
-                <entry>
-                  <guimenuitem>Zoom <accel>O</accel>ut</guimenuitem>
-                </entry>
-                <entry>
-                  <keycombo>
-                    <keycap>Ctrl</keycap>
-                    <keycap>-</keycap>
-                  </keycombo>
-                </entry>
-                <entry>Zooms out of the document.  Make the center of the new view the same as the center of the previous view.</entry>
-              </row>
-              <row>
-                <entry>
-                  <guimenuitem><accel>N</accel>ormal Size</guimenuitem>
-                </entry>
-                <entry>
-                  <keycombo>
-                    <keycap>Ctrl</keycap>
-                    <keycap>0</keycap>
-                  </keycombo>
-                </entry>
-                <entry>Resets the zoom level back to the default value, normally 100%.  Make the center of the new view the same as the center of the previous view.</entry>
-              </row>
-              <row>
-                <entry>
-                  <guimenuitem><accel>B</accel>est Fit</guimenuitem>
-                </entry>
-                <entry>None</entry>
-                <entry>Makes the document fill the window.  Show the document, or the current page of the document, at as high a zoom level as will fit in the window whilst allowing the whole document or page to be visible without scrolling.</entry>
-              </row>
-              <row>
-                <entry>
-                  <guimenuitem><accel>R</accel>efresh</guimenuitem>
-                </entry>
-                <entry>
-                  <keycombo>
-                    <keycap>Ctrl</keycap>
-                    <keycap>R</keycap>
-                  </keycombo>
-                </entry>
-                <entry>Redraws the current view of the document from local storage.  For example, in a web browser application, this would redraw the page from the browser page cache.</entry>
-              </row>
-              <row>
-                <entry>
-                  <guimenuitem><accel>R</accel>eload</guimenuitem>
-                </entry>
-                <entry>
-                  <keycombo>
-                    <keycap>Ctrl</keycap>
-                    <keycap>R</keycap>
-                  </keycombo>
-                </entry>
-                <entry>Redraws the current view of the document, checking the data source for changes first.  For example, checks the web server for updates to the page before redrawing it.
+
+		</tbody>
+		</tgroup>
+	</table>
+	</sect3>
+
+	<sect3>
+	<title>Content Presentation</title>
+	<table>
+	<title>Content Presentation menu items</title>
+	 <tgroup cols="3" align="left">
+	    <thead> 
+	      <row> 
+		<entry>Label</entry> 
+		<entry>Shortcut</entry>
+		<entry>Description</entry>
+		</row>
+	      </thead>
+	    <tbody valign="top">
+
+		<row>
+			<entry><guimenuitem><accel>I</accel>cons</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Shows the contents of the selected container as rows and columns of large icons, each with its name underneath.  This is a <link linkend="menu-item-type-radio">radio button menu item</link>.</entry>
+		</row>
+
+		<row>
+			<entry><guimenuitem><accel>L</accel>ist</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Shows the contents of the selected container as a list of small icons, possibly in multiple columns, each with its name on its right-hand side.  This is a <link linkend="menu-item-type-radio">radio button menu item</link>.</entry>
+		</row>
+
+		<row>
+			<entry><guimenuitem><accel>D</accel>etails</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Shows the contents of the selected container as single column of small icons, each with its name on its right-hand side.  Additional columns give extra information about the object each icon represents, for example the size and modification date of files in a file manager.  This is a <link linkend="menu-item-type-radio">radio button menu item</link>.
+			<para>If your application has no need for both <guimenu>List</guimenu> and <guimenu>Details</guimenu> modes, use the <guimenu>List</guimenu> item for whichever of the two modes you support.</para></entry>
+		</row>
+
+		<row>
+			<entry><guimenuitem>S<accel>o</accel>rt By...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Sorts the contents of an container by user-specified criteria.  Open a dialog allowing the user to choose from pre-defined sort keys (for example, Name, Size, or Modification Date in a file manager), or to specify their own if applicable.</entry>
+		</row>
+
+		<row>
+			<entry><guimenuitem><accel>F</accel>ilter...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Hides objects that are not of interest to the user.  Open a dialog allowing the user to choose from a list of types of object they want to display, or to enter their own criteria (for example, a regular expression matched against a particular property of the objects).</entry>
+		</row>
+
+
+		<row>
+			<entry><guimenuitem><accel>Z</accel>oom In</guimenuitem></entry>
+			<entry><keycombo><keycap>Ctrl</keycap><keycap>+</keycap></keycombo></entry>
+			<entry>Zooms into the document.  Make the center of the new view the same as the center of the previous view. <remark>Should probably encourage apps to support Ctrl+= as well.</remark></entry>
+		</row>
+
+		<row>
+			<entry><guimenuitem>Zoom <accel>O</accel>ut</guimenuitem></entry>
+			<entry><keycombo><keycap>Ctrl</keycap><keycap>-</keycap></keycombo></entry>
+			<entry>Zooms out of the document.  Make the center of the new view the same as the center of the previous view.</entry>
+		</row>
+
+		<row>
+			<entry><guimenuitem><accel>N</accel>ormal Size</guimenuitem></entry>
+			<entry><keycombo><keycap>Ctrl</keycap><keycap>0</keycap></keycombo></entry>
+			<entry>Resets the zoom level back to the default value, normally 100%.  Make the center of the new view the same as the center of the previous view.</entry>
+		</row>
+
+		<row>
+			<entry><guimenuitem><accel>B</accel>est Fit</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Makes the document fill the window.  Show the document, or the current page of the document, at as high a zoom level as will fit in the window whilst allowing the whole document or page to be visible without scrolling.</entry>
+		</row>
+
+		<row>
+			<entry><guimenuitem><accel>R</accel>efresh</guimenuitem></entry>
+			<entry><keycombo><keycap>Ctrl</keycap><keycap>R</keycap></keycombo></entry>
+			<entry>Redraws the current view of the document from local storage.  For example, in a web browser application, this would redraw the page from the browser page cache.</entry>
+		</row>
+		<row>
+			<entry><guimenuitem><accel>R</accel>eload</guimenuitem></entry>
+			<entry><keycombo><keycap>Ctrl</keycap><keycap>R</keycap></keycombo></entry>
+
+			<entry>Redraws the current view of the document, checking the data source for changes first.  For example, checks the web server for updates to the page before redrawing it.
 			<para>If your application requires both <guimenuitem>Reload</guimenuitem> and <guimenuitem>Refresh</guimenuitem>, use <keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap><keycap>R</keycap></keycombo> as the shortcut for <guimenuitem>Reload</guimenuitem>.</para></entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
-      </sect3>
-    </sect2>
-    <sect2 id="menu-standard-insert">
-      <title>Insert</title>
-      <para>The <guimenuitem>Insert</guimenuitem> menu lists the type of special objects that can be inserted into the document at the current caret position, for example images, links, page breaks or GUI objects.  Only provide this menu if you have more than about six types of object that can be inserted, otherwise place individual items for each type on the <link linkend="menu-standard-edit"><guimenu>Edit</guimenu> menu</link>.</para>
-      <figure id="generic-insert-menu">
-        <title>A generic Insert menu</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="images/generic-insert-menu.png" format="PNG"/>
-          </imageobject>
-          <imageobject>
-            <imagedata fileref="images/generic-insert-menu.eps" format="EPS"/>
-          </imageobject>
-          <textobject>
-            <literallayout class="monospaced"><guimenu><accel>P</accel>age Break</guimenu><guimenuitem><accel>D</accel>ate and Time...</guimenuitem><guimenuitem><accel>S</accel>ymbol...</guimenuitem>
+		</row>
+
+		</tbody>
+		</tgroup>
+	</table>
+	</sect3>
+      </sect2>
+
+      <sect2 id="menu-standard-insert">
+	<title>Insert</title>
+	<para>The <guimenuitem>Insert</guimenuitem> menu lists the type of special objects that can be inserted into the document at the current caret position, for example images, links, page breaks or GUI objects.  Only provide this menu if you have more than about six types of object that can be inserted, otherwise place individual items for each type on the <link linkend="menu-standard-edit"><guimenu>Edit</guimenu> menu</link>.</para>
+
+	<figure id="generic-insert-menu">
+	  <title>A generic Insert menu</title>
+	  <mediaobject>
+	  <imageobject><imagedata fileref="images/menus-insert.png" width="118" depth="245" format="PNG"/></imageobject>
+	  <imageobject><imagedata fileref="images/menus-insert.eps" format="EPS"/></imageobject>
+	    <textobject>
+	      <literallayout class="monospaced">
+<guimenu><accel>P</accel>age Break</guimenu>
+<guimenuitem><accel>D</accel>ate and Time...</guimenuitem>
+<guimenuitem><accel>S</accel>ymbol...</guimenuitem>
 ---
-<guimenuitem><accel>S</accel>heet...</guimenuitem><guimenuitem><accel>R</accel>ows...</guimenuitem><guimenuitem><accel>C</accel>olumns...</guimenuitem>
+<guimenuitem><accel>S</accel>heet...</guimenuitem>
+<guimenuitem><accel>R</accel>ows...</guimenuitem>
+<guimenuitem><accel>C</accel>olumns...</guimenuitem>
 ---
-<guimenuitem><accel>I</accel>mage...</guimenuitem><guimenuitem><accel>G</accel>raph...</guimenuitem>
+<guimenuitem><accel>I</accel>mage...</guimenuitem>
+<guimenuitem><accel>G</accel>raph...</guimenuitem>
 ---
-<guimenuitem><accel>F</accel>rom File...</guimenuitem><guimenuitem>E<accel>x</accel>ternal Link...</guimenuitem></literallayout>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <para>The types of object will vary between applications, but the table below shows some common types that may be applicable.</para>
-      <table frame="none">
-        <title>Insert menu items</title>
-        <tgroup colsep="0" rowsep="0" cols="3" align="left">
-          <thead>
-            <row>
-              <entry>Label</entry>
-              <entry>Shortcut</entry>
-              <entry>Description</entry>
-            </row>
-          </thead>
-          <tbody valign="top">
-            <row>
-              <entry>
-                <guimenuitem><accel>P</accel>age Break</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Inserts a page break at the caret position.  Show the page break visually, for example as a dotted line across the page, unless the user has specifically requested not to see them.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>D</accel>ate and Time...</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Inserts the current date and/or time at the caret position.  Open a dialog giving a choice of date and time formats.  If applicable, also offer the choice to insert either as plain text, so the specified date and time will always appear in the document, or as a special field that will updated every time the document is opened, refreshed or printed.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem>Sy<accel>m</accel>bol...</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Inserts a special symbol, such as a mathematical symbol or foreign character, at the caret position.  Open a dialog showing all the available symbols as a table, from which the user can choose.  The user must be able to add multiple symbols to the document at one time without having to close and re-open the dialog.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>S</accel>heet...</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Adds a new sheet to the current workbook.  Do not prompt for a name, but choose a sensible default (such as <guilabel>Sheet-2</guilabel>) and allow the user to change it later.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>R</accel>ows...</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Adds new rows to a table in which one or more rows or cells are currently selected.  Open a dialog asking whether to insert rows above or below the current selection, and for any other required information.  Copy the row format from the last or first row of the current selection respectively, unless the user specifies otherwise.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>C</accel>olumns...</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Adds new columns to a table in which one or more columns or cells are currently selected.  Open a dialog asking whether to insert columns to the left or right of the current selection, and for any other required information.  Copy the column format from the right- or left-most column of the current selection respectively, unless the user specifies otherwise.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>I</accel>mage...</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Inserts an image into the document from a file.  Present a standard Open File dialog filtered on acceptable file types, from which the user can choose an image file to insert.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>G</accel>raph...</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Inserts a graph into the document.  Open a dialog or assistant that allows the user to build (or open from a file) a graph of their choice, using the current selection as an indication of which values, axis labels and data labels to use.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>F</accel>rom FIle...</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Inserts an object from any acceptable file type, for example plain text, formatted text, or an image.  Present a standard Open File dialog filtered on acceptable file types, from which the user can choose a file to insert.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem>E<accel>x</accel>ternal Link...</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Inserts a link to an object stored in a different file, or on a remote system.  The object is not embedded in or saved with the document, only a link to it.  Open a dialog in which the user can type or choose the name of the object, for example a filename or a webpage URL.  Show the link in the document in as informative way as possible.  For example, show a link to an image as a thumbnail of that image, unless the user specifies otherwise.</entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-    </sect2>
-    <sect2 id="menu-standard-format">
-      <title>Format</title>
-      <para>A <guimenu>Format</guimenu> menu contains commands to change the visual appearance of the document.  For example, changing the font, color, or line spacing of a text selection.</para>
-      <para>The difference between these commands and those on the <link linkend="menu-standard-view"><guimenuitem>View</guimenuitem> menu</link> is that changes made with Format commands are persistent and saved as part of the document, for example as HTML or RTF tags.</para>
-      <figure id="generic-format-menu">
-        <title>A generic Format menu</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="images/generic-format-menu.png" format="PNG"/>
-          </imageobject>
-          <imageobject>
-            <imagedata fileref="images/generic-format-menu.eps" format="EPS"/>
-          </imageobject>
-          <textobject>
-            <literallayout class="monospaced"><guimenu><accel>S</accel>tyle...</guimenu>
+<guimenuitem><accel>F</accel>rom File...</guimenuitem>
+<guimenuitem>E<accel>x</accel>ternal Link...</guimenuitem>
+
+	      </literallayout>
+	    </textobject>
+	  </mediaobject>
+	</figure>
+	
+	<para>The types of object will vary between applications, but the table below shows some common types that may be applicable.</para>
+
+	<table>
+	<title>Insert menu items</title>
+	 <tgroup cols="3" align="left">
+	    <thead> 
+	      <row> 
+		<entry>Label</entry> 
+		<entry>Shortcut</entry>
+		<entry>Description</entry>
+		</row>
+	      </thead>
+	    <tbody valign="top">
+
+		<row>
+			<entry><guimenuitem><accel>P</accel>age Break</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Inserts a page break at the caret position.  Show the page break visually, for example as a dotted line across the page, unless the user has specifically requested not to see them.</entry>
+		</row>
+
+		<row>
+			<entry><guimenuitem><accel>D</accel>ate and Time...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Inserts the current date and/or time at the caret position.  Open a dialog giving a choice of date and time formats.  If applicable, also offer the choice to insert either as plain text, so the specified date and time will always appear in the document, or as a special field that will updated every time the document is opened, refreshed or printed.</entry>
+			</row>
+
+		<row>
+			<entry><guimenuitem>Sy<accel>m</accel>bol...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Inserts a special symbol, such as a mathematical symbol or foreign character, at the caret position.  Open a dialog showing all the available symbols as a table, from which the user can choose.  The user must be able to add multiple symbols to the document at one time without having to close and re-open the dialog.</entry>
+			</row>
+
+		<row>
+			<entry><guimenuitem><accel>S</accel>heet...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Adds a new sheet to the current workbook.  Do not prompt for a name, but choose a sensible default (such as <guilabel>Sheet-2</guilabel>) and allow the user to change it later.</entry>
+			</row>
+
+		<row>
+			<entry><guimenuitem><accel>R</accel>ows...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Adds new rows to a table in which one or more rows or cells are currently selected.  Open a dialog asking whether to insert rows above or below the current selection, and for any other required information.  Copy the row format from the last or first row of the current selection respectively, unless the user specifies otherwise.</entry>
+			</row>
+
+		<row>
+			<entry><guimenuitem><accel>C</accel>olumns...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Adds new columns to a table in which one or more columns or cells are currently selected.  Open a dialog asking whether to insert columns to the left or right of the current selection, and for any other required information.  Copy the column format from the right- or left-most column of the current selection respectively, unless the user specifies otherwise.</entry>
+			</row>
+
+		<row>
+			<entry><guimenuitem><accel>I</accel>mage...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Inserts an image into the document from a file.  Present a standard Open File dialog filtered on acceptable file types, from which the user can choose an image file to insert.</entry>
+			</row>
+
+		<row>
+			<entry><guimenuitem><accel>G</accel>raph...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Inserts a graph into the document.  Open a dialog or assistant that allows the user to build (or open from a file) a graph of their choice, using the current selection as an indication of which values, axis labels and data labels to use.</entry>
+			</row>
+
+		<row>
+			<entry><guimenuitem><accel>F</accel>rom FIle...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Inserts an object from any acceptable file type, for example plain text, formatted text, or an image.  Present a standard Open File dialog filtered on acceptable file types, from which the user can choose a file to insert.</entry>
+			</row>
+
+		<row>
+			<entry><guimenuitem>E<accel>x</accel>ternal Link...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Inserts a link to an object stored in a different file, or on a remote system.  The object is not embedded in or saved with the document, only a link to it.  Open a dialog in which the user can type or choose the name of the object, for example a filename or a webpage URL.  Show the link in the document in as informative way as possible.  For example, show a link to an image as a thumbnail of that image, unless the user specifies otherwise.</entry>
+			</row>
+
+		</tbody>
+		</tgroup>
+	</table>
+
+
+      </sect2>
+
+
+      <sect2 id="menu-standard-format">
+	<title>Format</title>
+
+		<para>A <guimenu>Format</guimenu> menu contains commands to change the visual appearance of the document.  For example, changing the font, color, or line spacing of a text selection.</para>
+		<para>The difference between these commands and those on the <link linkend="menu-standard-view"><guimenuitem>View</guimenuitem> menu</link> is that changes made with Format commands are persistent and saved as part of the document, for example as HTML or RTF tags.</para>
+
+	<figure id="generic-format-menu">
+	  <title>A generic Format menu</title>
+	  <mediaobject>
+	    <imageobject><imagedata fileref="images/menus-format.png" width="163" depth="265" format="PNG"/></imageobject>
+	    <imageobject><imagedata fileref="images/menus-format.eps" format="EPS"/></imageobject>
+	    <textobject>
+	      <literallayout class="monospaced">
+<guimenu><accel>S</accel>tyle...</guimenu>
 ---
-<guimenuitem><accel>F</accel>ont...</guimenuitem><guimenuitem><accel>P</accel>aragraph...</guimenuitem>
+<guimenuitem><accel>F</accel>ont...</guimenuitem>
+<guimenuitem><accel>P</accel>aragraph...</guimenuitem>
 ---
-<guimenuitem><accel>B</accel>old	Ctrl+B</guimenuitem><guimenuitem><accel>I</accel>talic	Ctrl+I</guimenuitem><guimenuitem><accel>U</accel>nderline	Ctrl+U</guimenuitem>
+<guimenuitem><accel>B</accel>old	Ctrl+B</guimenuitem>
+<guimenuitem><accel>I</accel>talic	Ctrl+I</guimenuitem>
+<guimenuitem><accel>U</accel>nderline	Ctrl+U</guimenuitem>
 ---
-<guimenuitem><accel>C</accel>ells...</guimenuitem><guimenuitem><accel>L</accel>ist...</guimenuitem>
+<guimenuitem><accel>C</accel>ells...</guimenuitem>
+<guimenuitem><accel>L</accel>ist...</guimenuitem>
 ---
-<guimenuitem>L<accel>ayer</accel>...</guimenuitem><guimenuitem>P<accel>a</accel>ge...</guimenuitem></literallayout>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <para>Items found on the <guimenu>Format</guimenu> will be very application-specific, but some common items are listed in the table below.</para>
-      <table frame="none">
-        <title>Format menu items</title>
-        <tgroup colsep="0" rowsep="0" cols="3" align="left">
-          <thead>
-            <row>
-              <entry>Label</entry>
-              <entry>Shortcut</entry>
-              <entry>Description</entry>
-            </row>
-          </thead>
-          <tbody valign="top">
-            <row>
-              <entry>
-                <guimenuitem><accel>S</accel>tyle...</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Sets the style attributes of the selected text or objects either individually or to a named, predefined style.  Open a dialog allowing the user to set attributes such as bold, italic, size and spacing individually, and to create their own named styles where applicable.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>F</accel>ont...</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Sets the font properties of the selected text or objects.  Open a dialog allowing the user to choose font, size, style, color, or whatever other attributes are applicable.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>P</accel>aragraph...</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Sets the properties of the selected paragraph.  Open a dialog allowing the user to choose style, line spacing, tabulation, or whatever other attributes are applicable.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>B</accel>old</guimenuitem>
-              </entry>
-              <entry>
-                <keycombo>
-                  <keycap>Ctrl</keycap>
-                  <keycap>B</keycap>
-                </keycombo>
-              </entry>
-              <entry>Toggles the boldness of the current text selection on or off.  If some of the selection is currently bold and some is not, this command should bolden the selected text.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>I</accel>talic</guimenuitem>
-              </entry>
-              <entry>
-                <keycombo>
-                  <keycap>Ctrl</keycap>
-                  <keycap>I</keycap>
-                </keycombo>
-              </entry>
-              <entry>Toggles the italicization of the current text selection on or off.  If some of the selection is currently italicized and some is not, this command should italicize the selected text.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>U</accel>nderline</guimenuitem>
-              </entry>
-              <entry>
-                <keycombo>
-                  <keycap>Ctrl</keycap>
-                  <keycap>U</keycap>
-                </keycombo>
-              </entry>
-              <entry>Toggles underlining of the current text selection.  If some of the selection is currently underlined and some is not, this command should underline the selected text.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>C</accel>ells...</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Sets the properties of the selected table cells.  Open a dialog allowing the user to choose alignment, borders, shading, text style, number format, or whatever other attributes are applicable.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>L</accel>ist...</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Sets the properties of the selected list, or turns the selected paragraphs into a list if they are not already formatted as such.  Open a dialog allowing the user to choose number or bullet style, spacing, tabulation, or whatever other attributes are applicable.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem>Laye<accel>r</accel>...</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Sets the properties of all or selected layers of a multi-layered document.  Open a dialog allowing the user to choose name, size, visibility, opacity, z-ordering, or whatever other attributes are applicable.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem>P<accel>a</accel>ge...</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Sets the properties of all or selected pages of the document.  Open a dialog allowing the user to choose paper size, orientation, columns, margins, or whatever other attributes are applicable.</entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-    </sect2>
-    <sect2 id="menu-standard-bookmarks">
-      <title>Bookmarks</title>
-      <para>Provide a <guimenu>Bookmarks</guimenu> menu in any application that allows the user to browse files and folders, help documents, web pages or any other large information space.</para>
-      <note>
-        <title>Icons</title>
-        <para>Show icons for bookmark entries on the Bookmarks menu that indicate the type of the bookmark, even if the user has globally turned off icons for other menu items on the desktop.</para>
-      </note>
-      <figure id="generic-bookmarks-menu">
-        <title>A generic Bookmarks menu</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="images/generic-bookmarks-menu.png" format="PNG"/>
-          </imageobject>
-          <imageobject>
-            <imagedata fileref="images/generic-bookmarks-menu.eps" format="EPS"/>
-          </imageobject>
-          <textobject>
-            <literallayout class="monospaced">
-              <guimenu><accel>B</accel>ookmarks</guimenu>
-              <guimenuitem><accel>A</accel>dd Bookmark   </guimenuitem>
-              <keycombo>
-                <keycap>Ctrl</keycap>
-                <keycap>D</keycap>
-              </keycombo>
-              <guimenuitem><accel>E</accel>dit Bookmarks </guimenuitem>
-              <keycombo>
-                <keycap>Ctrl</keycap>
-                <keycap>B</keycap>
-              </keycombo>
-            </literallayout>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <table frame="none">
-        <title>Bookmark menu items</title>
-        <tgroup colsep="0" rowsep="0" cols="3" align="left">
-          <thead>
-            <row>
-              <entry>Label</entry>
-              <entry>Shortcut</entry>
-              <entry>Description</entry>
-            </row>
-          </thead>
-          <tbody valign="top">
-            <row>
-              <entry>
-                <guimenuitem><accel>A</accel>dd Bookmark</guimenuitem>
-              </entry>
-              <entry>
-                <keycombo>
-                  <keycap>Ctrl</keycap>
-                  <keycap>D</keycap>
-                </keycombo>
-              </entry>
-              <entry>Adds a bookmark for the current document to the default bookmark list.  Do not pop up a dialog asking for a title or location for the bookmark, instead choose sensible defaults (such as the document's title or filename as the bookmark name) and allow the user to change them later using the <guimenuitem>Edit Bookmarks</guimenuitem> feature.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>E</accel>dit Bookmarks</guimenuitem>
-              </entry>
-              <entry>
-                <keycombo>
-                  <keycap>Ctrl</keycap>
-                  <keycap>B</keycap>
-                </keycombo>
-              </entry>
-              <entry>Allows the user to edit the application's bookmark list.  Open a window in which the user can arrange bookmarks into a hierarchy, move, copy, and delete bookmarks, and change their properties.</entry>
-            </row>
-            <row>
-              <entry>
-                <emphasis>Bookmark List</emphasis>
-              </entry>
-              <entry>None</entry>
-              <entry>The user's current list of bookmarks for the application.</entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-    </sect2>
-    <sect2 id="menu-standard-go">
-      <title>Go</title>
-      <para>A <guimenu>Go</guimenu> menu provides commands for quickly navigating around a document or collection of documents, or an information space such as a directory structure or the web.</para>
-      <para>The contents of the menu will vary depending on the type of application.  Different standard menus are presented here for browser-based and document-based applications , but your application may require a combination of both.</para>
-      <figure id="generic-browser-go-menu">
-        <title>A generic Go menu for a browser application</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="images/generic-browser-go-menu.png" format="PNG"/>
-          </imageobject>
-          <imageobject>
-            <imagedata fileref="images/generic-browser-go-menu.eps" format="EPS"/>
-          </imageobject>
-          <textobject>
-            <literallayout class="monospaced"><guimenu><accel>G</accel>o</guimenu><guimenuitem><accel>B</accel>ack       Alt+Left</guimenuitem><guimenuitem><accel>F</accel>orward	Alt+Right    </guimenuitem><guimenuitem><accel>U</accel>p		Alt+Up         </guimenuitem>
+<guimenuitem>L<accel>ayer</accel>...</guimenuitem>
+<guimenuitem>P<accel>a</accel>ge...</guimenuitem>
+
+	      </literallayout>
+	    </textobject>
+	  </mediaobject>
+	</figure>
+
+
+	<para>Items found on the <guimenu>Format</guimenu> will be very application-specific, but some common items are listed in the table below.</para>
+
+	<table>
+	<title>Format menu items</title>
+	 <tgroup cols="3" align="left">
+	    <thead> 
+	      <row> 
+		<entry>Label</entry> 
+		<entry>Shortcut</entry>
+		<entry>Description</entry>
+		</row>
+	      </thead>
+	    <tbody valign="top">
+
+		<row>
+			<entry><guimenuitem><accel>S</accel>tyle...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Sets the style attributes of the selected text or objects either individually or to a named, predefined style.  Open a dialog allowing the user to set attributes such as bold, italic, size and spacing individually, and to create their own named styles where applicable.</entry>
+
+		</row>
+
+		<row>
+			<entry><guimenuitem><accel>F</accel>ont...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Sets the font properties of the selected text or objects.  Open a dialog allowing the user to choose font, size, style, color, or whatever other attributes are applicable.</entry>
+		</row>
+
+		<row>
+			<entry><guimenuitem><accel>P</accel>aragraph...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Sets the properties of the selected paragraph.  Open a dialog allowing the user to choose style, line spacing, tabulation, or whatever other attributes are applicable.</entry>
+		</row>
+
+		<row>
+			<entry><guimenuitem><accel>B</accel>old</guimenuitem></entry>
+			<entry><keycombo><keycap>Ctrl</keycap><keycap>B</keycap></keycombo></entry>
+			<entry>Toggles the boldness of the current text selection on or off.  If some of the selection is currently bold and some is not, this command should bolden the selected text.</entry>
+
+		</row>
+
+		<row>
+			<entry><guimenuitem><accel>I</accel>talic</guimenuitem></entry>
+			<entry><keycombo><keycap>Ctrl</keycap><keycap>I</keycap></keycombo></entry>
+			<entry>Toggles the italicisation of the current text selection on or off.  If some of the selection is currently italicised and some is not, this command should italicise the selected text.</entry>
+
+		</row>
+
+		<row>
+			<entry><guimenuitem><accel>U</accel>nderline</guimenuitem></entry>
+			<entry><keycombo><keycap>Ctrl</keycap><keycap>U</keycap></keycombo></entry>
+			<entry>Toggles underlining of the current text selection.  If some of the selection is currently underlined and some is not, this command should underline the selected text.</entry>
+
+		</row>
+
+		<row>
+			<entry><guimenuitem><accel>C</accel>ells...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Sets the properties of the selected table cells.  Open a dialog allowing the user to choose alignment, borders, shading, text style, number format, or whatever other attributes are applicable.</entry>
+		</row>
+
+		<row>
+			<entry><guimenuitem><accel>L</accel>ist...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Sets the properties of the selected list, or turns the selected paragraphs into a list if they are not already formatted as such.  Open a dialog allowing the user to choose number or bullet style, spacing, tabulation, or whatever other attributes are applicable.</entry>
+		</row>
+
+
+		<row>
+			<entry><guimenuitem>Laye<accel>r</accel>...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Sets the properties of all or selected layers of a multi-layered document.  Open a dialog allowing the user to choose name, size, visibility, opacity, z-ordering, or whatever other attributes are applicable.</entry>
+		</row>
+
+
+		<row>
+			<entry><guimenuitem>P<accel>a</accel>ge...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Sets the properties of all or selected pages of the document.  Open a dialog allowing the user to choose paper size, orientation, columns, margins, or whatever other attributes are applicable.</entry>
+		</row>
+
+		</tbody>
+		</tgroup>
+	</table>
+
+      </sect2>
+
+
+      <sect2 id="menu-standard-bookmarks">
+	<title>Bookmarks</title>
+
+	<para>Provide a <guimenu>Bookmarks</guimenu> menu in any application that allows the user to browse files and folders, help documents, web pages or any other large information space.</para>
+	<note><title>Icons</title><para>Show icons for bookmark entries on the Bookmarks menu that indicate the type of the bookmark, even if the user has globally turned off icons for other menu items on the desktop.</para></note>
+
+	<figure id="generic-bookmarks-menu">
+	  <title>A generic Bookmarks menu</title>
+	  <mediaobject>
+	    <imageobject><imagedata fileref="images/menus-bookmarks.png" width="190" depth="49"  format="PNG"/></imageobject>
+	    <imageobject><imagedata fileref="images/menus-bookmarks.eps" format="EPS"/></imageobject>
+	    <textobject>
+	      <literallayout class="monospaced">
+<guimenu><accel>B</accel>ookmarks</guimenu>
+<guimenuitem><accel>A</accel>dd Bookmark   </guimenuitem><keycombo><keycap>Ctrl</keycap><keycap>D</keycap></keycombo>
+<guimenuitem><accel>E</accel>dit Bookmarks </guimenuitem><keycombo><keycap>Ctrl</keycap><keycap>B</keycap></keycombo>
+	      </literallayout>
+	    </textobject>
+	  </mediaobject>
+	</figure>
+
+	<table>
+	<title>Bookmark menu items</title>
+	 <tgroup cols="3" align="left">
+	    <thead> 
+	      <row> 
+		<entry>Label</entry> 
+		<entry>Shortcut</entry>
+		<entry>Description</entry>
+		</row>
+	      </thead>
+	    <tbody valign="top">
+
+		<row>
+			<entry><guimenuitem><accel>A</accel>dd Bookmark</guimenuitem></entry>
+			<entry><keycombo><keycap>Ctrl</keycap><keycap>D</keycap></keycombo></entry>
+			<entry>Adds a bookmark for the current document to the default bookmark list.  Do not pop up a dialog asking for a title or location for the bookmark, instead choose sensible defaults (such as the document's title or filename as the bookmark name) and allow the user to change them later using the <guimenuitem>Edit Bookmarks</guimenuitem> feature.</entry>
+		</row>
+
+		<row>
+			<entry><guimenuitem><accel>E</accel>dit Bookmarks</guimenuitem></entry>
+			<entry><keycombo><keycap>Ctrl</keycap><keycap>B</keycap></keycombo></entry>
+			<entry>Allows the user to edit the application's bookmark list.  Open a window in which the user can arrange bookmarks into a hierarchy, move, copy, and delete bookmarks, and change their properties.</entry>
+		</row>
+		<row>
+			<entry><emphasis>Bookmark List</emphasis></entry>
+			<entry>None</entry>
+			<entry>The user's current list of bookmarks for the application.</entry>
+		</row>
+		</tbody>
+		</tgroup>
+	</table>
+
+      </sect2>
+      <sect2 id="menu-standard-go">
+
+	<title>Go</title>
+
+	<para>A <guimenu>Go</guimenu> menu provides commands for quickly navigating around a document or collection of documents, or an information space such as a directory structure or the web.</para>
+
+	<para>The contents of the menu will vary depending on the type of application.  Different standard menus are presented here for browser-based and document-based applications , but your application may require a combination of both.</para>
+
+	<figure id="generic-browser-go-menu">
+	  <title>A generic Go menu for a browser application</title>
+	  <mediaobject>
+	    <imageobject><imagedata fileref="images/menus-go-browser.png" width="178" depth="127" format="PNG"/></imageobject>
+	    <imageobject><imagedata fileref="images/menus-go-browser.eps" format="EPS"/></imageobject>
+	    <textobject>
+<literallayout class="monospaced">
+<guimenu><accel>G</accel>o</guimenu>
+<guimenuitem><accel>B</accel>ack       Alt+Left</guimenuitem>
+<guimenuitem><accel>F</accel>orward	Alt+Right    </guimenuitem>
+<guimenuitem><accel>U</accel>p		Alt+Up         </guimenuitem>
 ---
-<guimenuitem><accel>H</accel>ome	Alt+Home       </guimenuitem><guimenuitem><accel>L</accel>ocation...  Ctrl+L</guimenuitem></literallayout>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <table frame="none">
-        <title>Go menu items for a browser application</title>
-        <tgroup colsep="0" rowsep="0" cols="3" align="left">
-          <thead>
-            <row>
-              <entry>Label</entry>
-              <entry>Shortcut</entry>
-              <entry>Description</entry>
-            </row>
-          </thead>
-          <tbody valign="top">
-            <row>
-              <entry>
-                <guimenuitem><accel>B</accel>ack</guimenuitem>
-              </entry>
-              <entry>
-                <keycombo>
-                  <keycap>Alt</keycap>
-                  <keycap>Left</keycap>
-                </keycombo>
-              </entry>
-              <entry>Navigates to the previous document in the browser's history list.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>F</accel>orward</guimenuitem>
-              </entry>
-              <entry>
-                <keycombo>
-                  <keycap>Alt</keycap>
-                  <keycap>Right</keycap>
-                </keycombo>
-              </entry>
-              <entry>Navigates to the next document in the browser's history list.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>U</accel>p</guimenuitem>
-              </entry>
-              <entry>
-                <keycombo>
-                  <keycap>Alt</keycap>
-                  <keycap>Up</keycap>
-                </keycombo>
-              </entry>
-              <entry>Navigates to the current document's (or folder's) parent document (or folder).  For a document browser, such as an on-line help viewer, this usually means navigating to the enclosing sub-section, section, chapter or contents page.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>H</accel>ome</guimenuitem>
-              </entry>
-              <entry>
-                <keycombo>
-                  <keycap>Alt</keycap>
-                  <keycap>Home</keycap>
-                </keycombo>
-              </entry>
-              <entry>Navigates to a starting page defined by the user or the application.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>L</accel>ocation...</guimenuitem>
-              </entry>
-              <entry>
-                <keycombo>
-                  <keycap>Ctrl</keycap>
-                  <keycap>L</keycap>
-                </keycombo>
-              </entry>
-              <entry>Navigates to a user-specified URI.  Open a dialog into which the user can type a suitable URI, or select one from a list where applicable (for example, a file selection dialog for applications that can handle file:// URIs).</entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-      <figure id="generic-document-go-menu">
-        <title>A generic Go menu for document-based applications</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="images/generic-document-go-menu.png" format="PNG"/>
-          </imageobject>
-          <imageobject>
-            <imagedata fileref="images/generic-document-go-menu.eps" format="EPS"/>
-          </imageobject>
-          <textobject>
-            <literallayout class="monospaced"><guimenu><accel>G</accel>o</guimenu><guimenuitem><accel>P</accel>revious Page 	PgUp </guimenuitem><guimenuitem><accel>N</accel>ext Page      		PgDn</guimenuitem><guimenuitem><accel>G</accel>o to Page...</guimenuitem>
+<guimenuitem><accel>H</accel>ome	Alt+Home       </guimenuitem>
+<guimenuitem><accel>L</accel>ocation...  Ctrl+L</guimenuitem>
+</literallayout>
+	    </textobject>
+	  </mediaobject>
+	</figure>
+
+
+	<table>
+	<title>Go menu items for a browser application</title>
+	 <tgroup cols="3" align="left">
+	    <thead> 
+	      <row> 
+		<entry>Label</entry> 
+		<entry>Shortcut</entry>
+		<entry>Description</entry>
+		</row>
+	      </thead>
+	    <tbody valign="top">
+
+		<row>
+			<entry><guimenuitem><accel>B</accel>ack</guimenuitem></entry>
+			<entry><keycombo><keycap>Alt</keycap><keycap>Left</keycap></keycombo></entry>
+			<entry>Navigates to the previous document in the browser's history list.</entry>
+		</row>
+
+		<row>
+			<entry><guimenuitem><accel>F</accel>orward</guimenuitem></entry>
+			<entry><keycombo><keycap>Alt</keycap><keycap>Right</keycap></keycombo></entry>
+			<entry>Navigates to the next document in the browser's history list.</entry>		
+		</row>
+
+		<row>
+			<entry><guimenuitem><accel>U</accel>p</guimenuitem></entry>
+			<entry><keycombo><keycap>Alt</keycap><keycap>Up</keycap></keycombo></entry>
+			<entry>Navigates to the current document's (or folder's) parent document (or folder).  For a document browser, such as an online help viewer, this usually means navigating to the enclosing sub-section, section, chapter or contents page.</entry>		
+		</row>
+	
+		<row>
+			<entry><guimenuitem><accel>H</accel>ome</guimenuitem></entry>
+			<entry><keycombo><keycap>Alt</keycap><keycap>Home</keycap></keycombo></entry>
+			<entry>Navigates to a starting page defined by the user or the application.</entry>
+		</row>
+
+
+		<row>
+			<entry><guimenuitem><accel>L</accel>ocation...</guimenuitem></entry>
+			<entry><keycombo><keycap>Ctrl</keycap><keycap>L</keycap></keycombo></entry>
+			<entry>Navigates to a user-specified URI.  Open a dialog into which the user can type a suitable URI, or select one from a list where applicable (for example, a file selection dialog for applications that can handle file:// URIs).</entry>		
+		</row>
+
+			</tbody>
+		</tgroup>
+	</table>
+
+	<figure id="generic-document-go-menu">
+	  <title>A generic Go menu for document-based applications</title>
+	  <mediaobject>
+	    <imageobject><imagedata fileref="images/menus-go-document.png" width="206" depth="127" format="PNG"/></imageobject>
+	    <imageobject><imagedata fileref="images/menus-go-document.eps" width="210" depth="121" format="EPS"/></imageobject>
+	    <textobject>
+<literallayout class="monospaced">
+<guimenu><accel>G</accel>o</guimenu>
+<guimenuitem><accel>P</accel>revious Page 	PgUp </guimenuitem>
+<guimenuitem><accel>N</accel>ext Page      		PgDn</guimenuitem>
+<guimenuitem><accel>G</accel>o to Page...</guimenuitem>
 -
-<guimenuitem><accel>F</accel>irst Page    		Ctrl+Home </guimenuitem><guimenuitem><accel>L</accel>ast Page		Ctrl+End</guimenuitem></literallayout>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <table frame="none">
-        <title>Go menu items for a document-based application</title>
-        <tgroup colsep="0" rowsep="0" cols="3" align="left">
-          <thead>
-            <row>
-              <entry>Label</entry>
-              <entry>Shortcut</entry>
-              <entry>Description</entry>
-            </row>
-          </thead>
-          <tbody valign="top">
-            <row>
-              <entry>
-                <guimenuitem><accel>P</accel>revious Page</guimenuitem>
-              </entry>
-              <entry>
-                <keycap>PageUp</keycap>
-              </entry>
-              <entry>Navigates to the previous page in the document.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>N</accel>ext Page</guimenuitem>
-              </entry>
-              <entry>
-                <keycap>PageDown</keycap>
-              </entry>
-              <entry>Navigates to the next page in the document.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>G</accel>o to Page...</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Navigates to a user-specified page number.  Open a dialog into which the user can type a page number.
-			<para>Text-based applications may also include a <guimenuitem>Go  to Line...</guimenuitem> menu item, which allows the user to jump to a specified line number.</para></entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>F</accel>irst Page</guimenuitem>
-              </entry>
-              <entry>
-                <keycombo>
-                  <keycap>Ctrl</keycap>
-                  <keycap>Home</keycap>
-                </keycombo>
-              </entry>
-              <entry>Navigates to the first page in the document.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>L</accel>ast Page</guimenuitem>
-              </entry>
-              <entry>
-                <keycombo>
-                  <keycap>Ctrl</keycap>
-                  <keycap>End</keycap>
-                </keycombo>
-              </entry>
-              <entry>Navigates to the last page in the document.</entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-    </sect2>
+<guimenuitem><accel>F</accel>irst Page    		Ctrl+Home </guimenuitem>
+<guimenuitem><accel>L</accel>ast Page		Ctrl+End</guimenuitem>
+</literallayout>
+	    </textobject>
+	  </mediaobject>
+	</figure>
+
+	<table>
+	<title>Go menu items for a document-based application</title>
+	 <tgroup cols="3" align="left">
+	    <thead> 
+	      <row> 
+		<entry>Label</entry> 
+		<entry>Shortcut</entry>
+		<entry>Description</entry>
+		</row>
+	      </thead>
+	    <tbody valign="top">
+
+		<row>
+			<entry><guimenuitem><accel>P</accel>revious Page</guimenuitem></entry>
+			<entry><keycap>PageUp</keycap></entry>
+			<entry>Navigates to the previous page in the document.</entry>
+		</row>
+
+		<row>
+			<entry><guimenuitem><accel>N</accel>ext Page</guimenuitem></entry>
+			<entry><keycap>PageDown</keycap></entry>
+			<entry>Navigates to the next page in the document.</entry>		
+		</row>
+
+		<row>
+			<entry><guimenuitem><accel>G</accel>o to Page...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Navigates to a user-specified page number.  Open a dialog into which the user can type a page number.
+			<para>Text-based applications may also include a <guimenuitem>Go  to Line...</guimenuitem> menu item, which allows the user to jump to a specified line number.</para></entry>		
+		</row>
+	
+		<row>
+			<entry><guimenuitem><accel>F</accel>irst Page</guimenuitem></entry>
+			<entry><keycombo><keycap>Ctrl</keycap><keycap>Home</keycap></keycombo></entry>
+			<entry>Navigates to the first page in the document.</entry>
+		</row>
+
+
+		<row>
+			<entry><guimenuitem><accel>L</accel>ast Page</guimenuitem></entry>
+			<entry><keycombo><keycap>Ctrl</keycap><keycap>End</keycap></keycombo></entry>
+			<entry>Navigates to the last page in the document.</entry>		
+		</row>
+
+			</tbody>
+		</tgroup>
+	</table>
+
+      </sect2>
+
 <!-- CFB Commenting out until we have anything to go on it :/
       <sect2 id="menu-standard-tools">
 	<title>Tools</title>
@@ -1718,126 +1465,118 @@
       </sect2>
 
 -->
-    <sect2 id="application-windows-menu">
-      <title>Windows</title>
-      <para>The Windows menu contains commands that apply to all of the application's open windows.  Only use a Windows menu in <link linkend="mdi">multiple document interface</link> (MDI) applications.</para>
-      <note>
-        <title>MDI Applications</title>
-        <para>The use of MDI is discouraged, as they have a number of inherent usability problems.</para>
-      </note>
-      <para>You may also label this menu <guimenu><accel>D</accel>ocuments</guimenu>, <guimenu><accel>B</accel>uffers</guimenu>, or similar according to the type of document handled by your application.</para>
-      <para>The last items on this menu are a numbered list of the application's primary windows, for example <guimenuitem><accel>1</accel>shoppinglist.abw</guimenuitem>.  Selecting one of these items raises the corresponding window.</para>
-      <figure id="generic-windows-menu">
-        <title>A generic Windows menu</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="images/generic-windows-menu.png" format="PNG"/>
-          </imageobject>
-          <imageobject>
-            <imagedata fileref="images/generic-windows-menu.eps" format="EPS"/>
-          </imageobject>
-          <textobject>
-            <literallayout class="monospaced">
-              <guimenu><accel>W</accel>indows</guimenu>
-              <guimenuitem><accel>S</accel>ave All</guimenuitem>
-              <guimenuitem><accel>C</accel>lose All</guimenuitem>
-            </literallayout>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <table frame="none">
-        <title>Windows menu items</title>
-        <tgroup colsep="0" rowsep="0" cols="3" align="left">
-          <thead>
-            <row>
-              <entry>Label</entry>
-              <entry>Shortcut</entry>
-              <entry>Description</entry>
-            </row>
-          </thead>
-          <tbody valign="top">
-            <row>
-              <entry>
-                <guimenuitem><accel>S</accel>ave All</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Saves all open documents.  If any documents have no current filename, prompt for a filename for each one in turn using the standard Save dialog.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>C</accel>lose All</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Closes all open documents.  If there are any unsaved changes in any documents, post a <link linkend="alerts-confirmation">confirmation alert</link> for each one in turn.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>1</accel>. <replaceable>first open window title</replaceable></guimenuitem>
-                <para>
-                  <guimenuitem><accel>2</accel>. <replaceable>second open window title</replaceable></guimenuitem>
-                </para>
-                <para>etc.</para>
-              </entry>
-              <entry>None</entry>
-              <entry>Raises the corresponding window to the top of the window stack.</entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-    </sect2>
-    <sect2 id="menu-standard-help">
-      <title>Help</title>
-      <para>The <guimenu>Help</guimenu> menu provides access to all on-line documentation for your application.  This includes both the user guide, and the <guimenuitem>About</guimenuitem> window which includes a brief description of your application's functionality.</para>
-      <figure id="generic-help-menu">
-        <title>A generic Help menu</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="images/generic-help-menu.png" format="PNG"/>
-          </imageobject>
-          <imageobject>
-            <imagedata fileref="images/generic-help-menu.eps" format="EPS"/>
-          </imageobject>
-          <textobject>
-            <literallayout class="monospaced">
-              <guimenu><accel>H</accel>elp</guimenu>
+
+      <sect2 id="application-windows-menu">
+	<title>Windows</title>
+		<para>The Windows menu contains commands that apply to all of the application's open windows.  Only use a Windows menu in <link linkend="mdi">multiple document interface</link> (MDI) applications.</para>
+
+      <note><title>MDI Applications</title><para>The use of MDI is discouraged, as they have a number of inherent usability problems.</para></note>
+	
+		<para>You may also label this menu <guimenu><accel>D</accel>ocuments</guimenu>, <guimenu><accel>B</accel>uffers</guimenu>, or similar according to the type of document handled by your application.</para>
+	
+	<para>The last items on this menu are a numbered list of the application's primary windows, for example <guimenuitem><accel>1</accel>shoppinglist.abw</guimenuitem>.  Selecting one of these items raises the corresponding window.</para>
+
+	<figure id="generic-windows-menu">
+	  <title>A generic Windows menu</title>
+	  <mediaobject>
+	    <imageobject><imagedata fileref="images/menus-windows.png" width="151" depth="172" format="PNG"/></imageobject>
+	    <imageobject><imagedata fileref="images/menus-windows.eps" format="EPS"/></imageobject>
+	    <textobject>
+	      <literallayout class="monospaced">
+<guimenu><accel>W</accel>indows</guimenu>
+<guimenuitem><accel>S</accel>ave All</guimenuitem>
+<guimenuitem><accel>C</accel>lose All</guimenuitem>
+	      </literallayout>
+	    </textobject>
+	  </mediaobject>
+	</figure>
+	
+
+<table>
+	<title>Windows menu items</title>
+	 <tgroup cols="3" align="left">
+	    <thead> 
+	      <row> 
+		<entry>Label</entry> 
+		<entry>Shortcut</entry>
+		<entry>Description</entry>
+		</row>
+	      </thead>
+	    <tbody valign="top">
+		<row>
+			<entry><guimenuitem><accel>S</accel>ave All</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Saves all open documents.  If any documents have no current filename, prompt for a filename for each one in turn using the standard Save dialog.</entry>		
+		</row>
+
+		<row>
+			<entry><guimenuitem><accel>C</accel>lose All</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Closes all open documents.  If there are any unsaved changes in any documents, post a <link linkend="alerts-confirmation">confirmation alert</link> for each one in turn.</entry>
+		</row>
+		<row>
+			<entry><guimenuitem><accel>1</accel>. <replaceable>first open window title</replaceable></guimenuitem>
+			<para><guimenuitem><accel>2</accel>. <replaceable>second open window title</replaceable></guimenuitem></para>
+			<para>etc.</para></entry>
+			<entry>None</entry>
+			<entry>Raises the corresponding window to the top of the window stack.</entry>
+		</row>
+			</tbody>
+		</tgroup>
+	</table>
+
+	
+      </sect2>
+      <sect2 id="menu-standard-help">
+	<title>Help</title>
+	<para>The <guimenu>Help</guimenu> menu provides access to all online documentation for your application.  This includes both the user guide, and the <guimenuitem>About</guimenuitem> window which includes a brief description of your application's functionality.</para>
+
+	<figure id="generic-help-menu">
+	  <title>A generic Help menu</title>
+	  <mediaobject>
+	    <imageobject><imagedata fileref="images/menus-help.png" width="118" depth="45"  format="PNG"/></imageobject>
+	    <imageobject><imagedata fileref="images/menus-help.eps" format="EPS"/></imageobject>
+	    <textobject>
+	      <literallayout class="monospaced">
+<guimenu><accel>H</accel>elp</guimenu>
 <!--<guimenuitem><accel>S</accel>earch</guimenuitem>-->
-              <guimenuitem><accel>C</accel>ontents      F1</guimenuitem>
-              <guimenuitem><accel>A</accel>bout</guimenuitem>
-            </literallayout>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <table frame="none">
-        <title>Help menu items</title>
-        <tgroup colsep="0" rowsep="0" cols="3" align="left">
-          <thead>
-            <row>
-              <entry>Label</entry>
-              <entry>Shortcut</entry>
-              <entry>Description</entry>
-            </row>
-          </thead>
-          <tbody valign="top">
-            <row>
-              <entry>
-                <guimenuitem><accel>C</accel>ontents</guimenuitem>
-              </entry>
-              <entry>
-                <keycap>F1</keycap>
-              </entry>
-              <entry>Opens the default help browser on the contents page for the application.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>A</accel>bout</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Opens the About dialog for the application.  Use the standard dialog provided by the GNOME libraries, which contains the name and version number of the application, a short description of the application's functionality, author contact details, copyright message and a pointer to the license under which the application is made available.</entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-      <remark>We originally wanted a Search item on here too, but it's not technically possible to implement it right now.</remark>
-    </sect2>
-  </sect1>
-</chapter>
+<guimenuitem><accel>C</accel>ontents      F1</guimenuitem>
+<guimenuitem><accel>A</accel>bout</guimenuitem>
+	      </literallayout>
+	    </textobject>
+	  </mediaobject>
+	</figure>
+
+	<table>
+	<title>Help menu items</title>
+	 <tgroup cols="3" align="left">
+	    <thead> 
+	      <row> 
+		<entry>Label</entry> 
+		<entry>Shortcut</entry>
+		<entry>Description</entry>
+		</row>
+	      </thead>
+	    <tbody valign="top">
+
+		<row>
+			<entry><guimenuitem><accel>C</accel>ontents</guimenuitem></entry>
+			<entry><keycap>F1</keycap></entry>
+			<entry>Opens the default help browser on the contents page for the application.</entry>
+		</row>
+
+		<row>
+			<entry><guimenuitem><accel>A</accel>bout</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Opens the About dialog for the application.  Use the standard dialog provided by the GNOME libraries, which contains the name and version number of the application, a short description of the application's functionality, author contact details, copyright message and a pointer to the licence under which the application is made available.</entry>		
+		</row>
+
+			</tbody>
+		</tgroup>
+	</table>
+
+	<remark>We originally wanted a Search item on here too, but it's not technically possible to implement it right now.</remark>
+
+      </sect2>
+    </sect1>
+  </chapter>

Modified: trunk/content/projects/gup/hig/hig-ch-principles.xml
==============================================================================
--- trunk/content/projects/gup/hig/hig-ch-principles.xml	(original)
+++ trunk/content/projects/gup/hig/hig-ch-principles.xml	Mon Sep 29 23:05:52 2008
@@ -37,7 +37,7 @@
 		<listitem><para>Users with limited movement may not be able to use your application if you don't provide keyboard equivalents for commands</para></listitem>
 	</itemizedlist>
 
-	<para>Your software should also be usable with voice interfaces, screen readers such as <ulink url="http://www.gnome.org/projects/orca/index.html";>Orca</ulink>, alternate input devices, and other assistive technologies.  The standard GNOME libraries do most of this work for you, but with a little extra effort you can make your application every bit as useful to users who rely on those technologies as to those who don't.</para>
+	<para>Your software should also be usable with voice interfaces, screen readers such as <ulink url="http://developer.gnome.org/projects/gap/AT/Gnopernicus/index.html";>Gnopernicus</ulink>, alternate input devices, and other assistive technologies.  The standard GNOME libraries do most of this work for you, but with a little extra effort you can make your application every bit as useful to users who rely on those technologies as to those who don't.</para>
 
 	<para>GNOME has excellent inbuilt support for accessibility by means of the ATK and GAIL libraries, which in many cases can do most of the work for you. More information on accessibility in GNOME can be found at the <ulink url="http://developer.gnome.org/projects/gap/";>GNOME Accessibility Project</ulink>.</para>
 
@@ -85,7 +85,7 @@
 
       <para>Consistency enables users to apply their existing knowledge of their computing environment and other applications to understanding a new application.  This not only allows users to become familiar with new applications more quickly, but also helps create a sense of comfort and trust in the overall environment.  Most of the recommendations in the GNOME HI Guidelines are designed to help you create applications that are consistent with the GNOME environment and other GNOME applications.</para>
 
-      <para>A word of caution: a misapplied or incomplete consistency is often worse than inconsistency.  If your application includes an <guimenuitem>Undo</guimenuitem> menu item for consistency, but it is always disabled because your application does not actually support Undo, this will reduce the user's trust in the availability of Undo in other applications on their desktop.  Either make your application support Undo, or eliminate the <guimenuitem>Undo</guimenuitem> menu item.</para>
+      <para>A word of caution: a mis-applied or incomplete consistency is often worse than inconsistency.  If your application includes an <guimenuitem>Undo</guimenuitem> menu item for consistency, but it is always disabled because your application does not actually support Undo, this will reduce the user's trust in the availability of Undo in other applications on their desktop.  Either make your application support Undo, or eliminate the <guimenuitem>Undo</guimenuitem> menu item.</para>
 
     </sect1>
 
@@ -131,7 +131,7 @@
     <sect1 id="principles-direct-manipulation">
       <title>Provide Direct Manipulation</title>
 
-      <para>Wherever possible, allow users to act on objects and data directly, rather than through dialogs or explicit commands.  For example, it is more intuitive to drag a circle object around in a diagram rather than selecting a "Move" command from a menu while the circle is selected.  Similarly, in an email application, allow the user to attach files by dragging them from the file manager and dropping them onto the message composition window if they wish.</para>
+      <para>Wherever possible, allow users to act on objects and data directly, rather than through dialogs or explicit commands.  For example, it is more intuitive to drag a circle object around in a diagram rather than selecting a "Move" command from a menu while the circle is selected.  Simlarly, in an email application, allow the user to attach files by dragging them from the file manager and dropping them onto the message composition window if they wish.</para>
 
 	<para>See <xref linkend="input"/> for more information on direct manipulation.</para>
 

Modified: trunk/content/projects/gup/hig/hig-ch-toolbars.xml
==============================================================================
--- trunk/content/projects/gup/hig/hig-ch-toolbars.xml	(original)
+++ trunk/content/projects/gup/hig/hig-ch-toolbars.xml	Mon Sep 29 23:05:52 2008
@@ -8,53 +8,20 @@
   <note><para>Although the latter is just a side-effect of the fact that palettes can't be created with the standard toolbar widgetsâ it would be rather nice if they could, especially as they would then automatically feature in the toolbar keyboard navigation order.</para></note>
   -->
     
-
-  <!--    
   <figure id="mail-toolbar-example">
-  <title>Example toolbar from an email composition window</title>
-  <mediaobject>
-  <imageobject><imagedata fileref="images/EvoToolbar.png" format="PNG" width="577" depth="36"/></imageobject>
-  <imageobject><imagedata fileref="images/EvoToolbar.eps" format="EPS"/></imageobject>
-  <textobject><phrase>Example email composition toolbar</phrase></textobject>
-      </mediaobject>
-    </figure>
-  -->
-    
-  <figure id="web-toolbar-example">
-    <title>Example toolbar from a web browser window</title>
+    <title>Example toolbar from a simple mail application</title>
     <mediaobject>
-      <imageobject><imagedata fileref="images/browser-toolbar.png" format="PNG" width="612" depth="86"/></imageobject>
-      <imageobject><imagedata fileref="images/browser-toolbar.eps" format="EPS"/></imageobject>
-      <textobject><phrase>Example web browser toolbar</phrase></textobject>
+      <imageobject><imagedata fileref="images/toolbars-mail.png" format="PNG" width="428" depth="48"/></imageobject>
+      <imageobject><imagedata fileref="images/toolbars-mail.eps" format="EPS"/></imageobject>
+      <textobject><phrase>Example mail application toolbar</phrase></textobject>
     </mediaobject>
   </figure>
 
-  <!--    
-  <figure id="fileman-toolbar-example">
-  <title>Example toolbar from a file manager window</title>
-  <mediaobject>
-  <imageobject><imagedata fileref="images/GtkToolbar_browserdefault.png" format="PNG" width="486" depth="58"/></imageobject>
-  <imageobject><imagedata fileref="images/GtkToolbar_browserdefault.eps" format="EPS"/></imageobject>
-  <textobject><phrase>Example file manager toolbar</phrase></textobject>
-      </mediaobject>
-    </figure>
-  <figure id="text-toolbar-example">
-  <title>Example toolbar from a text editor window</title>
-  <mediaobject>
-  <imageobject><imagedata fileref="images/GtkToolbar_gedit.png" format="PNG" width="476" depth="58"/></imageobject>
-  <imageobject><imagedata fileref="images/GtkToolbar_gedit.eps" format="EPS"/></imageobject>
-  <textobject><phrase>Example text editor toolbar</phrase></textobject>
-      </mediaobject>
-    </figure>
-  -->
-
   <!-- Notes from GJM:
   Text-on-the-side toolbars are now part of Gtk+.
   Stock items have mnemonics/access keys. I don't think they should.
   -->
-    
-
-  <!-- CB-Fig: The four figures of the toolbars in rapid succession right at the beginning of the chapter is a little overwhelming, and possibly useless before the user reads anything about these.  Perhaps save them for later, when each type is discussed, or more details are given about toolbars so that the figures actually demonstrate something more than variety.  -->
+ 
   <!-- CFB: Assuming for now therefore that we ought to be recommending Gtk toolbars, but trying to keep the text as widget-neutral as possible
   <note>
   <title>For discussion</title>
@@ -161,8 +128,8 @@
 	<figure id="view-toolbar">
 	  <title>Example View menu fragments for applications with one toolbar (left), two or three toolbars (middle), or four or more toolbars (right)</title>
 	  <mediaobject>
-	    <imageobject><imagedata fileref="images/view-toolbar.png" format="PNG" width="450" depth="118"/></imageobject>
-	    <imageobject><imagedata fileref="images/view-toolbar.eps" format="EPS"/></imageobject>
+	    <imageobject><imagedata fileref="images/toolbars-configure-menu.png" format="PNG" width="488" depth="135"/></imageobject>
+	    <imageobject><imagedata fileref="images/toolbars-congfigure-menu.eps" format="EPS"/></imageobject>
 	    <textobject><phrase>Example View menu for application with single toolbar</phrase></textobject>
 	  </mediaobject>
 	</figure>
@@ -190,8 +157,8 @@
 	<figure>
 	  <title>Toolbar with labels under all buttons</title>
 	  <mediaobject>
-	    <imageobject><imagedata fileref="images/GtkToolbar_gedit.png" format="PNG" width="476" depth="58"/></imageobject>
-	    <imageobject><imagedata fileref="images/GtkToolbar_gedit.eps" format="EPS"/></imageobject>
+	    <imageobject><imagedata fileref="images/toolbars-labels-below.png" format="PNG" width="381" depth="56"/></imageobject>
+	    <imageobject><imagedata fileref="images/toolbars-labels-below.eps" format="EPS"/></imageobject>
 	    <textobject><phrase>Toolbar showing labels under all controls</phrase></textobject>
 	  </mediaobject>
 	</figure>
@@ -203,8 +170,8 @@
 	<figure>
 	  <title>Toolbar with &quot;priority text&quot; labels beside the first few buttons only</title>
 	  <mediaobject>
-	    <imageobject><imagedata fileref="images/EvoToolbar.png" format="PNG" width="577" depth="36"/></imageobject>
-	    <imageobject><imagedata fileref="images/EvoToolbar.eps" format="EPS"/></imageobject>
+	    <imageobject><imagedata fileref="images/toolbars-labels-beside.png" format="PNG" width="459" depth="35"/></imageobject>
+	    <imageobject><imagedata fileref="images/toolbars-labels-beside.eps" format="EPS"/></imageobject>
 	    <textobject><phrase>Toolbar with "priority text" labels beside the first few items only</phrase></textobject>
 	  </mediaobject>
 	</figure>
@@ -268,9 +235,9 @@
 	  </mediaobject>
 	</figure>
 	
-	<table frame="none">
+	<table>
 	  <title>Proposed toolbar re-ordering for Nautilus</title>
-	  <tgroup colsep="0" rowsep="0" cols='2' align='left'>
+	  <tgroup cols='2' align='left'>
 	    	    
 	    <tbody>
 	      <row>
@@ -285,9 +252,9 @@
 	  </tgroup>
 	</table>
 
-	<table frame="none">
+	<table>
 	  <title>Proposed toolbar re-ordering for Galeon</title>
-	  <tgroup colsep="0" rowsep="0" cols='2' align='left'>
+	  <tgroup cols='2' align='left'>
 
 	    <tbody>
 	      <row>
@@ -302,9 +269,9 @@
 	  </tgroup>
 	</table>
 	
-	<table frame="none">
+	<table>
 	  <title>Proposed toolbar re-ordering for GNOME Help (deprecated, for illustration purposes only)</title>
-	  <tgroup colsep="0" rowsep="0" cols='2' align='left'>
+	  <tgroup cols='2' align='left'>
 
 	    <tbody>
 	      <row>

Modified: trunk/content/projects/gup/hig/hig-ch-whatsnew.xml
==============================================================================
--- trunk/content/projects/gup/hig/hig-ch-whatsnew.xml	(original)
+++ trunk/content/projects/gup/hig/hig-ch-whatsnew.xml	Mon Sep 29 23:05:52 2008
@@ -2,69 +2,163 @@
 <!-- :xml.root=hig-book.xml: -->
 
   <preface id="whatsnew">
-    <title>What's new since HIG v2.0?</title>
+    <title>What's new?</title>
     <para>This section highlights recent changes to the HIG that may affect your application.</para>
-    <para>The following sections are new to this version of the HIG:</para>
+     <para>The following changes were made in HIG v2.2:</para>
+    <itemizedlist>
+	<listitem><para>Mention deprecation of low contrast icons in <xref linkend="icons-design-accessible"/>
+		</para></listitem>
+    	<listitem><para>
+	    	Updated illustrations throughout.
+		</para></listitem>	
+	</itemizedlist>
+
+    <para>The following sections were added in HIG v2.0:</para>
     <itemizedlist>
     	<listitem><para>
-	    	<xref linkend="desktop-application-startup"/>
+	    	<xref linkend="gconf-keys"/>
 		</para></listitem>	
 	<listitem><para>
-	    	<xref linkend="controls-disclosure"/>
+	    	<xref linkend="windows-show-hide"/>
+		</para></listitem>
+	<listitem><para>
+	    	<xref linkend="desktop-notification-area"/>
+		</para></listitem>
+	<listitem><para>
+	    	<xref linkend="windows-progress"/>
 		</para></listitem>
-    </itemizedlist>
+        <listitem><para>
+	    	<xref linkend="toolbars-media"/>
+		</para></listitem>
+		<listitem><para>
+	    	<xref linkend="controls-scrollbars"/>
+		</para></listitem>
+	<listitem><para>
+	    	<xref linkend="controls-lists-sortable"/>
+		</para></listitem>
+	<listitem><para>
+	    	<xref linkend="controls-trees-sortable"/>
+		</para></listitem>
+	<listitem><para>
+	    	<xref linkend="controls-tab-status"/>
+		</para></listitem>
+	<listitem><para>
+	    	<xref linkend="controls-progress-bars"/>
+		</para></listitem>
+		<listitem><para>
+	    	<xref linkend="icons-design-accessible"/>
+		</para></listitem>
+	<listitem><para>
+	    	<xref linkend="bibliography"/>
+		</para></listitem>
+	</itemizedlist>
+
+	
+    <para>New or revised guidelines were added to these sections in HIG v2.0:</para>
 
-    <para>The following sections include new or revised guidelines:</para>
-    	<itemizedlist>
+  	<itemizedlist>
 	    <listitem><para>
-		  <xref linkend="icons-design-accessible"/>
-		  <itemizedlist>
-			<listitem><para>
-			contains more information on low contrast icons
-			</para></listitem>
-	  	</itemizedlist>
-		  
-	    </para></listitem>
-	    
+		<xref linkend="internationalization"/>
+		</para></listitem>
+
 	    <listitem><para>
-		  <xref linkend="menu-type-popup"/>
-		   <itemizedlist>
-			<listitem><para>
-		  	clarifies when to disable items and when to hide them
-			</para></listitem>
-	  	</itemizedlist>
-	    </para></listitem>
+		<xref linkend="desktop-integration"/>
+		</para></listitem>
 
 	    <listitem><para>
-		  <xref linkend="desktop-notification-interaction"/>
-		  <itemizedlist>
-			<listitem><para>
-		  	specifies that <action>single click</action>, not <action>double click</action>, should be used to activate a status notification icon
-			</para></listitem>
-			<listitem><para>
-			specifies that if <action>clicking</action> a notification icon opens a window, <action>clicking</action> it again should dismiss it (unless it's an explicit apply dialog)</para></listitem>
-	  	</itemizedlist>
-	  </para></listitem>
+		<xref linkend="windows-primary"/>
+		</para></listitem>
 
 	    <listitem><para>
-		  <xref linkend="window-props-icon"/>
-		  <itemizedlist>
-			<listitem><para>
-		  	suggests that an icon identical or similar to an application's launcher icon be used as the window icon for every window in the
-			application.
-			</para></listitem>
-	  	</itemizedlist>
-	  </para></listitem>
-
-	  <listitem><para>
-		  <xref linkend="choosing-access-keys"/>
-		  <itemizedlist>
-			<listitem><para>
-		  	notes that the shortcut for entering unicode characters in widgets is now Shift-Ctrl-U.
-			</para></listitem>
-	  	</itemizedlist>
-	  </para></listitem>
-	  
-    </itemizedlist>
+		<xref linkend="windows-utility"/>
+		</para></listitem>
+
+	     <listitem><para>
+		<xref linkend="alerts-confirmation"/>
+		</para></listitem>
+	
+	     <listitem><para>
+		<xref linkend="windows-assistant"/>
+		</para></listitem>
+
+	     <listitem><para>
+		<xref linkend="menus-menubar"/>
+		</para></listitem>
+
+	      <listitem><para>
+		<xref linkend="the-file-menu"/>
+		</para></listitem>
+
+	      <listitem><para>
+		<xref linkend="menu-standard-view"/>
+		</para></listitem>
+
+	      <listitem><para>
+		<xref linkend="menu-standard-bookmarks"/>
+		</para></listitem>
+
+	      <listitem><para>
+		<xref linkend="menu-standard-go"/>
+		</para></listitem>
+
+	      <listitem><para>
+		<xref linkend="application-windows-menu"/>
+		</para></listitem>
+
+	       <listitem><para>
+		<xref linkend="controls-status-bars"/>
+		</para></listitem>
+
+	      <listitem><para>
+		<xref linkend="controls-entry"/>
+		</para></listitem>
+
+	      <listitem><para>
+		<xref linkend="controls-frames"/>
+		</para></listitem>
+
+	      <listitem><para>
+		<xref linkend="feedback-choosing"/>
+		</para></listitem>
+
+	      <listitem><para>
+		<xref linkend="feedback-interrupting"/>
+		</para></listitem>
+
+	       <listitem><para>
+		<xref linkend="layout-capitalization"/>
+		</para></listitem>
+
+	     <listitem><para>
+		<xref linkend="mouse-buttons"/>
+		</para></listitem>
+
+	      <listitem><para>
+		<xref linkend="selection"/>
+		</para></listitem>
+
+	      <listitem><para>
+		<xref linkend="drag-drop"/>
+		</para></listitem>
+
+	      <listitem><para>
+		<xref linkend="choosing-access-keys"/>
+		</para></listitem>
+
+	      <listitem><para>
+		<xref linkend="shortcuts"/>
+		</para></listitem>
+
+	      <listitem><para>
+		<xref linkend="standard-shortcuts"/>
+		</para></listitem>
+
+	</itemizedlist>
+
+<para>The following terminology changes were introduced in HIG v2.0:</para>
+<itemizedlist>
+	<listitem><para>"Option menus" are now called "Drop-down lists" </para></listitem>
+	<listitem><para>"Combo boxes" are now called "Drop-down combination boxes"</para></listitem>
+</itemizedlist>
 
-  </preface>
+</preface>

Modified: trunk/content/projects/gup/hig/hig-ch-windows.xml
==============================================================================
--- trunk/content/projects/gup/hig/hig-ch-windows.xml	(original)
+++ trunk/content/projects/gup/hig/hig-ch-windows.xml	Mon Sep 29 23:05:52 2008
@@ -21,16 +21,17 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata depth="27" fileref="images/window-title.png"
-            format="PNG" width="367" />
+            <imagedata depth="28" fileref="images/windows-titlebar.png"
+            format="PNG" width="379" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/window-title.eps" format="EPS" />
+            <imagedata fileref="images/windows-titlebar.eps" format="EPS" />
           </imageobject>
 
           <textobject>
-            <phrase>Screenshot showing a window title bar with title &quot;blah.abw Properties&quot;</phrase>
+            <phrase>Screenshot showing a window title bar with title
+            &quot;Parts of Windows and System Interaction - Mozilla Firefox&quot;</phrase>
           </textobject>
         </mediaobject>
       </figure>
@@ -39,12 +40,6 @@
       formats.</para>
     </sect2>
 
-    <sect2 id="window-props-icon">
-	    <title>Icon</title>
-	    <para>Every window has an icon, which normally appears on its menu button.  If the window appears on the window list or in the <keycombo><keycap>Alt</keycap><keycap>Tab</keycap></keycombo> sequence, the icon will also appear there, alongside the window title.</para>
-	    <para>Always provide your own icon for this purpose, as the default icon assigned by GNOME is unlikely to convey any useful information about the window to the user.  In general, every window that is part of the same application should use the same icon.  Ideally, this icon should be the same or similar to the icon used to launch the application.  </para>
-    </sect2>
-
     <sect2 id="window-props-borders">
       <title>Borders and Window Commands</title>
 
@@ -179,7 +174,7 @@
         context-sensitiveâ that is, they cannot initiate an action such as
         <guibutton>Save</guibutton> on the current document. This is because
         while moving the mouse from the current document to the utility
-        window, the user could inadvertently pass the pointer over a different
+        window, the user could inadvertantly pass the pointer over a different
         document window, thus changing the focus and possibly saving the wrong
         document.</para>
       </note>
@@ -191,10 +186,10 @@
 	<itemizedlist><title>Guidelines</title>
 		<listitem><para>Always show a window as soon as possible, but make sure your window is the correct size before displaying it. Resizing a window after it is visible is disorienting and gives an unpolished look to your application.</para></listitem>
 		<listitem><para>If a window contains information that takes a few seconds to compute or display, it is often better not to fill it in completely before displaying the window.  For example, a window containing a large text area can be shown
-quickly, and then the text can be filled in afterward (provided this does not result in the window resizing).  This will make your application feel more responsive than if you had not shown the window until its content was complete.</para></listitem>
+quickly, and then the text can be filled in afterwards (provided this does not result in the window resizing).  This will make your application feel more responsive than if you had not shown the window until its content was complete.</para></listitem>
 		<listitem><para>Hide a window as soon as possible after it is
 closed. Unless an alert might be shown, immediately hide a window that the user has closed by clicking the Close button in the window border--  
-your application can still perform any internal clean-up operations afterward. Besides making the
+your application can still perform any internal clean-up operations afterwards. Besides making the
 system appear slow, not doing this can cause the window manager to think the application is not responding, and display an unnecessary alert to the user.</para></listitem>
 	</itemizedlist> 
 
@@ -219,12 +214,12 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/primary-window.png"
-          format="PNG" />
+          <imagedata depth="372" fileref="images/windows-primary.png"
+          format="PNG" width="397" />
         </imageobject>
 
         <imageobject>
-          <imagedata fileref="images/primary-window.eps" format="EPS" />
+          <imagedata fileref="images/windows-primary.eps" format="EPS" />
         </imageobject>
 
         <textobject>
@@ -254,8 +249,8 @@
       	<example>
         <title>Using document names as window titles</title>
 
-        <informaltable frame="none">
-          <tgroup colsep="0" rowsep="0" align="left" cols="2">
+        <informaltable frame="all">
+          <tgroup align="left" cols="2">
             <thead>
               <row>
                 <entry>Application</entry>
@@ -314,8 +309,8 @@
       	<example>
         <title>Using application names as window titles</title>
 
-        <informaltable frame="none">
-          <tgroup colsep="0" rowsep="0" align="left" cols="2">
+        <informaltable frame="all">
+          <tgroup align="left" cols="2">
             <thead>
               <row>
                 <entry>Application</entry>
@@ -390,16 +385,17 @@
 
           <mediaobject>
             <imageobject>
-              <imagedata fileref="images/sdi.png" format="PNG"
-              />
+              <imagedata depth="226" fileref="images/windows-sdi.png" format="PNG"
+              width="268" />
             </imageobject>
 
             <imageobject>
-              <imagedata fileref="images/sdi.eps" format="EPS" />
+              <imagedata fileref="images/windows-sdi.eps" format="EPS" />
             </imageobject>
 
             <textobject>
-              <phrase>A typical SDI application: Eye of GNOME being used to inspect an icon</phrase>
+              <phrase>A typical SDI application: Eye of GNOME being used to
+              inspect an icon</phrase>
             </textobject>
           </mediaobject>
         </figure>
@@ -413,21 +409,22 @@
         within a single window.</para>
 
         <figure>
-          <title>A typical MDI application (epiphany) showing three open
+          <title>A typical MDI application (gedit) showing three open
           documents on tabbed pages</title>
 
           <mediaobject>
             <imageobject>
-              <imagedata fileref="images/mdi.png" format="PNG"
-             />
+              <imagedata depth="349" fileref="images/windows-mdi.png" format="PNG"
+              width="372" />
             </imageobject>
 
             <imageobject>
-              <imagedata fileref="images/mdi.eps" format="EPS" />
+              <imagedata fileref="images/windows-mdi.eps" format="EPS" />
             </imageobject>
 
             <textobject>
-              <phrase>A typical MDI application: epiphany with three open documents in the same window</phrase>
+              <phrase>A typical MDI application: gedit with three open
+              documents in the same window</phrase>
             </textobject>
           </mediaobject>
         </figure>
@@ -585,16 +582,17 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata depth="55" fileref="images/explicit-apply.png"
-            format="PNG" width="449" />
+            <imagedata depth="55" fileref="images/windows-explicit-apply.png"
+            format="PNG" width="387" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/explicit-apply.eps" format="EPS" />
+            <imagedata fileref="images/windows-explicit-apply.eps" format="EPS" />
           </imageobject>
 
           <textobject>
-            <phrase>Screenshot showing correct positions for Help, Apply, Cancel and OK buttons in a dialog</phrase>
+            <phrase>Screenshot showing correct positions for Help, Apply,
+            Cancel and OK buttons in a dialog</phrase>
           </textobject>
         </mediaobject>
       </figure>
@@ -637,32 +635,30 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/property-window.png"
-            format="PNG" />
+            <imagedata fileref="images/windows-properties.png"
+            format="PNG" width="302" depth="335"/>
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/property-window.eps" format="EPS" />
+            <imagedata fileref="images/windows-properties.eps" format="EPS" />
           </imageobject>
 
           <textobject>
-            <phrase>Screenshot showing the &quot;file properties&quot; window from Nautilus</phrase>
+            <phrase>Screenshot showing the &quot;file properties&quot; window
+            from Nautilus</phrase>
           </textobject>
         </mediaobject>
       </figure>
-      
-      <formalpara>
-        <title>Icon:</title>
-        <para>Same as application</para>
-      </formalpara>
 
       <formalpara>
         <title>Title Format:</title>
+
         <para><replaceable>Object Name</replaceable> Properties</para>
       </formalpara>
 
       <formalpara>
         <title>Window Commands:</title>
+
         <para>Close, Minimize, Roll-up/Unroll</para>
       </formalpara>
 
@@ -687,12 +683,12 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/preferences-window.png"
-            format="PNG" />
+            <imagedata depth="249" fileref="images/windows-preferences.png"
+            format="PNG" width="354" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/preferences-window.eps" format="EPS" />
+            <imagedata fileref="images/windows-preferences.eps" format="EPS" />
           </imageobject>
 
           <textobject>
@@ -702,11 +698,6 @@
       </figure>
 
       <formalpara>
-        <title>Icon:</title>
-        <para>Same as application</para>
-      </formalpara>
-
-      <formalpara>
         <title>Title Format:</title>
 
         <para><replaceable>Application Name</replaceable> Preferences</para>
@@ -764,26 +755,22 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata depth="89" fileref="images/toolbox-small.png"
-            format="PNG" width="131" />
+            <imagedata depth="89" fileref="images/windows-toolbox-small.png"
+            format="PNG" width="136" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/toolbox-small.eps" format="EPS" />
+            <imagedata fileref="images/windows-toolbox-small.eps" format="EPS" />
           </imageobject>
 
           <textobject>
-            <phrase>A screenshot of a toolbox with eight buttons arranged into two rows</phrase>
+            <phrase>A screenshot of a toolbox with eight buttons arranged into
+            two rows</phrase>
           </textobject>
         </mediaobject>
       </figure>
 
       <formalpara>
-        <title>Icon:</title>
-        <para>Same as application</para>
-      </formalpara>
-
-      <formalpara>
         <title>Title Format:</title>
 
         <para>Toolboxes have no title</para>
@@ -869,8 +856,8 @@
         <title>Toolbox Categories</title>
 
         <para>While categories may not be as visually appealing as a toolbox
-        homogeneously filled with beautiful icons, they make an unwieldy large
-        toolbox more manageable. Picking a small icon from more than fifteen
+        homogenously filled with beautiful icons, they make an unwieldy large
+        toolbox more managable. Picking a small icon from more than fifteen
         other items is a difficult task. Additionally, categories allow users
         to hide sets of tool items that are not relevant to their current
         task.</para>
@@ -880,12 +867,12 @@
 
           <mediaobject>
             <imageobject>
-              <imagedata depth="332" fileref="images/toolbox.png" format="PNG"
-              width="131" />
+              <imagedata depth="156" fileref="images/windows-toolbox-large.png" format="PNG"
+              width="136" />
             </imageobject>
 
             <imageobject>
-              <imagedata fileref="images/toolbox.eps" format="EPS" />
+              <imagedata fileref="images/windows-toolbox-large.eps" format="EPS" />
             </imageobject>
 
             <textobject>
@@ -950,25 +937,22 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/information-alert.png" format="PNG" />
+          <imagedata fileref="images/windows-alert-information.png" width="251" depth="123" format="PNG" />
         </imageobject>
 
         <imageobject>
-          <imagedata fileref="images/information-alert.eps" format="EPS" />
+          <imagedata fileref="images/windows-alert-information.eps" format="EPS" />
         </imageobject>
 
         <textobject>
-          <phrase>An example of an alert, showing the text &quot;You have an appointment with George Wells in 15 minutes&quot;, and with an OK button to dismiss the window.</phrase>
+          <phrase>An example of an alert, showing the text &quot;You have an
+          appointment with George Wells in 15 minutes&quot;, and with an OK
+          button to dismiss the window.</phrase>
         </textobject>
       </mediaobject>
     </figure>
 
     <!--<remark>FIXME: need to redo the spacing and icons in the alert shots. I think I have a glade file for these somewhere. -Seth</remark>-->
-    
-    <formalpara>
-        <title>Icon:</title>
-        <para>Same as application</para>
-      </formalpara>
 
     <formalpara>
       <title>Title Format</title>
@@ -1044,15 +1028,16 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/alert-text.png" format="PNG" />
+            <imagedata fileref="images/windows-alert-text.png" width="446" depth="178" format="PNG" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/alert-text.eps" format="EPS" />
+            <imagedata fileref="images/windows-alert-text.eps" format="EPS" />
           </imageobject>
 
           <textobject>
-            <phrase>Screenshot of an alert showing example of primary text in bold, and secondary text in a smaller font underneath.</phrase>
+            <phrase>Screenshot of an alert showing example of primary text in
+            bold, and secondary text in a smaller font underneath.</phrase>
           </textobject>
         </mediaobject>
       </figure>
@@ -1107,16 +1092,18 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata depth="54" fileref="images/alert-button-order.png"
-            format="PNG" width="481" />
+            <imagedata fileref="images/windows-alert-buttons.png"
+            format="PNG" width="425" depth="62" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/alert-button-order.eps" format="EPS" />
+            <imagedata fileref="images/windows-alert-buttons.eps" format="EPS" />
           </imageobject>
 
           <textobject>
-            <phrase>Screenshot showing ordering and placement of alert buttons: Help button in bottom left, and Alternate, Cancel and Affirmative buttons in bottom right.</phrase>
+            <phrase>Screenshot showing ordering and placement of alert
+            buttons: Help button in bottom left, and Alternate, Cancel and
+            Affirmative buttons in bottom right.</phrase>
           </textobject>
         </mediaobject>
       </figure>
@@ -1203,16 +1190,18 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata depth="213" fileref="images/alert-spacing.png"
-            format="PNG" width="591" />
+            <imagedata fileref="images/windows-alert-spacing.png"
+            format="PNG" width="530" depth="250" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/alert-spacing.eps" format="EPS" />
+            <imagedata fileref="images/windows-alert-spacing.eps" format="EPS" />
           </imageobject>
 
           <textobject>
-            <phrase>Diagram showing correct spacing to use between controls and buttons in an alert window. This is detailed in the guidelines below.</phrase>
+            <phrase>Diagram showing correct spacing to use between controls
+            and buttons in an alert window. This is detailed in the guidelines
+            below.</phrase>
           </textobject>
         </mediaobject>
       </figure>
@@ -1258,10 +1247,10 @@
         <replaceable>Secondary Text</replaceable>. Now change the properties
         for each control according to these tables:</para>
 
-        <table frame="none" pgwide="0">
+        <table frame="topbot" pgwide="0">
           <title>Properties for the GtkDialog</title>
 
-          <tgroup colsep="0" rowsep="0" align="left" cols="2"> 
+          <tgroup align="left" cols="2" colsep="0" rowsep="0">
             <thead>
               <row valign="top">
                 <entry>Property</entry>
@@ -1296,7 +1285,7 @@
               </row>
 
               <row>
-                <entry>Has Separator</entry>
+                <entry>Has Seperator</entry>
 
                 <entry>No</entry>
               </row>
@@ -1304,8 +1293,9 @@
           </tgroup>
         </table>
 
-        <table frame="none" pgwide="0">
-          <title>Properties for the GtkVBox (included in the dialog by default)</title>
+        <table frame="topbot" pgwide="0">
+          <title>Properties for the GtkVBox (included in the dialog by
+          default)</title>
 
           <tgroup align="left" cols="2" colsep="0" rowsep="0">
             <thead>
@@ -1326,7 +1316,7 @@
           </tgroup>
         </table>
 
-        <table frame="none" pgwide="0">
+        <table frame="topbot" pgwide="0">
           <title>Properties for the GtkHBox</title>
 
           <tgroup align="left" cols="2" colsep="0" rowsep="0">
@@ -1354,7 +1344,7 @@
           </tgroup>
         </table>
 
-        <table frame="none" pgwide="0">
+        <table frame="topbot" pgwide="0">
           <title>Properties for the GtkImage</title>
 
           <tgroup align="left" cols="2" colsep="0" rowsep="0">
@@ -1382,7 +1372,7 @@
           </tgroup>
         </table>
 
-        <table frame="none" pgwide="0">
+        <table frame="topbot" pgwide="0">
           <title>Properties for the GtkLabel</title>
 
           <tgroup align="left" cols="2" colsep="0" rowsep="0">
@@ -1431,12 +1421,12 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata depth="152" fileref="images/information-alert.png"
-            format="PNG" width="438" />
+            <imagedata depth="123" fileref="images/windows-alert-information.png"
+            format="PNG" width="251" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/information-alert.eps" format="EPS" />
+            <imagedata fileref="images/windows-alert-information.eps" format="EPS" />
           </imageobject>
 
           <textobject>
@@ -1481,7 +1471,7 @@
       <title>Error Alerts</title>
 
       <para>Display an error alert when a user-requested operation cannot be
-      successfully completed. Present errors caused by operations not requested
+      sucessfully completed. Present errors caused by operations not requested
       by the user by another means, unless the error could result in data loss
       or other serious problems. For example, an error encountered during an
       email check initiated by the user clicking a toolbar button should
@@ -1494,11 +1484,11 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/error-alert.png" format="PNG" />
+            <imagedata fileref="images/windows-alert-error.png" width="287" depth="156" format="PNG" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/error-alert.eps" format="EPS" />
+            <imagedata fileref="images/windows-alert-error.eps" format="EPS" />
           </imageobject>
 
           <textobject>
@@ -1547,11 +1537,11 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/confirmation-alert.png" format="PNG" />
+            <imagedata fileref="images/windows-alert-confirmation.png" contentwidth="450" contentdepth="162" format="PNG" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/confirmation-alert.eps" format="EPS" />
+            <imagedata fileref="images/windows-alert-confirmation.eps" format="EPS" />
           </imageobject>
 
           <textobject>
@@ -1568,9 +1558,9 @@
         </listitem>
 
         <listitem>
-          <para>presents a selectable message and a button labeled with 
+          <para>presents a selectable message and a button labelled with 
           a verb or verb phrase
-          describing the action to be confirmed, or labeled
+          describing the action to be confirmed, or labelled
           <guilabel>OK</guilabel> if such a phrase would be longer than three
           words. This button is placed in the bottom right corner of the
           alert.</para>
@@ -1609,15 +1599,16 @@
 
           <mediaobject>
             <imageobject>
-              <imagedata fileref="images/save_alert.png" format="PNG" />
+              <imagedata fileref="images/windows-alert-save.png" width="500" depth="194" format="PNG" />
             </imageobject>
 
             <imageobject>
-              <imagedata fileref="images/save_alert.eps" format="EPS" />
+              <imagedata fileref="images/windows-alert-save.eps" format="EPS" />
             </imageobject>
 
             <textobject>
-              <phrase>Save confirmation alert: &quot;[ Close without Saving] [ Cancel ] [[ Save ]] &quot;</phrase>
+              <phrase>Save confirmation alert: &quot;[ Close without Saving] [
+              Cancel ] [[ Save ]] &quot;</phrase>
             </textobject>
           </mediaobject>
         </figure>
@@ -1656,7 +1647,7 @@
 before doing any necessary internal clean-up.
 If the user chooses to save before
 closing, hide the alert immediately but show the document window until the document is
-saved, in case an error occurs.  Then hide the document window immediately after it has been saved successfully.
+saved, in case an error occurs.  Then hide the document window immediately after it has been saved successfuly.
 	</para>
       </sect3>
     </sect2>
@@ -1676,11 +1667,11 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/authentication-alert.png" format="PNG" />
+            <imagedata fileref="images/windows-alert-authentication.png" width="460" depth="279" format="PNG" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/authentication-alert.eps" format="EPS" />
+            <imagedata fileref="images/windows-alert-authentication.eps" format="EPS" />
           </imageobject>
 
           <textobject>
@@ -1691,12 +1682,12 @@
 
       <para><itemizedlist><title>Guidelines</title><listitem><para>Use the
       stock authentication icon.</para></listitem><listitem><para>Show
-      a labeled field for each required item of information. Suggested fields
+      a labelled field for each required item of information. Suggested fields
       are <guilabel>Username</guilabel> and <guilabel>Password</guilabel> (in
       that order) where appropriate.</para></listitem><listitem><para>If it is
       secure to retain the username longer than the password, pre-fill the
       username field and give focus to the password field when the alert is
-      displayed.</para></listitem><listitem><para>Show a button labeled with
+      displayed.</para></listitem><listitem><para>Show a button labelled with
       a verb or verb phrase describing the authentication action, or
       <guilabel>OK</guilabel> if there is no appropriate phrase or such a
       phrase would be longer than three words. Place this button in the bottom
@@ -1742,11 +1733,11 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/progress-window.png" format="PNG" />
+          <imagedata fileref="images/windows-progress.png" width="425" depth="159" format="PNG" />
         </imageobject>
 
         <imageobject>
-          <imagedata fileref="images/progress-window.eps" format="EPS" />
+          <imagedata fileref="images/windows-progress.eps" format="EPS" />
         </imageobject>
 
         <textobject>
@@ -1755,11 +1746,6 @@
       </mediaobject>
     </figure>
 
-      <formalpara>
-        <title>Icon:</title>
-        <para>Same as application</para>
-      </formalpara>
-
     <formalpara>
       <title>Title Format</title>
 
@@ -1794,7 +1780,7 @@
       <listitem>
         <para>The progress bar text should provide an idea of how much work
         has been completed. It is better to provide specific information
-        rather than a unit-less percentage. For example, &quot;13 of 19 images
+        rather than a unitless percentage. For example, &quot;13 of 19 images
         rotated&quot; or &quot;12.1 of 30 MB downloaded&quot; rather than
         &quot;13% complete&quot;.</para>
       </listitem>
@@ -1824,8 +1810,8 @@
         the <guibutton>Cancel</guibutton> button. When paused, the italicized
         current sub-operation text should have &quot; (Paused)&quot; appended.
         This will allow users to perform important tasks requiring that
-        resource, or give them time to think whether they want to proceed with
-        a dangerous operation they inadvertently triggered.</para>
+        resource, or give them time to think whether they want to procede with
+        a dangerous operation they inadvertantly triggered.</para>
       </listitem>
     </itemizedlist>
 
@@ -1834,11 +1820,11 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/progress-window-copy.png" format="PNG" />
+          <imagedata fileref="images/windows-progress-copy-file.png" width="408" depth="227" format="PNG" />
         </imageobject>
 
         <imageobject>
-          <imagedata fileref="images/progress-window-copy.eps" format="EPS" />
+          <imagedata fileref="images/windows-progress-copy-file.eps" format="EPS" />
         </imageobject>
 
         <textobject>
@@ -1863,21 +1849,20 @@
         internet super-daemon, and configure the user&apos;s web browser to
         operate through the firewall. It may be desirable that the user is
         exposed the series of actions involved in setting up the firewall to
-        increase the chances that they will be successful in making
+        increase the chances that they will be sucessful in making
         modifications later, if they so desire.</para>
       </example>
 
-      <figure id="example-checklist-in-progress-figure">
-        <title>An example checklist window (In Progress)</title>
+      <figure id="example-checklist-start-figure">
+        <title>An example checklist window (Ready to Start)</title>
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/checklist-window-in-progress.png"
-            format="PNG" />
+            <imagedata fileref="images/windows-progress-checklist-start.png" width="422" depth="249" format="PNG" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/checklist-window-in-progress.eps"
+            <imagedata fileref="images/windows-progress-checklist-start.eps"
             format="EPS" />
           </imageobject>
 
@@ -1887,17 +1872,17 @@
         </mediaobject>
       </figure>
 
-      <figure id="example-checklist-start-figure">
-        <title>An example checklist window (Ready to Start)</title>
+      <figure id="example-checklist-in-progress-figure">
+        <title>An example checklist window (In Progress)</title>
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/checklist-window-start.png"
-            format="PNG" />
+            <imagedata fileref="images/windows-progress-checklist.png"
+            width="336" depth="220" format="PNG" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/checklist-window-start.eps"
+            <imagedata fileref="images/windows-progress-checklist.eps"
             format="EPS" />
           </imageobject>
 
@@ -1906,17 +1891,17 @@
           </textobject>
         </mediaobject>
       </figure>
-
+      
       <figure id="example-checklist-done-figure">
         <title>An example checklist window (Completed)</title>
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/checklist-window-done.png" format="PNG" />
+            <imagedata fileref="images/windows-progress-checklist-done.png" width="356" depth="223" format="PNG" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/checklist-window-done.eps" format="EPS" />
+            <imagedata fileref="images/windows-progress-checklist-done.eps" format="EPS" />
           </imageobject>
 
           <textobject>
@@ -1980,24 +1965,19 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tabbed-dialog-box.png" format="PNG" />
+          <imagedata fileref="images/windows-dialog-tabbed.png" width="357" depth="322" format="PNG" />
         </imageobject>
 
         <imageobject>
-          <imagedata fileref="images/tabbed-dialog-box.eps" format="EPS" />
+          <imagedata fileref="images/windows-dialog-tabbed.eps" format="EPS" />
         </imageobject>
 
         <textobject>
-          <phrase>An example of a dialog: the Glade project options dialog</phrase>
+          <phrase>An example of a tabbed dialog: the GNOME print dialog</phrase>
         </textobject>
       </mediaobject>
     </figure>
 
-      <formalpara>
-        <title>Icon:</title>
-        <para>Same as application</para>
-      </formalpara>
-
     <formalpara>
       <title>Title Format:</title>
 
@@ -2124,7 +2104,7 @@
     into the assistant are stored. Often people will resort to re-running
     the assistant, re-entering many settings that they don't want to change.
     <remark>Why do they need to re-enter anything? The assistant should
-	be populated with the existing settings whenever it is run.</remark>
+	be populated with the exisiting settings whenever it is run.</remark>
     </para>
 
     <warning><para>Assistants are often used in situations where a better
@@ -2149,27 +2129,6 @@
       this, state the goal of the assistant, and, if it is not obvious, where
       the user can find the information the assistant will be asking for.</para>
 
-	<remark>Might want to do/mention something about first-time setup
-		assistants, as there's some inconsistency about whether
-		pressing Cancel in such a beast should just cancel the
-		setup and start the application, or cancel out of the
-		application altogether.  Possible options:
-			Just decide what Cancel should do--
-					in which case, I'd prefer it just to
-					cancel the druid and run the app; or 
-			consider adding a "Skip Setup" button
-					to the front page of first-time
-					setup druids-- clearer, but would need
-					extra code if the druid was available
-					within the application too, which most 
-					are. -Calum.
-	</remark>
-
-      <formalpara>
-        <title>Icon:</title>
-        <para>Same as application</para>
-      </formalpara>
-
       <formalpara>
         <title>Title Format:</title>
 
@@ -2187,16 +2146,17 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata depth="341" fileref="images/assistant-first-page.png"
-            format="PNG" width="452" />
+            <imagedata fileref="images/windows-assistant-first-page.png"
+            format="PNG" width="502" depth="318" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/assistant-first-page.eps" format="EPS" />
+            <imagedata fileref="images/windows-assistant-first-page.eps" format="EPS" />
           </imageobject>
 
           <textobject>
-            <phrase>Screenshot showing the first page of an assistant for creating a new email account</phrase>
+            <phrase>Screenshot showing the first page of an assistant for
+            creating a new email account</phrase>
           </textobject>
         </mediaobject>
       </figure>
@@ -2229,16 +2189,17 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata depth="341" fileref="images/assistant-middle-page.png"
+            <imagedata depth="341" fileref="images/windows-assistant-middle-page.png"
             format="PNG" width="452" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/assistant-middle-page.eps" format="EPS" />
+            <imagedata fileref="images/windows-assistant-middle-page.eps" format="EPS" />
           </imageobject>
 
           <textobject>
-            <phrase>Screenshot showing the third page of an email account assistant, asking for mail server information</phrase>
+            <phrase>Screenshot showing the third page of an email account
+            assistant, asking for mail server information</phrase>
           </textobject>
         </mediaobject>
       </figure>

Modified: trunk/content/projects/gup/hig/images/controls-buttons.png
==============================================================================
Binary files. No diff available.

Modified: trunk/content/projects/gup/hig/images/controls-check-box-ambiguous.png
==============================================================================
Binary files. No diff available.

Modified: trunk/content/projects/gup/hig/images/controls-check-boxes-mixed.png
==============================================================================
Binary files. No diff available.

Modified: trunk/content/projects/gup/hig/images/controls-check-boxes.png
==============================================================================
Binary files. No diff available.

Modified: trunk/content/projects/gup/hig/images/controls-combo.png
==============================================================================
Binary files. No diff available.

Modified: trunk/content/projects/gup/hig/images/controls-frames.png
==============================================================================
Binary files. No diff available.

Modified: trunk/content/projects/gup/hig/images/controls-list-checkbox.png
==============================================================================
Binary files. No diff available.

Modified: trunk/content/projects/gup/hig/images/controls-list.png
==============================================================================
Binary files. No diff available.

Modified: trunk/content/projects/gup/hig/images/controls-locked.png
==============================================================================
Binary files. No diff available.

Modified: trunk/content/projects/gup/hig/images/controls-notebook-list.png
==============================================================================
Binary files. No diff available.

Modified: trunk/content/projects/gup/hig/images/controls-notebook-tabs.png
==============================================================================
Binary files. No diff available.

Modified: trunk/content/projects/gup/hig/images/controls-notebook.png
==============================================================================
Binary files. No diff available.

Modified: trunk/content/projects/gup/hig/images/controls-old-frames.png
==============================================================================
Binary files. No diff available.

Modified: trunk/content/projects/gup/hig/images/controls-option-menu.png
==============================================================================
Binary files. No diff available.

Added: trunk/content/projects/gup/hig/images/controls-progress-indeterminate.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/controls-progress-time.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/controls-progress-typical.png
==============================================================================
Binary file. No diff available.

Modified: trunk/content/projects/gup/hig/images/controls-radio-button-mixed.png
==============================================================================
Binary files. No diff available.

Modified: trunk/content/projects/gup/hig/images/controls-radio-buttons.png
==============================================================================
Binary files. No diff available.

Modified: trunk/content/projects/gup/hig/images/controls-sensitivity.png
==============================================================================
Binary files. No diff available.

Modified: trunk/content/projects/gup/hig/images/controls-slider-spinbox.png
==============================================================================
Binary files. No diff available.

Modified: trunk/content/projects/gup/hig/images/controls-slider.png
==============================================================================
Binary files. No diff available.

Modified: trunk/content/projects/gup/hig/images/controls-spin-box.png
==============================================================================
Binary files. No diff available.

Modified: trunk/content/projects/gup/hig/images/controls-status-bar-interactive.png
==============================================================================
Binary files. No diff available.

Modified: trunk/content/projects/gup/hig/images/controls-status-bar.png
==============================================================================
Binary files. No diff available.

Modified: trunk/content/projects/gup/hig/images/controls-text-choose.png
==============================================================================
Binary files. No diff available.

Modified: trunk/content/projects/gup/hig/images/controls-text-prompt.png
==============================================================================
Binary files. No diff available.

Modified: trunk/content/projects/gup/hig/images/controls-text.png
==============================================================================
Binary files. No diff available.

Modified: trunk/content/projects/gup/hig/images/controls-toggle-buttons.png
==============================================================================
Binary files. No diff available.

Modified: trunk/content/projects/gup/hig/images/controls-tree-checkbox.png
==============================================================================
Binary files. No diff available.

Modified: trunk/content/projects/gup/hig/images/controls-tree.png
==============================================================================
Binary files. No diff available.

Added: trunk/content/projects/gup/hig/images/desktop-applications-menu.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/feedback-checklist-running.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/feedback-pointers-busy.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/icons-applications.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/icons-evolution.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/icons-floppy-dissected.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/icons-font-selection-good.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/icons-font-selection-poor.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/icons-gedit.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/icons-gnumeric.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/icons-hc-book-blur.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/icons-hc-book.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/icons-hc-cdrom-blur.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/icons-hc-cdrom.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/icons-hc-copy-blur.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/icons-hc-copy.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/icons-hc-metaphors.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/icons-lowcontrast-levels.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/icons-menu.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/icons-nautilus.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/icons-objects.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/icons-perspective-shelf.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/icons-perspective-table.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/icons-shut-down.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/icons-silhouette.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/icons-sodipodi.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/icons-style-aqua.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/icons-style-gnome.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/icons-style-java.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/icons-system-log.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/icons-toolbar.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/icons-underline-text.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/icons-word-processor.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/input-accesskeys-shortcuts.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/input-drag-cursor-copy.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/input-drag-cursor-link.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/input-drag-cursor-move.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/input-drag-cursor-nodrop.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/input-drag-cursor-query.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/input-drag-cursor.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/input-drag-select-files.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/input-drag-select-graphics.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/input-pointing-devices.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/menus-application.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/menus-bookmarks.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/menus-checkbox-group.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/menus-command-group.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/menus-dropdown.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/menus-edit.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/menus-file.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/menus-format.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/menus-go-browser.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/menus-go-document.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/menus-help.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/menus-insert.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/menus-popup.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/menus-radiobutton-group.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/menus-submenu.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/menus-view.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/menus-windows.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/toolbars-configure-menu.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/toolbars-labels-below.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/toolbars-labels-beside.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/toolbars-mail.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-button-label.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-colorblind-deutan.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-colorblind-normal.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-colorblind-tritan.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-large-icon-label.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-layout-annotated.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-layout-good.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-layout-poor.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-list-label.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-other-labels.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-palette-1.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-palette-10.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-palette-11.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-palette-12.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-palette-13.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-palette-14.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-palette-15.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-palette-16.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-palette-17.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-palette-18.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-palette-19.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-palette-2.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-palette-20.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-palette-21.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-palette-22.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-palette-23.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-palette-24.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-palette-25.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-palette-26.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-palette-27.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-palette-28.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-palette-29.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-palette-3.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-palette-30.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-palette-31.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-palette-32.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-palette-4.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-palette-5.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-palette-6.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-palette-7.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-palette-8.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-palette-9.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-palette.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-radiobutton-label.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-small-icon-label.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/visdes-textbox-label.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/windows-alert-authentication.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/windows-alert-buttons.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/windows-alert-confirmation.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/windows-alert-error.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/windows-alert-information.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/windows-alert-save.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/windows-alert-spacing.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/windows-alert-text.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/windows-assistant-first-page.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/windows-assistant-middle-page.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/windows-dialog-tabbed.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/windows-explicit-apply.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/windows-mdi.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/windows-preferences.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/windows-primary.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/windows-progress-checklist-done.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/windows-progress-checklist-start.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/windows-progress-checklist.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/windows-progress-copy-file.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/windows-progress.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/windows-properties.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/windows-sdi.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/windows-titlebar.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/windows-toolbox-large.png
==============================================================================
Binary file. No diff available.

Added: trunk/content/projects/gup/hig/images/windows-toolbox-small.png
==============================================================================
Binary file. No diff available.



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]