Merge lp://qastaging/~jpickett/ubuntu/oneiric/ubuntu-docs/fix-for-804855-bitesize into lp://qastaging/ubuntu/oneiric/ubuntu-docs

Proposed by Joel Pickett
Status: Work in progress
Proposed branch: lp://qastaging/~jpickett/ubuntu/oneiric/ubuntu-docs/fix-for-804855-bitesize
Merge into: lp://qastaging/ubuntu/oneiric/ubuntu-docs
Diff against target: 108214 lines (+106462/-0) (has conflicts)
333 files modified
.bzrignore (+19/-0)
AUTHORS (+4/-0)
COPYING (+4/-0)
ChangeLog (+1/-0)
MAINTAINERS (+9/-0)
Makefile.am (+7/-0)
NEWS (+1/-0)
README (+20/-0)
TODO (+3/-0)
autogen.sh (+24/-0)
configure.in (+14/-0)
debian/changelog (+1501/-0)
debian/compat (+1/-0)
debian/control (+21/-0)
debian/copyright (+282/-0)
debian/docs (+1/-0)
debian/rules (+17/-0)
html/Makefile (+53/-0)
html/add-html5-doctype.sh (+24/-0)
html/fix-urls.sh (+49/-0)
html/img/audio-volume-high-panel.svg (+19/-0)
html/img/battery-100.svg (+18/-0)
html/img/bluetooth-active.svg (+21/-0)
html/img/indicator-messages.svg (+15/-0)
html/img/network-offline.svg (+16/-0)
html/img/system-shutdown-panel.svg (+15/-0)
html/img/user-offline-panel.svg (+15/-0)
html/ubuntu.xsl (+436/-0)
html/yelp-build (+505/-0)
libs/gnome-doc-utils.make (+656/-0)
libs/mallard-1.0.rng (+2111/-0)
ubuntu-help/C/a11y-bouncekeys.page (+47/-0)
ubuntu-help/C/a11y-braille.page (+29/-0)
ubuntu-help/C/a11y-contrast.page (+27/-0)
ubuntu-help/C/a11y-dwellclick.page (+56/-0)
ubuntu-help/C/a11y-feature.page.tmpl (+35/-0)
ubuntu-help/C/a11y-font-size.page (+30/-0)
ubuntu-help/C/a11y-icon.page (+35/-0)
ubuntu-help/C/a11y-locate-pointer.page (+31/-0)
ubuntu-help/C/a11y-mag.stub (+28/-0)
ubuntu-help/C/a11y-right-click.page (+35/-0)
ubuntu-help/C/a11y-screen-reader.page (+28/-0)
ubuntu-help/C/a11y-slowkeys.page (+52/-0)
ubuntu-help/C/a11y-stickykeys.page (+54/-0)
ubuntu-help/C/a11y-visualalert.page (+40/-0)
ubuntu-help/C/a11y.page (+68/-0)
ubuntu-help/C/about-this-guide.page (+38/-0)
ubuntu-help/C/addremove-install-synaptic.page (+62/-0)
ubuntu-help/C/addremove-install.page (+37/-0)
ubuntu-help/C/addremove-ppa.page (+31/-0)
ubuntu-help/C/addremove-remove.page (+55/-0)
ubuntu-help/C/addremove-sources.page (+43/-0)
ubuntu-help/C/addremove.page (+33/-0)
ubuntu-help/C/app-banshee.page.stub (+25/-0)
ubuntu-help/C/app-cheese.page (+36/-0)
ubuntu-help/C/app-pitivi.page.stub (+25/-0)
ubuntu-help/C/app-shotwell.page.stub (+25/-0)
ubuntu-help/C/app-totem.page.stub (+25/-0)
ubuntu-help/C/backup-check.page (+37/-0)
ubuntu-help/C/backup-frequency.page (+41/-0)
ubuntu-help/C/backup-how.page (+36/-0)
ubuntu-help/C/backup-restore.page (+29/-0)
ubuntu-help/C/backup-thinkabout.page (+61/-0)
ubuntu-help/C/backup-what.page (+52/-0)
ubuntu-help/C/backup-where.page (+58/-0)
ubuntu-help/C/backup-why.page (+34/-0)
ubuntu-help/C/bluetooth-connect-device.page (+60/-0)
ubuntu-help/C/bluetooth-problem-connecting.page (+53/-0)
ubuntu-help/C/bluetooth-remove-connection.page (+39/-0)
ubuntu-help/C/bluetooth-send-file.page (+46/-0)
ubuntu-help/C/bluetooth-turn-on-off.page (+45/-0)
ubuntu-help/C/check_makefile.sh (+2/-0)
ubuntu-help/C/check_status.sh (+63/-0)
ubuntu-help/C/check_validation.sh (+26/-0)
ubuntu-help/C/clock-calendar.page (+59/-0)
ubuntu-help/C/clock-more-info.page (+45/-0)
ubuntu-help/C/clock-set.page (+41/-0)
ubuntu-help/C/clock-timezone.page (+36/-0)
ubuntu-help/C/clock.page (+24/-0)
ubuntu-help/C/disk-benchmark.page (+60/-0)
ubuntu-help/C/disk-capacity.page (+63/-0)
ubuntu-help/C/disk-check.page (+58/-0)
ubuntu-help/C/disk-format.page (+54/-0)
ubuntu-help/C/disk-partitions.page (+41/-0)
ubuntu-help/C/display-2monitors.page (+61/-0)
ubuntu-help/C/display-dimscreen.page (+54/-0)
ubuntu-help/C/display-lock.page (+37/-0)
ubuntu-help/C/fallback-mode.page (+31/-0)
ubuntu-help/C/files-autorun.page (+63/-0)
ubuntu-help/C/files-browse.page (+70/-0)
ubuntu-help/C/files-copy.page (+66/-0)
ubuntu-help/C/files-delete.page (+78/-0)
ubuntu-help/C/files-disc-write.page (+53/-0)
ubuntu-help/C/files-hidden.page (+59/-0)
ubuntu-help/C/files-lost.page (+50/-0)
ubuntu-help/C/files-open.page (+65/-0)
ubuntu-help/C/files-preview-music.page (+31/-0)
ubuntu-help/C/files-recover.page (+36/-0)
ubuntu-help/C/files-removedrive.page (+52/-0)
ubuntu-help/C/files-rename.page (+75/-0)
ubuntu-help/C/files-search.page (+73/-0)
ubuntu-help/C/files-select.page (+48/-0)
ubuntu-help/C/files-share.page (+70/-0)
ubuntu-help/C/files-sort.page (+74/-0)
ubuntu-help/C/files-templates.page.stub (+37/-0)
ubuntu-help/C/files-tilde.page (+31/-0)
ubuntu-help/C/files.page (+54/-0)
ubuntu-help/C/get-involved.page (+31/-0)
ubuntu-help/C/hardware-cardreader.page.stub (+26/-0)
ubuntu-help/C/hardware-driver.page (+31/-0)
ubuntu-help/C/hardware-phone-connecting.page.stub (+25/-0)
ubuntu-help/C/hardware-problems-bluetooth.page (+23/-0)
ubuntu-help/C/hardware-problems-crashes.page.stub (+22/-0)
ubuntu-help/C/hardware-problems-graphics.page (+23/-0)
ubuntu-help/C/hardware-problems-scanning.page.stub (+22/-0)
ubuntu-help/C/hardware.page (+79/-0)
ubuntu-help/C/index.page (+36/-0)
ubuntu-help/C/keyboard-cursor-blink.page (+32/-0)
ubuntu-help/C/keyboard-inputmethods.page.stub (+22/-0)
ubuntu-help/C/keyboard-layouts.page (+51/-0)
ubuntu-help/C/keyboard-repeat-keys.page (+38/-0)
ubuntu-help/C/keyboard.page (+25/-0)
ubuntu-help/C/legal.xml (+3/-0)
ubuntu-help/C/look-background.page (+62/-0)
ubuntu-help/C/look-display-fuzzy.page (+64/-0)
ubuntu-help/C/look-resolution.page (+48/-0)
ubuntu-help/C/media.page (+53/-0)
ubuntu-help/C/more-help.page (+31/-0)
ubuntu-help/C/mouse-disabletouchpad.page (+43/-0)
ubuntu-help/C/mouse-doubleclick.page (+49/-0)
ubuntu-help/C/mouse-drag-threshold.page (+35/-0)
ubuntu-help/C/mouse-lefthanded.page (+33/-0)
ubuntu-help/C/mouse-middleclick.page (+58/-0)
ubuntu-help/C/mouse-mousekeys.page (+78/-0)
ubuntu-help/C/mouse-problem-notmoving.page (+143/-0)
ubuntu-help/C/mouse-sensitivity.page (+47/-0)
ubuntu-help/C/mouse-touchpad-click.page (+58/-0)
ubuntu-help/C/mouse-wakeup.page (+25/-0)
ubuntu-help/C/mouse.page (+32/-0)
ubuntu-help/C/music-cantplay-drm.page (+27/-0)
ubuntu-help/C/music-player-ipodtransfer.page (+25/-0)
ubuntu-help/C/music-player-newipod.page (+25/-0)
ubuntu-help/C/music-player-notrecognized.page (+34/-0)
ubuntu-help/C/nautilus-behavior.page (+84/-0)
ubuntu-help/C/nautilus-bookmarks-edit.page (+50/-0)
ubuntu-help/C/nautilus-connect.page (+127/-0)
ubuntu-help/C/nautilus-display.page (+63/-0)
ubuntu-help/C/nautilus-file-properties-basic.page (+119/-0)
ubuntu-help/C/nautilus-file-properties-permissions.page (+104/-0)
ubuntu-help/C/nautilus-list.page (+116/-0)
ubuntu-help/C/nautilus-prefs.page (+24/-0)
ubuntu-help/C/nautilus-preview.page (+71/-0)
ubuntu-help/C/nautilus-views.page (+144/-0)
ubuntu-help/C/net-adhoc.page (+79/-0)
ubuntu-help/C/net-antivirus.page (+33/-0)
ubuntu-help/C/net-browser.page (+24/-0)
ubuntu-help/C/net-chat-empathy.page (+48/-0)
ubuntu-help/C/net-chat-skype.page (+76/-0)
ubuntu-help/C/net-chat-social.page (+64/-0)
ubuntu-help/C/net-chat-video.page (+39/-0)
ubuntu-help/C/net-chat.page (+26/-0)
ubuntu-help/C/net-default-browser.page (+37/-0)
ubuntu-help/C/net-default-email.page (+35/-0)
ubuntu-help/C/net-editcon.page (+146/-0)
ubuntu-help/C/net-email-virus.page (+26/-0)
ubuntu-help/C/net-email.page (+22/-0)
ubuntu-help/C/net-findip.page (+40/-0)
ubuntu-help/C/net-firewall-on-off.page (+45/-0)
ubuntu-help/C/net-firewall-ports.page (+104/-0)
ubuntu-help/C/net-fixed-ip-address.page (+33/-0)
ubuntu-help/C/net-general.page (+25/-0)
ubuntu-help/C/net-install-flash.page (+49/-0)
ubuntu-help/C/net-install-java-plugin.page (+21/-0)
ubuntu-help/C/net-install-moonlight.page (+46/-0)
ubuntu-help/C/net-macaddress.page (+37/-0)
ubuntu-help/C/net-manual.page (+54/-0)
ubuntu-help/C/net-mobile.page (+94/-0)
ubuntu-help/C/net-no-wireless-connection.page.stub (+33/-0)
ubuntu-help/C/net-nonm.page (+28/-0)
ubuntu-help/C/net-othersconnect.page (+42/-0)
ubuntu-help/C/net-otherscontrol.page (+43/-0)
ubuntu-help/C/net-passwordok-noconnect.page (+48/-0)
ubuntu-help/C/net-problem.page (+23/-0)
ubuntu-help/C/net-proxy.page (+25/-0)
ubuntu-help/C/net-security-tips.page (+55/-0)
ubuntu-help/C/net-security.page (+23/-0)
ubuntu-help/C/net-slow.page (+54/-0)
ubuntu-help/C/net-tethering.page.stub (+32/-0)
ubuntu-help/C/net-vpn-connect.page (+55/-0)
ubuntu-help/C/net-what-is-ip-address.page (+25/-0)
ubuntu-help/C/net-wired-connect.page (+29/-0)
ubuntu-help/C/net-wired.page (+23/-0)
ubuntu-help/C/net-wireless-airplane.page (+32/-0)
ubuntu-help/C/net-wireless-connect.page (+51/-0)
ubuntu-help/C/net-wireless-disconnecting.page (+57/-0)
ubuntu-help/C/net-wireless-find.page (+44/-0)
ubuntu-help/C/net-wireless-hidden.page (+37/-0)
ubuntu-help/C/net-wireless-troubleshooting-device-drivers.page (+122/-0)
ubuntu-help/C/net-wireless-troubleshooting-hardware-check.page (+95/-0)
ubuntu-help/C/net-wireless-troubleshooting-hardware-info.page (+42/-0)
ubuntu-help/C/net-wireless-troubleshooting-initial-check.page (+41/-0)
ubuntu-help/C/net-wireless-troubleshooting.page (+54/-0)
ubuntu-help/C/net-wireless-wepwpa.page (+27/-0)
ubuntu-help/C/net-wireless.page (+27/-0)
ubuntu-help/C/net-wrongnetwork.page (+43/-0)
ubuntu-help/C/net.page (+32/-0)
ubuntu-help/C/photos-print-fullpage.page.stub (+26/-0)
ubuntu-help/C/power-batterybroken.page (+35/-0)
ubuntu-help/C/power-batterycapacity.page.old (+49/-0)
ubuntu-help/C/power-batteryestimate.page (+39/-0)
ubuntu-help/C/power-batterylife.page (+74/-0)
ubuntu-help/C/power-batteryoptimal.page (+44/-0)
ubuntu-help/C/power-batteryslow.page (+25/-0)
ubuntu-help/C/power-batterywindows.page (+29/-0)
ubuntu-help/C/power-brighter.page (+31/-0)
ubuntu-help/C/power-closelid.page (+47/-0)
ubuntu-help/C/power-constantfan.page (+27/-0)
ubuntu-help/C/power-hotcomputer.page (+30/-0)
ubuntu-help/C/power-lowpower.page (+25/-0)
ubuntu-help/C/power-nowireless.page (+29/-0)
ubuntu-help/C/power-othercountry.page (+34/-0)
ubuntu-help/C/power-suspendfail.page (+52/-0)
ubuntu-help/C/power-suspendhibernate.page (+41/-0)
ubuntu-help/C/power-turnoffbutton.page (+30/-0)
ubuntu-help/C/power-whydim.page (+42/-0)
ubuntu-help/C/power-willnotturnon.page (+51/-0)
ubuntu-help/C/power.page (+34/-0)
ubuntu-help/C/prefs-display.page (+23/-0)
ubuntu-help/C/prefs-language.page (+23/-0)
ubuntu-help/C/prefs.page (+27/-0)
ubuntu-help/C/printing-2sided.page (+52/-0)
ubuntu-help/C/printing-booklet-duplex.page.stub (+66/-0)
ubuntu-help/C/printing-booklet-singlesided.page.stub (+107/-0)
ubuntu-help/C/printing-booklet.page.stub (+54/-0)
ubuntu-help/C/printing-cancel-job.page (+34/-0)
ubuntu-help/C/printing-differentsize.page (+45/-0)
ubuntu-help/C/printing-envelopes.page (+51/-0)
ubuntu-help/C/printing-inklevel.page.stub (+28/-0)
ubuntu-help/C/printing-order.page (+60/-0)
ubuntu-help/C/printing-paperjam.page (+30/-0)
ubuntu-help/C/printing-select.page (+37/-0)
ubuntu-help/C/printing-setup-default-printer.page (+47/-0)
ubuntu-help/C/printing-setup-drivers.page.stub (+24/-0)
ubuntu-help/C/printing-setup-networked.page.stub (+68/-0)
ubuntu-help/C/printing-setup.page (+79/-0)
ubuntu-help/C/printing-streaks.page (+54/-0)
ubuntu-help/C/printing.page (+45/-0)
ubuntu-help/C/report-ubuntu-bug.page (+71/-0)
ubuntu-help/C/screen-shot-record.page (+66/-0)
ubuntu-help/C/session-fingerprint.page.stub (+74/-0)
ubuntu-help/C/session-language.page (+57/-0)
ubuntu-help/C/session-loginsound.page (+93/-0)
ubuntu-help/C/session-netlogin.page.stub (+25/-0)
ubuntu-help/C/session-screenlocks.page.stub (+36/-0)
ubuntu-help/C/session-smartcard.page.stub (+24/-0)
ubuntu-help/C/shell-apps-favorites.page (+38/-0)
ubuntu-help/C/shell-apps-forcequit.page.stub (+48/-0)
ubuntu-help/C/shell-apps-install.page.stub (+23/-0)
ubuntu-help/C/shell-apps-search.page.old (+55/-0)
ubuntu-help/C/shell-exit.page (+82/-0)
ubuntu-help/C/shell-guest-session.page (+44/-0)
ubuntu-help/C/shell-keyboard-shortcuts.page (+177/-0)
ubuntu-help/C/shell-net-remote.page.stub (+25/-0)
ubuntu-help/C/shell-notifications.page.stub (+35/-0)
ubuntu-help/C/shell-overview.page (+37/-0)
ubuntu-help/C/shell-prefs.page.old (+41/-0)
ubuntu-help/C/shell-session-status.page.stub (+38/-0)
ubuntu-help/C/shell-terminology.page.stub (+71/-0)
ubuntu-help/C/shell-windows-lost.page.stub (+39/-0)
ubuntu-help/C/shell-windows-maximize.page (+49/-0)
ubuntu-help/C/shell-windows-states.page (+111/-0)
ubuntu-help/C/shell-windows-switching.page (+86/-0)
ubuntu-help/C/shell-windows.page (+55/-0)
ubuntu-help/C/shell-workspaces-movewindow.page (+57/-0)
ubuntu-help/C/shell-workspaces-switch.page (+53/-0)
ubuntu-help/C/shell-workspaces.page (+43/-0)
ubuntu-help/C/sound-alert.page (+35/-0)
ubuntu-help/C/sound-broken.page (+24/-0)
ubuntu-help/C/sound-crackle.page (+49/-0)
ubuntu-help/C/sound-nosound.page (+85/-0)
ubuntu-help/C/sound-usemic.page (+44/-0)
ubuntu-help/C/sound-usespeakers.page (+51/-0)
ubuntu-help/C/sound-volume.page (+32/-0)
ubuntu-help/C/templates/games/GENERIC.page.stub (+37/-0)
ubuntu-help/C/templates/games/README (+11/-0)
ubuntu-help/C/templates/games/controls-changing.page.stub (+26/-0)
ubuntu-help/C/templates/games/controls.page.stub (+46/-0)
ubuntu-help/C/templates/games/gameplay.page.stub (+53/-0)
ubuntu-help/C/templates/games/index.page (+19/-0)
ubuntu-help/C/templates/games/multiplayer.page.stub (+36/-0)
ubuntu-help/C/templates/games/strategy.page.stub (+39/-0)
ubuntu-help/C/templates/games/tips.page.stub (+32/-0)
ubuntu-help/C/tips-specialchars.page (+117/-0)
ubuntu-help/C/tips.page (+17/-0)
ubuntu-help/C/unity-appmenu-intro.page (+77/-0)
ubuntu-help/C/unity-dash-intro.page (+86/-0)
ubuntu-help/C/unity-introduction.page (+89/-0)
ubuntu-help/C/unity-launcher-change-autohide.page (+27/-0)
ubuntu-help/C/unity-launcher-change-size.page (+42/-0)
ubuntu-help/C/unity-launcher-intro.page (+74/-0)
ubuntu-help/C/unity-launcher.page (+32/-0)
ubuntu-help/C/unity-stubs/unity-appmenu-intro.page (+28/-0)
ubuntu-help/C/unity-stubs/unity-dash-intro.page (+28/-0)
ubuntu-help/C/unity-stubs/unity-dash-startup.page (+28/-0)
ubuntu-help/C/unity-stubs/unity-launcher-dash.page (+28/-0)
ubuntu-help/C/unity-stubs/unity-launcher-intro.page (+28/-0)
ubuntu-help/C/unity-stubs/unity-launcher-keyboard.page (+28/-0)
ubuntu-help/C/unity-stubs/unity-stub.page.tmpl (+30/-0)
ubuntu-help/C/user-accounts.page (+38/-0)
ubuntu-help/C/user-add.page (+54/-0)
ubuntu-help/C/user-addguest.page.stub (+55/-0)
ubuntu-help/C/user-admin-change.page (+59/-0)
ubuntu-help/C/user-admin-explain.page (+43/-0)
ubuntu-help/C/user-admin-problems.page (+37/-0)
ubuntu-help/C/user-changepassword.page (+60/-0)
ubuntu-help/C/user-changepicture.page (+36/-0)
ubuntu-help/C/user-delete.page (+44/-0)
ubuntu-help/C/user-forgottenpassword.page (+222/-0)
ubuntu-help/C/user-goodpassword.page (+89/-0)
ubuntu-help/C/video-dvd-noplay.page.stub (+25/-0)
ubuntu-help/C/video-dvd-restricted.page (+46/-0)
ubuntu-help/C/video-dvd.page (+36/-0)
ubuntu-help/C/video-nosound.page.stub (+25/-0)
ubuntu-help/C/video-sending.page (+35/-0)
ubuntu-help/C/video-wontplay.page.stub (+25/-0)
ubuntu-help/C/windows-key.page (+32/-0)
ubuntu-help/Makefile.am (+268/-0)
ubuntu-help/de/de.po (+11182/-0)
ubuntu-help/es/es.po (+16219/-0)
ubuntu-help/fi/fi.po (+23016/-0)
ubuntu-help/gl/gl.po (+11780/-0)
ubuntu-help/sv/sv.po (+14232/-0)
ubuntu-help/ubuntu-help.pot (+9876/-0)
Conflict adding file debian.  Moved existing file to debian.moved.
Conflict adding file libs.  Moved existing file to libs.moved.
To merge this branch: bzr merge lp://qastaging/~jpickett/ubuntu/oneiric/ubuntu-docs/fix-for-804855-bitesize
Reviewer Review Type Date Requested Status
Jeremy Bícha Disapprove
Didier Roche-Tolomelli Needs Fixing
Ubuntu branches Pending
Review via email: mp+67200@code.qastaging.launchpad.net

