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

[Dustin Kirkland ]

[Jim Campbell (jwcampbell)]

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)]

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)]

> 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

[Giuseppe Terrasi (giuseppeterrasi-deactivatedaccount)]

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)]

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)]

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...

[Dustin Kirkland  (kirkland)]

This is related to:
 * https://bugs.launchpad.net/ubuntu/+source/ubuntu-docs/+bug/687995

Dustin

[Matthew East (mdke)]

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)]

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.

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-19 10:43:54 +0000
+++ debian/changelog	2010-12-09 18:52:28 +0000
@@ -1,3 +1,10 @@
+ubuntu-docs (10.10.4) UNRELEASED; urgency=low
+
+  * libs/ubuntu-banner.xsl: update google custom search cx value,
+    LP: #687995
+
+ -- Dustin Kirkland <[e-mail]>  Thu, 09 Dec 2010 12:47:19 -0600
+
 ubuntu-docs (10.10.3) maverick; urgency=low
 
   * Amend font-family for browser startpage (LP: #195590)
 
=== modified file 'libs/ubuntu-banner.xsl'
--- libs/ubuntu-banner.xsl	2010-03-09 03:39:42 +0000
+++ libs/ubuntu-banner.xsl	2010-12-09 18:52:28 +0000
@@ -19,7 +19,7 @@
 <noscript>
  <form action="http://www.google.com/cse" id="cse-search-box">
    <div>
-     <input type="hidden" name="cx" value="004599128559784038176:vj_p0xo-nng" />
+     <input type="hidden" name="cx" value="003883529982892832976:e2vwumte3fq" />
      <input type="hidden" name="ie" value="UTF-8" />
      <input type="text" name="q" size="27" />
      <input type="submit" name="sa" value="Search" />
@@ -31,7 +31,7 @@
  document.write('<form action="https://help.ubuntu.com/search.html" id="cse-search-box">');
  document.write('  <div>');
  document.write('    <input type="hidden" name="cof" value="FORID:9" />');
- document.write('    <input type="hidden" name="cx" value="004599128559784038176:vj_p0xo-nng" />');
+ document.write('    <input type="hidden" name="cx" value="003883529982892832976:e2vwumte3fq" />');
  document.write('    <input type="hidden" name="ie" value="UTF-8" />');
  document.write('    <input type="text" name="q" size="27" />');
  document.write('    <input type="submit" name="sa" value="Search" />');