Bazaar

Merge lp:~jameinel/bzr/2.4-quick-start-ref-273160 into lp:bzr

  1. 2.4-quick-start-ref-273160
  2. Merge into bzr.dev
Proposed by John A Meinel
Status: Merged
Approved by: Vincent Ladeuil
Approved revision: no longer in the source branch.
Merged at revision: 5827
Proposed branch: lp:~jameinel/bzr/2.4-quick-start-ref-273160
Merge into: lp:bzr
Diff against target: 66 lines (+7/-7)
1 file modified
doc/en/_static/en/bzr-en-quick-reference.svg (+7/-7)
To merge this branch: bzr merge lp:~jameinel/bzr/2.4-quick-start-ref-273160
Reviewer Review Type Date Requested Status
Vincent Ladeuil Approve
Martin Packman (community) Needs Information
Review via email: mp+58470@code.launchpad.net

Commit message

Bug #273160, tweaks to the Bazaar Quick Reference Card from Clemens Tolboom.

Description of the change

This is us finally landing some tweaks from Clemens. On the bug report I attached the .png file.

It updates the .svg (manually), and then rebuilds the .pdf and .png associated with it.

I think it looks decent. I ended up moving the "More Information" section back far enough that "http://bazaar.canonical.com" no longer goes past the right margin (of the boxes).

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) wrote :

SVG changes look fine.

The PNG you posted in the bug has a transparent background, is that intentional? It made the text illegible against black for me. I've posted a copy with a white background that also optimises slightly smaller.

I've not examined the PDF.

review: Needs Information
Revision history for this message
John A Meinel (jameinel) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 04/20/2011 07:50 PM, Martin [gz] wrote:
> Review: Needs Information
> SVG changes look fine.
>
> The PNG you posted in the bug has a transparent background, is that intentional? It made the text illegible against black for me. I've posted a copy with a white background that also optimises slightly smaller.
>
> I've not examined the PDF.
>
>

The original PNG was transparent, so I assume the new PNG should be as
well. The PDF is not transparent.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk2vLPIACgkQJdeBCYSNAANz6QCguW71+UMRHDeQBvZfQqwov02m
2OEAoJIIi1uG9gbqiuJFZtSprOpGFLit
=1KCd
-----END PGP SIGNATURE-----

Revision history for this message
John A Meinel (jameinel) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 04/20/2011 07:50 PM, Martin [gz] wrote:
> Review: Needs Information
> SVG changes look fine.
>
> The PNG you posted in the bug has a transparent background, is that intentional? It made the text illegible against black for me. I've posted a copy with a white background that also optimises slightly smaller.
>
> I've not examined the PDF.
>
>

I just double checked:
http://doc.bazaar.canonical.com/bzr.dev/en/quick-reference/

If you download the PNG format, it is definitely transparent.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk2vLTgACgkQJdeBCYSNAAPvgwCfViW7efInBS0CEGq8GkqE+lMF
eGIAn3KEKKEhDa8iGzYLaPhBes99593i
=+xab
-----END PGP SIGNATURE-----

Revision history for this message
Vincent Ladeuil (vila) wrote :

Let's land this and fix the generated .png and .pdf it they appear to be wrong or mgz yells loudly before we do.

Revision history for this message
Vincent Ladeuil (vila) wrote :

Rats I intended to approve. Done.

review: Approve
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

sent to pqm by email

Revision history for this message
Martin Packman (gz) wrote :

Yup, jam answered my query fine, the conversation was just a little split between here and the bug.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/en/_static/en/bzr-en-quick-reference.pdf'
2Binary files doc/en/_static/en/bzr-en-quick-reference.pdf 2009-12-02 23:09:40 +0000 and doc/en/_static/en/bzr-en-quick-reference.pdf 2011-04-20 10:39:11 +0000 differ
3=== modified file 'doc/en/_static/en/bzr-en-quick-reference.png'
4Binary files doc/en/_static/en/bzr-en-quick-reference.png 2009-12-02 23:09:40 +0000 and doc/en/_static/en/bzr-en-quick-reference.png 2011-04-20 10:39:11 +0000 differ
5=== modified file 'doc/en/_static/en/bzr-en-quick-reference.svg'
6--- doc/en/_static/en/bzr-en-quick-reference.svg 2010-01-29 10:36:23 +0000
7+++ doc/en/_static/en/bzr-en-quick-reference.svg 2011-04-20 10:39:11 +0000
8@@ -2,7 +2,7 @@
9 <!-- Created with Inkscape (http://www.inkscape.org/) -->
10 <svg
11 xmlns:dc="http://purl.org/dc/elements/1.1/"
12- xmlns:cc="http://web.resource.org/cc/"
13+ xmlns:cc="http://creativecommons.org/ns#"
14 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
15 xmlns:svg="http://www.w3.org/2000/svg"
16 xmlns="http://www.w3.org/2000/svg"
17@@ -13,7 +13,7 @@
18 height="744.09448"
19 id="svg2766"
20 sodipodi:version="0.32"
21- inkscape:version="0.45.1"
22+ inkscape:version="0.46"
23 version="1.0"
24 sodipodi:docbase="/home/ian/bzr/repo.packs/bzr.quick-start-tweaks/doc/en/quick-reference"
25 sodipodi:docname="quick-start-summary.svg"
26@@ -363,7 +363,7 @@
27 sodipodi:role="line"
28 id="tspan2187"
29 x="64.448624"
30- y="277.48495">bzr branch mp myproject</tspan></text>
31+ y="277.48495">bzr branch myproject newproject</tspan></text>
32 <text
33 xml:space="preserve"
34 style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:30.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;font-family:Bitstream Vera Sans"
35@@ -389,7 +389,7 @@
36 sodipodi:role="line"
37 id="tspan3406"
38 x="64.448624"
39- y="308.44989">bzr checkout mp myproject</tspan></text>
40+ y="308.44989">bzr checkout srcproject myproject</tspan></text>
41 <text
42 xml:space="preserve"
43 style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:30.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;font-family:Bitstream Vera Sans"
44@@ -415,11 +415,11 @@
45 id="tspan3424"
46 sodipodi:role="line"
47 x="64.448624"
48- y="341.88864">bzr checkout --lightweight mp \</tspan><tspan
49+ y="341.88864">bzr checkout --lightweight \</tspan><tspan
50 sodipodi:role="line"
51 x="64.448624"
52 y="352.96197"
53- id="tspan2780"> myproject</tspan></text>
54+ id="tspan2780"> srcproject myproject</tspan></text>
55 <text
56 xml:space="preserve"
57 style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:30.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;font-family:Bitstream Vera Sans"
58@@ -1329,7 +1329,7 @@
59 sodipodi:role="line"
60 id="tspan3411"
61 x="146.57143"
62- y="97.808769">Quick Start Card</tspan></text>
63+ y="97.808769">Quick Reference Card</tspan></text>
64 <g
65 id="g12314"
66 transform="translate(17.946423,1.7472534)"