Merge lp:~pctech4life/ubuntu/saucy/ubuntu-docs/fix-for-foo into lp:ubuntu/saucy/ubuntu-docs
- Saucy (13.10)
- fix-for-foo
- Merge into saucy
Proposed by
Brian Smith
Status: | Work in progress |
---|---|
Proposed branch: | lp:~pctech4life/ubuntu/saucy/ubuntu-docs/fix-for-foo |
Merge into: | lp:ubuntu/saucy/ubuntu-docs |
Diff against target: |
1654735 lines (+1651921/-0) (has conflicts) 491 files modified
.bzrignore (+19/-0) AUTHORS (+4/-0) COPYING (+4/-0) ChangeLog (+1/-0) MAINTAINERS (+17/-0) Makefile.am (+1/-0) NEWS (+1/-0) README (+34/-0) TODO (+3/-0) autogen.sh (+24/-0) collect-screenshots.sh (+263/-0) configure.in (+12/-0) debian/changelog (+1991/-0) debian/compat (+1/-0) debian/control (+21/-0) debian/copyright (+319/-0) debian/rules (+13/-0) debian/source/format (+1/-0) debian/ubuntu-docs.preinst (+11/-0) html/Makefile (+112/-0) html/fix-urls.sed (+43/-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-keyboard-En.svg (+10/-0) html/img/indicator-messages.svg (+15/-0) html/img/network-offline.svg (+16/-0) html/img/stock_person-panel.svg (+21/-0) html/img/system-devices-panel.svg (+8/-0) html/img/system-shutdown-panel.svg (+15/-0) html/img/user-offline-panel.svg (+15/-0) html/ubuntu.xsl (+785/-0) libs/mallard-1.0.rng (+2111/-0) translations-syntax-fix.sh (+11/-0) ubuntu-help/C/a11y-bouncekeys.page (+67/-0) ubuntu-help/C/a11y-braille.page (+40/-0) ubuntu-help/C/a11y-contrast.page (+57/-0) ubuntu-help/C/a11y-dwellclick.page (+104/-0) ubuntu-help/C/a11y-feature.page.tmpl (+35/-0) ubuntu-help/C/a11y-font-size.page (+60/-0) ubuntu-help/C/a11y-locate-pointer.page.stub (+45/-0) ubuntu-help/C/a11y-mag.stub (+49/-0) ubuntu-help/C/a11y-right-click.page (+104/-0) ubuntu-help/C/a11y-screen-reader.page (+38/-0) ubuntu-help/C/a11y-slowkeys.page (+84/-0) ubuntu-help/C/a11y-stickykeys.page (+104/-0) ubuntu-help/C/a11y-visualalert.page (+62/-0) ubuntu-help/C/a11y.page (+107/-0) ubuntu-help/C/about-this-guide.page (+72/-0) ubuntu-help/C/accounts-add.page (+98/-0) ubuntu-help/C/accounts-disable-service.page (+79/-0) ubuntu-help/C/accounts-provider-not-available.page (+69/-0) ubuntu-help/C/accounts-remove.page (+75/-0) ubuntu-help/C/accounts-which-application.page (+129/-0) ubuntu-help/C/accounts-whyadd.page (+41/-0) ubuntu-help/C/accounts.page (+36/-0) ubuntu-help/C/addremove-install-synaptic.page (+98/-0) ubuntu-help/C/addremove-install.page (+92/-0) ubuntu-help/C/addremove-ppa.page (+87/-0) ubuntu-help/C/addremove-remove.page (+68/-0) ubuntu-help/C/addremove-sources.page (+111/-0) ubuntu-help/C/addremove.page (+26/-0) ubuntu-help/C/app-banshee.page.stub (+25/-0) ubuntu-help/C/app-cheese.page (+68/-0) ubuntu-help/C/app-evolution-setup.page.stub (+34/-0) ubuntu-help/C/app-fspot.page.stub (+25/-0) ubuntu-help/C/app-pitivi.page.stub (+25/-0) ubuntu-help/C/app-rhythmbox.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 (+40/-0) ubuntu-help/C/backup-frequency.page (+48/-0) ubuntu-help/C/backup-how.page (+59/-0) ubuntu-help/C/backup-restore.page (+39/-0) ubuntu-help/C/backup-thinkabout.page (+77/-0) ubuntu-help/C/backup-what.page (+72/-0) ubuntu-help/C/backup-where.page (+65/-0) ubuntu-help/C/backup-why.page (+34/-0) ubuntu-help/C/bluetooth-connect-device.page (+107/-0) ubuntu-help/C/bluetooth-problem-connecting.page (+70/-0) ubuntu-help/C/bluetooth-remove-connection.page (+55/-0) ubuntu-help/C/bluetooth-send-file.page (+132/-0) ubuntu-help/C/bluetooth-turn-on-off.page (+73/-0) ubuntu-help/C/bluetooth-visibility.page (+37/-0) ubuntu-help/C/bluetooth.page (+54/-0) ubuntu-help/C/check_makefile.sh (+2/-0) ubuntu-help/C/check_releases.sh (+66/-0) ubuntu-help/C/check_status.sh (+83/-0) ubuntu-help/C/check_validation.sh (+83/-0) ubuntu-help/C/clock-calendar.page (+64/-0) ubuntu-help/C/clock-more-info.page (+46/-0) ubuntu-help/C/clock-set.page (+84/-0) ubuntu-help/C/clock-timezone.page (+44/-0) ubuntu-help/C/clock.page (+27/-0) ubuntu-help/C/color-assignprofiles.page (+63/-0) ubuntu-help/C/color-calibrate-camera.page (+45/-0) ubuntu-help/C/color-calibrate-printer.page (+49/-0) ubuntu-help/C/color-calibrate-scanner.page (+54/-0) ubuntu-help/C/color-calibrate-screen.page (+67/-0) ubuntu-help/C/color-calibrationcharacterization.page (+64/-0) ubuntu-help/C/color-calibrationdevices.page (+60/-0) ubuntu-help/C/color-calibrationtargets.page (+48/-0) ubuntu-help/C/color-canshareprofiles.page (+46/-0) ubuntu-help/C/color-gettingprofiles.page (+45/-0) ubuntu-help/C/color-howtoimport.page (+48/-0) ubuntu-help/C/color-missingvcgt.page (+31/-0) ubuntu-help/C/color-notifications.page (+51/-0) ubuntu-help/C/color-notspecifiededid.page (+42/-0) ubuntu-help/C/color-testing.page (+68/-0) ubuntu-help/C/color-virtualdevice.page (+59/-0) ubuntu-help/C/color-whatisprofile.page (+41/-0) ubuntu-help/C/color-whatisspace.page (+100/-0) ubuntu-help/C/color-why-calibrate.page (+43/-0) ubuntu-help/C/color-whyimportant.page (+100/-0) ubuntu-help/C/color.page (+37/-0) ubuntu-help/C/contacts-access-and-privacy.page.stub (+44/-0) ubuntu-help/C/contacts-add-remove.page (+64/-0) ubuntu-help/C/contacts-connect.page (+51/-0) ubuntu-help/C/contacts-edit-details.page (+69/-0) ubuntu-help/C/contacts-import.page.stub (+56/-0) ubuntu-help/C/contacts-integrated-messaging.page.stub (+32/-0) ubuntu-help/C/contacts-link-unlink.page (+89/-0) ubuntu-help/C/contacts-search.page (+65/-0) ubuntu-help/C/contacts-setup.page (+45/-0) ubuntu-help/C/contacts.page (+27/-0) ubuntu-help/C/disk-benchmark.page (+80/-0) ubuntu-help/C/disk-capacity.page (+106/-0) ubuntu-help/C/disk-check.page (+89/-0) ubuntu-help/C/disk-format.page (+78/-0) ubuntu-help/C/disk-partitions.page (+76/-0) ubuntu-help/C/disk.page (+28/-0) ubuntu-help/C/display-dimscreen.page (+64/-0) ubuntu-help/C/display-dimscreen.page.stub (+102/-0) ubuntu-help/C/display-dual-monitors-desktop.page (+62/-0) ubuntu-help/C/display-dual-monitors.page (+102/-0) ubuntu-help/C/display-lock.page (+46/-0) ubuntu-help/C/documents-collection-send.page.stub (+46/-0) ubuntu-help/C/documents-collections.page (+67/-0) ubuntu-help/C/documents-favorite.page.stub (+58/-0) ubuntu-help/C/documents-filter.page (+37/-0) ubuntu-help/C/documents-formats.page (+31/-0) ubuntu-help/C/documents-info.page (+74/-0) ubuntu-help/C/documents-location.page.stub (+40/-0) ubuntu-help/C/documents-previews.page (+44/-0) ubuntu-help/C/documents-print.page (+48/-0) ubuntu-help/C/documents-search.page (+49/-0) ubuntu-help/C/documents-select.page (+58/-0) ubuntu-help/C/documents-sort.page.stub (+29/-0) ubuntu-help/C/documents-tracker.page (+44/-0) ubuntu-help/C/documents-view.page (+51/-0) ubuntu-help/C/documents-viewgrid.page (+63/-0) ubuntu-help/C/documents.page (+51/-0) ubuntu-help/C/figures/input-keyboard-symbolic.svg (+17/-0) ubuntu-help/C/figures/system-devices-panel.svg (+8/-0) ubuntu-help/C/files-autorun.page (+131/-0) ubuntu-help/C/files-browse.page (+86/-0) ubuntu-help/C/files-copy.page (+95/-0) ubuntu-help/C/files-delete.page (+81/-0) ubuntu-help/C/files-disc-write.page (+83/-0) ubuntu-help/C/files-hidden.page (+79/-0) ubuntu-help/C/files-lost.page (+57/-0) ubuntu-help/C/files-open.page (+73/-0) ubuntu-help/C/files-preview.page (+36/-0) ubuntu-help/C/files-recover.page (+45/-0) ubuntu-help/C/files-removedrive.page (+70/-0) ubuntu-help/C/files-rename.page (+104/-0) ubuntu-help/C/files-search.page (+88/-0) ubuntu-help/C/files-select.page (+52/-0) ubuntu-help/C/files-share.page (+77/-0) ubuntu-help/C/files-sort.page (+101/-0) ubuntu-help/C/files-templates.page (+51/-0) ubuntu-help/C/files-tilde.page (+41/-0) ubuntu-help/C/files.page (+66/-0) ubuntu-help/C/get-involved.page (+32/-0) ubuntu-help/C/gnome-help.its (+14/-0) ubuntu-help/C/gnome-help.sct (+22/-0) ubuntu-help/C/hardware-cardreader.page (+63/-0) ubuntu-help/C/hardware-driver-proprietary.page (+44/-0) ubuntu-help/C/hardware-driver.page (+32/-0) ubuntu-help/C/hardware-phone-connecting.page.stub (+25/-0) ubuntu-help/C/hardware-problems-crashes.page.stub (+23/-0) ubuntu-help/C/hardware-problems-graphics.page (+25/-0) ubuntu-help/C/hardware-problems-scanning.page.stub (+22/-0) ubuntu-help/C/hardware.page (+45/-0) ubuntu-help/C/index.page (+37/-0) ubuntu-help/C/keyboard-cursor-blink.page (+51/-0) ubuntu-help/C/keyboard-inputmethods.page.stub (+25/-0) ubuntu-help/C/keyboard-layouts.page (+145/-0) ubuntu-help/C/keyboard-nav.page (+177/-0) ubuntu-help/C/keyboard-osk.page (+42/-0) ubuntu-help/C/keyboard-repeat-keys.page (+55/-0) ubuntu-help/C/keyboard-shortcuts-set.page (+88/-0) ubuntu-help/C/keyboard.page (+43/-0) ubuntu-help/C/legal.xml (+5/-0) ubuntu-help/C/look-background.page (+74/-0) ubuntu-help/C/look-display-fuzzy.page (+70/-0) ubuntu-help/C/look-resolution.page (+73/-0) ubuntu-help/C/media.page (+55/-0) ubuntu-help/C/more-help.page (+30/-0) ubuntu-help/C/mouse-disabletouchpad.page (+42/-0) ubuntu-help/C/mouse-doubleclick.page (+57/-0) ubuntu-help/C/mouse-drag-threshold.page.stub (+40/-0) ubuntu-help/C/mouse-lefthanded.page (+43/-0) ubuntu-help/C/mouse-middleclick.page (+86/-0) ubuntu-help/C/mouse-mousekeys.page (+93/-0) ubuntu-help/C/mouse-problem-notmoving.page (+160/-0) ubuntu-help/C/mouse-sensitivity.page (+64/-0) ubuntu-help/C/mouse-touchpad-click.page (+110/-0) ubuntu-help/C/mouse-wakeup.page (+27/-0) ubuntu-help/C/mouse.page (+46/-0) ubuntu-help/C/music-cantplay-drm.page (+28/-0) ubuntu-help/C/music-player-ipodtransfer.page (+26/-0) ubuntu-help/C/music-player-newipod.page (+26/-0) ubuntu-help/C/music-player-notrecognized.page (+35/-0) ubuntu-help/C/nautilus-behavior.page (+126/-0) ubuntu-help/C/nautilus-bookmarks-edit.page (+59/-0) ubuntu-help/C/nautilus-connect.page (+175/-0) ubuntu-help/C/nautilus-display.page (+57/-0) ubuntu-help/C/nautilus-file-properties-basic.page (+113/-0) ubuntu-help/C/nautilus-file-properties-permissions.page (+104/-0) ubuntu-help/C/nautilus-list.page (+100/-0) ubuntu-help/C/nautilus-prefs.page (+22/-0) ubuntu-help/C/nautilus-preview.page (+57/-0) ubuntu-help/C/nautilus-views.page (+129/-0) ubuntu-help/C/net-antivirus.page (+35/-0) ubuntu-help/C/net-browser.page (+26/-0) ubuntu-help/C/net-chat-empathy.page (+48/-0) ubuntu-help/C/net-chat-skype.page (+77/-0) ubuntu-help/C/net-chat-social.page (+59/-0) ubuntu-help/C/net-chat-video.page (+40/-0) ubuntu-help/C/net-chat.page (+26/-0) ubuntu-help/C/net-default-browser.page (+43/-0) ubuntu-help/C/net-default-email.page (+41/-0) ubuntu-help/C/net-email-virus.page (+29/-0) ubuntu-help/C/net-email.page (+26/-0) ubuntu-help/C/net-findip.page (+47/-0) ubuntu-help/C/net-firewall-on-off.page (+48/-0) ubuntu-help/C/net-firewall-ports.page (+106/-0) ubuntu-help/C/net-fixed-ip-address.page (+35/-0) ubuntu-help/C/net-general.page (+31/-0) ubuntu-help/C/net-install-flash.page (+56/-0) ubuntu-help/C/net-install-java-plugin.page (+22/-0) ubuntu-help/C/net-install-moonlight.page (+35/-0) ubuntu-help/C/net-macaddress.page (+42/-0) ubuntu-help/C/net-manual.page (+57/-0) ubuntu-help/C/net-mobile.page (+95/-0) ubuntu-help/C/net-no-wireless-connection.page.stub (+33/-0) ubuntu-help/C/net-nonm.page (+29/-0) ubuntu-help/C/net-othersconnect.page (+54/-0) ubuntu-help/C/net-othersedit.page (+57/-0) ubuntu-help/C/net-problem.page (+24/-0) ubuntu-help/C/net-proxy.page (+78/-0) ubuntu-help/C/net-security-tips.page (+57/-0) ubuntu-help/C/net-security.page (+24/-0) ubuntu-help/C/net-slow.page (+57/-0) ubuntu-help/C/net-tethering.page.stub (+32/-0) ubuntu-help/C/net-vpn-connect.page (+58/-0) ubuntu-help/C/net-what-is-ip-address.page (+28/-0) ubuntu-help/C/net-wired-connect.page (+31/-0) ubuntu-help/C/net-wired.page (+24/-0) ubuntu-help/C/net-wireless-adhoc.page (+56/-0) ubuntu-help/C/net-wireless-airplane.page (+34/-0) ubuntu-help/C/net-wireless-connect.page (+50/-0) ubuntu-help/C/net-wireless-disconnecting.page (+61/-0) ubuntu-help/C/net-wireless-edit-connection.page (+157/-0) ubuntu-help/C/net-wireless-find.page (+47/-0) ubuntu-help/C/net-wireless-hidden.page (+45/-0) ubuntu-help/C/net-wireless-noconnection.page (+51/-0) ubuntu-help/C/net-wireless-troubleshooting-device-drivers.page (+129/-0) ubuntu-help/C/net-wireless-troubleshooting-hardware-check.page (+93/-0) ubuntu-help/C/net-wireless-troubleshooting-hardware-info.page (+50/-0) ubuntu-help/C/net-wireless-troubleshooting-initial-check.page (+51/-0) ubuntu-help/C/net-wireless-troubleshooting.page (+44/-0) ubuntu-help/C/net-wireless-wepwpa.page (+25/-0) ubuntu-help/C/net-wireless.page (+33/-0) ubuntu-help/C/net-wrongnetwork.page (+44/-0) ubuntu-help/C/net.page (+47/-0) ubuntu-help/C/photos-print-fullpage.page.stub (+26/-0) ubuntu-help/C/power-batterybroken.page (+39/-0) ubuntu-help/C/power-batterycapacity.page.old (+49/-0) ubuntu-help/C/power-batteryestimate.page (+60/-0) ubuntu-help/C/power-batterylife.page (+108/-0) ubuntu-help/C/power-batteryoptimal.page (+60/-0) ubuntu-help/C/power-batteryslow.page (+29/-0) ubuntu-help/C/power-batterywindows.page (+45/-0) ubuntu-help/C/power-closelid.page (+58/-0) ubuntu-help/C/power-constantfan.page (+43/-0) ubuntu-help/C/power-hibernate.page (+105/-0) ubuntu-help/C/power-hotcomputer.page (+61/-0) ubuntu-help/C/power-lowpower.page (+43/-0) ubuntu-help/C/power-nowireless.page (+57/-0) ubuntu-help/C/power-othercountry.page (+49/-0) ubuntu-help/C/power-suspend.page (+51/-0) ubuntu-help/C/power-suspendfail.page (+86/-0) ubuntu-help/C/power-turnoffbutton.page.old (+27/-0) ubuntu-help/C/power-whydim.page (+43/-0) ubuntu-help/C/power-willnotturnon.page (+70/-0) ubuntu-help/C/power.page (+46/-0) ubuntu-help/C/prefs-display.page (+25/-0) ubuntu-help/C/prefs-language-install.page (+59/-0) ubuntu-help/C/prefs-language.page (+41/-0) ubuntu-help/C/prefs.page (+40/-0) ubuntu-help/C/printing-2sided.page (+49/-0) ubuntu-help/C/printing-booklet-duplex.page.stub (+66/-0) ubuntu-help/C/printing-booklet-singlesided.page.stub (+85/-0) ubuntu-help/C/printing-booklet.page.stub (+55/-0) ubuntu-help/C/printing-cancel-job.page (+82/-0) ubuntu-help/C/printing-differentsize.page (+49/-0) ubuntu-help/C/printing-envelopes.page (+64/-0) ubuntu-help/C/printing-inklevel.page (+43/-0) ubuntu-help/C/printing-order.page (+58/-0) ubuntu-help/C/printing-paperjam.page (+35/-0) ubuntu-help/C/printing-select.page (+39/-0) ubuntu-help/C/printing-setup-default-printer.page (+54/-0) ubuntu-help/C/printing-setup-drivers.page.stub (+59/-0) ubuntu-help/C/printing-setup-networked.page.stub (+79/-0) ubuntu-help/C/printing-setup.page (+96/-0) ubuntu-help/C/printing-streaks.page (+62/-0) ubuntu-help/C/printing.page (+57/-0) ubuntu-help/C/report-ubuntu-bug.page (+69/-0) ubuntu-help/C/schematron.sh (+1/-0) ubuntu-help/C/screen-shot-record.page (+59/-0) ubuntu-help/C/session-fingerprint.page.stub (+101/-0) ubuntu-help/C/session-formats.page (+73/-0) ubuntu-help/C/session-language.page (+83/-0) ubuntu-help/C/session-loginsound.page.stub (+93/-0) ubuntu-help/C/session-netlogin.page.stub (+25/-0) ubuntu-help/C/session-screenlocks.page (+46/-0) ubuntu-help/C/session-smartcard.page.stub (+24/-0) ubuntu-help/C/sharing-bluetooth.page (+43/-0) ubuntu-help/C/sharing-desktop.page (+99/-0) ubuntu-help/C/sharing.page (+29/-0) ubuntu-help/C/shell-apps-favorites.page (+51/-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 (+56/-0) ubuntu-help/C/shell-exit.page (+105/-0) ubuntu-help/C/shell-guest-session.page (+63/-0) ubuntu-help/C/shell-keyboard-shortcuts.page (+134/-0) ubuntu-help/C/shell-net-remote.page.stub (+28/-0) ubuntu-help/C/shell-notifications.page.stub (+78/-0) ubuntu-help/C/shell-overview.page (+39/-0) ubuntu-help/C/shell-prefs.page.old (+41/-0) ubuntu-help/C/shell-session-status.page.stub (+41/-0) ubuntu-help/C/shell-terminology.page.stub (+88/-0) ubuntu-help/C/shell-windows-lost.page.stub (+56/-0) ubuntu-help/C/shell-windows-maximize.page (+47/-0) ubuntu-help/C/shell-windows-states.page (+125/-0) ubuntu-help/C/shell-windows-switching.page (+100/-0) ubuntu-help/C/shell-windows-tiled.page (+40/-0) ubuntu-help/C/shell-windows.page (+61/-0) ubuntu-help/C/shell-workspaces-movewindow.page (+74/-0) ubuntu-help/C/shell-workspaces-switch.page (+63/-0) ubuntu-help/C/shell-workspaces.page (+63/-0) ubuntu-help/C/sound-alert.page (+38/-0) ubuntu-help/C/sound-broken.page (+29/-0) ubuntu-help/C/sound-crackle.page (+60/-0) ubuntu-help/C/sound-nosound.page (+119/-0) ubuntu-help/C/sound-usemic.page (+43/-0) ubuntu-help/C/sound-usespeakers.page (+53/-0) ubuntu-help/C/sound-volume.page (+52/-0) ubuntu-help/C/startup-applications.page (+46/-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 (+81/-0) ubuntu-help/C/tips.page (+17/-0) ubuntu-help/C/unity-dash-apps.page (+55/-0) ubuntu-help/C/unity-dash-files.page (+54/-0) ubuntu-help/C/unity-dash-friends.page (+47/-0) ubuntu-help/C/unity-dash-intro.page (+86/-0) ubuntu-help/C/unity-dash-music.page (+47/-0) ubuntu-help/C/unity-dash-photos.page (+50/-0) ubuntu-help/C/unity-dash-video.page (+46/-0) ubuntu-help/C/unity-hud-intro.page (+64/-0) ubuntu-help/C/unity-introduction.page (+85/-0) ubuntu-help/C/unity-launcher-change-autohide.page (+34/-0) ubuntu-help/C/unity-launcher-change-size.page (+37/-0) ubuntu-help/C/unity-launcher-intro.page (+53/-0) ubuntu-help/C/unity-launcher-menu.page (+38/-0) ubuntu-help/C/unity-launcher-shapes.page (+48/-0) ubuntu-help/C/unity-menubar-intro.page (+132/-0) ubuntu-help/C/unity-scrollbars-intro.page (+82/-0) ubuntu-help/C/unity-shopping.page (+59/-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 (+49/-0) ubuntu-help/C/user-add.page (+105/-0) ubuntu-help/C/user-addguest.page.stub (+55/-0) ubuntu-help/C/user-admin-change.page (+74/-0) ubuntu-help/C/user-admin-explain.page (+75/-0) ubuntu-help/C/user-admin-problems.page (+41/-0) ubuntu-help/C/user-changepassword.page (+94/-0) ubuntu-help/C/user-changepicture.page (+38/-0) ubuntu-help/C/user-delete.page (+45/-0) ubuntu-help/C/user-forgottenpassword.page (+247/-0) ubuntu-help/C/user-goodpassword.page (+135/-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 (+53/-0) ubuntu-help/C/video-nosound.page.stub (+25/-0) ubuntu-help/C/video-sending.page (+57/-0) ubuntu-help/C/video-wontplay.page.stub (+25/-0) ubuntu-help/C/wacom-left-handed.page (+36/-0) ubuntu-help/C/wacom-map-buttons.page.stub (+40/-0) ubuntu-help/C/wacom-mode.page (+42/-0) ubuntu-help/C/wacom-multi-monitor.page (+45/-0) ubuntu-help/C/wacom-stylus.page (+61/-0) ubuntu-help/C/wacom.page (+20/-0) ubuntu-help/C/whats-new.page.disabled (+79/-0) ubuntu-help/C/windows-key.page (+70/-0) ubuntu-help/Makefile.am (+349/-0) ubuntu-help/am/am.po (+22238/-0) ubuntu-help/ar/ar.po (+22835/-0) ubuntu-help/ast/ast.po (+27068/-0) ubuntu-help/az/az.po (+22238/-0) ubuntu-help/bg/bg.po (+22956/-0) ubuntu-help/bo/bo.po (+22233/-0) ubuntu-help/br/br.po (+22240/-0) ubuntu-help/bs/bs.po (+26314/-0) ubuntu-help/ca/ca.po (+23407/-0) ubuntu-help/ce/ce.po (+22233/-0) ubuntu-help/cs/cs.po (+26468/-0) ubuntu-help/da/da.po (+23054/-0) ubuntu-help/de/de.po (+28921/-0) ubuntu-help/el/el.po (+28637/-0) ubuntu-help/en_AU/en_AU.po (+26531/-0) ubuntu-help/en_CA/en_CA.po (+22289/-0) ubuntu-help/en_GB/en_GB.po (+27939/-0) ubuntu-help/es/es.po (+28691/-0) ubuntu-help/et/et.po (+22237/-0) ubuntu-help/eu/eu.po (+22233/-0) ubuntu-help/fi/fi.po (+27505/-0) ubuntu-help/fo/fo.po (+22236/-0) ubuntu-help/fr/fr.po (+29094/-0) ubuntu-help/gl/gl.po (+28445/-0) ubuntu-help/he/he.po (+22235/-0) ubuntu-help/hi/hi.po (+22276/-0) ubuntu-help/hr/hr.po (+22237/-0) ubuntu-help/hu/hu.po (+28378/-0) ubuntu-help/id/id.po (+22242/-0) ubuntu-help/it/it.po (+28737/-0) ubuntu-help/ja/ja.po (+23673/-0) ubuntu-help/kk/kk.po (+22236/-0) ubuntu-help/kn/kn.po (+22237/-0) ubuntu-help/ko/ko.po (+22238/-0) ubuntu-help/lt/lt.po (+22248/-0) ubuntu-help/lv/lv.po (+27921/-0) ubuntu-help/mg/mg.po (+22233/-0) ubuntu-help/ms/ms.po (+28249/-0) ubuntu-help/my/my.po (+22300/-0) ubuntu-help/nb/nb.po (+22336/-0) ubuntu-help/nl/nl.po (+28722/-0) ubuntu-help/oc/oc.po (+22243/-0) ubuntu-help/pl/pl.po (+22242/-0) ubuntu-help/pt/pt.po (+23807/-0) ubuntu-help/pt_BR/pt_BR.po (+27254/-0) ubuntu-help/ro/ro.po (+22254/-0) ubuntu-help/ru/ru.po (+28521/-0) ubuntu-help/si/si.po (+22236/-0) ubuntu-help/sk/sk.po (+23495/-0) ubuntu-help/sl/sl.po (+27906/-0) ubuntu-help/sq/sq.po (+22242/-0) ubuntu-help/sr/sr.po (+22238/-0) ubuntu-help/sv/sv.po (+24541/-0) ubuntu-help/ta/ta.po (+22237/-0) ubuntu-help/te/te.po (+22237/-0) ubuntu-help/tg/tg.po (+22233/-0) ubuntu-help/th/th.po (+22237/-0) ubuntu-help/tl/tl.po (+22238/-0) ubuntu-help/tr/tr.po (+28126/-0) ubuntu-help/ubuntu-help.pot (+16791/-0) ubuntu-help/ug/ug.po (+26684/-0) ubuntu-help/uk/uk.po (+28509/-0) ubuntu-help/ur/ur.po (+22238/-0) ubuntu-help/uz/uz.po (+22236/-0) ubuntu-help/zh_CN/zh_CN.po (+24113/-0) ubuntu-help/zh_HK/zh_HK.po (+22237/-0) ubuntu-help/zh_TW/zh_TW.po (+23491/-0) update-translations.sh (+45/-0) Conflict adding file AUTHORS. Moved existing file to AUTHORS.moved. Conflict adding file COPYING. Moved existing file to COPYING.moved. Conflict adding file ChangeLog. Moved existing file to ChangeLog.moved. Conflict adding file MAINTAINERS. Moved existing file to MAINTAINERS.moved. Conflict adding file Makefile.am. Moved existing file to Makefile.am.moved. Conflict adding file NEWS. Moved existing file to NEWS.moved. Conflict adding file README. Moved existing file to README.moved. Conflict adding file TODO. Moved existing file to TODO.moved. Conflict adding file autogen.sh. Moved existing file to autogen.sh.moved. Conflict adding file collect-screenshots.sh. Moved existing file to collect-screenshots.sh.moved. Conflict adding file configure.in. Moved existing file to configure.in.moved. Conflict adding file debian. Moved existing file to debian.moved. Conflict adding file html. Moved existing file to html.moved. Conflict adding file libs. Moved existing file to libs.moved. Conflict adding file ubuntu-help. Moved existing file to ubuntu-help.moved. |
To merge this branch: | bzr merge lp:~pctech4life/ubuntu/saucy/ubuntu-docs/fix-for-foo |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sebastien Bacher | Needs Fixing | ||
Review via email: mp+238807@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote : | # |
(setting to "work in progress", please change it back to "needs review" once the issue is resolved)
Unmerged revisions
- 446. By Brian Smith
-
Brief one sentence summary of change goes here
- 445. By Gunnar Hjalmarsson
-
Revert the changes in revision 444.
- 444. By Gunnar Hjalmarsson
-
html/ubuntu.xsl: New Google custom search engine.
- 443. By Gunnar Hjalmarsson
-
Releasing version 14.10.4
- 442. By Gunnar Hjalmarsson
-
ubuntu-
help/C/ figures/ ubuntu- mascot- creature. jpg: Official unicorn mascot. - 441. By Gunnar Hjalmarsson
-
Releasing version 14.10.3
- 440. By Gunnar Hjalmarsson
-
Certain Mallard syntax errors fixed via script.
- 439. By Gunnar Hjalmarsson
-
The latest translations exported from Launchpad.
- 438. By Gunnar Hjalmarsson
-
translations-
syntax- fix.sh: Script for correcting some syntax errors in .po files. - 437. By Gunnar Hjalmarsson
-
ubuntu-
help/C/ figures/ ubuntu- mascot- creature. jpg: Made the unicorn darker.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added file '.bzrignore' |
2 | --- .bzrignore 1970-01-01 00:00:00 +0000 |
3 | +++ .bzrignore 2014-10-18 21:40:54 +0000 |
4 | @@ -0,0 +1,19 @@ |
5 | +unity-stubs/unity-stub.page.tmpl |
6 | +ubuntu-help/C/.page.tmpl |
7 | +ubuntu-help/C/unity-stub.page.tmpl |
8 | +.page.tmpl |
9 | +build/ |
10 | +INSTALL |
11 | +Makefile |
12 | +Makefile.in |
13 | +aclocal.m4 |
14 | +autom4te.cache/ |
15 | +config.log |
16 | +config.status |
17 | +configure |
18 | +gnome-doc-utils.make |
19 | +install-sh |
20 | +missing |
21 | +ubuntu-help/Makefile |
22 | +ubuntu-help/Makefile.in |
23 | + |
24 | |
25 | === added file 'AUTHORS' |
26 | --- AUTHORS 1970-01-01 00:00:00 +0000 |
27 | +++ AUTHORS 2014-10-18 21:40:54 +0000 |
28 | @@ -0,0 +1,4 @@ |
29 | +Ubuntu Documentation Team |
30 | +<ubuntu-doc@lists.ubuntu.com> |
31 | + |
32 | + |
33 | |
34 | === renamed file 'AUTHORS' => 'AUTHORS.moved' |
35 | === added file 'COPYING' |
36 | --- COPYING 1970-01-01 00:00:00 +0000 |
37 | +++ COPYING 2014-10-18 21:40:54 +0000 |
38 | @@ -0,0 +1,4 @@ |
39 | +This work is licenced under the Creative Commons Attribution 3.0 |
40 | +United States License. To view a copy of this licence, visit |
41 | +http://creativecommons.org/licenses/by/3.0/ or send a letter to Creative |
42 | +Commons, 171 Second Street, Suite 300, San Francisco, California 94105, USA. |
43 | |
44 | === renamed file 'COPYING' => 'COPYING.moved' |
45 | === added file 'ChangeLog' |
46 | --- ChangeLog 1970-01-01 00:00:00 +0000 |
47 | +++ ChangeLog 2014-10-18 21:40:54 +0000 |
48 | @@ -0,0 +1,1 @@ |
49 | +Placeholder |
50 | |
51 | === renamed file 'ChangeLog' => 'ChangeLog.moved' |
52 | === added file 'MAINTAINERS' |
53 | --- MAINTAINERS 1970-01-01 00:00:00 +0000 |
54 | +++ MAINTAINERS 2014-10-18 21:40:54 +0000 |
55 | @@ -0,0 +1,17 @@ |
56 | +PLEASE USE THE MAILING LIST: |
57 | +ubuntu-doc@lists.ubuntu.com |
58 | +https://lists.ubuntu.com/mailman/listinfo/ubuntu-doc |
59 | + |
60 | + Maintainers: |
61 | + |
62 | +Benjamin Kerensa |
63 | +E-mail: bkerensa@ubuntu.com |
64 | +Userid: bkerensa |
65 | + |
66 | +Doug Smythies |
67 | +E-mail: dsmythies@ubuntu.com |
68 | +Userid: dsmythies |
69 | + |
70 | +Kevin Godby |
71 | +E-mail: kevin@godby.org |
72 | +Userid: godbyk |
73 | |
74 | === renamed file 'MAINTAINERS' => 'MAINTAINERS.moved' |
75 | === added file 'Makefile.am' |
76 | --- Makefile.am 1970-01-01 00:00:00 +0000 |
77 | +++ Makefile.am 2014-10-18 21:40:54 +0000 |
78 | @@ -0,0 +1,1 @@ |
79 | +SUBDIRS = ubuntu-help |
80 | |
81 | === renamed file 'Makefile.am' => 'Makefile.am.moved' |
82 | === added file 'NEWS' |
83 | --- NEWS 1970-01-01 00:00:00 +0000 |
84 | +++ NEWS 2014-10-18 21:40:54 +0000 |
85 | @@ -0,0 +1,1 @@ |
86 | +See debian/changelog |
87 | |
88 | === renamed file 'NEWS' => 'NEWS.moved' |
89 | === added file 'README' |
90 | --- README 1970-01-01 00:00:00 +0000 |
91 | +++ README 2014-10-18 21:40:54 +0000 |
92 | @@ -0,0 +1,34 @@ |
93 | +ubuntu-docs |
94 | +=============== |
95 | + |
96 | +This package contains documents which will be packaged together and |
97 | +shipped as ubuntu-docs in the Ubuntu distribution. They contain |
98 | +documents targetted for end-users of Ubuntu as a desktop. |
99 | + |
100 | +The Ubuntu Documentation Project (UDP) is responsible for this documentation. |
101 | +Packages are maintained in bzr in the ubuntu-docs Launchpad project and are |
102 | +uploaded periodically by the UDP. Please do not sponsor or upload |
103 | +new packages without consulting with the UDP. |
104 | + |
105 | +UDP homepage: https://wiki.ubuntu.com/DocumentationTeam |
106 | +UDP mailing list: http://lists.ubuntu.com/mailman/listinfo/ubuntu-docs |
107 | +Launchpad project: https://launchpad.net/ubuntu-docs |
108 | +Bzr: https://code.launchpad.net/ubuntu-docs |
109 | + |
110 | +Reporting Problems |
111 | +------------------ |
112 | + |
113 | +If you find problems in the documentation, please report bugs in Launchpad. |
114 | + |
115 | +http://bugs.launchpad.net/ubuntu/+source/ubuntu-docs |
116 | + |
117 | +Helpful shell commands |
118 | +---------------------- |
119 | + |
120 | +# Rename .po files from Launchpad export to remove the extra |
121 | +# "ubuntu-help-" prefix (you need to have perl installed for this one) |
122 | + |
123 | +find ./ -path '*/*.po' -exec rename 's/ubuntu-help-//' '{}' \; |
124 | + |
125 | +# Recursively find and replace a string |
126 | +find ./ -type f -exec sed -i 's/typo/fixed/g' {} \; |
127 | |
128 | === renamed file 'README' => 'README.moved' |
129 | === added file 'TODO' |
130 | --- TODO 1970-01-01 00:00:00 +0000 |
131 | +++ TODO 2014-10-18 21:40:54 +0000 |
132 | @@ -0,0 +1,3 @@ |
133 | +* Include serverguide here or separate branch? |
134 | +* usb-creator and jockey documents to move into respective packages? |
135 | +* Undo browser-homepage installation - any special requirements? |
136 | |
137 | === renamed file 'TODO' => 'TODO.moved' |
138 | === added file 'autogen.sh' |
139 | --- autogen.sh 1970-01-01 00:00:00 +0000 |
140 | +++ autogen.sh 2014-10-18 21:40:54 +0000 |
141 | @@ -0,0 +1,24 @@ |
142 | +#!/bin/sh |
143 | +# Run this to generate all the initial makefiles, etc. |
144 | + |
145 | +srcdir=`dirname $0` |
146 | +test -z "$srcdir" && srcdir=. |
147 | + |
148 | +PKG_NAME="ubuntu-docs" |
149 | + |
150 | +(test -f $srcdir/configure.in \ |
151 | + && test -d $srcdir/ubuntu-help) || { |
152 | + echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" |
153 | + echo " top-level $PKG_NAME directory" |
154 | + exit 1 |
155 | +} |
156 | + |
157 | +which gnome-autogen.sh || { |
158 | + echo "You need to install gnome-common from the GNOME CVS" |
159 | + exit 1 |
160 | +} |
161 | + |
162 | +REQUIRED_AUTOMAKE_VERSION=1.6 |
163 | +export REQUIRED_AUTOMAKE_VERSION |
164 | + |
165 | +USE_GNOME2_MACROS=1 . gnome-autogen.sh |
166 | |
167 | === renamed file 'autogen.sh' => 'autogen.sh.moved' |
168 | === added file 'collect-screenshots.sh' |
169 | --- collect-screenshots.sh 1970-01-01 00:00:00 +0000 |
170 | +++ collect-screenshots.sh 2014-10-18 21:40:54 +0000 |
171 | @@ -0,0 +1,263 @@ |
172 | +#!/bin/bash |
173 | + |
174 | +# Prerequisites |
175 | +# sudo apt-get install gstreamer0.10-fluendo-mp3 imagemagick xdotool |
176 | +# |
177 | +# Save this script in ~/.ubuntu-help (this is also where the screenshots will be kept) |
178 | +# The hidden directory is so that they don't clutter the File Browser screenshot |
179 | +# |
180 | +# Open System Settings>Privacy. Delete all history |
181 | +# Switch to the Files tab and add the .ubuntu-help directory to the don't record list. |
182 | +# |
183 | +# Make sure that /etc/default/apport has enabled=0 . This |
184 | +# will turn off the automatic bug report window that will just get in the way of screenshots. |
185 | +# |
186 | +# Finally press Alt+F2 and run .ubuntu-help/collect-screenshots-without-mouse.sh |
187 | + |
188 | +function error { |
189 | + echo -e $1 |
190 | + exit 1 |
191 | +} |
192 | + |
193 | +## prerequisites installed? Needs more work |
194 | +#for pkg in gedit gstreamer0.10-fluendo-mp3 xdotool imagemagick ; do |
195 | +# if dpkg --get-selections | grep -q $pkg ; then error "Error: $pkg isn't installed. To install it, run: \n sudo apt-get install $pkg#"; fi |
196 | +#done |
197 | + |
198 | +lang=$(basename $LANG .UTF-8) |
199 | +echo "lang: $lang" |
200 | +dir=$HOME/.ubuntu-help/$lang/figures |
201 | +downdir=$HOME/.downloads |
202 | +echo "dir: $dir" |
203 | +mkdir -p $dir |
204 | +mkdir -p $downdir |
205 | + |
206 | +long_pause="sleep 5" |
207 | +mid_pause="sleep 3" |
208 | +short_pause="sleep 1" |
209 | + |
210 | +wget -c -O $downdir/EmblemDivide.pdf http://emblemdivide.files.wordpress.com/2009/12/chapter0.pdf |
211 | +wget -c -O $downdir/standard-tube-map.pdf http://www.tfl.gov.uk/assets/downloads/standard-tube-map.pdf |
212 | +wget -c -O $downdir/richard-stallman-young.jpg http://upload.wikimedia.org/wikipedia/commons/f/f7/Richard_Matthew_Stallman.jpeg |
213 | +wget -c -O $downdir/Echoes\ In\ Time.mp3 http://people.ubuntu.com/~jbicha/Echoes%20In%20Time.mp3 |
214 | + |
215 | +# Set the screen resolution |
216 | +xrandr -s 1024x768 |
217 | +$long_pause |
218 | +xdotool mousemove 1024 350 |
219 | + |
220 | +# Change the time to match the version number |
221 | +# This needs to be updated for different locales |
222 | +gsettings set com.canonical.indicator.datetime time-format "custom" |
223 | +gsettings set com.canonical.indicator.datetime custom-time-format "14:04 %p" |
224 | +gsettings set org.gnome.Evince.Default show-sidebar false # This doesn't seem to work |
225 | +gsettings set com.canonical.Unity form-factor "Netbook" |
226 | + |
227 | +xdotool key Super |
228 | +$mid_pause |
229 | +xdotool key m a h |
230 | +$short_pause |
231 | +xdotool key Down Down Return |
232 | +$mid_pause |
233 | + |
234 | +xdotool key Super |
235 | +$mid_pause |
236 | +xdotool key t e x |
237 | +$short_pause |
238 | +xdotool key Down Down Return |
239 | +$mid_pause |
240 | + |
241 | +xdotool key Super |
242 | +$mid_pause |
243 | +xdotool key d o c |
244 | +$short_pause |
245 | +xdotool key Down Down Return |
246 | +$mid_pause |
247 | + |
248 | +xdotool key Super |
249 | +$mid_pause |
250 | +xdotool key i m a |
251 | +$short_pause |
252 | +xdotool key Down Down Right Return |
253 | +$mid_pause |
254 | + |
255 | +pkill mahjongg |
256 | +evince $downdir/standard-tube-map.pdf & |
257 | +$mid_pause |
258 | +pkill evince |
259 | +touch $downdir/index.html |
260 | +gedit $downdir/index.html & |
261 | +$mid_pause |
262 | +pkill gedit |
263 | +evince $downdir/EmblemDivide.pdf & |
264 | +$mid_pause |
265 | +pkill evince |
266 | +eog $downdir/richard-stallman-young.jpg & |
267 | +$mid_pause |
268 | +pkill eog |
269 | +$long_pause |
270 | +xdotool click 1 |
271 | + |
272 | +nautilus & |
273 | +$long_pause |
274 | +xdotool getactivewindow windowsize 650 325 |
275 | +gnome-screenshot -w -f $dir/nautilus.png |
276 | +$long_pause |
277 | +convert $dir/nautilus.png -resize 250x125 $dir/nautilus.png |
278 | +xdotool key Alt+F4 |
279 | + |
280 | +$short_pause |
281 | +gnome-screenshot -f $dir/unity.png |
282 | +$long_pause |
283 | +convert $dir/unity.png -resize 250x188 $dir/unity2.png |
284 | +$long_pause |
285 | +if [ $dir == ".ubuntu-help/en-US/figures" ] # English only |
286 | + then |
287 | + convert $dir/unity.png -crop 65x180+0+25 +repage $dir/unity-launcher.png |
288 | + $mid_pause |
289 | + convert $dir/unity-launcher.png -crop 65x123+0+57 +repage $dir/unity-launcher-apps.png |
290 | +fi |
291 | + |
292 | +xdotool key Super |
293 | +$short_pause |
294 | +xdotool key BackSpace |
295 | +$short_pause |
296 | +gnome-screenshot -f $dir/unity-overview-original.png |
297 | +convert $dir/unity-overview-original.png -crop 230x130+0+0 +repage $dir/unity-dash-sample.png |
298 | +$short_pause |
299 | +convert $dir/unity-overview-original.png -resize 75% $dir/unity-overview.png |
300 | +rm $dir/unity-overview-original.png |
301 | + |
302 | +xdotool key Ctrl+Tab |
303 | +$mid_pause |
304 | +gnome-screenshot -f $dir/unity-dash.png |
305 | +convert $dir/unity-dash.png -crop 525x227+0+0 +repage $dir/unity-dash.png |
306 | + |
307 | +xdotool key Escape |
308 | +$long_pause |
309 | + |
310 | +gsettings set com.canonical.Unity.Launcher favorites "['ubuntu-software-center.desktop', |
311 | + 'ubuntuone-installer.desktop', 'gnome-control-center.desktop', 'evince.desktop', 'sol.desktop']" |
312 | +$mid_pause |
313 | +evince $downdir/standard-tube-map.pdf & |
314 | +$long_pause |
315 | +xdotool getactivewindow windowsize 600 500 |
316 | +xdotool getactivewindow windowmove 55 208 |
317 | +xdotool key Down Down Down Down |
318 | +xdotool key Down Down Down Down Down |
319 | +xdotool key Right Right Right Right Right Right Right |
320 | +sol -v Klondike & |
321 | +$mid_pause |
322 | +xdotool getactivewindow windowmove 240 340 |
323 | +xdotool mousemove --sync 300 510 |
324 | +xdotool click 1 |
325 | +xdotool mousemove --sync 53 413 |
326 | +$short_pause |
327 | +gnome-screenshot -p -d 3 -f $dir/unity-workspace-intro.png |
328 | +$mid_pause |
329 | +convert $dir/unity-workspace-intro.png -crop 375x300+0+202 +repage $dir/unity-workspace-intro.png |
330 | +$short_pause |
331 | +convert $dir/unity-workspace-intro.png -resize 250x200 $dir/unity-workspace-intro.png |
332 | +pkill evince |
333 | +pkill sol |
334 | +gsettings set com.canonical.Unity.Launcher favorites "[]" |
335 | +$mid_pause |
336 | +gsettings reset com.canonical.Unity.Launcher favorites |
337 | +$short_pause |
338 | + |
339 | +xdotool key Ctrl+Alt+Down Ctrl+Alt+Right |
340 | +software-center & |
341 | +$long_pause |
342 | +$long_pause |
343 | +xdotool key Ctrl+Alt+Up |
344 | +$mid_pause |
345 | +evince $downdir/EmblemDivide.pdf & |
346 | +$mid_pause |
347 | +xdotool key Down Down Down Down Down Down |
348 | +xdotool getactivewindow windowsize --sync 580 520 |
349 | +xdotool getactivewindow windowmove --sync 270 150 |
350 | +xdotool key Ctrl+Alt+Left |
351 | +xdg-open "http://www.ubuntu.com" |
352 | +$long_pause |
353 | +$mid_pause |
354 | +xdotool mousemove --sync 53 650 |
355 | +$short_pause |
356 | +xdotool click 1 |
357 | +gnome-screenshot -p -d 3 -f $dir/unity-windows.png |
358 | +convert $dir/unity-windows.png -resize 400x300 $dir/unity-windows.png |
359 | +xdotool click 1 |
360 | +pkill software-center |
361 | +pkill evince |
362 | + |
363 | +xdotool key Ctrl+Super+Right |
364 | +xdotool key Alt+F1 |
365 | +$short_pause |
366 | +xdotool key Down |
367 | +$short_pause |
368 | +xdotool key Down |
369 | +$short_pause |
370 | +xdotool key Right |
371 | +$short_pause |
372 | +xdotool key Down |
373 | +$short_pause |
374 | +xdotool mousemove --sync 85 205 |
375 | +gnome-screenshot -p -f $dir/unity-launcher-intro.png |
376 | +$mid_pause |
377 | +convert $dir/unity-launcher-intro.png -crop 300x240+0+83 +repage $dir/unity-launcher-intro.png |
378 | +$mid_pause |
379 | +convert $dir/unity-launcher-intro.png -resize 250x200 $dir/unity-launcher-intro.png |
380 | +xdotool key Escape |
381 | +xdotool key Ctrl+Super+Up |
382 | +xdotool key Ctrl+W |
383 | + |
384 | +xdg-open $downdir/Echoes\ In\ Time.mp3 |
385 | +sleep 25 |
386 | +xdotool key Alt+F4 |
387 | +$short_pause |
388 | +xdotool key Alt+F10 |
389 | +$short_pause |
390 | +xdotool key Left |
391 | +$short_pause |
392 | +xdotool key Left |
393 | +$short_pause |
394 | +xdotool key Left |
395 | +$short_pause |
396 | +xdotool key Down |
397 | +$short_pause |
398 | +xdotool key Down |
399 | +$short_pause |
400 | +xdotool key Down |
401 | +$short_pause |
402 | +xdotool mousemove --sync 900 165 |
403 | +gnome-screenshot -p -f $dir/unity-appmenu-intro.png |
404 | +pkill rhythmbox |
405 | +convert $dir/unity-appmenu-intro.png -crop 375x300+650+0 +repage $dir/unity-appmenu-intro.png |
406 | +convert $dir/unity-appmenu-intro.png -resize 250x200 $dir/unity-appmenu-intro.png |
407 | + |
408 | +xdotool key Right |
409 | +$short_pause |
410 | +xdotool key Right |
411 | +$short_pause |
412 | +xdotool key Up |
413 | +$short_pause |
414 | +xdotool key Up |
415 | +$short_pause |
416 | +xdotool key Up |
417 | +$short_pause |
418 | +xdotool key Up |
419 | +$short_pause |
420 | +xdotool mousemove --sync 900 210 |
421 | +gnome-screenshot -p -f $dir/unity-exit.png |
422 | +convert $dir/unity-exit.png -crop 375x300+650+0 +repage $dir/unity-exit.png |
423 | +$short_pause |
424 | +convert $dir/unity-exit.png -resize 250x200 $dir/unity-exit.png |
425 | +xdotool key Escape |
426 | + |
427 | + |
428 | +# Change things back to normal |
429 | +gsettings reset com.canonical.indicator.datetime time-format |
430 | +gsettings reset com.canonical.indicator.datetime custom-time-format |
431 | +gsettings reset com.canonical.Unity form-factor |
432 | + |
433 | +# This is supposed to set a laptop's screen resolution back to default |
434 | +xrandr --output LVDS1 --auto |
435 | |
436 | === renamed file 'collect-screenshots.sh' => 'collect-screenshots.sh.moved' |
437 | === added file 'configure.in' |
438 | --- configure.in 1970-01-01 00:00:00 +0000 |
439 | +++ configure.in 2014-10-18 21:40:54 +0000 |
440 | @@ -0,0 +1,12 @@ |
441 | +AC_INIT([ubuntu-docs], [14.10], |
442 | + [https://bugs.launchpad.net/ubuntu/+source/ubuntu-docs]) |
443 | +AM_INIT_AUTOMAKE |
444 | + |
445 | +YELP_HELP_INIT |
446 | + |
447 | +AM_MAINTAINER_MODE |
448 | + |
449 | +AC_OUTPUT([ |
450 | +Makefile |
451 | +ubuntu-help/Makefile |
452 | +]) |
453 | |
454 | === renamed file 'configure.in' => 'configure.in.moved' |
455 | === added directory 'debian' |
456 | === renamed directory 'debian' => 'debian.moved' |
457 | === added file 'debian/changelog' |
458 | --- debian/changelog 1970-01-01 00:00:00 +0000 |
459 | +++ debian/changelog 2014-10-18 21:40:54 +0000 |
460 | @@ -0,0 +1,1991 @@ |
461 | +ubuntu-docs (14.10.4) utopic; urgency=low |
462 | + |
463 | + * ubuntu-help/C/figures/ubuntu-mascot-creature.jpg: |
464 | + - Official unicorn mascot. |
465 | + |
466 | + -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com> Mon, 13 Oct 2014 18:19:00 +0200 |
467 | + |
468 | +ubuntu-docs (14.10.3) utopic; urgency=low |
469 | + |
470 | + * index.page: Switched context between mascot file and unity.png. |
471 | + * debian/copyright: Modified to make Lintian shut up. |
472 | + * translations-syntax-fix.sh: |
473 | + - Script for correcting some syntax errors in .po files. |
474 | + * The latest translations exported from Launchpad. |
475 | + * Certain Mallard syntax errors fixed via script. |
476 | + |
477 | + -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com> Fri, 10 Oct 2014 02:26:00 +0200 |
478 | + |
479 | +ubuntu-docs (14.10.2) utopic; urgency=low |
480 | + |
481 | + * power-hibernate.page: |
482 | + - Correction of the fix in version 14.10.1 (LP: #1360657). |
483 | + * html/ubuntu.xsl: |
484 | + - Include wiki name in the "Community Help Wiki" link URL. |
485 | + * Bump version to 14.10 / trusty. |
486 | + * startup-applications.page: New page. |
487 | + * sharing-bluetooth.page, unity-launcher-menu.page: |
488 | + - Typos fixed (LP: #1301487, LP: #1303143). |
489 | + * References to non-existent Nautilus gear button replaced |
490 | + (LP: #1301468). |
491 | + * tips-specialchars.page: |
492 | + - Instruction how to enter a character by code point corrected |
493 | + (LP: #1303017). |
494 | + * shell-workspaces*.page: |
495 | + - Description of how to enable workspaces added (LP: #1305202). |
496 | + * look-background.page: |
497 | + - Removed suggestion to switch workspace - workspaces disabled by |
498 | + default. |
499 | + * "What's new" page disabled due to few news. |
500 | + * Updated ubuntu-help.pot. |
501 | + * ubuntu-help/C/figures/ubuntu-mascot-creature.jpg: Unicorn mascot. |
502 | + * New Chechen (ce) translation. |
503 | + * The latest translations exported from Launchpad. |
504 | + |
505 | + [ Doug Smythies ] |
506 | + * html/Makefile: |
507 | + - Missing languages added. |
508 | + - Broken "make install" fixed. |
509 | + |
510 | + -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com> Thu, 18 Sep 2014 19:32:00 +0200 |
511 | + |
512 | +ubuntu-docs (14.10.1) utopic; urgency=low |
513 | + |
514 | + * html/ubuntu.xsl: Contribute link added. |
515 | + * power-hibernate.page: |
516 | + - Enabling Hibernate for multiple sessions (LP: #1328227). |
517 | + * ubuntu-help/Makefile.am: New zh_HK translation. |
518 | + * The latest translations exported from Launchpad. |
519 | + |
520 | + -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com> Mon, 23 Jun 2014 23:22:00 +0200 |
521 | + |
522 | +ubuntu-docs (14.04.3) trusty; urgency=low |
523 | + |
524 | + * html/ubuntu.xsl: |
525 | + - Insert some space above the index page links groups. |
526 | + * unity-menubar-intro.page: |
527 | + - Bluetooth descr. moved to reflect the order of status menus. |
528 | + * backup-where.page, unity-shopping.page: |
529 | + - References to Ubuntu One removed (LP: #1300916). |
530 | + * sharing-remote-login.page: |
531 | + - Dropped since the remote-login-service package is no longer |
532 | + installed by default. |
533 | + * Updated ubuntu-help.pot. |
534 | + * The latest translations exported from Launchpad. |
535 | + |
536 | + [ Carsten Gerlach ] |
537 | + * addremove-sources.page: |
538 | + - saucy replaced with trusty in sources.list entries. |
539 | + * Two screenshots for the German translation. |
540 | + |
541 | + [ Doug Smythies ] |
542 | + * figures/unity.png, unity-overview.png, unity-windows.png: |
543 | + - Updated due to the Ubuntu One removal. |
544 | + * Obsolete region specific screenshots deleted. |
545 | + * Fixed a bunch of easily (via script) corrected Mallard syntax |
546 | + errors in translations. |
547 | + |
548 | + -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com> Mon, 07 Apr 2014 20:40:00 +0200 |
549 | + |
550 | +ubuntu-docs (14.04.2) trusty; urgency=low |
551 | + |
552 | + * media.page: |
553 | + - Confusing link removed. |
554 | + * shell-guest-session.page: |
555 | + - Prevent shell commands from showing up in translation template. |
556 | + * unity-launcher-change-autohide.page: |
557 | + - Description changed (LP: #1246022). |
558 | + * files-browse.page, backup-restore.page, backup-thinkabout.page: |
559 | + - Minor fixes (LP: #1225840, LP: #1221461, LP: #1221463). |
560 | + * update-translations.sh: |
561 | + - Script for renaming exported PO files. Thanks Kevin Godby! |
562 | + - A couple of adjustments to get the desired behavior. |
563 | + * unity-menubar-intro.page: |
564 | + - Description of new app menu option (LP: #1284221). |
565 | + - Input source added to list of status menus. |
566 | + * keyboard-layouts.page: |
567 | + - Notes about IM engine install and preferences button |
568 | + (LP: #1282364). Thanks to John Kim for valuable input! |
569 | + * whats-new.page: |
570 | + - News highlights between 12.04 and 14.04 (LP: #1271492). |
571 | + * Updated ubuntu-help.pot. |
572 | + * The latest translations exported from Launchpad. |
573 | + |
574 | + [ John Kim ] |
575 | + * Grammar fixes in power-lowpower.page (LP: #1189282). |
576 | + |
577 | + [ Doug Smythies ] |
578 | + * Typo fixes in three accounts-*.page pages. |
579 | + * ubuntu-help/C/check_validation.sh: |
580 | + - Script corrected and significantly improved. |
581 | + * ubuntu-mascot-creature.jpg: |
582 | + - Give mascot file a generic name (LP: #1287978). |
583 | + - Update content and back to JPG from PNG (LP: #1287978). |
584 | + * Fix nonexistent link destinations (LP: #1270318, LP: #1231612). |
585 | + * Fix "no way to navigate" yelp-check errors (LP: #1270314). |
586 | + * Fix or reassign or delete invalid internal links in the compiled |
587 | + html (LP: #931325). |
588 | + * html/fix-urls.sed: |
589 | + - Change gnome help redirects for html to revision neutral stable. |
590 | + * Screenshots updated (LP: #1249806). |
591 | + * Outdated UI terms updated with correct ones on a bunch of pages. |
592 | + * Incorrect sentence removed from nautilus-display.page. |
593 | + |
594 | + [ Nigel Hall ] |
595 | + * Spelling fix in unity-launcher-menu.page. |
596 | + |
597 | + [ goneaway ] |
598 | + * Grammar fix in unity-introduction.page. |
599 | + |
600 | + [ Kevin Godby ] |
601 | + * Spell-checked the *.page files and corrected detected errors. |
602 | + * Tweaked the language on whats-new.page. |
603 | + |
604 | + -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com> Thu, 20 Mar 2014 20:37:00 +0100 |
605 | + |
606 | +ubuntu-docs (14.04.1) trusty; urgency=low |
607 | + |
608 | + [ Kevin Godby ] |
609 | + * configure.in, html/Makefile, html/ubuntu.xsl, whats-new.page: |
610 | + - Bumped version number to 14.04. |
611 | + * Typo on printing-cancel-job.page fixed (LP: #1231655). |
612 | + |
613 | + [ Little Girl ] |
614 | + * ubuntu-help/C/check_status.sh: |
615 | + - Added the EXTINCT listing for status to display references to |
616 | + previous releases. |
617 | + - Added a section on how to use status tags. |
618 | + - Fixed the script so that it will find revision elements with stub |
619 | + attributes. |
620 | + * accounts-create.page: |
621 | + - Improved wording (LP: #1220971). |
622 | + * Improved structure and minor tweaking of many pages. |
623 | + |
624 | + [ Doug Smythies ] |
625 | + * ubuntu-help/Makefile.am: |
626 | + - Added missing .png files (LP: #1245031). |
627 | + * disk-capacity.page: |
628 | + - Clarify disk usage analyzer (LP: #1059535). |
629 | + * Link corrections so that yelp-check ids will pass. |
630 | + * display-dual-monitors.page: |
631 | + - Fixed 2 unmatched block elements: section html compile errors. |
632 | + * Some occurrences of GNOME only code and .png file requests removed |
633 | + (LP: #1232708). |
634 | + * PO files updated: |
635 | + - Exported the latest translations from Launchpad. |
636 | + - Four new languages: et, eu, tg, th. |
637 | + |
638 | + [ Benjamin Kerensa ] |
639 | + * Update of the MAINTAINERS file. |
640 | + * Minor tweaks. |
641 | + |
642 | + [ Gunnar Hjalmarsson ] |
643 | + * The group "Add & remove software" highlighted on index.page by |
644 | + creation of the guide page addremove.page. Related links tweaking. |
645 | + * shell-guest-session.page: |
646 | + - Added description of how you can disable the guest session |
647 | + feature (LP: #1076740). |
648 | + * Creation of prefs-language-install.page. |
649 | + * keyboard-layouts.page: |
650 | + - Rewritten to reflect the "System Settings -> Text Entry" design |
651 | + (LP: #1242626). |
652 | + * tips-specialchars.page: |
653 | + - Sections "Compose key" and "Input methods" removed. |
654 | + * debian/control: |
655 | + - Bump Standards-Version to 3.9.5. |
656 | + * Updated ubuntu-help.pot. |
657 | + |
658 | + [ Greg Beam ] |
659 | + * The "Online accounts" pages improved, including: |
660 | + - Grammar fixes on accounts-whyadd.page (LP: #1220983). |
661 | + - Removal of accounts-create.page (LP: #1220971). |
662 | + - System settings steps worded as on other pages (LP: #1268775). |
663 | + * addremove-install-synaptic.page: |
664 | + - Grammar fix (LP: #1222288). |
665 | + * Fixed validation errors (LP: #1268834). |
666 | + * Note style corrected (changed from "info" to "tip", LP: #1269100). |
667 | + |
668 | + [ Jeffery To ] |
669 | + * power-hibernate.page: |
670 | + - Instructions for re-enabling hibernation updated (LP: #1232814). |
671 | + |
672 | + [ Shaun McCance ] |
673 | + * html/ubuntu.xsl: |
674 | + - Link trail no longer needs override (LP: #1275818). |
675 | + * Changes to pass strict validation (LP: #1275866). |
676 | + |
677 | + -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com> Fri, 14 Feb 2014 18:07:00 +0100 |
678 | + |
679 | +ubuntu-docs (13.10.2) saucy; urgency=low |
680 | + |
681 | + [ Doug Smythies ] |
682 | + * Update translations for Saucy. |
683 | + |
684 | + [Benjamin Kerensa] |
685 | + * debian/changelog: Correct Version String |
686 | + |
687 | + -- Benjamin Kerensa <bkerensa@ubuntu.com> Fri, 04 Oct 2013 23:42:51 -0700 |
688 | + |
689 | +ubuntu-docs (13.10.1) saucy; urgency=low |
690 | + |
691 | + [Kevin Godby] |
692 | + * Improved wording of 'report a bug' footer text. |
693 | + * Added missing word (LP: #1170491) |
694 | + * Updated 'Google Docs' to 'Google Drive (LP: #1059554) |
695 | + * Various String Fixes and Validation Error Fixes |
696 | + * collect-screenshots.sh: |
697 | + - Fix Various Bugs |
698 | + * configure.in: |
699 | + - Bump version to 13.10 |
700 | + * Update Add Accounts Instructions (LP: #1220968) |
701 | + * Merge updates from GNOME Upstream |
702 | + |
703 | + [John Kim] |
704 | + * String Fix (LP: #1189280) |
705 | + |
706 | + [Doug Smythies] |
707 | + * Add Colors (LP: #1173426) |
708 | + * fix-urls.sed: |
709 | + - Update Gnome Link |
710 | + * Update Screenshots |
711 | + * Update Time Instructions (LP: #1225251) |
712 | + * Replace Gwibber Page with Friends Page |
713 | + * Change references to Saucy (LP: #1225247) |
714 | + |
715 | + [Stephen Webb] |
716 | + * Update What's New for 13.10 |
717 | + |
718 | + [Little Girl] |
719 | + * Improve Page Verbiage (LP: #1225829, LP: 1221452, LP: 1221456, LP: 1225842, LP: 1225842) |
720 | + * Added check_releases.sh to check for release versions in .page files |
721 | + |
722 | + [Benjamin Kerensa] |
723 | + * debian/control: Update Vcs-Bzr Field |
724 | + * debian/copyright: Update Copyright Year |
725 | + |
726 | + -- Benjamin Kerensa <bkerensa@ubuntu.com> Tue, 17 Sep 2013 01:04:05 -0700 |
727 | + |
728 | +ubuntu-docs (13.04.3) raring; urgency=low |
729 | + |
730 | + * Updated translations for raring |
731 | + |
732 | + -- Sebastien Bacher <seb128@ubuntu.com> Mon, 22 Apr 2013 15:02:53 +0200 |
733 | + |
734 | +ubuntu-docs (13.04.2) raring; urgency=low |
735 | + |
736 | + * Update translation template |
737 | + |
738 | + -- Sebastien Bacher <seb128@ubuntu.com> Wed, 17 Apr 2013 13:45:52 +0200 |
739 | + |
740 | +ubuntu-docs (13.04.1) raring; urgency=low |
741 | + |
742 | + [ Jeremy Bicha ] |
743 | + * Correct links to renamed menu bar page (LP: #1064559) |
744 | + * Fix "valuable" typo (LP: #1061512) |
745 | + * Add missing breadcrumbs to lens pages (LP: #1066482) |
746 | + |
747 | + [ Benjamin Kerensa ] |
748 | + * Merged updated gnome-docs |
749 | + *Bumped version numbers on the "What's new in Ubuntu 13.04?" page |
750 | + |
751 | + [Kevin Godby] |
752 | + * Capitalized Dash and Launcher consistently |
753 | + |
754 | + -- Benjamin Kerensa <bkerensa@ubuntu.com> Mon, 15 Apr 2013 19:33:07 -0700 |
755 | + |
756 | +ubuntu-docs (12.10.3) quantal; urgency=low |
757 | + |
758 | + [ James Plate ] |
759 | + * Use "Super" key instead of "Windows" key on shell-window-switching.page |
760 | + (LP: #993770) |
761 | + |
762 | + [ Jeremy Bicha ] |
763 | + * Re-merge with gnome-user-docs |
764 | + * Add "What's new in Ubuntu 12.10?" |
765 | + * Rewrite the Unity docs, including adding pages for each of the |
766 | + default lenses |
767 | + * "Tap" instead of "type" Alt to close HUD (LP: #992683) |
768 | + * Fix instructions for changing Compose key setting (LP: #884639) |
769 | + * Provide keyboard-only instructions for turning on Mouse Keys |
770 | + (LP: #1030767) |
771 | + * Fix typos in lens pages (LP: #1058565) |
772 | + * Fix spelling of 'hierarchies' (LP: #1058658) |
773 | + * Change "Super+P" shortcut to "Super+C" (LP: #1049090) |
774 | + |
775 | + [ Gunnar Hjalmarsson ] |
776 | + * shell-guest-session.page: |
777 | + - Mentioning of the possibility to launch a guest session from the |
778 | + login screen |
779 | + - Link to the tutorial "Customize Guest Session" reinserted (It was |
780 | + silently removed in revision 104 of lp:ubuntu/precise/ubuntu-docs.) |
781 | + (LP: #987788) |
782 | + |
783 | + -- Jeremy Bicha <jbicha@ubuntu.com> Tue, 09 Oct 2012 00:17:51 -0400 |
784 | + |
785 | +ubuntu-docs (12.10.2) quantal; urgency=low |
786 | + |
787 | + * Update translations from Precise (LP: #1019441) |
788 | + |
789 | + -- Jeremy Bicha <jbicha@ubuntu.com> Mon, 30 Jul 2012 13:12:47 -0400 |
790 | + |
791 | +ubuntu-docs (12.10.1) quantal; urgency=low |
792 | + |
793 | + * No-change upload from precise, bump version number only |
794 | + |
795 | + -- Matthew East <mdke@ubuntu.com> Mon, 07 May 2012 20:57:02 +0100 |
796 | + |
797 | +ubuntu-docs (12.04.5) precise; urgency=low |
798 | + |
799 | + [ Gunnar Hjalmarsson ] |
800 | + * session-language.page and session-formats.page: |
801 | + - Reinsert links to "Language Support Help" (LP: #987788) |
802 | + |
803 | + [ James Plate ] |
804 | + * Fix broken links to non-existant shell terminology page (LP: #981745) |
805 | + * Remove the extra > from the addremove pages (LP: #977260) |
806 | + * shell-windows-maximizing.page: |
807 | + - Use the correct Ctrl+Super+Up/Down keyboard shortcut (LP: #975890) |
808 | + * shell-windows-switching.page: |
809 | + - Alt+Tab by default shows app icons, not window previews (LP: #975899) |
810 | + |
811 | + [ Jeremy Bicha ] |
812 | + * Removed note about dragging screenshots to other apps since this doesn't |
813 | + work as described (LP: #978793) |
814 | + * Use "Ubuntu 12.04 LTS" name instead of "Ubuntu 12.04" (LP: #987385) |
815 | + * shell-windows-tiled.page: |
816 | + - Update keyboard shortcut and comment out invalid tips about how to |
817 | + restore the window's original size (LP: #975825, LP: #975813) |
818 | + * unity-appmenu-intro.page: Mention Rhythmbox not Banshee (LP: #968153) |
819 | + * debian/control: Update Vcs-Bzr link to point to precise branch |
820 | + |
821 | + [ Matthew East ] |
822 | + * Update translations from Launchpad 7.5.12 |
823 | + |
824 | + -- Matthew East <mdke@ubuntu.com> Mon, 07 May 2012 18:48:47 +0100 |
825 | + |
826 | +ubuntu-docs (12.04.4) precise; urgency=low |
827 | + |
828 | + * Finalize screenshots for Ubuntu 12.04 |
829 | + * Fix missing keyboard shortcuts page |
830 | + * Refer to the Windows key as the Super key instead of the meta key |
831 | + * Update for new Unity Ctrl+Super keyboard shortcuts (LP: #969235) |
832 | + |
833 | + -- Jeremy Bicha <jbicha@ubuntu.com> Wed, 04 Apr 2012 09:13:40 -0400 |
834 | + |
835 | +ubuntu-docs (12.04.3) precise; urgency=low |
836 | + |
837 | + [ Jeremy Bicha ] |
838 | + * Fixes to translation files to fix FTBFS |
839 | + * Use "menu bar" consistently rather than top bar or top panel |
840 | + * Substantial merges from Gnome |
841 | + * Various updates for precise |
842 | + * Document new dual monitor settings |
843 | + * Hibernate is disabled by default |
844 | + * Intro to HUD |
845 | + * Add overlay scrollbars page |
846 | + * Update addremove pages |
847 | + * Update screenshots |
848 | + * Use "dash" rather than "activities overview" (LP: #967356) |
849 | + |
850 | + [ Jan Simon ] |
851 | + * Typo fixes (LP: #814061) |
852 | + * Use "system menu" rather than "session menu" |
853 | + * Use right click rather than left click to recover files |
854 | + |
855 | + [ David Planella ] |
856 | + * Build all languages when building HTML |
857 | + |
858 | + -- Matthew East <mdke@ubuntu.com> Mon, 02 Apr 2012 12:30:55 +0000 |
859 | + |
860 | +ubuntu-docs (12.04.2) precise; urgency=low |
861 | + |
862 | + [ Robert Roth ] |
863 | + * Broadcast accounts are in messaging menu, not me menu (LP: #891190) |
864 | + * Fix typos and inconsistencies in color-whatisspace (LP: #892647) |
865 | + * Fixed basic file properties to use keyseq and key instead of guiseq |
866 | + and gui for keyboard shortcut. (LP: #923736) |
867 | + * Fix the power cog and the user icon urls for the HTML |
868 | + version (LP: #886503) |
869 | + * Updated the location of the System settings menu item in the |
870 | + contrast page to match the new location (LP: #908663) |
871 | + |
872 | + [ Jeremy Bicha] |
873 | + * Update version number to 12.04 |
874 | + * Update keyboard shortcuts |
875 | + * More merging with gnome-user-docs |
876 | + |
877 | + [ Ben Donald-Wilson ] |
878 | + * Typo fix in proprietary hardware drivers page (LP: #921227) |
879 | + |
880 | + -- Matthew East <mdke@ubuntu.com> Sun, 05 Feb 2012 15:44:00 +0000 |
881 | + |
882 | +ubuntu-docs (12.04.1) precise; urgency=low |
883 | + |
884 | + [ Robert Roth ] |
885 | + * Punctuation and typo fixes, LP: #874754, LP: #876257, LP: #872204, |
886 | + LP: #872205 |
887 | + * Fixe System Settings sections for Time&Date and Language Support LP: #868153 |
888 | + * Update instructions to starting CCSM (as it's not possible from |
889 | + System Settings anymore, the new instructions point to using the dash |
890 | + to start CCSM) LP: #869547 |
891 | + |
892 | + -- Matthew East <mdke@ubuntu.com> Thu, 20 Oct 2011 07:41:14 +0100 |
893 | + |
894 | +ubuntu-docs (11.10.4) oneiric; urgency=low |
895 | + |
896 | + [ Jeremy Bicha ] |
897 | + * Updated screenshots to current Oneiric |
898 | + * Don't install unused screenshots |
899 | + * Added missing desktop-sharing pages |
900 | + * Fixed lintian error in debian/copyright |
901 | + [ Matthew East ] |
902 | + * Add translations for langpacks |
903 | + |
904 | + -- Matthew East <mdke@ubuntu.com> Wed, 05 Oct 2011 21:12:59 +0100 |
905 | + |
906 | +ubuntu-docs (11.10.3) oneiric; urgency=low |
907 | + |
908 | + [ Jeremy Bicha ] |
909 | + * substantial merges from Gnome docs |
910 | + * adjusted indicator order for this week's Unity (LP: #823061) |
911 | + * Updated Seahorse's new name |
912 | + * updated the Fallback page to reference Unity 2D instead of Fallback |
913 | + * some updates for Oneiric's dash |
914 | + * dropped files-preview-music since that was removed in GNOME 3.2 |
915 | + (replaced by the sushi previewer which hasn't been packaged for |
916 | + Debian/Ubuntu yet) |
917 | + * Added a proprietary driver page from the old ubuntu-docs |
918 | + |
919 | + [ Jim Campbell ] |
920 | + * added instructions on manually locking the screen. |
921 | + |
922 | + -- Matthew East <mdke@ubuntu.com> Sun, 18 Sep 2011 12:14:49 +0100 |
923 | + |
924 | +ubuntu-docs (11.10.2) oneiric; urgency=low |
925 | + |
926 | + [ Christian Pommranz ] |
927 | + * Fixed two typos in shell-windows-switching.page (LP: #795959) |
928 | + |
929 | + [ Joel Pickett ] |
930 | + * Fixed a typo in wireless troubleshooting guide (LP: #804855) |
931 | + |
932 | + [ Jeremy Bicha ] |
933 | + * Partially rebased with Gnome help now that we're using Gnome 3 |
934 | + * Build with yelp-tools instead of gnome-doc-utils |
935 | + - files now install to /usr/share/help/ instead of /usr/share/gnome/help/ |
936 | + * debian/compat: Switch to debhelper 8 |
937 | + * debian/control |
938 | + - Dropped obsolete conflicts & unneeded dependencies |
939 | + - Updated description |
940 | + * debian/copyright: Updated, use DEP5 format |
941 | + * debian/rules: |
942 | + - No need to specify install source directory |
943 | + - Use xz compression |
944 | + * debian/source/format: Use 3.0 (native) |
945 | + * Update user pages for new user menu |
946 | + * Update indicator page with current indicators |
947 | + * Added missing bluetooth & disk category pages |
948 | + * Updated user-* pages |
949 | + * Update moonlight page since it is no longer in Ubuntu archive |
950 | + |
951 | + [ Matthew East ] |
952 | + * Fix document validity issues |
953 | + * Update pot file |
954 | + |
955 | + -- Matthew East <mdke@ubuntu.com> Sun, 4 Sep 2011 19:09:00 +0100 |
956 | + |
957 | +ubuntu-docs (11.10.1) oneiric; urgency=low |
958 | + |
959 | + * Use Gnome and gnome-doc-utils for packaging - update debian/control |
960 | + for new build-deps accordingly |
961 | + * Add Unity+Unity documentation here rather than gnome-user-docs; give it |
962 | + its own document id and install in ubuntu-help directory |
963 | + * Remove browser homepage update-alternative system |
964 | + * Update translations from gnome-user-docs natty package |
965 | + |
966 | + -- Matthew East <mdke@ubuntu.com> Fri, 29 Apr 2011 14:49:35 +0100 |
967 | + |
968 | +ubuntu-docs (11.04.2) natty; urgency=low |
969 | + |
970 | + * Updates for natty from Giuseppe Terrasi |
971 | + - Use Libreoffice instead of Openoffice.org |
972 | + - Use Banshee instead of Rhythmbox |
973 | + |
974 | + -- Matthew East <mdke@ubuntu.com> Fri, 22 Apr 2011 07:08:34 +0000 |
975 | + |
976 | +ubuntu-docs (11.04.1) natty; urgency=low |
977 | + |
978 | + * Convert ubuntu-docs package for use as help for "Ubuntu Classic" desktop |
979 | + (Unity documentation provided by the gnome-user-guide package) |
980 | + |
981 | + -- Matthew East <mdke@ubuntu.com> Tue, 12 Apr 2011 20:58:59 +0000 |
982 | + |
983 | +ubuntu-docs (10.10.4) maverick-proposed; urgency=low |
984 | + |
985 | + * ldif at openldap installation is broken (LP: #677998) |
986 | + + serverguide/C/network-auth.xml |
987 | + |
988 | + -- Mahyuddin Susanto <udienz@gmail.com> Mon, 06 Dec 2010 22:59:57 +0700 |
989 | + |
990 | +ubuntu-docs (10.10.3) maverick; urgency=low |
991 | + |
992 | + * Amend font-family for browser startpage (LP: #195590) |
993 | + * Add translations from Launchpad |
994 | + |
995 | + -- Matthew East <mdke@ubuntu.com> Sun, 19 Sep 2010 11:35:42 +0100 |
996 | + |
997 | +ubuntu-docs (10.10.2) maverick; urgency=low |
998 | + |
999 | + * Documentation String Freeze release |
1000 | + * General |
1001 | + - No longer generate ubuntu-serverguide binary |
1002 | + - Stop shipping serverguide, advanced-topics, |
1003 | + basic-commands and windows in ubuntu-docs |
1004 | + - Changes discussed on ubuntu-doc@ and ubuntu-server@ |
1005 | + * Update version number for offline browser startpage |
1006 | + LP: #632377 |
1007 | + * Newtoubuntu: |
1008 | + - Replace f-spot with shotwell |
1009 | + - Fix some broken icons |
1010 | + |
1011 | + -- Matthew East <mdke@ubuntu.com> Sun, 29 Aug 2010 14:47:58 +0100 |
1012 | + |
1013 | +ubuntu-docs (10.10.1) maverick; urgency=low |
1014 | + |
1015 | + * First release for maverick |
1016 | + * General: |
1017 | + - Update copyright year, LP: #580396 |
1018 | + - Update version numbers for maverick, LP: #587119 |
1019 | + - Update pot files |
1020 | + * Administrative: |
1021 | + - Users and Groups app UI changed - adjusted directions, |
1022 | + LP: #570429 (Connor Imes) |
1023 | + * Basic-commands: |
1024 | + - Removed incorrect comment about using ~ with sudo, |
1025 | + LP: #570423 (Connor Imes) |
1026 | + * Internet: |
1027 | + - Add section on Ubuntu One, authored by Matt Griffin with |
1028 | + some changes/review |
1029 | + - Typos: Cicso -> Cisco. Alex Wardle, LP: #561084 |
1030 | + * Musicvideophotos: |
1031 | + - Add material on using Ubuntu One Music Store and |
1032 | + other Music Stores |
1033 | + within Rhythmbox, content submitted by Matt Griffin |
1034 | + - Update microphone troubleshooting, LP: #591164 |
1035 | + * Serverguide: |
1036 | + - Removed erroneous text from vmbuilder command, |
1037 | + LP: #559190 |
1038 | + - Typo in network-config section. Alex Wardle, LP: #550892 |
1039 | + - Fix typo in Kerberos section. David C. Curtis, LP: #561788 |
1040 | + - Replaced dkim-filter with opendkim, feedback from |
1041 | + Scott Kitterman. LP: #561825 |
1042 | + - Changed ldapsearch command in ACL section for new authentication |
1043 | + mechanism. LP: #333733 |
1044 | + - Adjusted certificate wording to be more concise about which |
1045 | + lines to copy. LP: #575859 |
1046 | + - Changed samba restart command to use new upstart scripts. |
1047 | + LP: #575540 |
1048 | + - New information about granting groups Admin rights for Samba. |
1049 | + LP: #579851 |
1050 | + - Various typos and English fixes from Travis Nichol, Connor Imes, |
1051 | + Vikram Dhillon, Dean Sas, Andrew Rowell. LP: #594913, |
1052 | + LP: #572959, LP: #603947 |
1053 | + - New Amavisd-new and Spamassassin section which adds note about possible |
1054 | + large amount of error messages sent to email. LP: #165184 (Adam Sommer) |
1055 | + - Removed OpenNebula section (Adam Sommer) |
1056 | + - Removed eBox section (Adam Sommer) |
1057 | + - Reviewed and updated User Management and Console Security sections |
1058 | + (Adam Sommer) |
1059 | + - Fixed spelling typo of dyngroup.schema, fixed ldapscripts <ask> example |
1060 | + explanation, and ldapscripts example template path. LP: #595001 |
1061 | + (Adam Sommer) |
1062 | + - Updates to UEC sections (Adam Sommer) |
1063 | + - New "First Boot" section covering clout-init functionality (Adam Sommer) |
1064 | + - Fix broken links to installation-guide, add distro-rev-short |
1065 | + entity, LP: #575961 |
1066 | + * Windows: |
1067 | + - Change wording of windows/C/preparing.xml, LP: #483153 |
1068 | + |
1069 | + -- Matthew East <mdke@ubuntu.com> Sat, 14 Aug 2010 22:35:52 +0100 |
1070 | + |
1071 | +ubuntu-docs (10.04.3) lucid; urgency=low |
1072 | + |
1073 | + * Import translations from Rosetta |
1074 | + * Replace old Ubuntu logo with new one from wiki:Brand (LP: #551058) |
1075 | + |
1076 | + -- Matthew East <mdke@ubuntu.com> Sun, 18 Apr 2010 21:06:41 +0100 |
1077 | + |
1078 | +ubuntu-docs (10.04.2) lucid; urgency=low |
1079 | + |
1080 | + * General: |
1081 | + - Fixes to scripts/fix-url.sh (including LP: #482862) |
1082 | + - Fix character encoding in contributors.xml (LP: #448618) |
1083 | + - Updated version in browser-startpage html files, LP: #526320 |
1084 | + - Refresh pot files |
1085 | + * Add-applications: |
1086 | + - Updates for UI changes, Phil Bull |
1087 | + * Config-desktop: |
1088 | + - Added topic on changing window buttons from the left, Phil Bull |
1089 | + * Hardware: |
1090 | + - Added mention of gsynaptics, Connor Imes, LP: #450567 |
1091 | + * Internet: |
1092 | + - Refresh list of plugins supplied by ubuntu-restricted-extras, branch |
1093 | + from Nathan Murray, LP: #504981 |
1094 | + - Updates to reflect that Ekiga no longer installed by default, Connor Imes, |
1095 | + LP: #508572 |
1096 | + - Grammar fix from Alex Wardle, LP: #517776 |
1097 | + - Order adjustment for shares-admin usage, Alex Wardle, LP: #518119 |
1098 | + - Button name change for shares-admin app, Alex Wardle, LP: #518170 |
1099 | + - Use unlock icon in networking section, Alex Wardle, LP: #518117 |
1100 | + - Updated directions on changing text size and page zooming in firefox, |
1101 | + Alison Rowland, LP: #512556 |
1102 | + - Fixed guilabel usage in modem section. Alex Wardle, LP: #521243 |
1103 | + - Updated button and tab names in Static Connections section, |
1104 | + Alex Wardle, LP: #521508 |
1105 | + - Typo fix in adsl section. Alex Wardle, LP: #525349 |
1106 | + - Removed unused and empty basics.xml, LP: #525431 |
1107 | + - Minor wording update to directions for sharing folders via nautilus, |
1108 | + Connor Imes, LP: #518175 |
1109 | + - Use 'NetworkManager' not 'Network Manager' for consistency, Connor Imes |
1110 | + LP: #518107 |
1111 | + - Update to troubleshooting mobile devices, Connor Imes, LP: #453459 |
1112 | + - Adjusted description of NetworkManager applet icons, Connor Imes |
1113 | + LP: #440826 |
1114 | + - Additions to VPN section of connecting guide, Alex Wardle, LP: #452647 |
1115 | + - Expanded on using config files for vpn connections, Connor Imes |
1116 | + - Command line substitution for Services utility which is not in Karmic or |
1117 | + Lucid, Connor Imes, LP: #518460 |
1118 | + - Structural and language changes + updates for UI changes, Phil Bull |
1119 | + * Musicvideophotos: |
1120 | + - Added section for recording and editing video, Book 'em Dano, LP: #367569 |
1121 | + * Newtoubuntu: |
1122 | + - Complete rewrite, Matthew East |
1123 | + * Printing: |
1124 | + - Simple Scan replaced xsane for scanning documents, Alex Wardle, LP: #546193 |
1125 | + * Serverguide: |
1126 | + - Rename link to serverguide in advanced-topics.xml, Gilbert |
1127 | + Mendoza, LP: #505708 |
1128 | + - Use distro-short-codename variable for vmbuilder documentation in |
1129 | + serverguide rather than static version example, Connor Imes,. LP: #509653 |
1130 | + - Small fixes to security chapter, Connor Imes, LP: #510703 |
1131 | + - Small fixes from Nathan Handler, LP: #507624 |
1132 | + - Configuration change for OpenLDAP, Connor Imes, LP: #511090 |
1133 | + - Refresh of network-config section, Gilbert Mendoza, LP: #506800 |
1134 | + - Update manpage links to use distro-short-codename, Connor Imes |
1135 | + - Changed OpenLDAP replication to use single Provider/Consumer configuration, |
1136 | + Adam Sommer |
1137 | + - Removed grub-password-security section - it does not apply to Grub2, |
1138 | + Gilbert Mendoza, LP: #384148 |
1139 | + - Reference Grub2 community doc page for advanced configuration directions, |
1140 | + Connor Imes, LP: #437446 |
1141 | + - Added necessary configuration options for apt Periodic in automatic-updates |
1142 | + section, Connor Imes, LP: #532661 |
1143 | + - Added subsections for consumer and provider configuration steps, Adam Sommer |
1144 | + - Changed TLS Replication section to use Single-Master scheme, Adam Sommer |
1145 | + - Clarified Postfix TLS/SSL using a CA configuration steps, Adam Sommer, |
1146 | + LP: #518289 |
1147 | + - Changed Apache2 Subversion configuration to use VirtualHost file instead |
1148 | + of apache2.conf, Adam Sommer, LP: #515298. |
1149 | + - Adding Ubuntu Wiki links to each section's Resources subsection, Adam Sommer |
1150 | + - Added note in mail section about some packages being in multiverse, |
1151 | + Connor Imes, LP: #509355 |
1152 | + - Use default serverguide index.html file location for accessing serverguide |
1153 | + in terminal, Connor Imes, LP: #537167# |
1154 | + - Updated to use Grub2 directions, Connor Imes, LP: #533582 |
1155 | + - Updated MySQL information for mysql-server-5.1, Adam Sommer |
1156 | + - Replaced screen-profiles with byobu project, Adam Sommer |
1157 | + - Changed egrep command with kvm-ok script, Adam Sommer |
1158 | + - Removed references to likewise-open5, Adam Sommer |
1159 | + - Add reporting-bugs.xml - Steve Beattie |
1160 | + - Replaced Eucalyptus section with information on UEC, Adam Sommer |
1161 | + - Updated command and configuration mistakes in vpn.xml, Adam Sommer |
1162 | + LP: #489819 |
1163 | + - Replaced update-motd section with newer pam_motd, Adam Sommer, LP: #496184 |
1164 | + - Updated LocalSettings.php command for new file path, and recommending upping |
1165 | + the memory limit based on feedback from Cornelius Brümmer, Adam Sommer |
1166 | + - Updated Installation section for Lucid, and added row seperator for UEC |
1167 | + requirement tables, Adam Sommer |
1168 | + - Changed OpenLDAP TLS/SSL options to use gnutls to create certificate instead |
1169 | + of OpenSSL, Adam Sommer |
1170 | + * Switching/Windows: |
1171 | + - Updated dualboot section to use startupmanager for changing |
1172 | + boot options (valid for Grub and Grub2), Connor Imes |
1173 | + - Fixed 'Ubuntu Ubuntu' typo, Alex Wardle, LP: #526083 |
1174 | + - Removed old string from Windows section and copied correct string to |
1175 | + Switching guide, Connor Imes, LP: #527905 |
1176 | + - Split off directions for exporting favorites in IE8. Broke different |
1177 | + IE versions down into subsections, Connor Imes, LP: #528808 |
1178 | + |
1179 | + -- Matthew East <mdke@ubuntu.com> Mon, 29 Mar 2010 07:56:15 +0100 |
1180 | + |
1181 | +ubuntu-docs (10.04.1) lucid; urgency=low |
1182 | + |
1183 | + * First upload for lucid |
1184 | + * General: |
1185 | + - Refresh pot files |
1186 | + - Changed 'Text Editor' to 'gedit Text Editor' LP: #442417 (Connor Imes) |
1187 | + * Advanced-topics: |
1188 | + - Added link in advanced-topics to a description about Users and Groups in |
1189 | + Debian systems. LP: #145055 (Connor Imes) |
1190 | + * Hardware: |
1191 | + - Added mention of ext4 to hardware.xml and changed the mentioning of the |
1192 | + default filesystem in Ubuntu from ext3 to ext4 LP #449667 (Connor Imes) |
1193 | + - Removed subsection in hardware about quirk-checker script - link was |
1194 | + broken, script is outdated LP: #461158 (Connor Imes) |
1195 | + * Keeping-safe: |
1196 | + - Updating instructions for automatic login for new GDM LP: #442676 |
1197 | + (Dean Sas) |
1198 | + - String adjustment (period inside of a quote tag), Scott Shields, |
1199 | + LP: #496885 |
1200 | + * Internet: |
1201 | + - Changes remaining mention of flashplugin-nonfree to flashplugin-installer |
1202 | + in web-apps.xml LP: #444546 (Connor Imes) |
1203 | + - Change some <guimenu> tags to <guimenuitem> tags in web-apps.xml to show |
1204 | + arrows in HTML documentation instead of + signs LP: #453512 (Connor Imes) |
1205 | + - Removed reference to network-manager radio buttons, as radio buttons |
1206 | + aren't used in this version of NM for wired networks (Jim Campbell) |
1207 | + - Aligned similar strings in 'internet' section to benefit translators; |
1208 | + some small adjustments. LP: #460360 (Connor Imes) |
1209 | + * Musicvideophotos: |
1210 | + - Fixed apturl for mtp-tools package in music.xml LP #452262 (Connor Imes) |
1211 | + - Improve ipod section, patch by Michael Fitzhugh. LP: #370085 |
1212 | + * Printing: |
1213 | + - Updated printer setup directions in printing section LP: #435510 |
1214 | + (Connor Imes) |
1215 | + - Fix scanning typo. Patch by Shane Fagan LP: #447250 |
1216 | + * Programming: |
1217 | + - Removed entire programming section LP: #414035 (Connor Imes) |
1218 | + * Serverguide: |
1219 | + - Adjusted wording in serverguide package-management file to more |
1220 | + clearly describe apticron. LP: #473280 (Connor Imes) |
1221 | + - Updated LDAP section for changes to the Jaunty package. |
1222 | + Fixes LP: #475492, LP: #459403, LP: #463684 (Adam Sommer) |
1223 | + - In OpenSSH section, .ssh/authorized_keys permissions should be |
1224 | + 600, not 644 LP: #491159 (Connor Imes) |
1225 | + - Replaced description of ebox Log Observer in serverguide with a real |
1226 | + description of the event's purpose LP: #405926 (Connor Imes) |
1227 | + - Fixed IP example in serverguide's postfix configuration section |
1228 | + LP: #495202 (Connor Imes) |
1229 | + - Include 'auto eth1' in interfaces file for static IP configuration |
1230 | + LP: #441802 (Connor Imes) |
1231 | + - Fix for disabling Control-Alt-Delete in serverguide. Scott Shields, |
1232 | + LP: #496465 |
1233 | + - Typo fix, Scott Shields, LP: #497867 |
1234 | + - PostgreSQL setup fix for config file pg_hba.conf, Scott Shields, |
1235 | + LP: #492286 |
1236 | + - Misc fixes in windows-networking section. Vikram Dhillon, LP: #462607 |
1237 | + - Changes to RAID installation section LP: #428036, LP: #462719 |
1238 | + (Connor Imes) |
1239 | + - Fixes and adjustments to web-servers LP: #462621 (Connor Imes) |
1240 | + * Switching: |
1241 | + - Replaced Pidgin with Empathy in applications-equivalents |
1242 | + LP: #490980 (Connor Imes) |
1243 | + - Fixed misspelling of Rhythmbox (Connor Imes) |
1244 | + - Added note about FAT32 file size limit to Windows. Also removed comment |
1245 | + of NTFS needing extra work since Ubuntu now supports it out of the box |
1246 | + LP: #442111 (Connor Imes) |
1247 | + - Replaced explicit em-dashes with normal en-dashes LP: #493331 |
1248 | + (Connor Imes) |
1249 | + * Windows: |
1250 | + - Menu entry correction, LP: #483149 (Jonathan Jesse) |
1251 | + - Two very small fixes in Windows migratingdata section |
1252 | + LP: #493358, LP: #493843 (Connor Imes) |
1253 | + - Various updates to the Windows section on migrating data. LP: #492949, |
1254 | + LP: #492951, LP: #492955, LP: #493166, LP: #493169 (Connor Imes) |
1255 | + - Further updates to the Windows section on preparing to switch and |
1256 | + migrating data - specifically for transferring email |
1257 | + LP: #493169 (Connor Imes) |
1258 | + - Add support for for exporting bookmarks in IE7 and IE8 LP: #442097 |
1259 | + (Shane Fagan) |
1260 | + - Added necessary step to exporting Outlook data in windows section |
1261 | + LP: #493866 (Connor Imes) |
1262 | + - Ubuntu does have some fax support - adding link in glossary sections |
1263 | + LP: #493346 (Connor Imes) |
1264 | + |
1265 | + -- Matthew East <mdke@ubuntu.com> Sat, 09 Jan 2010 10:26:29 +0000 |
1266 | + |
1267 | +ubuntu-docs (9.10.11) karmic; urgency=low |
1268 | + |
1269 | + * Update translations from Rosetta |
1270 | + |
1271 | + -- Matthew East <mdke@ubuntu.com> Sat, 17 Oct 2009 17:23:03 +0100 |
1272 | + |
1273 | +ubuntu-docs (9.10.10) karmic; urgency=low |
1274 | + |
1275 | + * Remove draft watermark from html pages |
1276 | + * Drop fdupes script as it clashes with current pkgbinarymangler (LP: #441401) |
1277 | + - also need to set CDBS_NO_GNOME_HELP_SYMLINKING=1 to stop fdupes script |
1278 | + * Update version number in offline browser startpage to 9.10 |
1279 | + |
1280 | + -- Matthew East <mdke@ubuntu.com> Mon, 12 Oct 2009 22:09:57 +0100 |
1281 | + |
1282 | +ubuntu-docs (9.10.9) karmic; urgency=low |
1283 | + |
1284 | + * General: |
1285 | + - Refresh pot files |
1286 | + - Fix broken links to ghelp:hardware#jockey, Connor Imes, LP: #441460 |
1287 | + - Update references to gnome-app-install to software-center, Connor |
1288 | + Imes, LP: #441810 |
1289 | + * add-applications.xml: |
1290 | + - Replace references to 'Third party software' with 'Other software', |
1291 | + Shane Fagan, LP: #441323, LP: #441315 |
1292 | + * internet.xml: |
1293 | + - Update packagenames for flashplugin-installer and ttf-mscorefonts-installer, |
1294 | + Connor Imes, LP: #441799 |
1295 | + * musicvideophotos.xml: |
1296 | + - Correct firefox flash error message, LP: #441815 |
1297 | + * programming.xml: |
1298 | + - Replace gambas with gambas2, Connor Imes, LP: #414287 |
1299 | + * usb-creator.xml: |
1300 | + - Correct typo, Connor Imes, LP: #442231 |
1301 | + - Correct unclear sentence, LP: #442461 |
1302 | + |
1303 | + -- Matthew East <mdke@ubuntu.com> Sun, 04 Oct 2009 21:05:06 +0100 |
1304 | + |
1305 | +ubuntu-docs (9.10.8) karmic; urgency=low |
1306 | + |
1307 | + * General: |
1308 | + - Refresh pot files |
1309 | + * hardware.xml: |
1310 | + - Update jockey instructions to reflect UI changes from some time ago (LP: #281143) |
1311 | + - Remove link to deprecated section in accessibility guide (LP: #293842) |
1312 | + * internet.xml: |
1313 | + - Network manager network list no longer has radio buttons, Dean Sas |
1314 | + * keeping-safe.xml: |
1315 | + - Update firewall section, Connor Imes / bodhi.zazen (LP: #377039) |
1316 | + * usb-creator.xml: |
1317 | + - Add manual for usb-creator, new document by Augustina Blair |
1318 | + * serverguide.xml: |
1319 | + - Add additional information for configuring TLS with OpenLDAP and gnutls, PeterNSteinmetz (LP: #437483) |
1320 | + |
1321 | + -- Matthew East <mdke@ubuntu.com> Sun, 27 Sep 2009 17:26:16 +0100 |
1322 | + |
1323 | +ubuntu-docs (9.10.7) karmic; urgency=low |
1324 | + |
1325 | + * General: |
1326 | + - Refresh pot files |
1327 | + * Add-applications: |
1328 | + - Amend add-applications in light of move from gnome-app-install to software-center |
1329 | + * Serverguide (by Adam Sommer unless otherwise stated): |
1330 | + - Updating etckeeper section for new version and fixing typo, Thierry Carrez (LP: #432377) |
1331 | + - Updating the Postgresql section for version 8.4, ~BG (LP: #426971) |
1332 | + - Fix typos in Chat section, Connor Imes (LP: #410654) |
1333 | + - Removing note about command line utility differences, Connor Imes (LP: #394728) |
1334 | + - Update for phpinfo() test script, Christian Wenz (LP: #418045) |
1335 | + - Added note about manually compiling drbd module in virtual kernels, removed bad config |
1336 | + line based on feed back from Ante Karamatić (LP: #397241) |
1337 | + - Apache2 configuration update for more security, and clarification of using SSL |
1338 | + and Apache2 with Subversion (LP: #383605) |
1339 | + - Added a link to the Windows Networking section to find more info regarding Samba (LP: #415622) |
1340 | + - Added priority to MX record example (LP: #425207) |
1341 | + - Added more configuration options to Amavisd-new section to flag more messages as spam (LP: #363442) |
1342 | + - Updated mailman Apache2 configuration for latest version of moinmoin (LP: #381802) |
1343 | + |
1344 | + -- Matthew East <mdke@ubuntu.com> Sat, 26 Sep 2009 14:07:07 +0100 |
1345 | + |
1346 | +ubuntu-docs (9.10.6) karmic; urgency=low |
1347 | + |
1348 | + * General: |
1349 | + - Refresh pot files |
1350 | + - debian/rules: remove deprecated scrollkeeper calls |
1351 | + - debian/rules: small fix to build process for translated xml |
1352 | + * Internet: |
1353 | + - Remove outstanding mention of Pidgin (LP: #425834), Dougie Richardson |
1354 | + - Update bittorrent docs for introduction of Transmission, Dean Sas |
1355 | + - Fix instruction for Java plugin on amd64 (LP: #293781), Dougie Richardson |
1356 | + |
1357 | + -- Matthew East <mdke@ubuntu.com> Tue, 22 Sep 2009 21:32:29 +0100 |
1358 | + |
1359 | +ubuntu-docs (9.10.5) karmic; urgency=low |
1360 | + |
1361 | + * General: |
1362 | + - Also ship translations which are under 75% translated now, as these are included in language packs |
1363 | + - Refresh pot files |
1364 | + * Internet: |
1365 | + - New mobile broadband troubleshooting section, Dougie Richardson |
1366 | + * Serverguide: |
1367 | + - Adjust the command to create an LDIF for schema addition, Adam Sommer (LP: #416520) |
1368 | + * Switching: |
1369 | + - Fix several typos, Jonathan Jesse (LP: #416422) |
1370 | + |
1371 | + -- Matthew East <mdke@ubuntu.com> Mon, 31 Aug 2009 22:39:58 +0100 |
1372 | + |
1373 | +ubuntu-docs (9.10.4) karmic; urgency=low |
1374 | + |
1375 | + * General: |
1376 | + - Updating version numbers for 9.10/Karmic |
1377 | + - Refresh pot files |
1378 | + * About-ubuntu: |
1379 | + - reword first sentence to clarify system version number, LP: #395905 |
1380 | + * Internet: |
1381 | + - Replace Pidgin with Empathy, now default IM app in Karmic |
1382 | + - typo, LP: #414153 |
1383 | + * Serverguide: |
1384 | + - Update correct command for restarting cups, Dougie Richardson, LP: #380836 |
1385 | + - New Jabberd2 section, Adam Sommer |
1386 | + - New OpenVPN chapter, Adam Sommer |
1387 | + - Typo, LP: #414605 |
1388 | + |
1389 | + -- Matthew East <mdke@ubuntu.com> Mon, 17 Aug 2009 08:30:56 +0100 |
1390 | + |
1391 | +ubuntu-docs (9.10.3) karmic; urgency=low |
1392 | + |
1393 | + * debian/rules - install "C" locale documents (these were not being |
1394 | + installed following changes in 9.10.1) |
1395 | + * Basic-commands: |
1396 | + - Spelling fix, Dougie Richardson, LP #388651 |
1397 | + * Keeping-safe: |
1398 | + - Update for new firefox security dialogue, LP: #386556 |
1399 | + * Internet: |
1400 | + - Added FAQ section, Dougie Richardson |
1401 | + * Printing: |
1402 | + - Grammar fix, LP: #386376 |
1403 | + * Serverguide: |
1404 | + - Remove all instances of 'the the', LP: #377436 |
1405 | + - New Monitoring chapter, including Nagios and Munin, Adam Sommer |
1406 | + - Adding bind9-utils package to the DNS Server task package list, from Shane Fagan, LP: #381739 |
1407 | + - Typo in Landscape section, Jonathan Jesse, LP: #394026 |
1408 | + - Replaced Postfix and SMTPAUTH instructions, Adam Sommer |
1409 | + - Corrected /etc/ufw/sysctl.conf syntax, Adam Sommer, LP: #397357 |
1410 | + |
1411 | + -- Matthew East <mdke@ubuntu.com> Sat, 25 Jul 2009 14:08:12 +0100 |
1412 | + |
1413 | +ubuntu-docs (9.10.2) karmic; urgency=low |
1414 | + |
1415 | + * General: |
1416 | + - fix menu entry for gparted; patch from Artur Szymanski, LP: #371851 |
1417 | + - a few corrections to use US not UK spelling, patch from Nathan Handler |
1418 | + - remove unnecessary use of alt+f2 to start apps available from the menu, Dean Sas |
1419 | + * Hardware: |
1420 | + - fix instructions to lock screen with new FUSA applet, patch from Artur Szymanski, LP: #371930 |
1421 | + * Add-applications: |
1422 | + - new section on PPA, patch from Nathan Handler |
1423 | + * Musicvideophotos: |
1424 | + - generalise photo import instructions, from Stephanie Mardell |
1425 | + - update section on listening to online audio streams is outdated, patch from Shane Fagan |
1426 | + - Rhythmbox has a tag editor, patch from Shane Fagan |
1427 | + * Keeping-safe: |
1428 | + - fix link to removing programs, patch from Artur Szymanski |
1429 | + * Internet: |
1430 | + - document easiest way to change preferred email client, Dougie Richardson, LP: #356894 |
1431 | + - java is no longer installed by ubuntu-restricted-extras, Dean Sas, LP: #366039 |
1432 | + * Serverguide: |
1433 | + - Clarify read only explanation in samba section, patch from Connor Imes, LP: #281702 |
1434 | + - Patch by Joel Goguen adding note about restarting after joining a domain, LP: #352934. |
1435 | + - Patch by Nathan Handler to remove information about dhcdbd that is no longer needed, LP: #373867. |
1436 | + - Merge from Connor Imes: 2009-05-06 Fix bad flag in useradd command, LP: #371730 |
1437 | + * Games: |
1438 | + - remove confusing lines from supertux instructions, patch from Shane Fagan, LP: #346892 |
1439 | + * Printing: |
1440 | + - Fix typo and update notification text, patch from Nathan Handler |
1441 | + |
1442 | + -- Matthew East <mdke@ubuntu.com> Sun, 17 May 2009 09:45:19 +0100 |
1443 | + |
1444 | +ubuntu-docs (9.10.1) karmic; urgency=low |
1445 | + |
1446 | + * [Matthew East] |
1447 | + - First release for Karmic |
1448 | + - Drastically shorten package build time by only building translated xml |
1449 | + for translations that we are actually going to ship |
1450 | + - hardware.xml - computer-janitor updates |
1451 | + - Correction to PhotoEditor instructions - patch from Connor Ines - LP: #355008 |
1452 | + - photos.xml - import window opens automatically on f-spot first use, LP: #209530 |
1453 | + - Add introductory paragraph to seek to explain GNOME desktop - LP: #219972 |
1454 | + - Errors in musicvideophotos, patches from Artur Szymanski and Connor Imes - LP: #359288 |
1455 | + - Typos in desktop-effects.xml, patch from Connor Imes. LP: #357344 |
1456 | + - add missing apt: prefix to xchat-gnome installation link, LP: #356933 |
1457 | + - Update debian/control and debian/copyright - patch from Nathan Handler, LP: #363552 |
1458 | + - Grammar error in virtualization.xml, patch from Connor Imes. LP: #352313 |
1459 | + - Make language in jockey section consistent with language used in UI, LP: #274845 |
1460 | + - Add link to debian section on Ubuntu website, patch from Connor Imes, LP: #257337 |
1461 | + * [Bhuvaneswaran A] |
1462 | + - serverguide/lamp-applications.xml - improvements to mediawiki instructions |
1463 | + - serverguide/chat.xml - new section about chat server applications |
1464 | + - improvements to exim section in serverguide/mail |
1465 | + * [Dean Sas] - typo fix in serverguide/jeos |
1466 | + |
1467 | + -- Matthew East <mdke@ubuntu.com> Wed, 29 Apr 2009 00:23:20 +0100 |
1468 | + |
1469 | +ubuntu-docs (9.04.9) jaunty; urgency=low |
1470 | + |
1471 | + * Final import of translations from Rosetta for NonLangPackFreeze |
1472 | + * Removing erroneous section about totem not supporting DVD menus (LP: #354777) |
1473 | + * libdvdread3 -> libdvdread4 (LP: #354764) |
1474 | + |
1475 | + -- Matthew East <mdke@ubuntu.com> Thu, 09 Apr 2009 21:15:26 +0100 |
1476 | + |
1477 | +ubuntu-docs (9.04.8) jaunty; urgency=low |
1478 | + |
1479 | + * [Jordan Mantha] |
1480 | + - Add Conflicts on edubuntu-docs (<< 9.04.1ubuntu1) LP: #353288 |
1481 | + |
1482 | + * [Matthew East] |
1483 | + - Remove es_ES and es_PR locales (LP: #348855) |
1484 | + - Removing strings about totem not being able to support DVD menus (LP: #354777) |
1485 | + |
1486 | + -- Matthew East <mdke@ubuntu.com> Fri, 03 Apr 2009 21:19:27 +0100 |
1487 | + |
1488 | +ubuntu-docs (9.04.7) jaunty; urgency=low |
1489 | + |
1490 | + * debian/ubuntu-docs.postinst - Fix syntax error with previous release (LP: #353117) |
1491 | + * refreshing translations from Rosetta |
1492 | + |
1493 | + -- Matthew East <mdke@ubuntu.com> Wed, 01 Apr 2009 14:21:14 +0100 |
1494 | + |
1495 | +ubuntu-docs (9.04.6) jaunty; urgency=low |
1496 | + |
1497 | + * Remove deprecated directory at /usr/share/gnome/help/libs (LP: #303578) |
1498 | + - Thanks to Steve Langasek for the fix |
1499 | + |
1500 | + -- Matthew East <mdke@ubuntu.com> Mon, 30 Mar 2009 18:09:05 +0100 |
1501 | + |
1502 | +ubuntu-docs (9.04.5) jaunty; urgency=low |
1503 | + |
1504 | + * String freeze release |
1505 | + |
1506 | + * [Matthew East] |
1507 | + - Updating logout and shutdown instructions for Jaunty (User Switcher, not System menu) |
1508 | + - musicvideophotos.xml - use consistent language for extracting audio cds (LP: #346245) |
1509 | + - musicvideophotos.xml - use direct link to brasero manual |
1510 | + - Make titles of documents in yelp indexes match the title of the documents themselves (LP: #345852) |
1511 | + - Refresh pot templates |
1512 | + |
1513 | + * [Dougie Richardson] |
1514 | + - basic-commands.xml - paste instructions correction (LP: #341534) |
1515 | + - internet/troubleshooting.xml - changing bad wording |
1516 | + - video.xml - dvd support requires gstreamer-ugly (LP: #338321) |
1517 | + - connecting.xml - modem instructions (LP: #310331) |
1518 | + |
1519 | + * [Adam Sommer] - Server Guide |
1520 | + - Updated OpenLDAP section for new /etc/default/slapd configuration. |
1521 | + - Added instructions for setting correct ACL for the Kerberos keys. |
1522 | + - virtualization.xml - new Eucalyptus and OpenNebula sections |
1523 | + - installation.xml: |
1524 | + * rewrite of Extending Volume Groups section (LP: #347201, LP: #346862, and LP: #346859) |
1525 | + * Updates for Jaunty. |
1526 | + - security.xml: |
1527 | + * Updated Firewall section for Jaunty. |
1528 | + * Corrected "sudo ufw app info Samba" command (LP: #346327). |
1529 | + - dns.xml - fixing grammar and spelling mistakes (LP: #348032, LP: #348023, LP: #348094). |
1530 | + - windows-networking - Updated Likewise Open section for Jaunty (feedback from Thierry Carrez). |
1531 | + |
1532 | + * [Phil Bull] |
1533 | + - about-ubuntu.xml - minor edits and updates, simplify a few sentences |
1534 | + - add-applications.xml: |
1535 | + * Add new entity for Software Sources, with sensible name |
1536 | + * Simplify structure |
1537 | + * Reduce verbosity, concentrate on the instructions |
1538 | + * Separate-out conceptual information into dedicated sections |
1539 | + |
1540 | + * [Nathan Handler] |
1541 | + - virtualization.xml - typo (LP: #343633) |
1542 | + |
1543 | + * [Dean Sas] |
1544 | + - music.xml - volume control preferences fix (LP: #346957) |
1545 | + |
1546 | + * [Tim Bosse] |
1547 | + - connecting.xml - add basic VPN instructions |
1548 | + |
1549 | + -- Matthew East <mdke@ubuntu.com> Wed, 25 Mar 2009 22:03:21 +0000 |
1550 | + |
1551 | +ubuntu-docs (9.04.4) jaunty; urgency=low |
1552 | + |
1553 | + * [Matthew East] |
1554 | + - Rewrite of internet/connecting/mobile-broadband |
1555 | + - Review of internet/connecting/wireless |
1556 | + - fix typo - LP: #339227 |
1557 | + - Update guilabel for disabling visual effects (LP: #339103) |
1558 | + - Correction to 'Hardware Drivers' entity |
1559 | + - Add documentation for visual effects keyboard shortcuts (LP: #147294) - patch from seisen1 |
1560 | + - Refresh pot files |
1561 | + - programming.xml - package name should be in small case (LP: #336629) |
1562 | + - Switching from Windows - typo fix and update to firefox bookmark export (LP: #330912, LP: #330908) |
1563 | + |
1564 | + * [Dougie Richardson] |
1565 | + - Document MTP player support for rhythmbox (LP: #338437) |
1566 | + - Use xref links rather than ulink in musicvideophotos (LP: #222990) |
1567 | + |
1568 | + * [Adam Sommer] |
1569 | + - Improvements to OpenLDAP credentials section (LP: #333733, LP: #333437) |
1570 | + - Fix to Samba security instructions (LP: #332478) |
1571 | + - Fix to Subversion authentication details (LP: #337215) |
1572 | + - Add -c flag to vert-viewer command example (LP: #335541) |
1573 | + - Update link to MoinMoin website (LP: #334652) |
1574 | + - Updated Postfix section with instructions for new dovecot-postfix package |
1575 | + - Bind configuration improvements (LP: #339910) |
1576 | + |
1577 | + -- Matthew East <mdke@ubuntu.com> Sun, 08 Mar 2009 13:54:15 +0000 |
1578 | + |
1579 | +ubuntu-docs (9.04.3) jaunty; urgency=low |
1580 | + |
1581 | + * Cruft Remover renamed to Computer Janitor, adjusting hardware.xml accordingly (LP: #336288) |
1582 | + * Expansion and revision of Programming document (Dean Sas) |
1583 | + * No way to change hostname using GUI tool now (LP: #322268) - Dougie Richardson |
1584 | + * Update logout details (LP: #335279) - Dougie Richardson |
1585 | + * Update version number in offline firefox startpage |
1586 | + * Typo in serverguide (LP: #334697) - Dougie Richardson |
1587 | + * Update to Windows partition manager in Switching from Windows doc (LP: #333600) - Dougie Richardson |
1588 | + * Refresh pot files |
1589 | + |
1590 | + -- Matthew East <mdke@ubuntu.com> Sun, 01 Mar 2009 15:46:22 +0000 |
1591 | + |
1592 | +ubuntu-docs (9.04.2) jaunty; urgency=low |
1593 | + |
1594 | + * Various serverguide fixes: |
1595 | + - Grammar error (LP: #203829) - Dean Sas |
1596 | + - Fix mailman dependencies (LP: #291772) - Morten Siebuhr |
1597 | + - CVS installation error (LP: #298605) - Thomas M |
1598 | + - Postfox installation error (LP: #306289) - Adam Sommer |
1599 | + - SSH update (LP: #311900) - Dean Sas |
1600 | + - unzoo replaced by zoo (LP: #312506) |
1601 | + - Samba instructions update (LP: #313232) - Adam Sommer |
1602 | + - Clearer SSL instructions (LP: #314951) - Adam Sommer |
1603 | + - LDAP error (LP: #319179) - Adam Sommer |
1604 | + - MoinMoin installation fix (LP: #320840) - Adam Sommer |
1605 | + - Postfix ssl improvements (LP: #323203) - Adam Sommer |
1606 | + - Ebox instructions error (LP: #324399) - Dean Sas |
1607 | + - Typo in openssh section (LP: #325828) - Dean Sas |
1608 | + - Typo in samba section (LP: #285484) - Nick Ellery |
1609 | + - SSHD fix (LP: #295279) - Adam Sommer |
1610 | + - Jeos fix (LP: #307582) - Adam Sommer |
1611 | + - Remove reference to ebox-all package (LP: #322367) - Adam Sommer |
1612 | + |
1613 | + * Typo in "switching from windows" (LP: #309735) |
1614 | + * Broken link in "programming" (LP: #310081) - Jonathan Jesse |
1615 | + * lsb_release issue in "basic commands" (LP: #310713) - Thomas M |
1616 | + * Updating logout instructions (LP: #327060) - Dean Sas |
1617 | + * Updating all documents to use apt-url for installation instructions |
1618 | + * Refreshing pot files for Rosetta |
1619 | + * Recompress *.png files with 'advpng -z -4 file.png' to save space - Sahak Petrosyan |
1620 | + * Improve instructions on pasting commands (LP: #185892) - Martin Mai |
1621 | + * Rewrite of networking instructions (LP: #298513, LP: #321308, LP: #314680, LP: #321179) - Dougie Richardson |
1622 | + * Amend punctuation of about-ubuntu (LP: #275592) - Dougie Richardson |
1623 | + * Documentation for automatic login (LP: #290467) - Dougie Richardson |
1624 | + |
1625 | + -- Matthew East <mdke@ubuntu.com> Sun, 15 Feb 2009 11:50:28 +0000 |
1626 | + |
1627 | +ubuntu-docs (9.04.1) jaunty; urgency=low |
1628 | + |
1629 | + * Images should not be executable (LP: #206371) - Sahak Petrosyan |
1630 | + * Couple of typos (LP: #282358, LP: #266997) - Sahak Petrosyan |
1631 | + * ubuntu-restricted-extras has java6 (LP: #288623) - Dean Sas |
1632 | + * Permit building html for other languages in Makefile - Mitsuya Shibata |
1633 | + * Use the same background image as Ubuntu website (LP: #305760) |
1634 | + * Make search available for users without javascript - Dustin Kirkland |
1635 | + * Various content improvements - Phil Bull |
1636 | + * Use "Enter", not "Return" - Joel Goguen (LP: #213104) |
1637 | + |
1638 | + -- Matthew East <mdke@ubuntu.com> Thu, 11 Dec 2008 12:47:51 +0000 |
1639 | + |
1640 | +ubuntu-docs (8.10.2) intrepid; urgency=low |
1641 | + |
1642 | + * Updating translations from Launchpad as at 19 Oct 08 (LP: #286829) |
1643 | + * Small update to Hebrew translation of browser startpage (LP: #285696) |
1644 | + * To save CD space, only ship translations which are over 75% translated |
1645 | + |
1646 | + -- Matthew East <mdke@ubuntu.com> Sun, 19 Oct 2008 20:21:13 +0100 |
1647 | + |
1648 | +ubuntu-docs (8.10.1) intrepid; urgency=low |
1649 | + |
1650 | + * Add ukranian translation of firefox homepage (LP: #216982) |
1651 | + * Correct wrong codename in basic-commands document (LP: #281664) |
1652 | + |
1653 | + -- Matthew East <mdke@ubuntu.com> Tue, 14 Oct 2008 22:27:20 +0100 |
1654 | + |
1655 | +ubuntu-docs (8.09.2) intrepid; urgency=low |
1656 | + |
1657 | + * ubuntu-serverguide should suggest www-browser and not firefox (LP: #272772) |
1658 | + |
1659 | + -- Matthew East <mdke@ubuntu.com> Sun, 21 Sep 2008 21:21:03 +0100 |
1660 | + |
1661 | +ubuntu-docs (8.09.1) intrepid; urgency=low |
1662 | + |
1663 | + * about-ubuntu validity fix (LP: #255088) |
1664 | + * various text updates (LP: #238661, LP: #14425, LP: #248283, LP: #215025) |
1665 | + * hebrew startpage improvement (LP: #220780) |
1666 | + |
1667 | + -- Matthew East <mdke@ubuntu.com> Thu, 04 Sep 2008 22:50:16 +0100 |
1668 | + |
1669 | +ubuntu-docs (8.08.2) intrepid; urgency=low |
1670 | + |
1671 | + * Updating browser startpage version numbers |
1672 | + |
1673 | + -- Matthew East <mdke@ubuntu.com> Mon, 04 Aug 2008 21:55:44 +0100 |
1674 | + |
1675 | +ubuntu-docs (8.08.1) intrepid; urgency=low |
1676 | + |
1677 | + * First release for intrepid |
1678 | + * Severe restructuring and simplification of tree |
1679 | + * Removing lots of unused files |
1680 | + * Only build translated xml at build time, rather than in advance |
1681 | + * Various text fixes |
1682 | + |
1683 | + -- Matthew East <mdke@ubuntu.com> Sat, 05 Apr 2008 15:03:15 +0100 |
1684 | + |
1685 | +ubuntu-docs (8.03.4) hardy; urgency=low |
1686 | + |
1687 | + * Install omf file for serverguide (LP: #208134) |
1688 | + |
1689 | + -- Matthew East <mdke@ubuntu.com> Fri, 28 Mar 2008 08:12:48 +0000 |
1690 | + |
1691 | +ubuntu-docs (8.03.3) hardy; urgency=low |
1692 | + |
1693 | + * New bzr checkout (LP: #181236, LP: #203198, LP: #204163, LP: #204666) |
1694 | + * String freeze now in effect |
1695 | + * Refresh pot files |
1696 | + |
1697 | + -- Matthew East <mdke@ubuntu.com> Fri, 21 Mar 2008 14:34:49 +0000 |
1698 | + |
1699 | +ubuntu-docs (8.03.2) hardy; urgency=low |
1700 | + |
1701 | + * New bzr checkout (LP: #176678, LP: #118963, LP: #108083, LP: #202312) |
1702 | + * Replacing "server" document with "serverguide" |
1703 | + * Refresh pot files |
1704 | + * Fixing debian/rules to filter translations less than 40% |
1705 | + |
1706 | + -- Matthew East <mdke@ubuntu.com> Sun, 16 Mar 2008 22:16:42 +0000 |
1707 | + |
1708 | +ubuntu-docs (8.03.1) hardy; urgency=low |
1709 | + |
1710 | + * New bzr checkout (LP: #49435, LP: #197557, LP: #172650, LP: #192202, |
1711 | + LP: #144788, LP: #162446, LP: #183339, LP: #195882) |
1712 | + * Include html version of contributors in ubuntu-serverguide (LP: #88814) |
1713 | + * Refresh pot templates |
1714 | + |
1715 | + -- Matthew East <mdke@ubuntu.com> Sun, 09 Mar 2008 18:37:08 +0000 |
1716 | + |
1717 | +ubuntu-docs (8.02.2) hardy; urgency=low |
1718 | + |
1719 | + * Adding translations for all documents |
1720 | + * Amending path for pot templates, as requested by carlos |
1721 | + |
1722 | + -- Matthew East <mdke@ubuntu.com> Wed, 20 Feb 2008 07:56:10 +0000 |
1723 | + |
1724 | +ubuntu-docs (8.02.1) hardy; urgency=low |
1725 | + |
1726 | + * New bzr checkout - loads of text fixes and improvements (LP: #183148, |
1727 | + LP: #183025, LP: #178064, LP: #160435, LP: #158016, LP: #146794, |
1728 | + LP: #144795, LP: #185867, LP: #163188, LP: #150167, LP: #148372, |
1729 | + LP: #144928, LP: #141491, LP: #141444, LP: #138891, LP: #172565, |
1730 | + LP: #144285, LP: #150641, LP: #176678) |
1731 | + * First release for hardy |
1732 | + |
1733 | + -- Matthew East <mdke@ubuntu.com> Sat, 16 Feb 2008 18:31:20 +0000 |
1734 | + |
1735 | +ubuntu-docs (7.10.4) gutsy; urgency=low |
1736 | + |
1737 | + * Fix broken link in "windows" document (LP: #144796) |
1738 | + |
1739 | + -- Matthew East <mdke@ubuntu.com> Fri, 12 Oct 2007 08:36:57 +0100 |
1740 | + |
1741 | +ubuntu-docs (7.10.3) gutsy; urgency=low |
1742 | + |
1743 | + * Advanced Topics - changing link to more useful doc for programming reference |
1744 | + |
1745 | + -- Matthew East <mdke@ubuntu.com> Sun, 07 Oct 2007 12:34:41 +0100 |
1746 | + |
1747 | +ubuntu-docs (7.10.2) gutsy; urgency=low |
1748 | + |
1749 | + * New translation export from rosetta |
1750 | + * Restoring translations over 40% complete |
1751 | + * Including all languages in ubuntu-serverguide package (LP: #110863) |
1752 | + * Last package upload before gutsy (LP: #149993) |
1753 | + |
1754 | + -- Matthew East <mdke@ubuntu.com> Sat, 06 Oct 2007 15:25:19 +0100 |
1755 | + |
1756 | +ubuntu-docs (7.10.1) gutsy; urgency=low |
1757 | + |
1758 | + * Adding translations to source package |
1759 | + * Don't install libs/pdf directory |
1760 | + * Restore symlink-dupes script to eliminate duplicate files (LP: 149040) |
1761 | + * Fix debian/rules to take account of new location for pot files (thanks to Martin Pitt) |
1762 | + * Only install translations which are >90% complete (temporary measure to keep package size small) |
1763 | + |
1764 | + -- Matthew East <mdke@ubuntu.com> Thu, 04 Oct 2007 08:17:06 +0100 |
1765 | + |
1766 | +ubuntu-docs (7.09.3) gutsy; urgency=low |
1767 | + |
1768 | + * Strip out unwanted directories from the source package in |
1769 | + debian/rules rather than manually. |
1770 | + |
1771 | + -- Matthew East <mdke@ubuntu.com> Mon, 17 Sep 2007 08:46:53 +0100 |
1772 | + |
1773 | +ubuntu-docs (7.09.2) gutsy; urgency=low |
1774 | + |
1775 | + * New SVN checkout |
1776 | + * String Freeze in effect, refreshing pot templates |
1777 | + |
1778 | + -- Matthew East <mdke@ubuntu.com> Fri, 14 Sep 2007 08:23:05 +0100 |
1779 | + |
1780 | +ubuntu-docs (7.09.1) gutsy; urgency=low |
1781 | + |
1782 | + * New SVN checkout |
1783 | + * Changing 7.04 to 7.10 in browser homepage |
1784 | + |
1785 | + -- Matthew East <mdke@ubuntu.com> Tue, 28 Aug 2007 08:14:03 +0100 |
1786 | + |
1787 | +ubuntu-docs (7.07.2) gutsy; urgency=low |
1788 | + |
1789 | + * New SVN checkout. |
1790 | + |
1791 | + -- Jordan Mantha <mantha@ubuntu.com> Wed, 15 Aug 2007 13:35:31 -0700 |
1792 | + |
1793 | +ubuntu-docs (7.07.1) gutsy; urgency=low |
1794 | + |
1795 | + * New SVN checkout. |
1796 | + * debian/rules: remove symlink-dupes bits. |
1797 | + |
1798 | + -- Daniel Holbach <daniel.holbach@ubuntu.com> Wed, 04 Jul 2007 09:30:59 +0200 |
1799 | + |
1800 | +ubuntu-docs (7.04.4) feisty; urgency=low |
1801 | + |
1802 | + * debian/control: Add missing Pre-depends: on dpkg for bzip2 compression |
1803 | + support. |
1804 | + * debian/rules: Use the same 'poorly translated' barrier for the server |
1805 | + parts of ubuntu-doc, and raise the bar to 30%. |
1806 | + * debian/rules: Add -o /dev/null to msgfmt calls to avoid writing |
1807 | + messages.mo into the root directory. |
1808 | + |
1809 | + -- Martin Pitt <martin.pitt@ubuntu.com> Wed, 11 Apr 2007 10:00:01 +0200 |
1810 | + |
1811 | +ubuntu-docs (7.04.3) feisty; urgency=low |
1812 | + |
1813 | + * Update translations from Rosetta |
1814 | + * Install translations for ubuntu-serverguide |
1815 | + * Unbreak about-ubuntu panel menu entry |
1816 | + * [Martin Pitt]: |
1817 | + - debian/rules: Do not ship documents which are less than 25% translated. |
1818 | + They are useless for non-English speakers anyway and bloat the package. |
1819 | + - debian/control: Add bc build dependency (needed for the percentage |
1820 | + calculation). |
1821 | + |
1822 | + -- Matthew East <mdke@ubuntu.com> Sun, 8 Apr 2007 10:26:54 +0100 |
1823 | + |
1824 | +ubuntu-docs (7.04.2) feisty; urgency=low |
1825 | + |
1826 | + * Package diet to stop being so ridiculously space inefficient: |
1827 | + - debian/rules: Use bzip2 compression. |
1828 | + - Add symlink-dupes and run it in debian/rules, to symlink duplicate |
1829 | + files. Add fdupes build dependency for that. |
1830 | + |
1831 | + -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 5 Apr 2007 12:32:17 +0200 |
1832 | + |
1833 | +ubuntu-docs (7.04.1) feisty; urgency=low |
1834 | + |
1835 | + * Adding translations for all documents |
1836 | + * [Daniel Holbach] |
1837 | + - debian/control: change gnome2-user-guide to gnome-user-guide. |
1838 | + |
1839 | + -- Matthew East <mdke@ubuntu.com> Wed, 4 Apr 2007 08:00:57 +0100 |
1840 | + |
1841 | +ubuntu-docs (7.03.3) feisty; urgency=low |
1842 | + |
1843 | + * A few new strings approved as per DocumentationStringFreeze |
1844 | + * Refreshing pot templates |
1845 | + * Removing pot template for switching guide |
1846 | + |
1847 | + -- Matthew East <mdke@ubuntu.com> Thu, 15 Mar 2007 08:25:46 +0000 |
1848 | + |
1849 | +ubuntu-docs (7.03.2) feisty; urgency=low |
1850 | + |
1851 | + * New material, mainly from Phil Bull |
1852 | + * Refreshing pot templates |
1853 | + * String freeze now in effect |
1854 | + |
1855 | + -- Matthew East <mdke@ubuntu.com> Thu, 8 Mar 2007 08:20:38 +0000 |
1856 | + |
1857 | +ubuntu-docs (7.03.1) feisty; urgency=low |
1858 | + |
1859 | + * Two new documents - basic-commands and desktop-effects |
1860 | + * Refreshing pot templates |
1861 | + |
1862 | + -- Matthew East <mdke@ubuntu.com> Sat, 3 Mar 2007 11:03:55 +0000 |
1863 | + |
1864 | +ubuntu-docs (7.02.3) feisty; urgency=low |
1865 | + |
1866 | + * split out serverguide as a standalone .deb |
1867 | + - moved install, links, postinst, and prerm to ubuntu-docs.* |
1868 | + - added ubuntu-serverguide binary section to debian/control |
1869 | + - cleaned up long descriptions to reflect what is actually |
1870 | + shipped. |
1871 | + - added ubuntu-serverguide build and install rules |
1872 | + * split out packagingguide as standalone .deb |
1873 | + * updated debian/copyright to reflect above |
1874 | + |
1875 | + -- Jordan Mantha <mantha@ubuntu.com> Wed, 21 Feb 2007 02:10:28 -0800 |
1876 | + |
1877 | +ubuntu-docs (7.02.2) feisty; urgency=low |
1878 | + |
1879 | + * Adding a "Files, Folders and Documents" topic. |
1880 | + * Various text updates |
1881 | + |
1882 | + -- Matthew East <mdke@ubuntu.com> Fri, 9 Feb 2007 08:21:45 +0000 |
1883 | + |
1884 | +ubuntu-docs (7.02.1) feisty; urgency=low |
1885 | + |
1886 | + * Installing documents within the gnome/help scheme |
1887 | + - for easier linking |
1888 | + |
1889 | + -- Matthew East <mdke@ubuntu.com> Fri, 2 Feb 2007 00:28:53 +0000 |
1890 | + |
1891 | +ubuntu-docs (7.01.3) feisty; urgency=low |
1892 | + |
1893 | + * Rearranging directory structure and adding translation templates |
1894 | + |
1895 | + -- Matthew East <mdke@ubuntu.com> Sat, 27 Jan 2007 07:53:31 -0500 |
1896 | + |
1897 | +ubuntu-docs (7.01.2) feisty; urgency=low |
1898 | + |
1899 | + * adding new advanced-topics category with links to man pages |
1900 | + |
1901 | + -- Matthew East <mdke@ubuntu.com> Wed, 24 Jan 2007 00:14:21 +0000 |
1902 | + |
1903 | +ubuntu-docs (7.01.1) feisty; urgency=low |
1904 | + |
1905 | + * Adding gnome2-user-guide and yelp to Depends |
1906 | + * Two new top level topics |
1907 | + |
1908 | + -- Matthew East <mdke@ubuntu.com> Tue, 9 Jan 2007 00:08:10 +0000 |
1909 | + |
1910 | +ubuntu-docs (6.12.2) feisty; urgency=low |
1911 | + |
1912 | + * Tweaking of which documents show up on the front page |
1913 | + * Various text updates |
1914 | + |
1915 | + -- Matthew East <mdke@ubuntu.com> Sat, 23 Dec 2006 01:11:53 +0000 |
1916 | + |
1917 | +ubuntu-docs (6.12.1) feisty; urgency=low |
1918 | + |
1919 | + * Serious revamping of structure of documentation, accordingly |
1920 | + changes made to packaging. Please do some serious testing. |
1921 | + |
1922 | + -- Matthew East <mdke@ubuntu.com> Sat, 16 Dec 2006 17:00:00 +0000 |
1923 | + |
1924 | +ubuntu-docs (6.11.2) feisty; urgency=low |
1925 | + |
1926 | + * Changing the packaging process to point mainly at debian/rules rather |
1927 | + than debian/install so we don't have to keep adding files manually to the |
1928 | + latter. |
1929 | + |
1930 | + -- Matthew East <mdke@ubuntu.com> Sun, 19 Nov 2006 10:39:00 +0000 |
1931 | + |
1932 | +ubuntu-docs (6.11.1) edgy-updates; urgency=low |
1933 | + |
1934 | + * Some missing entities causing validity havoc in our docbook |
1935 | + * Fixing invalidity of contribute.xml |
1936 | + |
1937 | + -- Matthew East <mdke@ubuntu.com> Sat, 18 Nov 2006 20:53:00 +0000 |
1938 | + |
1939 | +ubuntu-docs (6.10.4) edgy; urgency=low |
1940 | + |
1941 | + * Updating omf files for getting-help |
1942 | + * Removing es_ES locale for aboutubuntu (duplicate of es) - bug 66819 |
1943 | + |
1944 | + -- Matthew East <mdke@ubuntu.com> Fri, 20 Oct 2006 20:30:00 +0100 |
1945 | + |
1946 | +ubuntu-docs (6.10.3) edgy; urgency=low |
1947 | + |
1948 | + * Matthew East: |
1949 | + - Fixing translations by installing *omf files for each document and |
1950 | + fixing paths in the omf files |
1951 | + * Daniel Holbach: |
1952 | + - fix installation, run dh_scrollkeeper. |
1953 | + |
1954 | + -- Matthew East <mdke@ubuntu.com> Wed, 18 Oct 2006 22:00:00 +0100 |
1955 | + |
1956 | +ubuntu-docs (6.10.2) edgy; urgency=low |
1957 | + |
1958 | + * Adding translations for all documents |
1959 | + |
1960 | + -- Matthew East <mdke@ubuntu.com> Sun, 15 Oct 2006 10:30:00 +0100 |
1961 | + |
1962 | +ubuntu-docs (6.10.1) edgy; urgency=low |
1963 | + |
1964 | + * Including po files for translations in source package, as requested by Carlos. |
1965 | + * Adding pot template and correcting typo in omf file for Getting Help document. |
1966 | + |
1967 | + -- Matthew East <mdke@ubuntu.com> Sun, 30 Sep 2006 12:00:00 +0100 |
1968 | + |
1969 | +ubuntu-docs (6.09.3) edgy; urgency=low |
1970 | + |
1971 | + * New SVN checkout. |
1972 | + * ubuntu/browser-startpage/*: |
1973 | + - changed occurrences of Dapper, Drake, 6.06, LTS, ... to their 'edgy' |
1974 | + equivalents - there are more strings to change outside of this. |
1975 | + |
1976 | + -- Daniel Holbach <daniel.holbach@ubuntu.com> Tue, 26 Sep 2006 12:42:25 +0200 |
1977 | + |
1978 | +ubuntu-docs (6.09.2) edgy; urgency=low |
1979 | + |
1980 | + * New SVN checkout. |
1981 | + |
1982 | + -- Daniel Holbach <daniel.holbach@ubuntu.com> Thu, 21 Sep 2006 22:52:02 +0200 |
1983 | + |
1984 | +ubuntu-docs (6.09.1) edgy; urgency=low |
1985 | + |
1986 | + * New release. |
1987 | + * debian/control: |
1988 | + - removed Depends on gnome2-user-guide, after discussion with Corey |
1989 | + Burger. |
1990 | + |
1991 | + -- Daniel Holbach <daniel.holbach@ubuntu.com> Fri, 15 Sep 2006 17:55:30 +0200 |
1992 | + |
1993 | +ubuntu-docs (6.08.2) edgy; urgency=low |
1994 | + |
1995 | + * New "Contribute to Ubuntu" doc, written by Andreas Lloyd and imported from the wiki |
1996 | + * Desktop guide significantly restructured, now includes the Gnome user-guide |
1997 | + * Including pot templates for automatic import into Rosetta |
1998 | + |
1999 | + -- Matthew East <mdke@ubuntu.com> Mon, 28 August 2006 22:00:00 +0100 |
2000 | + |
2001 | +ubuntu-docs (6.08.1) edgy; urgency=low |
2002 | + |
2003 | + * first package for Edgy |
2004 | + * removing translations of documentation |
2005 | + * changing installation directory for documentation from /usr/share/ubuntu-doc |
2006 | + to /usr/share/gnome/help to integrate with gnome help system |
2007 | + * splitting documents up to make a nicer structure for help system, hopefully |
2008 | + . |
2009 | + * [Daniel Holbach] |
2010 | + - debian/README: updated repository URL. |
2011 | + - debian/control: |
2012 | + - bumped Standards-Version, |
2013 | + - made cdbs and debhelper Build-Depends, not Build-Depends-Indep. |
2014 | + - debian/install: |
2015 | + - changed ubuntuheader.png location. |
2016 | + |
2017 | + -- Matthew East <mdke@ubuntu.com> Fri, 2 August 2006 14:00:00 +0100 |
2018 | + |
2019 | +ubuntu-docs (6.06.2) dapper-updates; urgency=low |
2020 | + |
2021 | + * New snapshot of translations from Rosetta |
2022 | + |
2023 | + -- Matthew East <mdke@ubuntu.com> Fri, 16 June 2006 13:25:00 +0100 |
2024 | + |
2025 | +ubuntu-docs (6.06.1) dapper; urgency=low |
2026 | + |
2027 | + * removing useless link (Ubuntu: #47016) |
2028 | + |
2029 | + -- Matthew East <mdke@ubuntu.com> Sun, 28 May 2006 01:44:00 +0100 |
2030 | + |
2031 | +ubuntu-docs (6.05.6) dapper; urgency=low |
2032 | + |
2033 | + * Replace `Ubuntu 6.06, Dapper Drake' with `Ubuntu 6.06 LTS'. |
2034 | + * Replace 6.04 with 60.6 in generic/libs/generic.ent. |
2035 | + * New sk translation of desktopguide (patch via mdke). |
2036 | + * Remove `ka_GE' from DapperFirefoxStartPageTranslation locale list. |
2037 | + It's too near to the Dapper release to complete the remaining stages |
2038 | + of the adding-a-locale process, and we must not stop halfway. |
2039 | + |
2040 | + -- Ian Jackson <iwj@ubuntu.com> Tue, 23 May 2006 15:39:25 +0100 |
2041 | + |
2042 | +ubuntu-docs (6.05.5) dapper; urgency=low |
2043 | + |
2044 | + * Updated translations for everything (last update before the release) |
2045 | + * [Daniel Holbach] |
2046 | + - debian/README: updated. |
2047 | + |
2048 | + -- Matthew East <mdke@ubuntu.com> Sun, 21 May 2006 17:31:00 +0100 |
2049 | + |
2050 | +ubuntu-docs (6.05.4) UNRELEASED; urgency=low |
2051 | + |
2052 | + * Adding preface.xml for zh_TW (was causing scrollkeeper errors) |
2053 | + * DapperFirefoxStartPageTranslation - new translateable locale `ka_GE' |
2054 | + |
2055 | + -- Matthew East <mdke@ubuntu.com> Wed, 17 May 2006 20:53:00 +0100 |
2056 | + |
2057 | +ubuntu-docs (6.05.3) dapper; urgency=low |
2058 | + |
2059 | + * DapperFirefoxStartPageTranslation for epiphany: |
2060 | + produce an index-C.html for epiphany's index-%l.html. |
2061 | + * New translateable locale `ku'. |
2062 | + |
2063 | + -- Ian Jackson <iwj@ubuntu.com> Tue, 16 May 2006 17:18:19 +0100 |
2064 | + |
2065 | +ubuntu-docs (6.05.2) dapper; urgency=low |
2066 | + |
2067 | + * New snapshot of translations for all documents |
2068 | + |
2069 | + -- Matthew East <mdke@ubuntu.com> Sun, 14 May 2006 12:42:00 +0100 |
2070 | + |
2071 | +ubuntu-docs (6.05.1) dapper; urgency=low |
2072 | + |
2073 | + * Taking html out of shipped documentation. |
2074 | + * Adding preface.xml for those translations which have them |
2075 | + * New snapshot of translations for all documents |
2076 | + |
2077 | + -- Matthew East <mdke@ubuntu.com> Tue, 02 May 2006 19:23:16 +0200 |
2078 | + |
2079 | +ubuntu-docs (6.04.8) dapper; urgency=low |
2080 | + |
2081 | + * [Matthew East and the Docteam] |
2082 | + - Adding some symbolic links so that the css and images in localised |
2083 | + firefox homepages work |
2084 | + - Adding translations of the documents (BIG INCREASE IN PACKAGE SIZE) |
2085 | + - Moved to debhelper 5 so that we can use comments in debian/install to |
2086 | + keep track of what has now become a long and confusing file. |
2087 | + - Relocated sample folders up a directory so that they don't need to be |
2088 | + included for each translation |
2089 | + * [Daniel Holbach] |
2090 | + - debian/README: |
2091 | + - updated instructions to obtain 'source' for ubuntu-docs. |
2092 | + |
2093 | + -- Daniel Holbach <daniel.holbach@ubuntu.com> Sun, 23 Apr 2006 08:39:40 +0200 |
2094 | + |
2095 | +ubuntu-docs (6.04.7) dapper; urgency=low |
2096 | + |
2097 | + * Revised DapperFirefoxStartPageTranslation: |
2098 | + - new slave alternatives directory for translated homepages |
2099 | + - automatic script for generation of link farm |
2100 | + |
2101 | + -- Ian Jackson <iwj@ubuntu.com> Fri, 21 Apr 2006 18:05:36 +0100 |
2102 | + |
2103 | +ubuntu-docs (6.04.6) dapper; urgency=low |
2104 | + |
2105 | + * SVN checkout to make mdke happy. |
2106 | + |
2107 | + -- Daniel Holbach <daniel.holbach@ubuntu.com> Sat, 15 Apr 2006 13:58:57 +0200 |
2108 | + |
2109 | +ubuntu-docs (6.04.5) dapper; urgency=low |
2110 | + |
2111 | + * Massive reduction in source package (to make dholbach happy) |
2112 | + * Adding more firefox homepage translations |
2113 | + |
2114 | + -- Matthew East <mdke@ubuntu.com> Tue, 11 Apr 2006 22:26:00 +0100 |
2115 | + |
2116 | +ubuntu-docs (6.04.4) dapper; urgency=low |
2117 | + |
2118 | + * The "gee the docteam rocks nowadays" release |
2119 | + * Documentation string freeze |
2120 | + * Pot templates for about ubuntu, desktop guide, server guide, packagingguide, preface |
2121 | + * Fixing broken entity in about ubuntu |
2122 | + * Adding more firefox homepage translations |
2123 | + |
2124 | + -- Matthew East <mdke@ubuntu.com> Fri, 07 Apr 2006 15:11:07 +0100 |
2125 | + |
2126 | +ubuntu-docs (6.04.3) dapper; urgency=low |
2127 | + |
2128 | + * Adding links for dummy firefox homepage translations |
2129 | + * Adding lt translation of firefox homepage |
2130 | + |
2131 | + -- Matthew East <mdke@ubuntu.com> Tue, 05 Apr 2006 15:11:07 +0100 |
2132 | + |
2133 | +ubuntu-docs (6.04.2) dapper; urgency=low |
2134 | + |
2135 | + * Adding a link for common files in /usr/share/gnome (fixes malone 37979) |
2136 | + |
2137 | + -- Matthew East <mdke@ubuntu.com> Tue, 04 Apr 2006 11:11:07 +0100 |
2138 | + |
2139 | +ubuntu-docs (6.04.1) dapper; urgency=low |
2140 | + |
2141 | + * New SVN snapshot: |
2142 | + - Rewrite of About Ubuntu document. |
2143 | + - Updated pot file for About-Ubuntu |
2144 | + |
2145 | + -- Daniel Holbach <daniel.holbach@ubuntu.com> Mon, 03 Apr 2006 20:55:07 +0200 |
2146 | + |
2147 | +ubuntu-docs (6.03.5) dapper; urgency=low |
2148 | + |
2149 | + * New SVN snapshot. |
2150 | + * debian/control: |
2151 | + - added docbook-xml to Build-Depends. |
2152 | + |
2153 | + -- Daniel Holbach <daniel.holbach@ubuntu.com> Sun, 26 Mar 2006 16:06:40 +0200 |
2154 | + |
2155 | +ubuntu-docs (6.03.4) dapper; urgency=low |
2156 | + |
2157 | + * New SVN snapshot, should make scrollkeeper happy again. |
2158 | + |
2159 | + -- Daniel Holbach <daniel.holbach@ubuntu.com> Sat, 25 Mar 2006 13:11:39 +0100 |
2160 | + |
2161 | +ubuntu-docs (6.03.3) dapper; urgency=low |
2162 | + |
2163 | + * New SVN snapshot. |
2164 | + |
2165 | + -- Daniel Holbach <daniel.holbach@ubuntu.com> Wed, 22 Mar 2006 14:46:49 +0100 |
2166 | + |
2167 | +ubuntu-docs (6.03.2) dapper; urgency=low |
2168 | + |
2169 | + * New SVN snapshot. |
2170 | + |
2171 | + -- Daniel Holbach <daniel.holbach@ubuntu.com> Tue, 14 Mar 2006 13:10:44 +0100 |
2172 | + |
2173 | +ubuntu-docs (6.03.1) dapper; urgency=low |
2174 | + |
2175 | + * lots of new material from the whole team |
2176 | + * new style for browser homepage, including some images |
2177 | + * corrected position of the sample directories for desktop/server guide html versions |
2178 | + |
2179 | + -- Matthew East <mdke@ubuntu.com> Wed, 8 Mar 2006 16:11:00 +0000 |
2180 | + |
2181 | +ubuntu-docs (6.02.3) dapper; urgency=low |
2182 | + |
2183 | + * New SVN snapshot. |
2184 | + - enhanced copyright file (Malone: #27923) |
2185 | + |
2186 | + -- Daniel Holbach <daniel.holbach@ubuntu.com> Tue, 28 Feb 2006 08:16:47 +0100 |
2187 | + |
2188 | +ubuntu-docs (6.02.2) dapper; urgency=low |
2189 | + |
2190 | + * New SVN snapshot. |
2191 | + |
2192 | + -- Daniel Holbach <daniel.holbach@ubuntu.com> Tue, 21 Feb 2006 14:02:23 +0100 |
2193 | + |
2194 | +ubuntu-docs (6.02.1) dapper; urgency=low |
2195 | + |
2196 | + * New SVN snapshot. |
2197 | + |
2198 | + -- Daniel Holbach <daniel.holbach@ubuntu.com> Mon, 13 Feb 2006 17:31:48 +0100 |
2199 | + |
2200 | +ubuntu-docs (6.01.6) dapper; urgency=low |
2201 | + |
2202 | + * removing links to html versions of the guides from Yelp Table of Contents |
2203 | + * new material for desktopguide (Naaman Campbell, Milo Casagrande, mdke); lots of bugs fixed; fairly drastic re-organisation: please test and give feedback!! |
2204 | + * new material for serverguide (bhuvan) |
2205 | + * reworking of the packagingguide (LaserJock) |
2206 | + * included pot templates for all the guides, which will go into Rosetta (hopefully) |
2207 | + |
2208 | + -- Matthew East <mdke@ubuntu.com> Fri, 3 Feb 2006 12:29:00 +0000 |
2209 | + |
2210 | +ubuntu-docs (6.01.5) dapper; urgency=low |
2211 | + |
2212 | + * [Daniel Holbach] |
2213 | + - New SVN checkout. |
2214 | + * [Matthew East] |
2215 | + - using a static html browser startpage rather than a page generated from |
2216 | + docbook xml. |
2217 | + |
2218 | + -- Daniel Holbach <daniel.holbach@ubuntu.com> Mon, 23 Jan 2006 15:55:39 +0100 |
2219 | + |
2220 | +ubuntu-docs (6.01.4) dapper; urgency=low |
2221 | + |
2222 | + * New SVN checkout. |
2223 | + |
2224 | + -- Daniel Holbach <daniel.holbach@ubuntu.com> Tue, 17 Jan 2006 20:20:09 +0100 |
2225 | + |
2226 | +ubuntu-docs (6.01.3) dapper; urgency=low |
2227 | + |
2228 | + * Matthew East <mkde@ubuntu.com>: |
2229 | + - new shorter firefox start page. |
2230 | + * Daniel Holbach <dholbach@ubuntu.com>: |
2231 | + - new SVN checkout. |
2232 | + |
2233 | + -- Daniel Holbach <daniel.holbach@ubuntu.com> Thu, 12 Jan 2006 10:27:36 +0100 |
2234 | + |
2235 | +ubuntu-docs (6.01.2) dapper; urgency=low |
2236 | + |
2237 | + * New SVN checkout. |
2238 | + |
2239 | + -- Daniel Holbach <daniel.holbach@ubuntu.com> Mon, 9 Jan 2006 13:08:28 +0100 |
2240 | + |
2241 | +ubuntu-docs (6.01.1) dapper; urgency=low |
2242 | + |
2243 | + * New SVN checkout. |
2244 | + |
2245 | + -- Daniel Holbach <daniel.holbach@ubuntu.com> Mon, 2 Jan 2006 15:19:27 +0100 |
2246 | + |
2247 | +ubuntu-docs (5.12.4) dapper; urgency=low |
2248 | + |
2249 | + * New SVN checkout. |
2250 | + * debian/README: |
2251 | + - fixed little typo. |
2252 | + * ubuntu/Makefile: |
2253 | + - dropped dg-IT from dg build target to fix build. |
2254 | + |
2255 | + -- Daniel Holbach <daniel.holbach@ubuntu.com> Thu, 22 Dec 2005 12:18:55 +0100 |
2256 | + |
2257 | +ubuntu-docs (5.12.3) dapper; urgency=low |
2258 | + |
2259 | + * Use update-alternatives for Firefox index page |
2260 | + |
2261 | + -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 20 Dec 2005 19:27:41 +0000 |
2262 | + |
2263 | +ubuntu-docs (5.12.2) dapper; urgency=low |
2264 | + |
2265 | + * New SVN checkout. |
2266 | + * debian/README.Debian |
2267 | + - added by Matthew East. |
2268 | + - The directories mentioned in there are stripped from the tarball. |
2269 | + |
2270 | + -- Daniel Holbach <daniel.holbach@ubuntu.com> Wed, 14 Dec 2005 22:43:52 +0100 |
2271 | + |
2272 | +ubuntu-docs (5.12.1) dapper; urgency=low |
2273 | + |
2274 | + * New SVN checkout. |
2275 | + |
2276 | + -- Daniel Holbach <daniel.holbach@ubuntu.com> Tue, 6 Dec 2005 08:32:51 +0100 |
2277 | + |
2278 | +ubuntu-docs (5.11-4) dapper; urgency=low |
2279 | + |
2280 | + * new text, image and css in /usr/share/ubuntu-artwork/home/index.html (Ubuntu #15013, #16932, #17605 and #20692) |
2281 | + * Including the sample/ directory with desktopguide and serverguide |
2282 | + |
2283 | + -- Matthew East <mdke@ubuntu.com> Mon, 2 Dec 2005 17:37:00 +0000 |
2284 | + |
2285 | +ubuntu-docs (5.11-3) dapper; urgency=low |
2286 | + |
2287 | + * adding packaging guide to the package |
2288 | + * moving xml guides to a new location (/usr/share/ubuntu-docs/ubuntu rather than /usr/share/ubuntu-docs) so that the entities work. |
2289 | + |
2290 | + -- Matthew East <mdke@ubuntu.com> Mon, 28 Nov 2005 18:37:49 +0000 |
2291 | + |
2292 | +ubuntu-docs (5.11-2) dapper; urgency=low |
2293 | + |
2294 | + * added html versions of desktopguide and serverguide with relevant omf targets |
2295 | + * fixing misplaced css and navigation buttons |
2296 | + |
2297 | + -- Matthew East <mdke@ubuntu.com> Mon, 28 Nov 2005 18:37:49 +0000 |
2298 | + |
2299 | +ubuntu-docs (5.11-1) dapper; urgency=low |
2300 | + |
2301 | + * New SVN checkout. |
2302 | + * debian/control: |
2303 | + - Bumped Standards-Version. |
2304 | + * debian/ubuntu-docs.doc-base.quicktour: |
2305 | + - dropped. |
2306 | + |
2307 | + -- Daniel Holbach <daniel.holbach@ubuntu.com> Fri, 25 Nov 2005 20:56:49 +0100 |
2308 | + |
2309 | +ubuntu-docs (5.10-7) dapper; urgency=low |
2310 | + |
2311 | + * New document names for dapper (faqguide -> desktopguide) |
2312 | + |
2313 | + * Improved About Ubuntu css |
2314 | + |
2315 | + * Removed translations (translation won't start until string freeze) |
2316 | + |
2317 | + * Added new Server Guide |
2318 | + |
2319 | + -- Matthew East <mdke@ubuntu.com> Fri, 25 Nov 2005 15:52:14 +0000 |
2320 | + |
2321 | +ubuntu-docs (5.10-6) breezy; urgency=low |
2322 | + |
2323 | + * Resolve remaining errors from pofile export from Rosetta. |
2324 | + (Ubuntu #17145) |
2325 | + Thanks to Matthew East for this! |
2326 | + |
2327 | + * Make ghelp URIs work again (Ubuntu #16982) |
2328 | + |
2329 | + * Prune out unused images. |
2330 | + |
2331 | + * Firefox start page now has image and CSS. |
2332 | + |
2333 | + * The faqguide is now known as the "Ubuntu 5.10 Starter Guide" |
2334 | + |
2335 | + -- Jeff Bailey <jbailey@ubuntu.com> Fri, 7 Oct 2005 16:32:14 -0400 |
2336 | + |
2337 | +ubuntu-docs (5.10-5) breezy; urgency=low |
2338 | + |
2339 | + * Resolve entity errors (Ubuntu: #15866, 16680) |
2340 | + |
2341 | + * Provide firefox start page (Ubuntu: #16663) |
2342 | + |
2343 | + Note: This page needs work as the image doesn't display and the CSS |
2344 | + file crashes firefox, but this kills the annoying error. |
2345 | + |
2346 | + -- Jeff Bailey <jbailey@ubuntu.com> Mon, 3 Oct 2005 02:20:04 -0400 |
2347 | + |
2348 | +ubuntu-docs (5.10-4) breezy; urgency=low |
2349 | + |
2350 | + * Final update for NonLanguagePackTranslationDeadlinreg |
2351 | + |
2352 | + -- Jeff Bailey <jbailey@ubuntu.com> Thu, 29 Sep 2005 23:28:43 -0400 |
2353 | + |
2354 | +ubuntu-docs (5.10-3) breezy; urgency=low |
2355 | + |
2356 | + * Lighten the package somewhat (Thanks to Jerome Gotangco) |
2357 | + |
2358 | + * Conflict/Replace ubuntu-faqguide (Ubuntu: #16465) |
2359 | + Thanks to Matt Zimmerman for catching this! |
2360 | + |
2361 | + -- Jeff Bailey <jbailey@ubuntu.com> Wed, 28 Sep 2005 00:26:10 -0400 |
2362 | + |
2363 | +ubuntu-docs (5.10-2) breezy; urgency=low |
2364 | + |
2365 | + * Switch to docbook |
2366 | + |
2367 | + * Remove old ubuntu-quickguide (Ubuntu #14816, #14709) |
2368 | + |
2369 | + * Various updates from the docteam and translators. |
2370 | + |
2371 | + -- Jeff Bailey <jbailey@ubuntu.com> Tue, 27 Sep 2005 00:34:05 -0400 |
2372 | + |
2373 | +ubuntu-docs (5.10-1) breezy; urgency=low |
2374 | + |
2375 | + * Redo packaging based heavily off of Matt's packaging, make |
2376 | + sure that images are all included and that pages don't say |
2377 | + "draft". |
2378 | + |
2379 | + Currently includes: about-ubuntu, faqamd64, faqi386, faqppc, |
2380 | + quicktour, and release-notes. |
2381 | + |
2382 | + -- Jeff Bailey <jbailey@ubuntu.com> Fri, 2 Sep 2005 01:55:34 -0400 |
2383 | + |
2384 | +ubuntu-docs (5.10-0.0) breezy; urgency=low |
2385 | + |
2386 | + * First release using new revision number scheme |
2387 | + * Currently only include releasenotes, aboutubuntu, and the faqguide |
2388 | + |
2389 | + -- Matt T Galvin <matt.t.galvin@gmail.com> Wed, 10 Aug 2005 20:37:21 -0400 |
2390 | + |
2391 | +ubuntu-docs (1.0-1) hoary; urgency=low |
2392 | + |
2393 | + * New release |
2394 | + (xh OMF files are now translated) |
2395 | + * Bump to 1.0 because this one wants to be the last upload for Hoary |
2396 | + |
2397 | + -- Enrico Zini <enrico@debian.org> Wed, 6 Apr 2005 15:03:50 +0200 |
2398 | + |
2399 | +ubuntu-docs (0.7-1) hoary; urgency=low |
2400 | + |
2401 | + * New release |
2402 | + * Added translated OMF files |
2403 | + |
2404 | + -- Enrico Zini <enrico@debian.org> Wed, 6 Apr 2005 14:20:26 +0200 |
2405 | + |
2406 | +ubuntu-docs (0.6-1) hoary; urgency=low |
2407 | + |
2408 | + * New release |
2409 | + * Translations updated |
2410 | + * quickguide file name changed |
2411 | + * Quickguide starts having translations as well |
2412 | + |
2413 | + -- Enrico Zini <enrico@debian.org> Tue, 5 Apr 2005 16:56:31 +0200 |
2414 | + |
2415 | +ubuntu-docs (0.5-1) hoary; urgency=low |
2416 | + |
2417 | + * New release |
2418 | + * Includes translations |
2419 | + |
2420 | + -- Enrico Zini <enrico@debian.org> Mon, 4 Apr 2005 15:52:27 +0200 |
2421 | + |
2422 | +ubuntu-docs (0.4-1) hoary; urgency=low |
2423 | + |
2424 | + * New release |
2425 | + * Reworked Debian packaging to install things according to Gnome standards |
2426 | + |
2427 | + -- Enrico Zini <enrico@debian.org> Thu, 24 Mar 2005 13:29:23 +0100 |
2428 | + |
2429 | +ubuntu-docs (0.3-1) hoary; urgency=low |
2430 | + |
2431 | + * New release |
2432 | + * Fixed the debian/ scripts to handle changes in the location of the release |
2433 | + notes |
2434 | + * ubuntu-docs conflicts with ubuntu-quickguide << 0.3 because an image has |
2435 | + been moved from the quickguide package to the ubuntu-docs package |
2436 | + |
2437 | + -- Enrico Zini <enrico@debian.org> Mon, 21 Mar 2005 11:16:12 +0100 |
2438 | + |
2439 | +ubuntu-docs (0.2-1) hoary; urgency=low |
2440 | + |
2441 | + * New release |
2442 | + * Added more OMF files; registration with scroolkeeper now works, but the |
2443 | + documents show up in the "Other" cathegory, which is suboptimal |
2444 | + |
2445 | + -- Enrico Zini <enrico@enricozini.org> Fri, 4 Mar 2005 15:42:16 +0100 |
2446 | + |
2447 | +ubuntu-docs (0.1-1) hoary; urgency=low |
2448 | + |
2449 | + * Initial release. |
2450 | + |
2451 | + -- Enrico Zini <enrico@enricozini.org> Tue, 30 Nov 2004 17:55:37 +0200 |
2452 | |
2453 | === added file 'debian/compat' |
2454 | --- debian/compat 1970-01-01 00:00:00 +0000 |
2455 | +++ debian/compat 2014-10-18 21:40:54 +0000 |
2456 | @@ -0,0 +1,1 @@ |
2457 | +8 |
2458 | |
2459 | === added file 'debian/control' |
2460 | --- debian/control 1970-01-01 00:00:00 +0000 |
2461 | +++ debian/control 2014-10-18 21:40:54 +0000 |
2462 | @@ -0,0 +1,21 @@ |
2463 | +Source: ubuntu-docs |
2464 | +Section: doc |
2465 | +Priority: optional |
2466 | +Maintainer: Ubuntu Documentation Team <ubuntu-doc@lists.ubuntu.com> |
2467 | +Build-Depends: debhelper (>= 8), cdbs |
2468 | +Build-Depends-Indep: gnome-common, |
2469 | + pkg-config, |
2470 | + yelp-tools |
2471 | +Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-doc/ubuntu-docs/saucy |
2472 | +Standards-Version: 3.9.5 |
2473 | +Homepage: https://launchpad.net/ubuntu-docs |
2474 | + |
2475 | +Package: ubuntu-docs |
2476 | +Architecture: all |
2477 | +Depends: ${misc:Depends}, |
2478 | + yelp |
2479 | +Description: Ubuntu Desktop Guide |
2480 | + This package holds the official Ubuntu-specific documentation, maintained |
2481 | + by the Ubuntu Documentation Team. The documentation can be viewed using |
2482 | + Yelp, the GNOME help browser. |
2483 | + |
2484 | |
2485 | === added file 'debian/copyright' |
2486 | --- debian/copyright 1970-01-01 00:00:00 +0000 |
2487 | +++ debian/copyright 2014-10-18 21:40:54 +0000 |
2488 | @@ -0,0 +1,319 @@ |
2489 | +Format: http://dep.debian.net/deps/dep5/ |
2490 | +Upstream-Name: ubuntu-docs |
2491 | +Upstream-Contact: Ubuntu Documentation Team <ubuntu-doc@lists.ubuntu.com> |
2492 | +Source: https://launchpad.net/ubuntu-docs |
2493 | +Copyright: (C) 2004-2014 The Ubuntu Documentation Team |
2494 | + |
2495 | +Files: * |
2496 | +Copyright: (C) 2004-2014 The Ubuntu Documentation Team |
2497 | +License: GPL-3+ |
2498 | + This program is free software: you can redistribute it and/or modify |
2499 | + it under the terms of the GNU General Public License as published by |
2500 | + the Free Software Foundation, either version 3 of the License, or |
2501 | + (at your option) any later version. |
2502 | + . |
2503 | + This program is distributed in the hope that it will be useful, |
2504 | + but WITHOUT ANY WARRANTY; without even the implied warranty of |
2505 | + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
2506 | + GNU General Public License for more details. |
2507 | + . |
2508 | + You should have received a copy of the GNU General Public License |
2509 | + along with this program. If not, see <http://www.gnu.org/licenses/>. |
2510 | + . |
2511 | + On Debian Systems, the full text of this license can be found in |
2512 | + /usr/share/common-licenses/GPL-3. |
2513 | + |
2514 | +Files: ubuntu-help/*/*.page* ubuntu-help/*/*.po ubuntu-help/*/figures/* html/img/* |
2515 | +Copyright: (C) 2004-2014 The Ubuntu Documentation Team |
2516 | +License: CC-BY-SA-3.0 |
2517 | + THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE |
2518 | + COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY |
2519 | + COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS |
2520 | + AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. |
2521 | + BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE |
2522 | + BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE |
2523 | + CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE |
2524 | + IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. |
2525 | + 1. Definitions |
2526 | + a. "Adaptation" means a work based upon the Work, or upon the Work and other |
2527 | + pre-existing works, such as a translation, adaptation, derivative work, |
2528 | + arrangement of music or other alterations of a literary or artistic work, |
2529 | + or phonogram or performance and includes cinematographic adaptations or |
2530 | + any other form in which the Work may be recast, transformed, or adapted |
2531 | + including in any form recognizably derived from the original, except that |
2532 | + a work that constitutes a Collection will not be considered an Adaptation |
2533 | + for the purpose of this License. For the avoidance of doubt, where the |
2534 | + Work is a musical work, performance or phonogram, the synchronization of |
2535 | + the Work in timed-relation with a moving image ("synching") will be |
2536 | + considered an Adaptation for the purpose of this License. |
2537 | + b. "Collection" means a collection of literary or artistic works, such as |
2538 | + encyclopedias and anthologies, or performances, phonograms or broadcasts, |
2539 | + or other works or subject matter other than works listed in Section 1(f) |
2540 | + below, which, by reason of the selection and arrangement of their |
2541 | + contents, constitute intellectual creations, in which the Work is |
2542 | + included in its entirety in unmodified form along with one or more other |
2543 | + contributions, each constituting separate and independent works in |
2544 | + themselves, which together are assembled into a collective whole. A work |
2545 | + that constitutes a Collection will not be considered an Adaptation (as |
2546 | + defined below) for the purposes of this License. |
2547 | + c. "Creative Commons Compatible License" means a license that is listed at |
2548 | + http://creativecommons.org/compatiblelicenses that has been approved by |
2549 | + Creative Commons as being essentially equivalent to this License, |
2550 | + including, at a minimum, because that license: (i) contains terms that |
2551 | + have the same purpose, meaning and effect as the License Elements of this |
2552 | + License; and, (ii) explicitly permits the relicensing of adaptations of |
2553 | + works made available under that license under this License or a Creative |
2554 | + Commons jurisdiction license with the same License Elements as this |
2555 | + License. |
2556 | + d. "Distribute" means to make available to the public the original and |
2557 | + copies of the Work or Adaptation, as appropriate, through sale or other |
2558 | + transfer of ownership. |
2559 | + e. "License Elements" means the following high-level license attributes as |
2560 | + selected by Licensor and indicated in the title of this License: |
2561 | + Attribution, ShareAlike. |
2562 | + f. "Licensor" means the individual, individuals, entity or entities that |
2563 | + offer(s) the Work under the terms of this License. |
2564 | + g. "Original Author" means, in the case of a literary or artistic work, the |
2565 | + individual, individuals, entity or entities who created the Work or if no |
2566 | + individual or entity can be identified, the publisher; and in addition |
2567 | + (i) in the case of a performance the actors, singers, musicians, dancers, |
2568 | + and other persons who act, sing, deliver, declaim, play in, interpret or |
2569 | + otherwise perform literary or artistic works or expressions of folklore; |
2570 | + (ii) in the case of a phonogram the producer being the person or legal |
2571 | + entity who first fixes the sounds of a performance or other sounds; and, |
2572 | + (iii) in the case of broadcasts, the organization that transmits the |
2573 | + broadcast. |
2574 | + h. "Work" means the literary and/or artistic work offered under the terms of |
2575 | + this License including without limitation any production in the literary, |
2576 | + scientific and artistic domain, whatever may be the mode or form of its |
2577 | + expression including digital form, such as a book, pamphlet and other |
2578 | + writing; a lecture, address, sermon or other work of the same nature; a |
2579 | + dramatic or dramatico-musical work; a choreographic work or entertainment |
2580 | + in dumb show; a musical composition with or without words; a |
2581 | + cinematographic work to which are assimilated works expressed by a |
2582 | + process analogous to cinematography; a work of drawing, painting, |
2583 | + architecture, sculpture, engraving or lithography; a photographic work to |
2584 | + which are assimilated works expressed by a process analogous to |
2585 | + photography; a work of applied art; an illustration, map, plan, sketch or |
2586 | + three-dimensional work relative to geography, topography, architecture or |
2587 | + science; a performance; a broadcast; a phonogram; a compilation of data |
2588 | + to the extent it is protected as a copyrightable work; or a work |
2589 | + performed by a variety or circus performer to the extent it is not |
2590 | + otherwise considered a literary or artistic work. |
2591 | + i. "You" means an individual or entity exercising rights under this License |
2592 | + who has not previously violated the terms of this License with respect to |
2593 | + the Work, or who has received express permission from the Licensor to |
2594 | + exercise rights under this License despite a previous violation. |
2595 | + j. "Publicly Perform" means to perform public recitations of the Work and to |
2596 | + communicate to the public those public recitations, by any means or |
2597 | + process, including by wire or wireless means or public digital |
2598 | + performances; to make available to the public Works in such a way that |
2599 | + members of the public may access these Works from a place and at a place |
2600 | + individually chosen by them; to perform the Work to the public by any |
2601 | + means or process and the communication to the public of the performances |
2602 | + of the Work, including by public digital performance; to broadcast and |
2603 | + rebroadcast the Work by any means including signs, sounds or images. |
2604 | + k. "Reproduce" means to make copies of the Work by any means including |
2605 | + without limitation by sound or visual recordings and the right of |
2606 | + fixation and reproducing fixations of the Work, including storage of a |
2607 | + protected performance or phonogram in digital form or other electronic |
2608 | + medium. |
2609 | + 2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, |
2610 | + or restrict any uses free from copyright or rights arising from limitations or |
2611 | + exceptions that are provided for in connection with the copyright protection |
2612 | + under copyright law or other applicable laws. |
2613 | + 3. License Grant. Subject to the terms and conditions of this License, Licensor |
2614 | + hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the |
2615 | + duration of the applicable copyright) license to exercise the rights in the |
2616 | + Work as stated below: |
2617 | + a. to Reproduce the Work, to incorporate the Work into one or more |
2618 | + Collections, and to Reproduce the Work as incorporated in the |
2619 | + Collections; |
2620 | + b. to create and Reproduce Adaptations provided that any such Adaptation, |
2621 | + including any translation in any medium, takes reasonable steps to |
2622 | + clearly label, demarcate or otherwise identify that changes were made to |
2623 | + the original Work. For example, a translation could be marked "The |
2624 | + original work was translated from English to Spanish," or a modification |
2625 | + could indicate "The original work has been modified."; |
2626 | + c. to Distribute and Publicly Perform the Work including as incorporated in |
2627 | + Collections; and, |
2628 | + d. to Distribute and Publicly Perform Adaptations. |
2629 | + e. For the avoidance of doubt: |
2630 | + i. Non-waivable Compulsory License Schemes. In those jurisdictions in |
2631 | + which the right to collect royalties through any statutory or |
2632 | + compulsory licensing scheme cannot be waived, the Licensor reserves |
2633 | + the exclusive right to collect such royalties for any exercise by |
2634 | + You of the rights granted under this License; |
2635 | + ii. Waivable Compulsory License Schemes. In those jurisdictions in |
2636 | + which the right to collect royalties through any statutory or |
2637 | + compulsory licensing scheme can be waived, the Licensor waives the |
2638 | + exclusive right to collect such royalties for any exercise by You |
2639 | + of the rights granted under this License; and, |
2640 | + iii. Voluntary License Schemes. The Licensor waives the right to collect |
2641 | + royalties, whether individually or, in the event that the Licensor |
2642 | + is a member of a collecting society that administers voluntary |
2643 | + licensing schemes, via that society, from any exercise by You of |
2644 | + the rights granted under this License. |
2645 | + The above rights may be exercised in all media and formats whether now known or |
2646 | + hereafter devised. The above rights include the right to make such |
2647 | + modifications as are technically necessary to exercise the rights in other |
2648 | + media and formats. Subject to Section 8(f), all rights not expressly granted by |
2649 | + Licensor are hereby reserved. |
2650 | + 4. Restrictions. The license granted in Section 3 above is expressly made |
2651 | + subject to and limited by the following restrictions: |
2652 | + a. You may Distribute or Publicly Perform the Work only under the terms of |
2653 | + this License. You must include a copy of, or the Uniform Resource |
2654 | + Identifier (URI) for, this License with every copy of the Work You |
2655 | + Distribute or Publicly Perform. You may not offer or impose any terms on |
2656 | + the Work that restrict the terms of this License or the ability of the |
2657 | + recipient of the Work to exercise the rights granted to that recipient |
2658 | + under the terms of the License. You may not sublicense the Work. You must |
2659 | + keep intact all notices that refer to this License and to the disclaimer |
2660 | + of warranties with every copy of the Work You Distribute or Publicly |
2661 | + Perform. When You Distribute or Publicly Perform the Work, You may not |
2662 | + impose any effective technological measures on the Work that restrict the |
2663 | + ability of a recipient of the Work from You to exercise the rights |
2664 | + granted to that recipient under the terms of the License. This Section 4 |
2665 | + (a) applies to the Work as incorporated in a Collection, but this does |
2666 | + not require the Collection apart from the Work itself to be made subject |
2667 | + to the terms of this License. If You create a Collection, upon notice |
2668 | + from any Licensor You must, to the extent practicable, remove from the |
2669 | + Collection any credit as required by Section 4(c), as requested. If You |
2670 | + create an Adaptation, upon notice from any Licensor You must, to the |
2671 | + extent practicable, remove from the Adaptation any credit as required by |
2672 | + Section 4(c), as requested. |
2673 | + b. You may Distribute or Publicly Perform an Adaptation only under the terms |
2674 | + of: (i) this License; (ii) a later version of this License with the same |
2675 | + License Elements as this License; (iii) a Creative Commons jurisdiction |
2676 | + license (either this or a later license version) that contains the same |
2677 | + License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); |
2678 | + (iv) a Creative Commons Compatible License. If you license the Adaptation |
2679 | + under one of the licenses mentioned in (iv), you must comply with the |
2680 | + terms of that license. If you license the Adaptation under the terms of |
2681 | + any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable |
2682 | + License"), you must comply with the terms of the Applicable License |
2683 | + generally and the following provisions: (I) You must include a copy of, |
2684 | + or the URI for, the Applicable License with every copy of each Adaptation |
2685 | + You Distribute or Publicly Perform; (II) You may not offer or impose any |
2686 | + terms on the Adaptation that restrict the terms of the Applicable License |
2687 | + or the ability of the recipient of the Adaptation to exercise the rights |
2688 | + granted to that recipient under the terms of the Applicable License; |
2689 | + (III) You must keep intact all notices that refer to the Applicable |
2690 | + License and to the disclaimer of warranties with every copy of the Work |
2691 | + as included in the Adaptation You Distribute or Publicly Perform; (IV) |
2692 | + when You Distribute or Publicly Perform the Adaptation, You may not |
2693 | + impose any effective technological measures on the Adaptation that |
2694 | + restrict the ability of a recipient of the Adaptation from You to |
2695 | + exercise the rights granted to that recipient under the terms of the |
2696 | + Applicable License. This Section 4(b) applies to the Adaptation as |
2697 | + incorporated in a Collection, but this does not require the Collection |
2698 | + apart from the Adaptation itself to be made subject to the terms of the |
2699 | + Applicable License. |
2700 | + c. If You Distribute, or Publicly Perform the Work or any Adaptations or |
2701 | + Collections, You must, unless a request has been made pursuant to Section |
2702 | + 4(a), keep intact all copyright notices for the Work and provide, |
2703 | + reasonable to the medium or means You are utilizing: (i) the name of the |
2704 | + Original Author (or pseudonym, if applicable) if supplied, and/or if the |
2705 | + Original Author and/or Licensor designate another party or parties (e.g., |
2706 | + a sponsor institute, publishing entity, journal) for attribution |
2707 | + ("Attribution Parties") in Licensor's copyright notice, terms of service |
2708 | + or by other reasonable means, the name of such party or parties; (ii) the |
2709 | + title of the Work if supplied; (iii) to the extent reasonably |
2710 | + practicable, the URI, if any, that Licensor specifies to be associated |
2711 | + with the Work, unless such URI does not refer to the copyright notice or |
2712 | + licensing information for the Work; and (iv) , consistent with Ssection 3 |
2713 | + (b), in the case of an Adaptation, a credit identifying the use of the |
2714 | + Work in the Adaptation (e.g., "French translation of the Work by Original |
2715 | + Author," or "Screenplay based on original Work by Original Author"). The |
2716 | + credit required by this Section 4(c) may be implemented in any reasonable |
2717 | + manner; provided, however, that in the case of a Adaptation or |
2718 | + Collection, at a minimum such credit will appear, if a credit for all |
2719 | + contributing authors of the Adaptation or Collection appears, then as |
2720 | + part of these credits and in a manner at least as prominent as the |
2721 | + credits for the other contributing authors. For the avoidance of doubt, |
2722 | + You may only use the credit required by this Section for the purpose of |
2723 | + attribution in the manner set out above and, by exercising Your rights |
2724 | + under this License, You may not implicitly or explicitly assert or imply |
2725 | + any connection with, sponsorship or endorsement by the Original Author, |
2726 | + Licensor and/or Attribution Parties, as appropriate, of You or Your use |
2727 | + of the Work, without the separate, express prior written permission of |
2728 | + the Original Author, Licensor and/or Attribution Parties. |
2729 | + d. Except as otherwise agreed in writing by the Licensor or as may be |
2730 | + otherwise permitted by applicable law, if You Reproduce, Distribute or |
2731 | + Publicly Perform the Work either by itself or as part of any Adaptations |
2732 | + or Collections, You must not distort, mutilate, modify or take other |
2733 | + derogatory action in relation to the Work which would be prejudicial to |
2734 | + the Original Author's honor or reputation. Licensor agrees that in those |
2735 | + jurisdictions (e.g. Japan), in which any exercise of the right granted in |
2736 | + Section 3(b) of this License (the right to make Adaptations) would be |
2737 | + deemed to be a distortion, mutilation, modification or other derogatory |
2738 | + action prejudicial to the Original Author's honor and reputation, the |
2739 | + Licensor will waive or not assert, as appropriate, this Section, to the |
2740 | + fullest extent permitted by the applicable national law, to enable You to |
2741 | + reasonably exercise Your right under Section 3(b) of this License (right |
2742 | + to make Adaptations) but not otherwise. |
2743 | + 5. Representations, Warranties and Disclaimer |
2744 | + UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS |
2745 | + THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND |
2746 | + CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, |
2747 | + WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A |
2748 | + PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, |
2749 | + ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. |
2750 | + SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH |
2751 | + EXCLUSION MAY NOT APPLY TO YOU. |
2752 | + 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN |
2753 | + NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, |
2754 | + INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS |
2755 | + LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE |
2756 | + POSSIBILITY OF SUCH DAMAGES. |
2757 | + 7. Termination |
2758 | + a. This License and the rights granted hereunder will terminate |
2759 | + automatically upon any breach by You of the terms of this License. |
2760 | + Individuals or entities who have received Adaptations or Collections from |
2761 | + You under this License, however, will not have their licenses terminated |
2762 | + provided such individuals or entities remain in full compliance with |
2763 | + those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any |
2764 | + termination of this License. |
2765 | + b. Subject to the above terms and conditions, the license granted here is |
2766 | + perpetual (for the duration of the applicable copyright in the Work). |
2767 | + Notwithstanding the above, Licensor reserves the right to release the |
2768 | + Work under different license terms or to stop distributing the Work at |
2769 | + any time; provided, however that any such election will not serve to |
2770 | + withdraw this License (or any other license that has been, or is required |
2771 | + to be, granted under the terms of this License), and this License will |
2772 | + continue in full force and effect unless terminated as stated above. |
2773 | + 8. Miscellaneous |
2774 | + a. Each time You Distribute or Publicly Perform the Work or a Collection, |
2775 | + the Licensor offers to the recipient a license to the Work on the same |
2776 | + terms and conditions as the license granted to You under this License. |
2777 | + b. Each time You Distribute or Publicly Perform an Adaptation, Licensor |
2778 | + offers to the recipient a license to the original Work on the same terms |
2779 | + and conditions as the license granted to You under this License. |
2780 | + c. If any provision of this License is invalid or unenforceable under |
2781 | + applicable law, it shall not affect the validity or enforceability of the |
2782 | + remainder of the terms of this License, and without further action by the |
2783 | + parties to this agreement, such provision shall be reformed to the |
2784 | + minimum extent necessary to make such provision valid and enforceable. |
2785 | + d. No term or provision of this License shall be deemed waived and no breach |
2786 | + consented to unless such waiver or consent shall be in writing and signed |
2787 | + by the party to be charged with such waiver or consent. |
2788 | + e. This License constitutes the entire agreement between the parties with |
2789 | + respect to the Work licensed here. There are no understandings, |
2790 | + agreements or representations with respect to the Work not specified |
2791 | + here. Licensor shall not be bound by any additional provisions that may |
2792 | + appear in any communication from You. This License may not be modified |
2793 | + without the mutual written agreement of the Licensor and You. |
2794 | + f. The rights granted under, and the subject matter referenced, in this |
2795 | + License were drafted utilizing the terminology of the Berne Convention |
2796 | + for the Protection of Literary and Artistic Works (as amended on |
2797 | + September 28, 1979), the Rome Convention of 1961, the WIPO Copyright |
2798 | + Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and |
2799 | + the Universal Copyright Convention (as revised on July 24, 1971). These |
2800 | + rights and subject matter take effect in the relevant jurisdiction in |
2801 | + which the License terms are sought to be enforced according to the |
2802 | + corresponding provisions of the implementation of those treaty provisions |
2803 | + in the applicable national law. If the standard suite of rights granted |
2804 | + under applicable copyright law includes additional rights not granted |
2805 | + under this License, such additional rights are deemed to be included in |
2806 | + the License; this License is not intended to restrict the license of any |
2807 | + rights under applicable law. |
2808 | |
2809 | === added file 'debian/rules' |
2810 | --- debian/rules 1970-01-01 00:00:00 +0000 |
2811 | +++ debian/rules 2014-10-18 21:40:54 +0000 |
2812 | @@ -0,0 +1,13 @@ |
2813 | +#!/usr/bin/make -f |
2814 | + |
2815 | +include /usr/share/cdbs/1/rules/debhelper.mk |
2816 | +include /usr/share/cdbs/1/class/gnome.mk |
2817 | +include /usr/share/cdbs/1/rules/utils.mk |
2818 | + |
2819 | +DEB_DH_BUILDDEB_ARGS := -- -Zxz |
2820 | + |
2821 | +makebuilddir/ubuntu-docs:: |
2822 | + @gnome-autogen.sh --prefix=/usr |
2823 | + @echo "---" |
2824 | + @make -C ubuntu-help -f Makefile pot |
2825 | + @echo "---" |
2826 | |
2827 | === added directory 'debian/source' |
2828 | === added file 'debian/source/format' |
2829 | --- debian/source/format 1970-01-01 00:00:00 +0000 |
2830 | +++ debian/source/format 2014-10-18 21:40:54 +0000 |
2831 | @@ -0,0 +1,1 @@ |
2832 | +3.0 (native) |
2833 | |
2834 | === added file 'debian/ubuntu-docs.preinst' |
2835 | --- debian/ubuntu-docs.preinst 1970-01-01 00:00:00 +0000 |
2836 | +++ debian/ubuntu-docs.preinst 2014-10-18 21:40:54 +0000 |
2837 | @@ -0,0 +1,11 @@ |
2838 | +#! /bin/sh |
2839 | +set -e |
2840 | + |
2841 | +if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt "11.10.1" ; then |
2842 | + update-alternatives --quiet --remove-all firefox-homepage || true |
2843 | +fi |
2844 | + |
2845 | +#DEBHELPER# |
2846 | + |
2847 | +exit 0 |
2848 | + |
2849 | |
2850 | === added directory 'html' |
2851 | === renamed directory 'html' => 'html.moved' |
2852 | === added file 'html/Makefile' |
2853 | --- html/Makefile 1970-01-01 00:00:00 +0000 |
2854 | +++ html/Makefile 2014-10-18 21:40:54 +0000 |
2855 | @@ -0,0 +1,112 @@ |
2856 | +#################################################################################### |
2857 | +# Makefile for the GNOME Ubuntu Documentation |
2858 | +# Copyright (C) 2005-2006 Ubuntu Documentation Project (ubuntu-doc@lists.ubuntu.com) |
2859 | +# This program is free software; you can redistribute it and/or modify |
2860 | +# it under the terms of the GNU General Public License as published by |
2861 | +# the Free Software Foundation; either version 2 of the License, or |
2862 | +# (at your option) any later version. |
2863 | +# |
2864 | +# This program is distributed in the hope that it will be useful, |
2865 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
2866 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
2867 | +# GNU General Public License for more details. |
2868 | +# |
2869 | +# You should have received a copy of the GNU General Public License |
2870 | +# along with this program; if not, write to the Free Software |
2871 | +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
2872 | +# On Debian based systems a copy of the GPL can be found |
2873 | +# at /usr/share/common-licenses/GPL |
2874 | +# |
2875 | +#################################################################################### |
2876 | + |
2877 | +MAKECMD=make |
2878 | +HTMLDESTDIR=build |
2879 | +SRCDIR=../ubuntu-help |
2880 | +SED=/bin/sed |
2881 | +INSTALLDIR=/var/www/14.10/ |
2882 | +URLFIXER=fix-urls.sed |
2883 | + |
2884 | +# Space-separated list of language codes for documents. HTML will only be |
2885 | +# built for those codes in the list |
2886 | +# Ex. HELP_LINGUAS=ja it for Japanese and Italian |
2887 | +# Note that the corresponding .page files for the locales must have been built |
2888 | +# for the HTML to be built in turn. This means all the locales for which |
2889 | +# HTML output is needed will have to have been specified in the main |
2890 | +# HELP_LINGUAS variable in the ubuntu-help Makefile |
2891 | +HELP_LINGUAS = am ar ast az bg bo br bs ca ce cs da de el en_AU en_CA en_GB es et eu fi fo fr gl he hi hr hu id it ja kk kn ko lt lv mg ms my nb nl oc pl pt_BR pt ro ru si sk sl sq sr sv ta te tg th tl tr ug uk ur uz zh_CN zh_HK zh_TW |
2892 | + |
2893 | +index_file_exists = $(wildcard $(SRCDIR)/$(lingua)/index.page) |
2894 | +linguas := $(HELP_LINGUAS) |
2895 | +help_linguas := \ |
2896 | + $(foreach lingua, $(linguas), \ |
2897 | + $(if $(index_file_exists), \ |
2898 | + $(lingua), \ |
2899 | + $(warning Cannot find source index page for locale: $(lingua), \ |
2900 | + skipping. You will probably have to build it adding it to \ |
2901 | + the HELP_LINGUAS variable in the Makefile at $(SRCDIR) \ |
2902 | + and rebuild))) |
2903 | + |
2904 | +# Ubuntu Mallard Customization Layer |
2905 | +UBUNTUXSL=ubuntu.xsl |
2906 | + |
2907 | +# Builds the HTML files for all specified language codes, specifiying the |
2908 | +# language in the final documents and performing some other necessary |
2909 | +# text replacements not handled by yelp-build. |
2910 | +# Language codes are normalized to IETF format, as opposed to glibc format |
2911 | +ubuntu-help: clean style |
2912 | + for lc in C $(help_linguas); do \ |
2913 | + lang=`echo $$lc | $(SED) -e 's/[@_]/-/'`; \ |
2914 | + if test "$$lang" = "C"; then lang=en; fi; \ |
2915 | + if test "$$lang" = "gl"; then lang=gl-GL; fi; \ |
2916 | + if test "$$lang" = "ms"; then lang=ms-MS; fi; \ |
2917 | + if test "$$lang" = "pl"; then lang=pl-PL; fi; \ |
2918 | + yelp-build html -o "$(HTMLDESTDIR)/$$lang/" -x $(UBUNTUXSL) \ |
2919 | + "$(SRCDIR)/$$lc/"; \ |
2920 | + $(SED) -i \ |
2921 | + -e '1s/^/<!DOCTYPE html\>\n/' \ |
2922 | + -e "s/<html>/<html lang="$$lang">/" \ |
2923 | + -e 's|/usr/share/icons/.*/\(.*\.svg\)|img/\1|'\ |
2924 | + "$(HTMLDESTDIR)/$$lang/"*.html; \ |
2925 | + $(SED) -i -f "$(URLFIXER)" "$(HTMLDESTDIR)/$$lang/"*.html; \ |
2926 | + echo "\nSearching for yelp help system internal links and either changing them to equivalent or related external links or deleting them:"; \ |
2927 | + $(SED) -i -e '/help:language-selector/d' "$(HTMLDESTDIR)/$$lang/"session*.html; \ |
2928 | + grep "href=\"ghelp:" "$(HTMLDESTDIR)/$$lang/"*.html; \ |
2929 | + rm -rf "$(HTMLDESTDIR)/$$lang/usr"; \ |
2930 | + done |
2931 | + |
2932 | +clean: |
2933 | + rm -rf build |
2934 | + |
2935 | +# Copy style sheet and common images to build directory |
2936 | +# TODO: copy C/figures to destination only for those cases where there are |
2937 | +# no localized figures |
2938 | +style: |
2939 | + for lc in C $(help_linguas); do \ |
2940 | + lang=`echo $$lc | $(SED) -e 's/[@_]/-/'`; \ |
2941 | + if test "$$lang" = "C"; then lang=en; fi; \ |
2942 | + if test "$$lang" = "gl"; then lang=gl-GL; fi; \ |
2943 | + if test "$$lang" = "ms"; then lang=ms-MS; fi; \ |
2944 | + if test "$$lang" = "pl"; then lang=pl-PL; fi; \ |
2945 | + mkdir -p "$(HTMLDESTDIR)/$$lang/img"; \ |
2946 | + mkdir -p "$(HTMLDESTDIR)/$$lang/figures"; \ |
2947 | + cp img/* "$(HTMLDESTDIR)/$$lang/img"; \ |
2948 | + cp "$(SRCDIR)/C/figures/"* "$(HTMLDESTDIR)/$$lang/figures"; \ |
2949 | + done |
2950 | + |
2951 | +# Installs all HTML files to a multilingual site (e.g. run with Apache and |
2952 | +# MultiViews enabled) |
2953 | +install: |
2954 | + rm -Rf "$(INSTALLDIR)"/*; \ |
2955 | + cp -R "$(HTMLDESTDIR)/"* "$(INSTALLDIR)"; \ |
2956 | + for lc in C $(help_linguas); do \ |
2957 | + lang=`echo $$lc | $(SED) -e 's/[@_]/-/'`; \ |
2958 | + if test "$$lang" = "C"; then lang=en; fi; \ |
2959 | + if test "$$lang" = "gl"; then lang=gl-GL; fi; \ |
2960 | + if test "$$lang" = "ms"; then lang=ms-MS; fi; \ |
2961 | + if test "$$lang" = "pl"; then lang=pl-PL; fi; \ |
2962 | + cp -af "$(INSTALLDIR)/$$lang"/*.css "$(INSTALLDIR)"; \ |
2963 | + rm -Rf "$(INSTALLDIR)/$$lang"/*.css ; \ |
2964 | + find "$(INSTALLDIR)/$$lang" -type f -exec mv {} {}.$$lang \; ; \ |
2965 | + cp -af "$(INSTALLDIR)/$$lang"/* "$(INSTALLDIR)"; \ |
2966 | + rm -Rf "$(INSTALLDIR)/$$lang" ; \ |
2967 | + done |
2968 | |
2969 | === added file 'html/fix-urls.sed' |
2970 | --- html/fix-urls.sed 1970-01-01 00:00:00 +0000 |
2971 | +++ html/fix-urls.sed 2014-10-18 21:40:54 +0000 |
2972 | @@ -0,0 +1,43 @@ |
2973 | +#!/bin/sed -f |
2974 | + |
2975 | +#################################################################################### |
2976 | +# Copyright (C) 2005-2006 Ubuntu Documentation Project (ubuntu-doc@lists.ubuntu.com) |
2977 | +# This program is free software; you can redistribute it and/or modify |
2978 | +# it under the terms of the GNU General Public License as published by |
2979 | +# the Free Software Foundation; either version 2 of the License, or |
2980 | +# (at your option) any later version. |
2981 | +# |
2982 | +# This program is distributed in the hope that it will be useful, |
2983 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
2984 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
2985 | +# GNU General Public License for more details. |
2986 | +# |
2987 | +# You should have received a copy of the GNU General Public License |
2988 | +# along with this program; if not, write to the Free Software |
2989 | +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
2990 | +# On Debian based systems a copy of the GPL can be found |
2991 | +# at /usr/share/common-licenses/GPL |
2992 | +# |
2993 | +# Change internal help system links to the GNOME web site equivalents. |
2994 | +# Use the gnome help "stable" link so we don't have to edit this |
2995 | +# for upstream version changes. |
2996 | +# |
2997 | +# Change internal redirects to Ubuntu Software Centre to the related |
2998 | +# ubuntu.com apps web page. This is done in two passes, one for |
2999 | +# the href and one for the title. It could have been one pass, |
3000 | +# but it seemed risky to only use "apt:" as the match. |
3001 | +# |
3002 | +#################################################################################### |
3003 | + |
3004 | +## Fix some of the gnome help links in the generated HTML documentation |
3005 | +s#help:empathy/audio-video#https://help\.gnome\.org/users/empathy/stable/audio-video#g |
3006 | +s#help:\(gnome-orca\|cheese\|baobab\|brasero\|gucharmap\|empathy\)#https://help\.gnome\.org/users/\1/stable/#g |
3007 | + |
3008 | +## Fix some of the appplication references |
3009 | +## s#"apt:#https://apps\.ubuntu\.com/cat/applications/#g |
3010 | +s#href=\"apt:#href=\"https://apps\.ubuntu\.com/cat/applications/#g |
3011 | +s#title=\"apt:#title=\"https://apps\.ubuntu\.com/cat/applications/#g |
3012 | + |
3013 | +## We use https for help.ubuntu.com, Chrome in particular doesn't |
3014 | +## like mixing http & https on the same page (LP: #1044714) |
3015 | +s#http://www.google#https://www.google#g |
3016 | |
3017 | === added directory 'html/img' |
3018 | === added file 'html/img/audio-volume-high-panel.svg' |
3019 | --- html/img/audio-volume-high-panel.svg 1970-01-01 00:00:00 +0000 |
3020 | +++ html/img/audio-volume-high-panel.svg 2014-10-18 21:40:54 +0000 |
3021 | @@ -0,0 +1,19 @@ |
3022 | +<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
3023 | +<!-- Created with Inkscape (http://www.inkscape.org/) --> |
3024 | +<svg id="svg3814" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="24" width="24" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> |
3025 | + <metadata id="metadata3819"> |
3026 | + <rdf:RDF> |
3027 | + <cc:Work rdf:about=""> |
3028 | + <dc:format>image/svg+xml</dc:format> |
3029 | + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> |
3030 | + <dc:title/> |
3031 | + </cc:Work> |
3032 | + </rdf:RDF> |
3033 | + </metadata> |
3034 | + <g id="layer1" transform="translate(0,8)"> |
3035 | + <path id="rect3180-0" d="m8.0134-2.3842e-8c-0.30522 0-0.56653 0.12796-0.75 0.34375l-2.25 2.6562h-2c-0.552 0-1 0.448-1 1-0.00627 0.99607 0.00222 2.0145 0 3 0 0.552 0.448 1 1 1h2l2.1562 2.4688c0.1714 0.305 0.4693 0.531 0.8438 0.531 0.552 0 1-0.448 1-1v-9c0-0.552-0.448-1-1-1z" style="opacity:.3;fill-rule:evenodd;fill:#fff"/> |
3036 | + <path id="path3209-4" d="m17.868-2.15s2.6135 2.4227 2.6135 7.6349c0 5.1866-2.618 7.6651-2.618 7.6651m-2.971-13.055s1.8454 1.7448 1.7797 5.4045c-0.0662 3.6901-1.8093 5.4045-1.8093 5.4045m-3-8.6827s0.98347 0.79498 1.0085 3.2306c0.02476 2.4053-1.0085 3.3256-1.0085 3.3256" style="opacity:.3;stroke-width:1.7;stroke:#fff;stroke-linecap:round;fill:none"/> |
3037 | + <path id="path3209" d="m17.868-3.15s2.6135 2.4227 2.6135 7.6349c0 5.1866-2.618 7.6651-2.618 7.6651m-2.971-13.055s1.8454 1.7448 1.7797 5.4045c-0.0662 3.6901-1.8093 5.4045-1.8093 5.4045m-3-8.6827s0.98347 0.79498 1.0085 3.2306c0.02476 2.4053-1.0085 3.3256-1.0085 3.3256" style="stroke-width:1.7;stroke:#3c3c3c;stroke-linecap:round;fill:none"/> |
3038 | + <path id="rect3180" d="m8.0134-1c-0.30522 0-0.56653 0.12796-0.75 0.34375l-2.25 2.6562h-2c-0.552 0-1 0.448-1 1-0.00627 0.99607 0.00222 2.0145 0 3 0 0.552 0.448 1 1 1h2l2.1562 2.4688c0.1714 0.3049 0.4693 0.5312 0.8438 0.5312 0.552 0 1-0.448 1-1v-9c0-0.552-0.448-1-1-1z" style="fill-rule:evenodd;fill:#3c3c3c"/> |
3039 | + </g> |
3040 | +</svg> |
3041 | |
3042 | === added file 'html/img/battery-100.svg' |
3043 | --- html/img/battery-100.svg 1970-01-01 00:00:00 +0000 |
3044 | +++ html/img/battery-100.svg 2014-10-18 21:40:54 +0000 |
3045 | @@ -0,0 +1,18 @@ |
3046 | +<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
3047 | +<!-- Created with Inkscape (http://www.inkscape.org/) --> |
3048 | +<svg id="svg3014" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="24" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> |
3049 | + <metadata id="metadata3019"> |
3050 | + <rdf:RDF> |
3051 | + <cc:Work rdf:about=""> |
3052 | + <dc:format>image/svg+xml</dc:format> |
3053 | + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> |
3054 | + <dc:title/> |
3055 | + </cc:Work> |
3056 | + </rdf:RDF> |
3057 | + </metadata> |
3058 | + <path id="rect2401-5" d="m7 7c-1.108 0-2 0.892-2 2v8c0 1.108 0.892 2 2 2h18c1.108 0 2-0.892 2-2v-1h0.38433c1.108 0 1.616-0.892 1.616-2v-2c0-1.108-0.42558-2-1.5336-2h-0.466v-1c0-1.108-0.892-2-2-2zm0 1h18c0.554 0 1 0.446 1 1v8c0 0.554-0.446 1-1 1h-18c-0.554 0-1-0.446-1-1v-8c0-0.554 0.446-1 1-1zm20 3c0.59742 0 1 0.051 1 1v2c0 0.9914-0.40645 1-1 1z" style="opacity:.3;fill:#fff"/> |
3059 | + <rect id="rect3190-4" style="opacity:.3;fill-rule:evenodd;fill:#fff" rx=".5" ry=".5" transform="rotate(90)" width="8" y="-25" x="9" height="18"/> |
3060 | + <path id="rect2401" d="m7 6c-1.108 0-2 0.892-2 2v8c0 1.108 0.892 2 2 2h18c1.108 0 2-0.892 2-2v-1h0.38433c1.108 0 1.616-0.892 1.616-2v-2c0-1.108-0.426-2-1.534-2h-0.466v-1c0-1.108-0.892-2-2-2zm0 1h18c0.554 0 1 0.446 1 1v8c0 0.554-0.446 1-1 1h-18c-0.554 0-1-0.446-1-1v-8c0-0.554 0.446-1 1-1zm20 3c0.59742 0 1 0.051 1 1v2c0 0.9914-0.40645 1-1 1z" style="fill:#3c3c3c"/> |
3061 | + <rect id="rect3192" style="opacity:.3;stroke-width:0.5;stroke:#3c3c3c;stroke-linecap:round;fill:none" rx=".75" ry=".75" height="9.5" width="19.5" y="7.25" x="6.25"/> |
3062 | + <rect id="rect3190" style="fill-rule:evenodd;fill:#3c3c3c" rx=".5" ry=".5" transform="rotate(90)" width="8" y="-25" x="8" height="18"/> |
3063 | +</svg> |
3064 | |
3065 | === added file 'html/img/bg_dotted.png' |
3066 | Binary files html/img/bg_dotted.png 1970-01-01 00:00:00 +0000 and html/img/bg_dotted.png 2014-10-18 21:40:54 +0000 differ |
3067 | === added file 'html/img/bluetooth-active.svg' |
3068 | --- html/img/bluetooth-active.svg 1970-01-01 00:00:00 +0000 |
3069 | +++ html/img/bluetooth-active.svg 2014-10-18 21:40:54 +0000 |
3070 | @@ -0,0 +1,21 @@ |
3071 | +<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
3072 | +<!-- Created with Inkscape (http://www.inkscape.org/) --> |
3073 | +<svg id="svg3213" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="24" width="24" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> |
3074 | + <metadata id="metadata12"> |
3075 | + <rdf:RDF> |
3076 | + <cc:Work rdf:about=""> |
3077 | + <dc:format>image/svg+xml</dc:format> |
3078 | + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> |
3079 | + <dc:title/> |
3080 | + </cc:Work> |
3081 | + </rdf:RDF> |
3082 | + </metadata> |
3083 | + <g id="layer1" transform="translate(-1 -.00025397)"> |
3084 | + <g id="g3790" style="opacity:.3;stroke:#fff" transform="translate(0 1.0003)"> |
3085 | + <path id="path3367-2" style="stroke-linejoin:round;stroke:#fff;stroke-linecap:round;stroke-width:1.4115;fill:none" d="m11.789 19.294 3.505-3.74-6.5883-6.6311m-1e-7 6.0661 6.5885-6.6311-3.5516-3.6521"/> |
3086 | + <path id="path3590-1" style="stroke:#fff;stroke-linecap:round;stroke-width:1px;fill:none" d="m11.507 4.8749 0.08824 14.156"/> |
3087 | + </g> |
3088 | + <path id="path3367" style="stroke-linejoin:round;stroke:#3c3c3c;stroke-linecap:round;stroke-width:1.4115;fill:none" d="m11.789 19.294 3.505-3.74-6.5883-6.6311m-1e-7 6.0661 6.5885-6.6311-3.5516-3.6521"/> |
3089 | + <path id="path3590" style="stroke:#3c3c3c;stroke-linecap:round;stroke-width:1px;fill:none" d="m11.507 4.8749 0.08824 14.156"/> |
3090 | + </g> |
3091 | +</svg> |
3092 | |
3093 | === added file 'html/img/body_bg.png' |
3094 | Binary files html/img/body_bg.png 1970-01-01 00:00:00 +0000 and html/img/body_bg.png 2014-10-18 21:40:54 +0000 differ |
3095 | === added file 'html/img/bullet.png' |
3096 | Binary files html/img/bullet.png 1970-01-01 00:00:00 +0000 and html/img/bullet.png 2014-10-18 21:40:54 +0000 differ |
3097 | === added file 'html/img/cap-top.png' |
3098 | Binary files html/img/cap-top.png 1970-01-01 00:00:00 +0000 and html/img/cap-top.png 2014-10-18 21:40:54 +0000 differ |
3099 | === added file 'html/img/dotted.png' |
3100 | Binary files html/img/dotted.png 1970-01-01 00:00:00 +0000 and html/img/dotted.png 2014-10-18 21:40:54 +0000 differ |
3101 | === added file 'html/img/error.png' |
3102 | Binary files html/img/error.png 1970-01-01 00:00:00 +0000 and html/img/error.png 2014-10-18 21:40:54 +0000 differ |
3103 | === added file 'html/img/favicon.ico' |
3104 | Binary files html/img/favicon.ico 1970-01-01 00:00:00 +0000 and html/img/favicon.ico 2014-10-18 21:40:54 +0000 differ |
3105 | === added file 'html/img/footer.png' |
3106 | Binary files html/img/footer.png 1970-01-01 00:00:00 +0000 and html/img/footer.png 2014-10-18 21:40:54 +0000 differ |
3107 | === added file 'html/img/footer_logo.png' |
3108 | Binary files html/img/footer_logo.png 1970-01-01 00:00:00 +0000 and html/img/footer_logo.png 2014-10-18 21:40:54 +0000 differ |
3109 | === added file 'html/img/header.png' |
3110 | Binary files html/img/header.png 1970-01-01 00:00:00 +0000 and html/img/header.png 2014-10-18 21:40:54 +0000 differ |
3111 | === added file 'html/img/header_bg.png' |
3112 | Binary files html/img/header_bg.png 1970-01-01 00:00:00 +0000 and html/img/header_bg.png 2014-10-18 21:40:54 +0000 differ |
3113 | === added file 'html/img/header_logo.png' |
3114 | Binary files html/img/header_logo.png 1970-01-01 00:00:00 +0000 and html/img/header_logo.png 2014-10-18 21:40:54 +0000 differ |
3115 | === added file 'html/img/indicator-keyboard-En.svg' |
3116 | --- html/img/indicator-keyboard-En.svg 1970-01-01 00:00:00 +0000 |
3117 | +++ html/img/indicator-keyboard-En.svg 2014-10-18 21:40:54 +0000 |
3118 | @@ -0,0 +1,10 @@ |
3119 | +<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
3120 | +<svg width="22" xmlns="http://www.w3.org/2000/svg" version="1.1" height="22"> |
3121 | + <defs> |
3122 | + <mask id="m"> |
3123 | + <rect y="0" x="0" style="fill:#fff" height="22" width="22"/> |
3124 | + <text y="15.5" x="4" style="font-size:12;font-family:Ubuntu;font-weight:500;fill:black">En</text> |
3125 | + </mask> |
3126 | + </defs> |
3127 | + <rect style="fill:#3c3c3c" mask="url(#m)" rx="2" height="20" width="20" y="1" x="1"/> |
3128 | +</svg> |
3129 | |
3130 | === added file 'html/img/indicator-messages.svg' |
3131 | --- html/img/indicator-messages.svg 1970-01-01 00:00:00 +0000 |
3132 | +++ html/img/indicator-messages.svg 2014-10-18 21:40:54 +0000 |
3133 | @@ -0,0 +1,15 @@ |
3134 | +<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
3135 | +<!-- Created with Inkscape (http://www.inkscape.org/) --> |
3136 | +<svg id="svg3229" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="24" width="24" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> |
3137 | + <metadata id="metadata9"> |
3138 | + <rdf:RDF> |
3139 | + <cc:Work rdf:about=""> |
3140 | + <dc:format>image/svg+xml</dc:format> |
3141 | + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> |
3142 | + <dc:title/> |
3143 | + </cc:Work> |
3144 | + </rdf:RDF> |
3145 | + </metadata> |
3146 | + <path id="rect3170-2" d="m4.305 7.0221c-0.6094 0-1.305 0.7602-1.305 1.3142v9.2987c0 0.731 0.7889 1.365 1.4535 1.365h15.048c0.798 0 1.498-0.678 1.498-1.376v-9.1594c0-0.7756-0.689-1.4646-1.409-1.4646l-15.286 0.0221zm0.5388 1.1341 6.8442 6.8438h0.59375l6.875-6.8438 0.6875 0.6875-4.094 4.1563 3.0938 3.1562-0.6875 0.6875-3.156-3.156-2.281 2.312h-1.438l-2.281-2.312-3.1562 3.187-0.6876-0.719 3.125-3.156-4.125-4.1562 0.6876-0.6876z" style="opacity:.3;fill:#fff"/> |
3147 | + <path id="rect3170" d="m4.305 6.0221c-0.6094 0-1.305 0.7602-1.305 1.3142v9.2987c0 0.731 0.7889 1.365 1.4535 1.365h15.048c0.798 0 1.498-0.678 1.498-1.376v-9.1594c0-0.7756-0.689-1.4646-1.409-1.4646l-15.286 0.0221zm0.5388 1.1341 6.8442 6.8438h0.59375l6.875-6.8438 0.6875 0.6875-4.094 4.1563 3.0938 3.1562-0.6875 0.6875-3.156-3.156-2.281 2.312h-1.438l-2.281-2.312-3.1562 3.187-0.6876-0.719 3.125-3.156-4.125-4.1562 0.6876-0.6876z" style="fill:#3c3c3c"/> |
3148 | +</svg> |
3149 | |
3150 | === added file 'html/img/logo-ubuntu-header.png' |
3151 | Binary files html/img/logo-ubuntu-header.png 1970-01-01 00:00:00 +0000 and html/img/logo-ubuntu-header.png 2014-10-18 21:40:54 +0000 differ |
3152 | === added file 'html/img/logo.png' |
3153 | Binary files html/img/logo.png 1970-01-01 00:00:00 +0000 and html/img/logo.png 2014-10-18 21:40:54 +0000 differ |
3154 | === added file 'html/img/mainnav.png' |
3155 | Binary files html/img/mainnav.png 1970-01-01 00:00:00 +0000 and html/img/mainnav.png 2014-10-18 21:40:54 +0000 differ |
3156 | === added file 'html/img/network-offline.svg' |
3157 | --- html/img/network-offline.svg 1970-01-01 00:00:00 +0000 |
3158 | +++ html/img/network-offline.svg 2014-10-18 21:40:54 +0000 |
3159 | @@ -0,0 +1,16 @@ |
3160 | +<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
3161 | +<!-- Created with Inkscape (http://www.inkscape.org/) --> |
3162 | +<svg id="svg3883" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="24" width="24" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> |
3163 | + <metadata id="metadata3888"> |
3164 | + <rdf:RDF> |
3165 | + <cc:Work rdf:about=""> |
3166 | + <dc:format>image/svg+xml</dc:format> |
3167 | + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> |
3168 | + <dc:title/> |
3169 | + </cc:Work> |
3170 | + </rdf:RDF> |
3171 | + </metadata> |
3172 | + <path id="path3683-6-6" d="m11.918 19.854-9.068-9.038s2.8978-3.2944 9.132-3.2944c6.2036 0 9.168 3.3 9.168 3.3z" style="opacity:.3;stroke-linejoin:round;stroke:#fff;stroke-linecap:round;fill:none"/> |
3173 | + <path id="path3683-6" d="m11.918 18.854-9.068-9.0379s2.8978-3.2944 9.132-3.2944c6.2036 0 9.168 3.3 9.168 3.3z" style="stroke-linejoin:round;stroke:#3c3c3c;stroke-linecap:round;fill:none"/> |
3174 | + <path id="path3868" d="m11.969 7.2812c-2.9839 0-5.1262 0.79512-6.5312 1.5625-1.0022 0.5473-1.1762 0.8107-1.4378 1.0625l7.9062 7.875 8.094-7.906c-0.273-0.2552-0.458-0.4861-1.469-1.0312-1.426-0.7692-3.594-1.5626-6.562-1.5626z" style="opacity:.3;stroke-linejoin:round;stroke-width:.5;stroke:#3c3c3c;stroke-linecap:round;fill:none"/> |
3175 | +</svg> |
3176 | |
3177 | === added file 'html/img/news_feed_bg.png' |
3178 | Binary files html/img/news_feed_bg.png 1970-01-01 00:00:00 +0000 and html/img/news_feed_bg.png 2014-10-18 21:40:54 +0000 differ |
3179 | === added file 'html/img/search_button.png' |
3180 | Binary files html/img/search_button.png 1970-01-01 00:00:00 +0000 and html/img/search_button.png 2014-10-18 21:40:54 +0000 differ |
3181 | === added file 'html/img/search_button_sprite.png' |
3182 | Binary files html/img/search_button_sprite.png 1970-01-01 00:00:00 +0000 and html/img/search_button_sprite.png 2014-10-18 21:40:54 +0000 differ |
3183 | === added file 'html/img/stock_person-panel.svg' |
3184 | --- html/img/stock_person-panel.svg 1970-01-01 00:00:00 +0000 |
3185 | +++ html/img/stock_person-panel.svg 2014-10-18 21:40:54 +0000 |
3186 | @@ -0,0 +1,21 @@ |
3187 | +<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
3188 | +<!-- Created with Inkscape (http://www.inkscape.org/) --> |
3189 | +<svg id="svg7739" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="22" width="22" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> |
3190 | + <metadata id="metadata9"> |
3191 | + <rdf:RDF> |
3192 | + <cc:Work rdf:about=""> |
3193 | + <dc:format>image/svg+xml</dc:format> |
3194 | + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> |
3195 | + <dc:title/> |
3196 | + </cc:Work> |
3197 | + </rdf:RDF> |
3198 | + </metadata> |
3199 | + <g id="g3" transform="matrix(1.0045 0 0 1.0004 -5.0676 -4.0069)"> |
3200 | + <g id="g5" style="opacity:.3;fill:#fff" transform="translate(.68443 .84687)"> |
3201 | + <path id="path7" style="fill:#fff" d="m20.299 20.358c-1.701-0.842-2.435-2.297-2.435-2.985 0-0.461 0.309-1.173 0.606-1.519 0.291-0.339 0.724-0.507 0.929-0.884 0.334-0.616 0.513-1.844 0.408-2.384-0.074-0.385-0.408-0.423-0.408-0.769 0-0.308 0.073-0.808 0.073-1.653 0-1.192-0.459-1.83-1.076-2.384-0.558-0.5-1.672-1.038-3.084-1.038-0.299 0-0.622 0.026-0.892 0.077-0.578 0.108-0.977 0.371-1.197 0.589 0.03-0.171 0.097-0.346 0.226-0.505l-0.285-0.246c-0.152 0.188-0.257 0.399-0.307 0.611-0.193-0.07-0.414-0.103-0.665-0.103v0.385c0.171 0 0.317 0.023 0.451 0.06-0.184 0.056-0.381 0.142-0.562 0.286-0.483 0.384-0.929 1.077-0.929 2.269 0 0.846 0.073 1.345 0.073 1.653 0 0.345-0.334 0.384-0.408 0.769-0.104 0.54 0.074 1.769 0.408 2.384 0.206 0.377 0.638 0.545 0.93 0.884 0.297 0.346 0.605 1.058 0.605 1.519 0 0.688-0.733 2.144-2.436 2.985-2.33 1.154-3.475 1.684-3.475 3.291h16.924c0.002-1.608-1.143-2.138-3.474-3.292z"/> |
3202 | + </g> |
3203 | + <g id="g5-8" transform="translate(.68443 -.15272)"> |
3204 | + <path id="path7-2" style="fill:#3c3c3c" d="m20.299 20.358c-1.701-0.842-2.435-2.297-2.435-2.985 0-0.461 0.309-1.173 0.606-1.519 0.291-0.339 0.724-0.507 0.929-0.884 0.334-0.616 0.513-1.844 0.408-2.384-0.074-0.385-0.408-0.423-0.408-0.769 0-0.308 0.073-0.808 0.073-1.653 0-1.192-0.459-1.83-1.076-2.384-0.558-0.5-1.672-1.038-3.084-1.038-0.299 0-0.622 0.026-0.892 0.077-0.578 0.108-0.977 0.371-1.197 0.589 0.03-0.171 0.097-0.346 0.226-0.505l-0.285-0.246c-0.152 0.188-0.257 0.399-0.307 0.611-0.193-0.07-0.414-0.103-0.665-0.103v0.385c0.171 0 0.317 0.023 0.451 0.06-0.184 0.056-0.381 0.142-0.562 0.286-0.483 0.384-0.929 1.077-0.929 2.269 0 0.846 0.073 1.345 0.073 1.653 0 0.345-0.334 0.384-0.408 0.769-0.104 0.54 0.074 1.769 0.408 2.384 0.206 0.377 0.638 0.545 0.93 0.884 0.297 0.346 0.605 1.058 0.605 1.519 0 0.688-0.733 2.144-2.436 2.985-2.33 1.154-3.475 1.684-3.475 3.291h16.924c0.002-1.608-1.143-2.138-3.474-3.292z"/> |
3205 | + </g> |
3206 | + </g> |
3207 | +</svg> |
3208 | |
3209 | === added file 'html/img/subnav_active_bg.png' |
3210 | Binary files html/img/subnav_active_bg.png 1970-01-01 00:00:00 +0000 and html/img/subnav_active_bg.png 2014-10-18 21:40:54 +0000 differ |
3211 | === added file 'html/img/system-devices-panel.svg' |
3212 | --- html/img/system-devices-panel.svg 1970-01-01 00:00:00 +0000 |
3213 | +++ html/img/system-devices-panel.svg 2014-10-18 21:40:54 +0000 |
3214 | @@ -0,0 +1,8 @@ |
3215 | +<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
3216 | +<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) --> |
3217 | +<svg id="Layer_1" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 22 22" xml:space="preserve" height="22px" viewBox="0 0 22 22" width="22px" version="1.1" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata id="metadata13"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata> |
3218 | +<rect id="rect3" style="opacity:.3;fill:#fff" height="7" width="2" y="4" x="10"/> |
3219 | +<g id="g5" style="opacity:.3;fill:#fff" transform="translate(0,1)"> |
3220 | + <path id="path7" style="fill:#fff" d="m19 12v-2h-2.09c-0.153-0.911-0.509-1.75-1.023-2.473l1.478-1.478-1.415-1.413-1.478 1.477c-0.448-0.319-0.945-0.57-1.472-0.758v2.2c1.19 0.693 2 1.969 2 3.445 0 1.1-0.444 2.094-1.162 2.817l-0.021 0.021c-0.723 0.718-1.717 1.162-2.817 1.162-1.104 0-2.103-0.447-2.827-1.171l-0.003-0.002c-0.723-0.723-1.17-1.723-1.17-2.827 0-1.477 0.81-2.752 2-3.445v-2.2c-0.527 0.188-1.025 0.439-1.473 0.758l-1.478-1.478-1.414 1.414 1.478 1.478c-0.514 0.723-0.87 1.562-1.023 2.473h-2.09v2h2.09c0.153 0.91 0.509 1.75 1.023 2.473l-1.477 1.477 1.414 1.414 1.477-1.477c0.723 0.514 1.562 0.87 2.473 1.023v2.09h2v-2.09c0.91-0.153 1.75-0.509 2.473-1.023l1.477 1.477 1.414-1.414-1.477-1.477c0.515-0.723 0.87-1.562 1.023-2.473h2.09z"/> |
3221 | +</g> |
3222 | +<rect id="rect3-8" style="fill:#3c3c3c" height="7" width="2" y="3" x="10"/><g id="g5-2" style="fill:#3c3c3c"><path id="path7-6" style="fill:#3c3c3c" d="m19 12v-2h-2.09c-0.153-0.911-0.509-1.75-1.023-2.473l1.478-1.478-1.415-1.413-1.478 1.477c-0.448-0.319-0.945-0.57-1.472-0.758v2.2c1.19 0.693 2 1.969 2 3.445 0 1.1-0.444 2.094-1.162 2.817l-0.021 0.021c-0.723 0.718-1.717 1.162-2.817 1.162-1.104 0-2.103-0.447-2.827-1.171l-0.003-0.002c-0.723-0.723-1.17-1.723-1.17-2.827 0-1.477 0.81-2.752 2-3.445v-2.2c-0.527 0.188-1.025 0.439-1.473 0.758l-1.478-1.478-1.414 1.414 1.478 1.478c-0.514 0.723-0.87 1.562-1.023 2.473h-2.09v2h2.09c0.153 0.91 0.509 1.75 1.023 2.473l-1.477 1.477 1.414 1.414 1.477-1.477c0.723 0.514 1.562 0.87 2.473 1.023v2.09h2v-2.09c0.91-0.153 1.75-0.509 2.473-1.023l1.477 1.477 1.414-1.414-1.477-1.477c0.515-0.723 0.87-1.562 1.023-2.473h2.09z"/></g></svg> |
3223 | |
3224 | === added file 'html/img/system-shutdown-panel.svg' |
3225 | --- html/img/system-shutdown-panel.svg 1970-01-01 00:00:00 +0000 |
3226 | +++ html/img/system-shutdown-panel.svg 2014-10-18 21:40:54 +0000 |
3227 | @@ -0,0 +1,15 @@ |
3228 | +<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
3229 | +<!-- Created with Inkscape (http://www.inkscape.org/) --> |
3230 | +<svg id="svg3194" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="24" width="24" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> |
3231 | + <metadata id="metadata8"> |
3232 | + <rdf:RDF> |
3233 | + <cc:Work rdf:about=""> |
3234 | + <dc:format>image/svg+xml</dc:format> |
3235 | + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> |
3236 | + <dc:title/> |
3237 | + </cc:Work> |
3238 | + </rdf:RDF> |
3239 | + </metadata> |
3240 | + <path id="path3341-5" style="opacity:.3;stroke:#fff;stroke-linecap:round;stroke-width:1.9;fill:none" d="m8.8428 8.45c-5.2339 2.742-2.8672 10.6 3.1162 10.6 5.9212 0 8.575-7.4496 3.1164-10.6m-3.125 3.55v-6.0059"/> |
3241 | + <path id="path3341" style="stroke:#3c3c3c;stroke-linecap:round;stroke-width:1.9;fill:none" d="m8.8428 7.45c-5.2339 2.7422-2.8671 10.6 3.1164 10.6 5.9212 0 8.575-7.4496 3.1164-10.6m-3.126 3.55v-6.0059"/> |
3242 | +</svg> |
3243 | |
3244 | === added file 'html/img/topnav_active_bg.png' |
3245 | Binary files html/img/topnav_active_bg.png 1970-01-01 00:00:00 +0000 and html/img/topnav_active_bg.png 2014-10-18 21:40:54 +0000 differ |
3246 | === added file 'html/img/topnav_divider.png' |
3247 | Binary files html/img/topnav_divider.png 1970-01-01 00:00:00 +0000 and html/img/topnav_divider.png 2014-10-18 21:40:54 +0000 differ |
3248 | === added file 'html/img/user-offline-panel.svg' |
3249 | --- html/img/user-offline-panel.svg 1970-01-01 00:00:00 +0000 |
3250 | +++ html/img/user-offline-panel.svg 2014-10-18 21:40:54 +0000 |
3251 | @@ -0,0 +1,15 @@ |
3252 | +<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
3253 | +<!-- Created with Inkscape (http://www.inkscape.org/) --> |
3254 | +<svg id="svg2816" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="24" width="24" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> |
3255 | + <metadata id="metadata8"> |
3256 | + <rdf:RDF> |
3257 | + <cc:Work rdf:about=""> |
3258 | + <dc:format>image/svg+xml</dc:format> |
3259 | + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> |
3260 | + <dc:title/> |
3261 | + </cc:Work> |
3262 | + </rdf:RDF> |
3263 | + </metadata> |
3264 | + <path id="path2396-7" style="opacity:.3;fill-rule:evenodd;fill:#fff" d="m11.5 6c-4.14 0-7.5 3.36-7.5 7.5s3.36 7.5 7.5 7.5c1.9648 0 3.7561-0.76222 5.0938-2h5.406l-3.344-3.344c0.208-0.687 0.344-1.401 0.344-2.156 0-4.14-3.36-7.5-7.5-7.5zm-2.1875 4 2.1875 2.25 2.25-2.219 1.25 1.281-2.25 2.188 2.219 2.25-1.281 1.25-2.188-2.25-2.25 2.219-1.25-1.281 2.25-2.188-2.2188-2.25 1.2813-1.25z"/> |
3265 | + <path id="path2396" style="fill-rule:evenodd;fill:#3c3c3c" d="m11.5 5c-4.14 0-7.5 3.36-7.5 7.5s3.36 7.5 7.5 7.5c1.9648 0 3.7561-0.76222 5.0938-2h5.406l-3.344-3.344c0.208-0.687 0.344-1.401 0.344-2.156 0-4.14-3.36-7.5-7.5-7.5zm-2.1875 4 2.1875 2.25 2.25-2.2188 1.25 1.2808-2.25 2.188 2.219 2.25-1.281 1.25-2.188-2.25-2.25 2.219-1.25-1.281 2.25-2.188-2.2188-2.25 1.2813-1.25z"/> |
3266 | +</svg> |
3267 | |
3268 | === added file 'html/ubuntu.xsl' |
3269 | --- html/ubuntu.xsl 1970-01-01 00:00:00 +0000 |
3270 | +++ html/ubuntu.xsl 2014-10-18 21:40:54 +0000 |
3271 | @@ -0,0 +1,785 @@ |
3272 | +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" |
3273 | + xmlns:html="http://www.w3.org/1999/xhtml" |
3274 | + xmlns:exsl="http://exslt.org/common" |
3275 | + xmlns:set="http://exslt.org/sets" |
3276 | + xmlns="http://www.w3.org/1999/xhtml" |
3277 | + exclude-result-prefixes="html set" |
3278 | + extension-element-prefixes="exsl" |
3279 | + version="1.0"> |
3280 | + |
3281 | +<xsl:param name="mal.if.platform" select="'platform:unity'"/> |
3282 | + |
3283 | +<xsl:param name="color.gray_background" select="'#f7f6f5'"/> |
3284 | +<xsl:param name="color.gray_border" select="'#ccc1c1'"/> |
3285 | +<xsl:param name="color.blue_background" select="'#f7f6f5'"/> |
3286 | +<xsl:param name="color.blue_border" select="'#ccc1c1'"/> |
3287 | +<xsl:param name="color.yellow_background" select="'#f7f6f5'"/> |
3288 | +<xsl:param name="color.yellow_border" select="'#ccc1c1'"/> |
3289 | +<xsl:param name="color.red_background" select="'#f7f6f5'"/> |
3290 | +<xsl:param name="color.red_border" select="'#ccc1c1'"/> |
3291 | + |
3292 | +<xsl:param name="color.text" select="'#333333'"/> |
3293 | +<xsl:param name="color.text_light" select="'#333333'"/> |
3294 | +<xsl:param name="color.link" select="'#dd4814'"/> |
3295 | +<xsl:param name="color.link_visited" select="'#dd4814'"/> |
3296 | + |
3297 | +<!-- It seems that many color definitions above were done to force the resulting html to mimic |
3298 | + the light-moin-theme, but they also broke some other things. |
3299 | + So also added back, below, some realistic color definitions for possible override use in some cases. |
3300 | + (Note: These defintions are the same as the Ubuntu ServerGuide and any changes should be |
3301 | + made to both, for consistency. --> |
3302 | + |
3303 | +<xsl:param name="color.gray_background_actually" select="'#e5e5e5'"/> |
3304 | +<xsl:param name="color.gray_border_actually" select="'#aaaaaa'"/> |
3305 | +<xsl:param name="color.blue_background_actually" select="'#bebeff'"/> |
3306 | +<xsl:param name="color.blue_border_actually" select="'#5050ff'"/> |
3307 | +<xsl:param name="color.yellow_background_actually" select="'#ffff6e'"/> |
3308 | +<xsl:param name="color.yellow_border_actually" select="'#ffff00'"/> |
3309 | +<xsl:param name="color.red_background_actually" select="'#ffbebe'"/> |
3310 | +<xsl:param name="color.red_border_actually" select="'#ff5050'"/> |
3311 | + |
3312 | +<xsl:param name="color.text_light_actually" select="'#808080'"/> |
3313 | + |
3314 | +<xsl:template name="html.css.custom"> |
3315 | + <xsl:param name="node" select="."/> |
3316 | + <xsl:param name="direction"> |
3317 | + <xsl:call-template name="l10n.direction"/> |
3318 | + </xsl:param> |
3319 | + <xsl:param name="left"> |
3320 | + <xsl:call-template name="l10n.align.start"> |
3321 | + <xsl:with-param name="direction" select="$direction"/> |
3322 | + </xsl:call-template> |
3323 | + </xsl:param> |
3324 | + <xsl:param name="right"> |
3325 | + <xsl:call-template name="l10n.align.end"> |
3326 | + <xsl:with-param name="direction" select="$direction"/> |
3327 | + </xsl:call-template> |
3328 | + </xsl:param> |
3329 | + <xsl:text> |
3330 | + |
3331 | +/* Based on light-moin-theme from https://code.launchpad.net/ubuntu-website/light-moin-theme |
3332 | + Some tweaks and adaptation for xsl by Matthew East for Ubuntu Documentation Team |
3333 | + ubuntu-doc@lists.ubuntu.com */ |
3334 | + |
3335 | +/* Don't forget to set a foreground and background color |
3336 | + on the 'html' or 'body' element! */ |
3337 | +html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, dd, dl, dt, li, ol, ul, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td { |
3338 | + margin: 0; |
3339 | + padding: 0; |
3340 | + border: 0; |
3341 | + font-weight: inherit; |
3342 | + font-style: inherit; |
3343 | + font-size: 100%; |
3344 | + line-height: 1.5; |
3345 | + font-family: inherit; |
3346 | + text-align: left; |
3347 | + vertical-align: baseline; |
3348 | +} |
3349 | + |
3350 | +/* span.key is not defined in the yelp html.xsl, but it should be. Define it here because it is required. */ |
3351 | +span.key { |
3352 | + font-weight: bold; |
3353 | +} |
3354 | + |
3355 | +/* overide the yelp html.xsl here. Why? Because the definition of text_light is wrong above, but fixing it breaks a multitude of other things. */ |
3356 | +span.gui, span.guiseq { color: </xsl:text> |
3357 | + <xsl:value-of select="$color.text_light_actually"/><xsl:text>; } |
3358 | + |
3359 | +/* overide some of the yelp html.xsl here. Why? Because the definition of gray stuff wrong above, but fixing it breaks a multitude of other things. */ |
3360 | +kbd { |
3361 | + background-color: </xsl:text> |
3362 | + <xsl:value-of select="$color.gray_background_actually"/><xsl:text>; |
3363 | + border: solid 1px </xsl:text> |
3364 | + <xsl:value-of select="$color.gray_border_actually"/><xsl:text>; |
3365 | + -moz-box-shadow: 1px 1px 1px </xsl:text> |
3366 | + <xsl:value-of select="$color.gray_border_actually"/><xsl:text>; |
3367 | + -webkit-box-shadow: 1px 1px 1px </xsl:text> |
3368 | + <xsl:value-of select="$color.gray_border_actually"/><xsl:text>; |
3369 | + box-shadow: 1px 1px 1px </xsl:text> |
3370 | + <xsl:value-of select="$color.gray_border_actually"/><xsl:text>; |
3371 | +} |
3372 | + |
3373 | +/* insert some space above the links groups on the front page */ |
3374 | +div.links-grid-link { |
3375 | + margin: 0.8em 0 0 0; |
3376 | +} |
3377 | + |
3378 | +a img, :link img, :visited img { |
3379 | + border: 0; |
3380 | +} |
3381 | + |
3382 | +table { |
3383 | + border-collapse: collapse; |
3384 | + border-spacing: 0; |
3385 | +} |
3386 | + |
3387 | +ol, ul { |
3388 | + list-style: none; |
3389 | +} |
3390 | + |
3391 | +q:before, q:after, blockquote:before, blockquote:after { |
3392 | + content: ""; |
3393 | +} |
3394 | + |
3395 | +/* moin specific overrides go below */ |
3396 | +.clear { clear: both; } |
3397 | +#fullsearch { display: none; } |
3398 | + |
3399 | +body { |
3400 | + background-image: url("img/bg_dotted.png"); |
3401 | +} |
3402 | + |
3403 | +#main-menu a { |
3404 | + padding: 24px 8px; |
3405 | +} |
3406 | + |
3407 | +#search-box { |
3408 | + margin-left: 650px; |
3409 | + -moz-border-radius: 0px 0px 4px 4px; |
3410 | + -webkit-border-bottom-left-radius: 4px; |
3411 | + -webkit-border-bottom-right-radius: 4px; |
3412 | + -moz-box-shadow: #bbb 0px 0px 2px; |
3413 | + -webkit-box-shadow: #bbb 0px 0px 2px; |
3414 | + background-color: #F2F2F2; |
3415 | + width: 290px; |
3416 | + height: 33px; |
3417 | + padding: 7px 0 0 10px; |
3418 | +} |
3419 | + |
3420 | +#search-box #searchinput { |
3421 | + float: left; |
3422 | + width: 172px; |
3423 | + height: 20px; |
3424 | + margin: 8px 0 0 8px; |
3425 | + padding: 3px 0 1px 4px; |
3426 | + font-size: 11px; |
3427 | + border: 1px solid #ccc; |
3428 | +} |
3429 | +#search-box #titlesearch { |
3430 | + float: left; |
3431 | + background: url("img/search_button_sprite.png") transparent; |
3432 | + width: 24px; |
3433 | + height: 24px; |
3434 | + margin: 8px 0 0 8px; |
3435 | + padding: 0; |
3436 | + border: none; |
3437 | + cursor: pointer; |
3438 | + text-indent: 50px; |
3439 | +} |
3440 | + |
3441 | +#search-box button span { |
3442 | + position: absolute; |
3443 | + overflow: hidden; |
3444 | + text-indent: -9999px; |
3445 | +} |
3446 | + |
3447 | +#subheader ul { |
3448 | + display: inline; |
3449 | + float: left; |
3450 | +} |
3451 | +#title span { |
3452 | + color: #333; |
3453 | +} |
3454 | + |
3455 | +/* fix TOC styles */ |
3456 | +#cwt-content table li { |
3457 | + margin-left: 1.5em; |
3458 | + line-height: 18px; |
3459 | +} |
3460 | +#cwt-content table ol { |
3461 | + list-style-type: decimal; |
3462 | +} |
3463 | + |
3464 | +/* fix wiki styles */ |
3465 | +#cwt-content pre { |
3466 | + line-height: 16px; |
3467 | + margin-bottom: 8px; |
3468 | +} |
3469 | +#cwt-content h1 { |
3470 | + margin-bottom: 8px; |
3471 | +} |
3472 | + |
3473 | +#cwt-content dt { |
3474 | + font-weight: bold; |
3475 | + margin-top: 10px; |
3476 | +} |
3477 | +#cwt-content dt, #cwt-content dd { |
3478 | + line-height: 18px; |
3479 | + font-size: 14px; |
3480 | +} |
3481 | + |
3482 | +#footer { |
3483 | + margin: 0; |
3484 | + font-size: 90%; |
3485 | + color: #444; |
3486 | +} |
3487 | + |
3488 | +/* edit form */ |
3489 | +#editor-textarea { |
3490 | + width: 100%; |
3491 | + font-size: 14px; |
3492 | + padding: 4px; |
3493 | +} |
3494 | +#cwt-content input[type=text] { |
3495 | + width: 100%; |
3496 | +} |
3497 | + |
3498 | +/* moin's msg dialog */ |
3499 | +#message { |
3500 | + padding: 16px; |
3501 | + margin: 8px 0; |
3502 | + border: 20px #F1F1ED solid; |
3503 | + font-size: 14px; |
3504 | + background-color: white; |
3505 | +} |
3506 | +#message p { |
3507 | + font-size: 14px; |
3508 | + font-weight: bold; |
3509 | +} |
3510 | + |
3511 | +/* tables need a little spacing */ |
3512 | +#cwt-content td, #cwt-content th { |
3513 | + margin: 1px; |
3514 | + padding: 4px; |
3515 | +} |
3516 | +#cwt-content td, #cwt-content th { |
3517 | + border: 1px solid #E9E9E9; |
3518 | +} |
3519 | +#cwt-content ol, #cwt-content ul, #cwt-content dl { |
3520 | + margin-bottom: 8px; |
3521 | + list-style-type: decimal; |
3522 | +} |
3523 | +#cwt-content li, #cwt-content dd, #cwt-content dt { |
3524 | + line-height: 14px; |
3525 | +} |
3526 | +#cwt-content ol li { |
3527 | + margin-left: 18px; |
3528 | +} |
3529 | +#cwt-content tt { |
3530 | + font-family: monospace; |
3531 | +} |
3532 | + |
3533 | +body { |
3534 | + font-family: "Ubuntu", "Ubuntu Beta", "Bitstream Vera Sans", DejaVu Sans, Tahoma, sans-serif; |
3535 | + color: #333; |
3536 | + background: white url(img/bg_dotted.png); |
3537 | + font-size: 13px; |
3538 | + line-height: 1.5; |
3539 | + margin: 0px; |
3540 | + padding: 0px; |
3541 | +} |
3542 | +#container { |
3543 | + background: #f7f6f5; |
3544 | + margin: 0px auto 20px; |
3545 | + padding: 0px; |
3546 | + width: 976px; |
3547 | +} |
3548 | +#container-inner { |
3549 | + background-color: #fff; |
3550 | +} |
3551 | +#header, #container-inner { |
3552 | + -moz-border-radius: 0px 0px 5px 5px; |
3553 | + -webkit-border-bottom-left-radius: 5px; |
3554 | + -webkit-border-bottom-right-radius: 5px; |
3555 | + -moz-box-shadow: #bbb 0px 0px 5px; |
3556 | + -webkit-box-shadow: #bbb 0px 0px 5px; |
3557 | +} |
3558 | +#header { |
3559 | + background: #dd4814 url(img/header_bg.png) top left repeat-x; |
3560 | + height: 64px; |
3561 | + margin: 0px; |
3562 | + padding: 0px; |
3563 | + position: relative; |
3564 | +} |
3565 | + |
3566 | +#mothership ul { |
3567 | + margin: 0; |
3568 | + padding: 0; |
3569 | + list-style-type: none; |
3570 | + height: 20px; |
3571 | +} |
3572 | + |
3573 | +#mothership li { |
3574 | + float: right; |
3575 | + padding: 3px 0; |
3576 | + margin: 0 16px 0 0; |
3577 | + font-size: 10px; |
3578 | + line-height: 14px; |
3579 | +} |
3580 | + |
3581 | +#mothership a { |
3582 | + color: #333; |
3583 | +} |
3584 | + |
3585 | +#menu-search { |
3586 | + height: 40px; |
3587 | + margin: 0 16px; |
3588 | +} |
3589 | + |
3590 | +#cwt-content { |
3591 | + width: 850px; |
3592 | + padding: 16px 40px 16px 40px; |
3593 | + margin: 0 16px 16px; |
3594 | + background-color: #ffffff; |
3595 | + -moz-border-radius: 4px; |
3596 | + -webkit-border-radius: 4px; |
3597 | +} |
3598 | + |
3599 | +#end-content { |
3600 | + clear: both; |
3601 | +} |
3602 | + |
3603 | +.box-944 { |
3604 | + background: #ffffff; |
3605 | + width: 944px; |
3606 | + -moz-border-radius: 4px; |
3607 | + -webkit-border-radius: 4px; |
3608 | +} |
3609 | +.box-304 { |
3610 | + background: #ffffff; |
3611 | + width: 304px; |
3612 | + -moz-border-radius: 4px; |
3613 | + -webkit-border-radius: 4px; |
3614 | +} |
3615 | +.box-624 { |
3616 | + background: #ffffff; |
3617 | + width: 304px; |
3618 | + -moz-border-radius: 4px; |
3619 | + -webkit-border-radius: 4px; |
3620 | +} |
3621 | + |
3622 | +.content-box { |
3623 | + width: 912px; |
3624 | + padding: 16px; |
3625 | +} |
3626 | + |
3627 | +#ubuntu-header { |
3628 | + background-image: url(img/header_logo.png); |
3629 | + background-repeat: no-repeat; |
3630 | + height: 32px; |
3631 | + right: 16px; |
3632 | + margin: 0; |
3633 | + padding: 0; |
3634 | + position: absolute; |
3635 | + top: 16px; |
3636 | + width: 292px; |
3637 | + overflow: hidden; |
3638 | + text-indent: -9999px; |
3639 | +} |
3640 | + |
3641 | +#ubuntu-header a { |
3642 | + display: block; |
3643 | + height: 100%; |
3644 | + width: 100%; |
3645 | +} |
3646 | + |
3647 | +#footer { |
3648 | + padding-top: 16px; |
3649 | +} |
3650 | + |
3651 | +#footer p { |
3652 | + margin: 0; |
3653 | + padding-bottom: 16px; |
3654 | + border-bottom: 1px dotted #aea79f; |
3655 | + text-align: center; |
3656 | +} |
3657 | + |
3658 | +#main-menu { |
3659 | + list-style: none; |
3660 | + margin: 0; |
3661 | + margin-left: 16px; |
3662 | + padding: 0; |
3663 | + height: 100%; |
3664 | + background: url(img/topnav_divider.png) no-repeat scroll left top transparent !important; |
3665 | +} |
3666 | +#main-menu li { |
3667 | + float: left; |
3668 | + margin: 0; |
3669 | + padding: 0; |
3670 | + height: 64px; |
3671 | + font-size: 14px; |
3672 | + line-height: 16px; |
3673 | + background: url(img/topnav_divider.png) no-repeat scroll right top transparent !important; |
3674 | +} |
3675 | +#main-menu a { |
3676 | + display: block; |
3677 | + float: left; |
3678 | + margin: 0; |
3679 | + padding: 24px 8px; |
3680 | + text-decoration: none; |
3681 | + color: #fff; |
3682 | + text-shadow: #000 0px 1px; |
3683 | +} |
3684 | + |
3685 | +.main-menu-item.current, |
3686 | +#main-menu a:hover, #main-menu a.active { |
3687 | + background: url(img/topnav_active_bg.png) no-repeat right top transparent !important; |
3688 | +} |
3689 | + |
3690 | +h1, h2, h3, h4, h5 { |
3691 | + color: #333; |
3692 | + padding: 0; |
3693 | + margin: 0; |
3694 | + font-weight: normal; |
3695 | + margin-top: 1em; |
3696 | +} |
3697 | +h1 { |
3698 | + font-size: 28px; |
3699 | + line-height: 32px; |
3700 | + margin-top: 0em; |
3701 | +} |
3702 | +h2 { |
3703 | + font-size: 24px; |
3704 | + line-height: 28px; |
3705 | + margin-bottom: 8px; |
3706 | +} |
3707 | +h3 { |
3708 | + font-size: 16px; |
3709 | + line-height: 20px; |
3710 | + margin-bottom: 8px; |
3711 | +} |
3712 | +h3.link-other { |
3713 | + color: #333; |
3714 | +} |
3715 | +h3.link-services { |
3716 | + color: #fff; |
3717 | +} |
3718 | +h4 { |
3719 | + font-size: 12px; |
3720 | + line-height: 14px; |
3721 | +} |
3722 | +h4.link-news { |
3723 | + color: #ef5a29; |
3724 | +} |
3725 | +h4.link-ubuntu { |
3726 | + color: #dd4814; |
3727 | +} |
3728 | +h4.partners { |
3729 | + color: #333; |
3730 | + font-size: 16px; |
3731 | + line-height: 20px; |
3732 | +} |
3733 | +h5 { |
3734 | + color: #333; |
3735 | + font-size: 10px; |
3736 | + line-height: 14px; |
3737 | +} |
3738 | +p { |
3739 | + font-size: 13px; |
3740 | + line-height: 1.5; |
3741 | + margin-bottom: 8px; |
3742 | +} |
3743 | +pre { |
3744 | + background-color:#F3F3F3; |
3745 | + border:1px dashed #C1B496; |
3746 | + font-family:UbuntuMono,courier,monospace; |
3747 | + padding:4pt; |
3748 | + white-space:pre-wrap; |
3749 | + word-wrap:break-word; |
3750 | +} |
3751 | +tt { |
3752 | + font-family:UbuntuMono,courier,monospace; |
3753 | +} |
3754 | + |
3755 | +strong { |
3756 | + font-weight: bold; |
3757 | +} |
3758 | + |
3759 | +a { |
3760 | + color: #DD4814; |
3761 | + text-decoration: none; |
3762 | +} |
3763 | + |
3764 | +a:hover { |
3765 | + text-decoration: underline; |
3766 | +} |
3767 | + |
3768 | +ul { |
3769 | + margin-bottom: 16px; |
3770 | +} |
3771 | +ul li { |
3772 | + margin-left: 2.4em; |
3773 | + margin-bottom: 8px; |
3774 | + line-height: 14px; |
3775 | +} |
3776 | +ul li:last-child { |
3777 | + margin-bottom: 0px; |
3778 | +} |
3779 | + |
3780 | +p.call-to-action { |
3781 | + color: #333; |
3782 | +} |
3783 | +p.case-study { |
3784 | + color: #333; |
3785 | +} |
3786 | +p.highlight { |
3787 | + font-size: 16px; |
3788 | + line-height: 20px; |
3789 | +} |
3790 | +p.introduction { |
3791 | + color: #333; |
3792 | + font-size: 16px; |
3793 | + line-height: 20px; |
3794 | +} |
3795 | +p.services { |
3796 | + color: #fff; |
3797 | +} |
3798 | +#pageinfo { |
3799 | + font-size: 70%; |
3800 | + padding: 0 16px 12px; |
3801 | + text-align: right; |
3802 | +} |
3803 | +p.small-text { |
3804 | + color: #333; |
3805 | + font-size: 10px; |
3806 | +} |
3807 | + |
3808 | +.newsfeed { |
3809 | + background: url(img/news_feed_bg.png) no-repeat scroll right top transparent; |
3810 | + padding: 0 20px 0 0; |
3811 | +} |
3812 | + |
3813 | +/* Clearing floats without extra markup |
3814 | +Based on How To Clear Floats Without Structural Markup by PiE |
3815 | +[http://www.positioniseverything.net/easyclearing.html] */ |
3816 | +.clearfix:after { |
3817 | + content: "."; |
3818 | + display: block; |
3819 | + height: 0; |
3820 | + clear: both; |
3821 | + visibility: hidden; |
3822 | +} |
3823 | +.clearfix { |
3824 | + display: inline-block; |
3825 | +} /* for IE/Mac */ |
3826 | + |
3827 | +div.trail { |
3828 | + font-size: 100%; |
3829 | + text-indent: -1em; |
3830 | + color: #aea79f; |
3831 | +} |
3832 | + |
3833 | +/* Form related styling */ |
3834 | +input, select { |
3835 | + /* Override mozilla's default form css inherited from the system */ |
3836 | + font-size: 100%; |
3837 | +} |
3838 | +.wForm form label { |
3839 | + display: block; |
3840 | + padding-bottom: 3px; |
3841 | + color: black; |
3842 | +} |
3843 | +.wForm form input[type=text], |
3844 | +.wForm form input[type=password], |
3845 | +.wForm form textarea { |
3846 | + border: 1px solid #c7c7c7; |
3847 | + padding: 2px; |
3848 | + color: black; |
3849 | + background: #fff; |
3850 | +} |
3851 | +.wForm form input[type=text]:focus, |
3852 | +.wForm form input[type=password]:focus, |
3853 | +.wForm form textarea:focus { |
3854 | + border: 1px solid #dd4814; |
3855 | + outline: 1px solid #dd4814; |
3856 | +} |
3857 | +/* Override FormAssembly formatting */ |
3858 | +.wFormContainer { |
3859 | + padding: 0; |
3860 | + width: 100%; |
3861 | +} |
3862 | +.wForm form { |
3863 | + margin: 0; |
3864 | +} |
3865 | +.wForm form .actions { |
3866 | + text-align: right; |
3867 | +} |
3868 | +.wForm form .actions .primaryAction { |
3869 | + background-color: #dd4814; |
3870 | + color: #fff; |
3871 | + border: 0; |
3872 | + cursor: pointer; |
3873 | + font-weight: normal; |
3874 | + font-size: 16px; |
3875 | + padding: 4px; |
3876 | + -moz-border-radius: 4px; |
3877 | + -webkit-border-radius: 4px; |
3878 | + text-shadow: #333 0px 1px; |
3879 | + margin: 10px 8px 10px 8px; |
3880 | +} |
3881 | +.wForm form input[type=text].errFld { |
3882 | + border: 2px solid #dd4814; |
3883 | +} |
3884 | +.wForm form .errMsg { |
3885 | + color: #dd4814 !important; |
3886 | +} |
3887 | +.wForm form .oneChoice { |
3888 | + display: block; |
3889 | +} |
3890 | +.wForm form .oneField { |
3891 | + padding: 0 8px; |
3892 | + margin-bottom: 8px; |
3893 | +} |
3894 | +.wForm form span.reqMark { |
3895 | + color: #dd4814 !important; |
3896 | + font-weight: bold !important; |
3897 | +} |
3898 | +.wForm fieldset { |
3899 | + border: none; |
3900 | + padding: 0; |
3901 | + background: #dfdcd9; |
3902 | +} |
3903 | +.wForm input[type=text], |
3904 | +.wForm input[type=password], |
3905 | +.wForm select, |
3906 | +.wForm textarea { |
3907 | + width: 290px; |
3908 | +} |
3909 | +.wForm legend { |
3910 | + padding: 8px; |
3911 | + font-size: 16px; |
3912 | + font-weight: normal !important; |
3913 | + background: #aea79f; |
3914 | + width: 100%; |
3915 | + color: #fff; |
3916 | + margin-bottom: 8px; |
3917 | +} |
3918 | +.wForm label.preField, |
3919 | +.wForm .labelsLeftAligned label.preField, |
3920 | +.wForm .labelsRightAligned label.preField { |
3921 | + float: none; |
3922 | + padding-bottom: 4px; |
3923 | +} |
3924 | +.wForm label.postField { |
3925 | + display: inline; |
3926 | +} |
3927 | +/* Hack for WebKit based browsers to display the fieldset properly */ |
3928 | +@media screen and (-webkit-min-device-pixel-ratio:0) { |
3929 | + .wForm fieldset { |
3930 | + padding: 8px 8px .1px 0px; |
3931 | + } |
3932 | + .wForm legend { |
3933 | + padding: 8px 0px 8px 8px; |
3934 | + } |
3935 | +} |
3936 | + |
3937 | +</xsl:text> |
3938 | +</xsl:template> |
3939 | + |
3940 | +<xsl:template name="html.page"> |
3941 | + <xsl:param name="node" select="."/> |
3942 | + <html> |
3943 | + <head> |
3944 | + <title> |
3945 | + <xsl:apply-templates mode="html.title.mode" select="$node"/> |
3946 | + </title> |
3947 | + <xsl:call-template name="html.css"/> |
3948 | + <xsl:call-template name="html.js"/> |
3949 | + <xsl:call-template name="html.head.custom"/> |
3950 | + </head> |
3951 | + <body id="home"> |
3952 | + |
3953 | + <xsl:apply-templates mode="html.body.attr.mode" select="$node"/> |
3954 | + <script src="https://ssl.google-analytics.com/urchin.js" |
3955 | + type="text/javascript"></script> |
3956 | + <script type="text/javascript"> |
3957 | + _uacct = "UA-1018242-8"; |
3958 | + urchinTracker(); |
3959 | + </script> |
3960 | + |
3961 | + |
3962 | + <div id="leftbanner"> |
3963 | + </div> |
3964 | + <div id="rightbanner"> |
3965 | + </div> |
3966 | + <div id="container"> |
3967 | + <div id="container-inner"> |
3968 | + <div id="mothership"> |
3969 | + <ul> |
3970 | + <li><a href="http://www.ubuntu.com/partners">Partners</a> </li> |
3971 | + <li><a href="http://www.ubuntu.com/support">Support</a></li> |
3972 | + <li><a href="http://www.ubuntu.com/community">Community</a></li> |
3973 | + <li><a href="http://www.ubuntu.com">Ubuntu.com</a></li> |
3974 | + </ul> |
3975 | + </div> |
3976 | + <div id="header"> |
3977 | + <h1 id="ubuntu-header"><a href="https://help.ubuntu.com/">Ubuntu Documentation</a></h1> |
3978 | + <ul id="main-menu"> |
3979 | + <li><a class="main-menu-item current" href="https://help.ubuntu.com/">Official Documentation</a></li> |
3980 | + <li><a href="https://help.ubuntu.com/community/CommunityHelpWiki">Community Help Wiki</a></li> |
3981 | + <li><a href="http://community.ubuntu.com/contribute/documentation/">Contribute</a></li> |
3982 | + </ul> |
3983 | + </div> |
3984 | + <div id="menu-search"> |
3985 | + <div id="subheader"> |
3986 | + <div class="subheader-menu"> |
3987 | + </div> |
3988 | + </div> |
3989 | + <div id="search-box"> |
3990 | + <noscript> |
3991 | + <form action="https://www.google.com/cse" id="cse-search-box"> |
3992 | + <div> |
3993 | + <input type="hidden" name="cx" value="003883529982892832976:e2vwumte3fq" /> |
3994 | + <input type="hidden" name="ie" value="UTF-8" /> |
3995 | + <input type="text" name="q" size="21" /> |
3996 | + <input type="submit" name="sa" value="Search" /> |
3997 | + </div> |
3998 | + </form> |
3999 | + </noscript> |
4000 | + |
4001 | + <script> |
4002 | + document.write('<form action="https://help.ubuntu.com/search.html" id="cse-search-box">'); |
4003 | + document.write(' <div>'); |
4004 | + document.write(' <input type="hidden" name="cof" value="FORID:9" />'); |
4005 | + document.write(' <input type="hidden" name="cx" value="003883529982892832976:e2vwumte3fq" />'); |
4006 | + document.write(' <input type="hidden" name="ie" value="UTF-8" />'); |
4007 | + document.write(' <input type="text" name="q" size="21" />'); |
4008 | + document.write(' <input type="submit" name="sa" value="Search" />'); |
4009 | + document.write(' </div>'); |
4010 | + document.write('</form>'); |
4011 | + </script> |
4012 | + </div> |
4013 | + </div> |
4014 | + <xsl:apply-templates mode="html.header.mode" select="$node"/> |
4015 | + <div id="cwt-content" class="clearfix content-area"> |
4016 | + <div id="page"> |
4017 | + <div id="content"> |
4018 | + <xsl:apply-templates mode="html.body.mode" select="$node"/> |
4019 | + </div> |
4020 | + <div id="pagebottom"> |
4021 | + </div> |
4022 | + </div> |
4023 | + </div> |
4024 | + </div> |
4025 | + <div id="footer"> |
4026 | + <p>The material in this document is available under a free license, see <a href="/legal.html">Legal</a> for details<br /> For information on contributing see the <a href="https://wiki.ubuntu.com/DocumentationTeam">Ubuntu Documentation Team wiki page</a>. To report errors in this documentation, <a href="https://bugs.launchpad.net/ubuntu/+source/ubuntu-docs">file a bug</a>.</p> |
4027 | + </div> |
4028 | + </div> |
4029 | + |
4030 | + <!-- IE6 hacks --> |
4031 | + <!--[if IE 6 ]> |
4032 | + <script src="js/pngFix.js"></script> |
4033 | + <script> DD_belatedPNG.fix('.png'); </script> |
4034 | + <![endif]--> |
4035 | +</body> |
4036 | +</html> |
4037 | + |
4038 | +</xsl:template> |
4039 | + |
4040 | +<xsl:template name="mal2html.page.linktrails.trail.prefix"> |
4041 | + <xsl:param name="node" select="."/> |
4042 | + <a href="https://help.ubuntu.com/14.10" class="trail">Ubuntu 14.10</a> |
4043 | + <xsl:variable name="direction"> |
4044 | + <xsl:call-template name="l10n.direction"/> |
4045 | + </xsl:variable> |
4046 | + <xsl:choose> |
4047 | + <xsl:when test="$direction = 'rtl'"> |
4048 | + <xsl:text> Â« </xsl:text> |
4049 | + </xsl:when> |
4050 | + <xsl:otherwise> |
4051 | + <xsl:text> Â» </xsl:text> |
4052 | + </xsl:otherwise> |
4053 | + </xsl:choose> |
4054 | +</xsl:template> |
4055 | + |
4056 | +</xsl:stylesheet> |
4057 | |
4058 | === added directory 'libs' |
4059 | === renamed directory 'libs' => 'libs.moved' |
4060 | === added file 'libs/mallard-1.0.rng' |
4061 | --- libs/mallard-1.0.rng 1970-01-01 00:00:00 +0000 |
4062 | +++ libs/mallard-1.0.rng 2014-10-18 21:40:54 +0000 |
4063 | @@ -0,0 +1,2111 @@ |
4064 | +<?xml version="1.0"?> |
4065 | +<grammar |
4066 | + xmlns="http://relaxng.org/ns/structure/1.0" |
4067 | + xmlns:mal="http://projectmallard.org/1.0/" |
4068 | + ns="http://projectmallard.org/1.0/"> |
4069 | + |
4070 | +<start> |
4071 | + <ref name="mal_page"/> |
4072 | +</start> |
4073 | + |
4074 | +<define name="mal_page"> |
4075 | + <element name="page"> |
4076 | + <ref name="mal_page_attr"/> |
4077 | + <ref name="mal_info"/> |
4078 | + <ref name="mal_block_title"/> |
4079 | + <optional> |
4080 | + <ref name="mal_block_subtitle"/> |
4081 | + </optional> |
4082 | + <zeroOrMore> |
4083 | + <choice> |
4084 | + <ref name="mal_block"/> |
4085 | + <ref name="mal_links"/> |
4086 | + </choice> |
4087 | + </zeroOrMore> |
4088 | + <zeroOrMore> |
4089 | + <ref name="mal_section"/> |
4090 | + </zeroOrMore> |
4091 | + <zeroOrMore> |
4092 | + <ref name="mal_links"/> |
4093 | + </zeroOrMore> |
4094 | + </element> |
4095 | +</define> |
4096 | + |
4097 | +<define name="mal_page_attr"> |
4098 | + <group> |
4099 | + <attribute name="id"> |
4100 | + <data type="NMTOKEN" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4101 | + </attribute> |
4102 | + <optional> |
4103 | + <attribute name="type"> |
4104 | + <data type="NMTOKEN" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4105 | + </attribute> |
4106 | + </optional> |
4107 | + <optional> |
4108 | + <attribute name="style"> |
4109 | + <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4110 | + </attribute> |
4111 | + </optional> |
4112 | + <optional> |
4113 | + <attribute name="version"> |
4114 | + <text/> |
4115 | + </attribute> |
4116 | + </optional> |
4117 | + <zeroOrMore> |
4118 | + <ref name="mal_attr_external"/> |
4119 | + </zeroOrMore> |
4120 | + </group> |
4121 | +</define> |
4122 | + |
4123 | +<define name="mal_section"> |
4124 | + <element name="section"> |
4125 | + <ref name="mal_section_attr"/> |
4126 | + <optional> |
4127 | + <ref name="mal_info"/> |
4128 | + </optional> |
4129 | + <ref name="mal_block_title"/> |
4130 | + <optional> |
4131 | + <ref name="mal_block_subtitle"/> |
4132 | + </optional> |
4133 | + <zeroOrMore> |
4134 | + <choice> |
4135 | + <ref name="mal_block"/> |
4136 | + <ref name="mal_links"/> |
4137 | + </choice> |
4138 | + </zeroOrMore> |
4139 | + <zeroOrMore> |
4140 | + <ref name="mal_section"/> |
4141 | + </zeroOrMore> |
4142 | + <zeroOrMore> |
4143 | + <ref name="mal_links"/> |
4144 | + </zeroOrMore> |
4145 | + </element> |
4146 | +</define> |
4147 | + |
4148 | +<define name="mal_section_attr"> |
4149 | + <group> |
4150 | + <attribute name="id"> |
4151 | + <data type="ID" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4152 | + </attribute> |
4153 | + <optional> |
4154 | + <attribute name="style"> |
4155 | + <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4156 | + </attribute> |
4157 | + </optional> |
4158 | + <zeroOrMore> |
4159 | + <ref name="mal_attr_external"/> |
4160 | + </zeroOrMore> |
4161 | + </group> |
4162 | +</define> |
4163 | + |
4164 | +<define name="mal_info"> |
4165 | + <element name="info"> |
4166 | + <ref name="mal_info_attr"/> |
4167 | + <ref name="mal_info_content"/> |
4168 | + </element> |
4169 | +</define> |
4170 | + |
4171 | +<define name="mal_info_attr"> |
4172 | + <group> |
4173 | + <zeroOrMore> |
4174 | + <ref name="mal_attr_external"/> |
4175 | + </zeroOrMore> |
4176 | + </group> |
4177 | +</define> |
4178 | + |
4179 | +<define name="mal_info_content"> |
4180 | + <interleave> |
4181 | + <optional> |
4182 | + <ref name="mal_info_desc"/> |
4183 | + </optional> |
4184 | + <zeroOrMore> |
4185 | + <ref name="mal_info_credit"/> |
4186 | + </zeroOrMore> |
4187 | + <zeroOrMore> |
4188 | + <ref name="mal_info_license"/> |
4189 | + </zeroOrMore> |
4190 | + <zeroOrMore> |
4191 | + <ref name="mal_info_link"/> |
4192 | + </zeroOrMore> |
4193 | + <zeroOrMore> |
4194 | + <ref name="mal_info_title"/> |
4195 | + </zeroOrMore> |
4196 | + <zeroOrMore> |
4197 | + <ref name="mal_info_revision"/> |
4198 | + </zeroOrMore> |
4199 | + <zeroOrMore> |
4200 | + <ref name="mal_external"/> |
4201 | + </zeroOrMore> |
4202 | + </interleave> |
4203 | +</define> |
4204 | + |
4205 | +<define name="mal_info_credit"> |
4206 | + <element name="credit"> |
4207 | + <ref name="mal_info_credit_attr"/> |
4208 | + <ref name="mal_info_credit_content"/> |
4209 | + </element> |
4210 | +</define> |
4211 | + |
4212 | +<define name="mal_info_credit_attr"> |
4213 | + <group> |
4214 | + <optional> |
4215 | + <attribute name="type"> |
4216 | + <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4217 | + </attribute> |
4218 | + </optional> |
4219 | + <optional> |
4220 | + <attribute name="style"> |
4221 | + <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4222 | + </attribute> |
4223 | + </optional> |
4224 | + <zeroOrMore> |
4225 | + <ref name="mal_attr_external"/> |
4226 | + </zeroOrMore> |
4227 | + </group> |
4228 | +</define> |
4229 | + |
4230 | +<define name="mal_info_credit_content"> |
4231 | + <interleave> |
4232 | + <ref name="mal_info_name"/> |
4233 | + <zeroOrMore> |
4234 | + <ref name="mal_info_email"/> |
4235 | + </zeroOrMore> |
4236 | + <optional> |
4237 | + <ref name="mal_info_years"/> |
4238 | + </optional> |
4239 | + <zeroOrMore> |
4240 | + <ref name="mal_external"/> |
4241 | + </zeroOrMore> |
4242 | + </interleave> |
4243 | +</define> |
4244 | + |
4245 | +<define name="mal_info_link"> |
4246 | + <element name="link"> |
4247 | + <ref name="mal_info_link_attr"/> |
4248 | + <zeroOrMore> |
4249 | + <ref name="mal_info_link_content"/> |
4250 | + </zeroOrMore> |
4251 | + </element> |
4252 | +</define> |
4253 | + |
4254 | +<define name="mal_info_link_attr"> |
4255 | + <group> |
4256 | + <attribute name="type"> |
4257 | + <data type="NMTOKEN" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4258 | + </attribute> |
4259 | + <optional> |
4260 | + <attribute name="style"> |
4261 | + <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4262 | + </attribute> |
4263 | + </optional> |
4264 | + <oneOrMore> |
4265 | + <ref name="mal_attr_link"/> |
4266 | + </oneOrMore> |
4267 | + <optional> |
4268 | + <attribute name="group"> |
4269 | + <text/> |
4270 | + </attribute> |
4271 | + </optional> |
4272 | + <zeroOrMore> |
4273 | + <ref name="mal_attr_external"/> |
4274 | + </zeroOrMore> |
4275 | + </group> |
4276 | +</define> |
4277 | + |
4278 | +<define name="mal_info_link_content"> |
4279 | + <ref name="mal_external"/> |
4280 | +</define> |
4281 | + |
4282 | +<define name="mal_info_title"> |
4283 | + <element name="title"> |
4284 | + <ref name="mal_info_title_attr"/> |
4285 | + <ref name="mal_info_title_inline"/> |
4286 | + </element> |
4287 | +</define> |
4288 | + |
4289 | +<define name="mal_info_title_attr"> |
4290 | + <group> |
4291 | + <attribute name="type"> |
4292 | + <data type="NMTOKEN" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4293 | + </attribute> |
4294 | + <optional> |
4295 | + <attribute name="style"> |
4296 | + <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4297 | + </attribute> |
4298 | + </optional> |
4299 | + <optional> |
4300 | + <attribute name="role"> |
4301 | + <data type="NMTOKEN" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4302 | + </attribute> |
4303 | + </optional> |
4304 | + <zeroOrMore> |
4305 | + <ref name="mal_attr_external"/> |
4306 | + </zeroOrMore> |
4307 | + </group> |
4308 | +</define> |
4309 | + |
4310 | +<define name="mal_info_title_inline"> |
4311 | + <ref name="mal_inline"/> |
4312 | +</define> |
4313 | + |
4314 | +<define name="mal_info_license"> |
4315 | + <element name="license"> |
4316 | + <ref name="mal_info_license_attr"/> |
4317 | + <oneOrMore> |
4318 | + <ref name="mal_info_license_content"/> |
4319 | + </oneOrMore> |
4320 | + </element> |
4321 | +</define> |
4322 | + |
4323 | +<define name="mal_info_license_attr"> |
4324 | + <group> |
4325 | + <optional> |
4326 | + <attribute name="style"> |
4327 | + <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4328 | + </attribute> |
4329 | + </optional> |
4330 | + <optional> |
4331 | + <attribute name="href"> |
4332 | + <text/> |
4333 | + </attribute> |
4334 | + </optional> |
4335 | + <zeroOrMore> |
4336 | + <ref name="mal_attr_external"/> |
4337 | + </zeroOrMore> |
4338 | + </group> |
4339 | +</define> |
4340 | + |
4341 | +<define name="mal_info_license_content"> |
4342 | + <ref name="mal_block"/> |
4343 | +</define> |
4344 | + |
4345 | +<define name="mal_info_desc"> |
4346 | + <element name="desc"> |
4347 | + <ref name="mal_info_desc_attr"/> |
4348 | + <ref name="mal_info_desc_inline"/> |
4349 | + </element> |
4350 | +</define> |
4351 | + |
4352 | +<define name="mal_info_desc_attr"> |
4353 | + <group> |
4354 | + <optional> |
4355 | + <attribute name="style"> |
4356 | + <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4357 | + </attribute> |
4358 | + </optional> |
4359 | + <zeroOrMore> |
4360 | + <ref name="mal_attr_external"/> |
4361 | + </zeroOrMore> |
4362 | + </group> |
4363 | +</define> |
4364 | + |
4365 | +<define name="mal_info_desc_inline"> |
4366 | + <ref name="mal_inline"/> |
4367 | +</define> |
4368 | + |
4369 | +<define name="mal_info_revision"> |
4370 | + <element name="revision"> |
4371 | + <ref name="mal_info_revision_attr"/> |
4372 | + <optional> |
4373 | + <ref name="mal_block_title"/> |
4374 | + </optional> |
4375 | + <optional> |
4376 | + <ref name="mal_block_desc"/> |
4377 | + </optional> |
4378 | + <zeroOrMore> |
4379 | + <ref name="mal_info_revision_content"/> |
4380 | + </zeroOrMore> |
4381 | + </element> |
4382 | +</define> |
4383 | + |
4384 | +<define name="mal_info_revision_attr"> |
4385 | + <group> |
4386 | + <optional> |
4387 | + <attribute name="style"> |
4388 | + <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4389 | + </attribute> |
4390 | + </optional> |
4391 | + <optional> |
4392 | + <attribute name="version"> |
4393 | + <text/> |
4394 | + </attribute> |
4395 | + </optional> |
4396 | + <optional> |
4397 | + <attribute name="docversion"> |
4398 | + <text/> |
4399 | + </attribute> |
4400 | + </optional> |
4401 | + <optional> |
4402 | + <attribute name="pkgversion"> |
4403 | + <text/> |
4404 | + </attribute> |
4405 | + </optional> |
4406 | + <optional> |
4407 | + <attribute name="date"> |
4408 | + <data type="date" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4409 | + </attribute> |
4410 | + </optional> |
4411 | + <optional> |
4412 | + <attribute name="status"> |
4413 | + <data type="NMTOKEN" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4414 | + </attribute> |
4415 | + </optional> |
4416 | + <zeroOrMore> |
4417 | + <ref name="mal_attr_external"/> |
4418 | + </zeroOrMore> |
4419 | + </group> |
4420 | +</define> |
4421 | + |
4422 | +<define name="mal_info_revision_content"> |
4423 | + <ref name="mal_external"/> |
4424 | +</define> |
4425 | + |
4426 | +<define name="mal_info_years"> |
4427 | + <element name="years"> |
4428 | + <ref name="mal_info_years_attr"/> |
4429 | + <ref name="mal_info_years_inline"/> |
4430 | + </element> |
4431 | +</define> |
4432 | + |
4433 | +<define name="mal_info_years_attr"> |
4434 | + <group> |
4435 | + <optional> |
4436 | + <attribute name="style"> |
4437 | + <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4438 | + </attribute> |
4439 | + </optional> |
4440 | + <zeroOrMore> |
4441 | + <ref name="mal_attr_external"/> |
4442 | + </zeroOrMore> |
4443 | + </group> |
4444 | +</define> |
4445 | + |
4446 | +<define name="mal_info_years_inline"> |
4447 | + <ref name="mal_inline"/> |
4448 | +</define> |
4449 | + |
4450 | +<define name="mal_info_email"> |
4451 | + <element name="email"> |
4452 | + <ref name="mal_info_email_attr"/> |
4453 | + <ref name="mal_info_email_inline"/> |
4454 | + </element> |
4455 | +</define> |
4456 | + |
4457 | +<define name="mal_info_email_attr"> |
4458 | + <group> |
4459 | + <optional> |
4460 | + <attribute name="style"> |
4461 | + <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4462 | + </attribute> |
4463 | + </optional> |
4464 | + <zeroOrMore> |
4465 | + <ref name="mal_attr_external"/> |
4466 | + </zeroOrMore> |
4467 | + </group> |
4468 | +</define> |
4469 | + |
4470 | +<define name="mal_info_email_inline"> |
4471 | + <ref name="mal_inline"/> |
4472 | +</define> |
4473 | + |
4474 | +<define name="mal_info_name"> |
4475 | + <element name="name"> |
4476 | + <ref name="mal_info_name_attr"/> |
4477 | + <ref name="mal_info_name_inline"/> |
4478 | + </element> |
4479 | +</define> |
4480 | + |
4481 | +<define name="mal_info_name_attr"> |
4482 | + <group> |
4483 | + <optional> |
4484 | + <attribute name="style"> |
4485 | + <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4486 | + </attribute> |
4487 | + </optional> |
4488 | + <zeroOrMore> |
4489 | + <ref name="mal_attr_external"/> |
4490 | + </zeroOrMore> |
4491 | + </group> |
4492 | +</define> |
4493 | + |
4494 | +<define name="mal_info_name_inline"> |
4495 | + <ref name="mal_inline"/> |
4496 | +</define> |
4497 | + |
4498 | +<define name="mal_links"> |
4499 | + <element name="links"> |
4500 | + <ref name="mal_links_attr"/> |
4501 | + <optional> |
4502 | + <ref name="mal_block_title"/> |
4503 | + </optional> |
4504 | + <zeroOrMore> |
4505 | + <ref name="mal_links_content"/> |
4506 | + </zeroOrMore> |
4507 | + </element> |
4508 | +</define> |
4509 | + |
4510 | +<define name="mal_links_attr"> |
4511 | + <group> |
4512 | + <attribute name="type"> |
4513 | + <data type="NMTOKEN" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4514 | + </attribute> |
4515 | + <optional> |
4516 | + <attribute name="style"> |
4517 | + <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4518 | + </attribute> |
4519 | + </optional> |
4520 | + <optional> |
4521 | + <attribute name="groups"> |
4522 | + <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4523 | + </attribute> |
4524 | + </optional> |
4525 | + <zeroOrMore> |
4526 | + <ref name="mal_attr_external"/> |
4527 | + </zeroOrMore> |
4528 | + </group> |
4529 | +</define> |
4530 | + |
4531 | +<define name="mal_links_content"> |
4532 | + <ref name="mal_external"/> |
4533 | +</define> |
4534 | + |
4535 | +<define name="mal_block"> |
4536 | + <choice> |
4537 | + <ref name="mal_block_elements"/> |
4538 | + <element> |
4539 | + <anyName> |
4540 | + <except> |
4541 | + <nsName ns="http://projectmallard.org/1.0/"/> |
4542 | + <nsName ns=""/> |
4543 | + </except> |
4544 | + </anyName> |
4545 | + <zeroOrMore> |
4546 | + <attribute> |
4547 | + <anyName/> |
4548 | + <text/> |
4549 | + </attribute> |
4550 | + </zeroOrMore> |
4551 | + <interleave> |
4552 | + <zeroOrMore> |
4553 | + <ref name="mal_external"/> |
4554 | + </zeroOrMore> |
4555 | + <zeroOrMore> |
4556 | + <ref name="mal_block_elements"/> |
4557 | + </zeroOrMore> |
4558 | + </interleave> |
4559 | + </element> |
4560 | + </choice> |
4561 | +</define> |
4562 | + |
4563 | +<define name="mal_block_elements"> |
4564 | + <choice> |
4565 | + <ref name="mal_block_code"/> |
4566 | + <ref name="mal_block_comment"/> |
4567 | + <ref name="mal_block_example"/> |
4568 | + <ref name="mal_block_figure"/> |
4569 | + <ref name="mal_block_list"/> |
4570 | + <ref name="mal_block_listing"/> |
4571 | + <ref name="mal_block_media"/> |
4572 | + <ref name="mal_block_note"/> |
4573 | + <ref name="mal_block_p"/> |
4574 | + <ref name="mal_block_quote"/> |
4575 | + <ref name="mal_block_screen"/> |
4576 | + <ref name="mal_block_steps"/> |
4577 | + <ref name="mal_block_synopsis"/> |
4578 | + <ref name="mal_block_terms"/> |
4579 | + <ref name="mal_block_tree"/> |
4580 | + <ref name="mal_table"/> |
4581 | + </choice> |
4582 | +</define> |
4583 | + |
4584 | +<define name="mal_block_code"> |
4585 | + <element name="code"> |
4586 | + <ref name="mal_block_code_attr"/> |
4587 | + <ref name="mal_block_code_inline"/> |
4588 | + </element> |
4589 | +</define> |
4590 | + |
4591 | +<define name="mal_block_code_attr"> |
4592 | + <group> |
4593 | + <optional> |
4594 | + <attribute name="style"> |
4595 | + <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4596 | + </attribute> |
4597 | + </optional> |
4598 | + <optional> |
4599 | + <attribute name="mime"> |
4600 | + <text/> |
4601 | + </attribute> |
4602 | + </optional> |
4603 | + <zeroOrMore> |
4604 | + <ref name="mal_attr_external"/> |
4605 | + </zeroOrMore> |
4606 | + </group> |
4607 | +</define> |
4608 | + |
4609 | +<define name="mal_block_code_inline"> |
4610 | + <ref name="mal_inline"/> |
4611 | +</define> |
4612 | + |
4613 | +<define name="mal_block_example"> |
4614 | + <element name="example"> |
4615 | + <ref name="mal_block_example_attr"/> |
4616 | + <oneOrMore> |
4617 | + <ref name="mal_block_example_content"/> |
4618 | + </oneOrMore> |
4619 | + </element> |
4620 | +</define> |
4621 | + |
4622 | +<define name="mal_block_example_attr"> |
4623 | + <group> |
4624 | + <optional> |
4625 | + <attribute name="style"> |
4626 | + <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4627 | + </attribute> |
4628 | + </optional> |
4629 | + <zeroOrMore> |
4630 | + <ref name="mal_attr_external"/> |
4631 | + </zeroOrMore> |
4632 | + </group> |
4633 | +</define> |
4634 | + |
4635 | +<define name="mal_block_example_content"> |
4636 | + <ref name="mal_block"/> |
4637 | +</define> |
4638 | + |
4639 | +<define name="mal_block_media"> |
4640 | + <element name="media"> |
4641 | + <ref name="mal_block_media_attr"/> |
4642 | + <zeroOrMore> |
4643 | + <ref name="mal_block_media_content"/> |
4644 | + </zeroOrMore> |
4645 | + </element> |
4646 | +</define> |
4647 | + |
4648 | +<define name="mal_block_media_attr"> |
4649 | + <group> |
4650 | + <optional> |
4651 | + <attribute name="type"> |
4652 | + <choice> |
4653 | + <value>image</value> |
4654 | + <value>video</value> |
4655 | + <value>audio</value> |
4656 | + <value>application</value> |
4657 | + </choice> |
4658 | + </attribute> |
4659 | + </optional> |
4660 | + <optional> |
4661 | + <attribute name="style"> |
4662 | + <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4663 | + </attribute> |
4664 | + </optional> |
4665 | + <optional> |
4666 | + <attribute name="mime"> |
4667 | + <text/> |
4668 | + </attribute> |
4669 | + </optional> |
4670 | + <attribute name="src"> |
4671 | + <text/> |
4672 | + </attribute> |
4673 | + <optional> |
4674 | + <attribute name="height"> |
4675 | + <text/> |
4676 | + </attribute> |
4677 | + </optional> |
4678 | + <optional> |
4679 | + <attribute name="width"> |
4680 | + <text/> |
4681 | + </attribute> |
4682 | + </optional> |
4683 | + <zeroOrMore> |
4684 | + <ref name="mal_attr_external"/> |
4685 | + </zeroOrMore> |
4686 | + </group> |
4687 | +</define> |
4688 | + |
4689 | +<define name="mal_block_media_content"> |
4690 | + <ref name="mal_block"/> |
4691 | +</define> |
4692 | + |
4693 | +<define name="mal_block_p"> |
4694 | + <element name="p"> |
4695 | + <ref name="mal_block_p_attr"/> |
4696 | + <ref name="mal_block_p_inline"/> |
4697 | + </element> |
4698 | +</define> |
4699 | + |
4700 | +<define name="mal_block_p_attr"> |
4701 | + <group> |
4702 | + <optional> |
4703 | + <attribute name="style"> |
4704 | + <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4705 | + </attribute> |
4706 | + </optional> |
4707 | + <zeroOrMore> |
4708 | + <ref name="mal_attr_external"/> |
4709 | + </zeroOrMore> |
4710 | + </group> |
4711 | +</define> |
4712 | + |
4713 | +<define name="mal_block_p_inline"> |
4714 | + <ref name="mal_inline"/> |
4715 | +</define> |
4716 | + |
4717 | +<define name="mal_block_screen"> |
4718 | + <element name="screen"> |
4719 | + <ref name="mal_block_screen_attr"/> |
4720 | + <ref name="mal_block_screen_inline"/> |
4721 | + </element> |
4722 | +</define> |
4723 | + |
4724 | +<define name="mal_block_screen_attr"> |
4725 | + <group> |
4726 | + <optional> |
4727 | + <attribute name="style"> |
4728 | + <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4729 | + </attribute> |
4730 | + </optional> |
4731 | + <optional> |
4732 | + <attribute name="mime"> |
4733 | + <text/> |
4734 | + </attribute> |
4735 | + </optional> |
4736 | + <zeroOrMore> |
4737 | + <ref name="mal_attr_external"/> |
4738 | + </zeroOrMore> |
4739 | + </group> |
4740 | +</define> |
4741 | + |
4742 | +<define name="mal_block_screen_inline"> |
4743 | + <ref name="mal_inline"/> |
4744 | +</define> |
4745 | + |
4746 | +<define name="mal_block_quote"> |
4747 | + <element name="quote"> |
4748 | + <ref name="mal_block_quote_attr"/> |
4749 | + <optional> |
4750 | + <ref name="mal_block_title"/> |
4751 | + </optional> |
4752 | + <optional> |
4753 | + <ref name="mal_block_cite"/> |
4754 | + </optional> |
4755 | + <oneOrMore> |
4756 | + <ref name="mal_block_quote_content"/> |
4757 | + </oneOrMore> |
4758 | + </element> |
4759 | +</define> |
4760 | + |
4761 | +<define name="mal_block_quote_attr"> |
4762 | + <group> |
4763 | + <optional> |
4764 | + <attribute name="style"> |
4765 | + <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4766 | + </attribute> |
4767 | + </optional> |
4768 | + <zeroOrMore> |
4769 | + <ref name="mal_attr_external"/> |
4770 | + </zeroOrMore> |
4771 | + </group> |
4772 | +</define> |
4773 | + |
4774 | +<define name="mal_block_quote_content"> |
4775 | + <ref name="mal_block"/> |
4776 | +</define> |
4777 | + |
4778 | +<define name="mal_block_comment"> |
4779 | + <element name="comment"> |
4780 | + <ref name="mal_block_comment_attr"/> |
4781 | + <optional> |
4782 | + <ref name="mal_block_title"/> |
4783 | + </optional> |
4784 | + <optional> |
4785 | + <ref name="mal_block_cite"/> |
4786 | + </optional> |
4787 | + <oneOrMore> |
4788 | + <ref name="mal_block_comment_content"/> |
4789 | + </oneOrMore> |
4790 | + </element> |
4791 | +</define> |
4792 | + |
4793 | +<define name="mal_block_comment_attr"> |
4794 | + <group> |
4795 | + <optional> |
4796 | + <attribute name="style"> |
4797 | + <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4798 | + </attribute> |
4799 | + </optional> |
4800 | + <zeroOrMore> |
4801 | + <ref name="mal_attr_external"/> |
4802 | + </zeroOrMore> |
4803 | + </group> |
4804 | +</define> |
4805 | + |
4806 | +<define name="mal_block_comment_content"> |
4807 | + <ref name="mal_block"/> |
4808 | +</define> |
4809 | + |
4810 | +<define name="mal_block_figure"> |
4811 | + <element name="figure"> |
4812 | + <ref name="mal_block_figure_attr"/> |
4813 | + <optional> |
4814 | + <ref name="mal_block_title"/> |
4815 | + </optional> |
4816 | + <optional> |
4817 | + <ref name="mal_block_desc"/> |
4818 | + </optional> |
4819 | + <oneOrMore> |
4820 | + <ref name="mal_block_figure_content"/> |
4821 | + </oneOrMore> |
4822 | + </element> |
4823 | +</define> |
4824 | + |
4825 | +<define name="mal_block_figure_attr"> |
4826 | + <group> |
4827 | + <optional> |
4828 | + <attribute name="style"> |
4829 | + <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4830 | + </attribute> |
4831 | + </optional> |
4832 | + <zeroOrMore> |
4833 | + <ref name="mal_attr_external"/> |
4834 | + </zeroOrMore> |
4835 | + </group> |
4836 | +</define> |
4837 | + |
4838 | +<define name="mal_block_figure_content"> |
4839 | + <ref name="mal_block"/> |
4840 | +</define> |
4841 | + |
4842 | +<define name="mal_block_listing"> |
4843 | + <element name="listing"> |
4844 | + <ref name="mal_block_listing_attr"/> |
4845 | + <optional> |
4846 | + <ref name="mal_block_title"/> |
4847 | + </optional> |
4848 | + <optional> |
4849 | + <ref name="mal_block_desc"/> |
4850 | + </optional> |
4851 | + <oneOrMore> |
4852 | + <ref name="mal_block_listing_content"/> |
4853 | + </oneOrMore> |
4854 | + </element> |
4855 | +</define> |
4856 | + |
4857 | +<define name="mal_block_listing_attr"> |
4858 | + <group> |
4859 | + <optional> |
4860 | + <attribute name="style"> |
4861 | + <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4862 | + </attribute> |
4863 | + </optional> |
4864 | + <zeroOrMore> |
4865 | + <ref name="mal_attr_external"/> |
4866 | + </zeroOrMore> |
4867 | + </group> |
4868 | +</define> |
4869 | + |
4870 | +<define name="mal_block_listing_content"> |
4871 | + <ref name="mal_block"/> |
4872 | +</define> |
4873 | + |
4874 | +<define name="mal_block_note"> |
4875 | + <element name="note"> |
4876 | + <ref name="mal_block_note_attr"/> |
4877 | + <optional> |
4878 | + <ref name="mal_block_title"/> |
4879 | + </optional> |
4880 | + <oneOrMore> |
4881 | + <ref name="mal_block_note_content"/> |
4882 | + </oneOrMore> |
4883 | + </element> |
4884 | +</define> |
4885 | + |
4886 | +<define name="mal_block_note_attr"> |
4887 | + <group> |
4888 | + <optional> |
4889 | + <attribute name="style"> |
4890 | + <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4891 | + </attribute> |
4892 | + </optional> |
4893 | + <zeroOrMore> |
4894 | + <ref name="mal_attr_external"/> |
4895 | + </zeroOrMore> |
4896 | + </group> |
4897 | +</define> |
4898 | + |
4899 | +<define name="mal_block_note_content"> |
4900 | + <ref name="mal_block"/> |
4901 | +</define> |
4902 | + |
4903 | +<define name="mal_block_synopsis"> |
4904 | + <element name="synopsis"> |
4905 | + <ref name="mal_block_synopsis_attr"/> |
4906 | + <optional> |
4907 | + <ref name="mal_block_title"/> |
4908 | + </optional> |
4909 | + <optional> |
4910 | + <ref name="mal_block_desc"/> |
4911 | + </optional> |
4912 | + <oneOrMore> |
4913 | + <ref name="mal_block_synopsis_content"/> |
4914 | + </oneOrMore> |
4915 | + </element> |
4916 | +</define> |
4917 | + |
4918 | +<define name="mal_block_synopsis_attr"> |
4919 | + <group> |
4920 | + <optional> |
4921 | + <attribute name="style"> |
4922 | + <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4923 | + </attribute> |
4924 | + </optional> |
4925 | + <zeroOrMore> |
4926 | + <ref name="mal_attr_external"/> |
4927 | + </zeroOrMore> |
4928 | + </group> |
4929 | +</define> |
4930 | + |
4931 | +<define name="mal_block_synopsis_content"> |
4932 | + <ref name="mal_block"/> |
4933 | +</define> |
4934 | + |
4935 | +<define name="mal_block_list"> |
4936 | + <element name="list"> |
4937 | + <ref name="mal_block_list_attr"/> |
4938 | + <optional> |
4939 | + <ref name="mal_block_title"/> |
4940 | + </optional> |
4941 | + <oneOrMore> |
4942 | + <ref name="mal_block_list_item"/> |
4943 | + </oneOrMore> |
4944 | + </element> |
4945 | +</define> |
4946 | + |
4947 | +<define name="mal_block_list_attr"> |
4948 | + <group> |
4949 | + <optional> |
4950 | + <attribute name="type"> |
4951 | + <data type="NMTOKEN" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4952 | + </attribute> |
4953 | + </optional> |
4954 | + <optional> |
4955 | + <attribute name="style"> |
4956 | + <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4957 | + </attribute> |
4958 | + </optional> |
4959 | + <zeroOrMore> |
4960 | + <ref name="mal_attr_external"/> |
4961 | + </zeroOrMore> |
4962 | + </group> |
4963 | +</define> |
4964 | + |
4965 | +<define name="mal_block_list_item"> |
4966 | + <element name="item"> |
4967 | + <ref name="mal_block_list_item_attr"/> |
4968 | + <oneOrMore> |
4969 | + <ref name="mal_block_list_item_content"/> |
4970 | + </oneOrMore> |
4971 | + </element> |
4972 | +</define> |
4973 | + |
4974 | +<define name="mal_block_list_item_attr"> |
4975 | + <group> |
4976 | + <optional> |
4977 | + <attribute name="style"> |
4978 | + <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/> |
4979 | + </attribute> |
4980 | + </optional> |
4981 | + <zeroOrMore> |
4982 | + <ref name="mal_attr_external"/> |
4983 | + </zeroOrMore> |
4984 | + </group> |
4985 | +</define> |
4986 | + |
4987 | +<define name="mal_block_list_item_content"> |
4988 | + <ref name="mal_block"/> |
4989 | +</define> |
4990 | + |
4991 | +<define name="mal_block_steps"> |
4992 | + <element name="steps"> |
4993 | + <ref name="mal_block_steps_attr"/> |
4994 | + <optional> |
4995 | + <ref name="mal_block_title"/> |
4996 | + </optional> |
4997 | + <oneOrMore> |
4998 | + <ref name="mal_block_steps_item"/> |
4999 | + </oneOrMore> |
5000 | + </element> |
The diff has been truncated for viewing.
Thanks for your work, the changes have quite some file conflicts though, are you sure you based on/targetted the right serie? it seems your commit is on top of utopic but you targetted saucy