Description of the change

fixed a small typo, recognizes --> recognize, to make the sentence make sense. updated changelog accordingly

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Thanks for your patch there

seems you have a lot of conflicts between your branch and the ubuntu one (see the merge request diff below). Can you please try again to propose another merge request there with a fixed branch?
Ensure you parent branch is lp:ubuntu/ubuntu-docs which is maybe the issue there :)

If you need any help, do not hesitate to hop in #ubuntu-motu on freenode IRC channel to get people helping you using that tool.

I'll set the branch as work in progress right now and "need fixing". Do not hesitate to repropose your merge once you fixed your branch.

review: Needs Fixing
Revision history for this message
Jeremy Bícha (jbicha) wrote :

There were two merge proposals. I merged in the other one so this one isn't needed.

review: Disapprove

Unmerged revisions

9. By Joel Pickett

* fixing bitesize bug, LP: #804855
 * change changelog entry from natty to oneiric

8. By Matthew East

Update from gnome-user-docs/natty branch

7. By Connor Imes

Add script to insert HTML5 doctype header during html build, along with other validation fixes. Fixes LP: #478097.

6. By Connor Imes

Use variables in Makefile. Still need to add infrastructure to support other languages during html build.

5. By Connor Imes

Add check for broken ghelp links in fix-urls.sh

4. By Connor Imes

Update fix-urls.sh script to look in build/ rather than ../build/

3. By Matthew East

Update .bzrignore with gnome-doc-utils automatically generated build files

2. By Matthew East

Update ubuntu-help with new material and updates in gnome-user-docs/natty branch, update pot file

1. By Matthew East

Add files from gnome-user-docs source in Natty, adjust build system for building ubuntu-help document id

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: