ubuntu-manual team mailing list archive

[Jim Connett <jimandmarcy@xxxxxxxxx>]

Thank you for your quick reply Kevin.

I checked what you asked, and I'm pointing to precise-e2, but when I try to
push, this is the message I get:

Unable to obtain lock  held by godbyk@xxxxxxxxxxxxxxxxxxxx on crowberry
(process #14337), acquired 169 hours, 55 minutes ago.
See "bzr help break-lock" for more.
bzr: ERROR: Could not acquire lock "(remote lock)": bzr+ssh://
bazaar.launchpad.net/%2Bbranch/ubuntu-manual/

I did 'bzr help break-lock', but the help suggested I not break the lock
unless I knew the process associated with the lock was done.

Can you take care of this from your end?

And I assume I just do a 'bzr push lp:ubuntu-manual' from my precise-e2
directory, right?

I just want to be cautious here because a) my experience with bzr is
limited, and b) we have two manuals in play right now.

Thanks!

On Sat, Jul 28, 2012 at 4:27 PM, Kevin Godby <godbyk@xxxxxxxxx> wrote:

> Hello, Jim.
>
> I'll respond to the first part of your email:
>
> On Sat, Jul 28, 2012 at 1:23 PM, Jim Connett <jimandmarcy@xxxxxxxxx>
> wrote:
> > What command do I use to push these changes to the e2 branch without
> > interfering with the main, 12.10 branch.
>
> Run 'bzr info' and insure that the push and pull URLs are pointing at
> the precise-e2 branch. If they're not, then you'll want to check out a
> copy of the precise-e2 branch and work on that (bzr branch
> lp:ubuntu-manual/precise-e2).
>
> > I used Kevin's feedback from Matt Thomas at Canonical as the "key" for
> the
> > names of the desktop elements.
> >
> > Of course...questions have arisen:
> >
> > "Dash" or "the Dash"?
> > "Launcher" or "the Launcher"?
>
> Those are all fine, depending on how the word Dash or Launcher is used:
>
>   "The Launcher contains many icons."
>   "There are many icons in the Launcher."
>   "Those icons are called Launcher items."
>
> > I also recommend we add "titlebar" to the style guide (similar to what
> was
> > done for "toolbar").
>
> I'll update the style guide to include that.
>
> Thanks, Jim!
>
> --Kevin
>