Merge lp:~kirkland/ubuntu-docs/687995 into lp:ubuntu-docs/natty

Proposed by Dustin Kirkland  on 2010-12-09
Status: Merged
Merge reported by: Matthew East
Merged at revision: not available
Proposed branch: lp:~kirkland/ubuntu-docs/687995
Merge into: lp:ubuntu-docs/natty
Diff against target: 36 lines (+9/-2)
2 files modified
debian/changelog (+7/-0)
libs/ubuntu-banner.xsl (+2/-2)
To merge this branch: bzr merge lp:~kirkland/ubuntu-docs/687995
Reviewer Review Type Date Requested Status
Matthew East (community) 2010-12-09 Approve on 2011-04-29
Review via email: mp+43267@code.launchpad.net
To post a comment you must log in.
Jim Campbell (jwcampbell) wrote :

Matthew, would you mind taking a look at this? It introduces a conflict with the Debian changelog, and I don't want to introduce any kind of error with that.

I'm a bit surprised that we didn't see this merge request before now. Dustin submitted it back in December.

Dustin Kirkland  (kirkland) wrote :

On Thu, Apr 21, 2011 at 11:44 AM, Jim Campbell <email address hidden> wrote:
> Matthew, would you mind taking a look at this? It introduces a conflict with the Debian changelog, and I don't want to introduce any kind of error with that.
>
> I'm a bit surprised that we didn't see this merge request before now. Dustin submitted it back in December.

of 2009 ;-)

> --
> https://code.launchpad.net/~kirkland/ubuntu-docs/687995/+merge/43267
> You are the owner of lp:~kirkland/ubuntu-docs/687995.

Seriously, I don't even know if this is valid or not any more...

--
:-Dustin

Jim Campbell (jwcampbell) wrote :

> On Thu, Apr 21, 2011 at 11:44 AM, Jim Campbell <email address hidden> wrote:
> > Matthew, would you mind taking a look at this? It introduces a conflict with
> the Debian changelog, and I don't want to introduce any kind of error with
> that.
> >
> > I'm a bit surprised that we didn't see this merge request before now. Dustin
> submitted it back in December.
>
> of 2009 ;-)
>
> > --
> > https://code.launchpad.net/~kirkland/ubuntu-docs/687995/+merge/43267
> > You are the owner of lp:~kirkland/ubuntu-docs/687995.
>
> Seriously, I don't even know if this is valid or not any more...

It does say 2010-12-09, so it looks like it was December 9th of 2010. Still, it's been several months.
>
> --
> :-Dustin

Oh yes! This is related of my bug open in november 2010.
https://bugs.launchpad.net/ubuntu/+source/ubuntu-docs/+bug/687995

Sorry if I don't remember you this :-)

Now is possible wait the natty release in order to use a cseId much up to date?

Giuseppe

Matthew East (mdke) wrote :

On 21 April 2011 15:44, Jim Campbell <email address hidden> wrote:
> Matthew, would you mind taking a look at this? It introduces a conflict with the Debian changelog, and I don't want to introduce any kind of error with that.

Yes, I'll look at this when we build the online docs.

--
Matthew East
http://www.mdke.org
gnupg pub 1024D/0E6B06FF

Dustin Kirkland  (kirkland) wrote :

On Thu, Apr 21, 2011 at 2:52 PM, Jim Campbell <email address hidden> wrote:
>> On Thu, Apr 21, 2011 at 11:44 AM, Jim Campbell <email address hidden> wrote:
>> > Matthew, would you mind taking a look at this? It introduces a conflict with
>> the Debian changelog, and I don't want to introduce any kind of error with
>> that.
>> >
>> > I'm a bit surprised that we didn't see this merge request before now. Dustin
>> submitted it back in December.
>>
>> of 2009 ;-)
>>
>> > --
>> > https://code.launchpad.net/~kirkland/ubuntu-docs/687995/+merge/43267
>> > You are the owner of lp:~kirkland/ubuntu-docs/687995.
>>
>> Seriously, I don't even know if this is valid or not any more...
>
> It does say 2010-12-09, so it looks like it was December 9th of 2010. Still, it's been several months.

Oh, sorry. Bleary eyes from international flights yesterday...

Matthew East (mdke) wrote :

Dustin - quick question, will the cx value need to be updated again after 11.04 docs are added?

Matthew East (mdke) :
review: Approve
Dustin Kirkland  (kirkland) wrote :

Should be a onetime thing, Matt.
On Apr 29, 2011 4:46 AM, "Matthew East" <email address hidden> wrote:
> Dustin - quick question, will the cx value need to be updated again after
11.04 docs are added?
> --
> https://code.launchpad.net/~kirkland/ubuntu-docs/687995/+merge/43267
> You are the owner of lp:~kirkland/ubuntu-docs/687995.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-09-19 10:43:54 +0000
3+++ debian/changelog 2010-12-09 18:52:28 +0000
4@@ -1,3 +1,10 @@
5+ubuntu-docs (10.10.4) UNRELEASED; urgency=low
6+
7+ * libs/ubuntu-banner.xsl: update google custom search cx value,
8+ LP: #687995
9+
10+ -- Dustin Kirkland <kirkland@ubuntu.com> Thu, 09 Dec 2010 12:47:19 -0600
11+
12 ubuntu-docs (10.10.3) maverick; urgency=low
13
14 * Amend font-family for browser startpage (LP: #195590)
15
16=== modified file 'libs/ubuntu-banner.xsl'
17--- libs/ubuntu-banner.xsl 2010-03-09 03:39:42 +0000
18+++ libs/ubuntu-banner.xsl 2010-12-09 18:52:28 +0000
19@@ -19,7 +19,7 @@
20 <noscript>
21 <form action="http://www.google.com/cse" id="cse-search-box">
22 <div>
23- <input type="hidden" name="cx" value="004599128559784038176:vj_p0xo-nng" />
24+ <input type="hidden" name="cx" value="003883529982892832976:e2vwumte3fq" />
25 <input type="hidden" name="ie" value="UTF-8" />
26 <input type="text" name="q" size="27" />
27 <input type="submit" name="sa" value="Search" />
28@@ -31,7 +31,7 @@
29 document.write('<form action="https://help.ubuntu.com/search.html" id="cse-search-box">');
30 document.write(' <div>');
31 document.write(' <input type="hidden" name="cof" value="FORID:9" />');
32- document.write(' <input type="hidden" name="cx" value="004599128559784038176:vj_p0xo-nng" />');
33+ document.write(' <input type="hidden" name="cx" value="003883529982892832976:e2vwumte3fq" />');
34 document.write(' <input type="hidden" name="ie" value="UTF-8" />');
35 document.write(' <input type="text" name="q" size="27" />');
36 document.write(' <input type="submit" name="sa" value="Search" />');

Subscribers

People subscribed via source and target branches