=== SDPlissken [n=snake@cpe-68-173-223-72.nyc.res.rr.com] has joined #ubuntu-doc === mgalvin [n=mgalvin@ubuntu/member/mgalvin] has joined #ubuntu-doc === bustacap [n=bustacap@ubuntu/member/bustacap] has joined #ubuntu-doc === bustacap [n=bustacap@ubuntu/member/bustacap] has joined #ubuntu-doc [12:30] hi bustacap [12:31] gday manicka === ompaul [n=ompaul@ubuntu/member/ompaul] has left #ubuntu-doc ["Leaving"] === manicka [n=manicka@ubuntu/member/manicka] has joined #ubuntu-doc === lakin [n=lakin@dsl-hill-66-18-228-60-cgy.nucleus.com] has joined #ubuntu-doc === bustacap [n=bustacap@ubuntu/member/bustacap] has joined #ubuntu-doc === ompaul [n=ompaul@ubuntu/member/ompaul] has joined #ubuntu-doc === Burgundavia [n=corey@S0106000fb085cc63.gv.shawcable.net] has joined #ubuntu-doc === LaserJock [n=mantha@ubuntu/member/laserjock] has joined #ubuntu-doc === Madpilot [n=brian@S0106000d88b9f3db.gv.shawcable.net] has joined #ubuntu-doc === manicka [n=manicka@ubuntu/member/manicka] has joined #ubuntu-doc [04:09] is there an svn command to merge a diff I've been sent into my local copy? svn merge looks right, but I can't figure out the syntax [04:12] hmm, not sure [04:14] I've created a fair number of diffs, but never bothered figuring out how to handle them further :P [04:15] is your local copy clean? [04:18] yes [04:20] then you should just apply the patch then [04:21] yikes, bad grammar there === poningru [n=poningru@pool-72-64-213-212.tampfl.fios.verizon.net] has joined #ubuntu-doc [04:30] svn's help is being non-helpful - which *is* the 'apply this patch' command, anyway? [04:31] Madpilot: svn not being helpful. What a shock [04:32] Burgundavia, by man-page standards, svn help is reasonable :P [04:32] Madpilot: why not use patch ? [04:33] the regular console command patch? (there doesn't seem to be an "svn patch"...) [04:33] yeah, that is what I always use [04:34] Ah, OK. bleh - given that svn uses it's own patch-creation routine, I was expecting patch-merging to be in svn as well [04:36] well, you aren't supposed to do anything outside of the repo so ;-) === ealden [n=ealden@203.76.213.249] has joined #ubuntu-doc [04:37] I'm still confused - what's the 'usual' method of dealing with diffs, then? [04:37] patch [04:40] patch -p0 patch.patch file (I think) [04:41] and if it's a diff encompassing multiple files? [04:49] usually you have to adjust the -p to -p1 or -p2 depending on how deep it is [04:51] "patch -p0 udgaddperiod.diff [04:51] " - but all it does is sit there until I hit Ctrl+C, no matter which directory I stick the .diff in before I start - wtf? [04:53] oh, use < to pipe the file in === robitaille [n=daniel@ubuntu/member/robitaille] has joined #ubuntu-doc [04:54] patch uses stdin for the diff [04:55] ah [04:56] that finally worked - thanks [05:13] np Madpilot [05:34] hi robotgeek [05:34] hey LaserJock [05:34] hi robotgeek [05:34] hey Madpilot [05:37] had to /remove someone in #kubuntu [05:38] really? [05:39] yeah, i hate it when people paste without reading /topic [05:39] lj: will review packaging guide later this weekend (a bit more time now that the alsa patches have been spun) [05:40] crimsun: ok, cool. I really got to get a lot done on that this weekend [05:41] ok, I'll see if I can svn up before sunday, but I'm away from Ubuntu this weekend visiting my gf in Atlanta [05:43] Madpilot: seveas fixed the nice script for me and nalioth [05:43] robotgeek, which script? [05:44] irssi only, but it basically ops and deops you automatically after performing the required action [05:44] ah, that one. Doesn't someone have an XChat version too? (Seveas?) [05:44] hmm, maybe [05:45] nalioth and I owe seveas some beer for fixing perl code! === rob [n=Robert@ubuntu/member/rob] has joined #ubuntu-doc [06:08] Madpilot: apparently the java version is not at update 6. i will make those changes, with some added instructiosn for ppc also === bburton [n=brett@ip68-13-128-127.om.om.cox.net] has joined #ubuntu-doc [06:20] Madpilot: i'm wondering what is the best way to do this === rob [n=Robert@ubuntu/member/rob] has joined #ubuntu-doc === robotgeek does wiki work so that he just give out link in Desktop Guide === robitaille [n=daniel@ubuntu/member/robitaille] has joined #ubuntu-doc [08:15] hey robitaille [08:16] Hi Burgundavia [08:28] mdke: ping === Madpilot [n=brian@S0106000d88b9f3db.gv.shawcable.net] has joined #ubuntu-doc [08:35] hi all [08:36] salut Madpilot [08:37] hey Madpilot [08:38] Madpilot: can you take a look at the java section in kdg and see if you like it? [08:39] robotgeek, sure - maybe not tonight, though [08:40] Madpilot: it's a small section, i will commit the changes for you too :) [08:40] robotgeek, just a minute, then I'll have a loook [08:48] robotgeek, shouldn't the Java section be somewhere more conspicuious than "Misc. Tips"? [08:48] Madpilot: hmm, did you guys move it already? :) [08:49] in UDG it's in Internet, in with the other Firefox setup tips [08:49] Madpilot: no, it's in programming [08:50] gah, you're right - I'm behind the times too :P [08:50] there's a link to it from the Internet section though [08:50] Madpilot: yeah, i see that. I will do the same. [08:50] but other than that, the content is fine? [08:51] Yes [08:51] cool, i'll move it and commit it [08:51] I'm going to steal your warning about what Java applies to for UDG [08:52] Madpilot: i was planning to copy over the java section to UDG and commit too [08:52] since you seemed to be in a hurry :) [08:52] sure, go ahead - thanks [08:54] i also updated the versions [09:01] Madpilot: Committed as revision 2574. [09:02] robotgeek, thanks [09:02] Madpilot: there are a couple of ppc things which i will be doing, hopefully [09:02] robotgeek, do you run PPC? [09:02] yes [09:03] hence the "help needed" sections on the guide, i can't install all that stuff even if i wanted to [09:03] anyone active on the docteam run AMD64, do you know? [09:03] nope, i know nalioth runs amd64 === tonyyarusso [n=anthony@HSE-Sudbury-ppp330105.sympatico.ca] has joined #ubuntu-doc [09:07] welcome tonyyarusso [09:07] I have arrived. [09:07] hi tonyyarusso [09:08] Madpilot: Hi. [09:09] tonyyarusso, there's a docteam mailing list as well, if you're interested in joining that [09:10] Madpilot: I may. First I need to take a few minutes to get my e-mail under control. [09:10] My nautilus-list things are already somewhat annoying, and no longer relevant, so I should probably part with that, and maybe use a different account next time. === robotgeek is planning email [09:11] (Not a fan of when my gdesklet says 12 new messages and they're all mailing list) [09:11] +1 tonyyarusso [09:11] What was that? [09:12] i used to get pissed off about those mails too :) [09:12] So are there some good little wiki things outlining good practice for things like documenting an installation experience, describing an OS, etc.? A large portion of my hopeful intended audience is Windows users that I want to inform about alternatives, especially now that Vista is on the horizon. [09:13] robotgeek: I see. [09:13] tonyyarusso, see the /topic here for a bunch of good links that should get you started - quick questions here, longer questions to the ML [09:13] I joined initially to ask about selecting files, like the Windows Explorer behavior. [09:13] Madpilot: Gotcha. [09:14] The /topic says next meeting a week ago... === ..[topic/#ubuntu-doc:Madpilot] : Ubuntu Documentation Team - general discussion - backlog at http://people.ubuntu.com/~fabbione/irclogs | Website http://doc.ubuntu.com | Get involved: https://wiki.ubuntu.com/DocumentationTeam | SVN - https://docteam.ubuntu.com/repos | Please observe the Ubuntu community code of conduct @ http://www.ubuntu.com/community/conduct | Next meeting: TBA, 3rd week of Mar 2006 21UTC https://wiki.ubuntu.com/DocumentationTeam/MeetingAgenda | [09:15] Not anymore, it doesn't :P [09:26] Madpilot: see my followup to the disucss list [09:27] Burgundavia, on freegeek victoria, you mean? Sounds interesting, too bad ReStore can't participate [09:27] Madpilot: What's the TBA about? [09:27] tonyyarusso, we don't have an exact date, but our meetings are always every two weeks - so right now it's just "sometime in the 3rd week of March" [09:28] Madpilot: I was told this coming Tuesday would have a meeting about possibly delaying 6.04. [09:28] tonyyarusso: indeed it will [09:28] tonyyarusso, yeah, I read Mark Shuttleworth's email [09:29] Madpilot: So shouldn't that info be in that? [09:29] tonyyarusso: do you have a x86 machine and a kubuntu dapper iso? [09:29] ah, crap Flight 5 made the front page of Digg and it is not even released [09:29] lol [09:29] tonyyarusso, probably - the announcement was only this morning, though [09:29] robotgeek: x86 with Ubuntu, ShipIt disks. [09:30] Madpilot: Point. [09:30] tonyyarusso: hmm okay [09:30] Actually, Danielle has my last disk now. I guess I need Dapper soon to have a disk! [09:30] robotgeek: Why do you ask? [09:31] tonyyarusso: testing what i wrote, i am a ppc user. a full list of things is currently being emailed :) [09:31] robotgeek: ah. [09:32] robotgeek, send your list to the ML too - I've got Flight4 CDs of both Ubuntu & Kubuntu burned [09:32] Madpilot: yes, i am mailing the list, and point nalioth the url :) [09:32] cool [09:37] sent [09:40] Hey, if you haven't kept track in the past, can you check for a list of all of the wiki pages you have edited somehow? [09:43] tonyyarusso: probably, but not easily [09:43] tonyyarusso: there is "User contributions" button ala Wikipedia, if that is what you mean [09:43] Burgundavia: Is that user-tied or page-tied? [09:44] tonyyarusso: in wikipedia? [09:44] Burgundavia: Either? [09:44] Whatever you think tells me what I need to know. [09:45] mediaiwiki is per user as well as per page [09:45] moin currenlty only does per page, unless there is a(nother, sigh) hidden feature [09:46] Hrm. 'k. === jpatrick [n=patrick@ubuntu/member/jpatrick] has joined #ubuntu-doc [11:12] hiya [11:12] hi [11:12] hi [11:19] night all [11:19] night Madpilot === WaterSevenUb [n=WaterSev@195-23-238-130.nr.ip.pt] has joined #ubuntu-doc === manicka [n=manicka@ubuntu/member/manicka] has joined #ubuntu-doc === manicka [n=manicka@ubuntu/member/manicka] has joined #ubuntu-doc === dsas [n=dean@host86-129-21-210.range86-129.btcentralplus.com] has joined #ubuntu-doc === manicka [n=manicka@ubuntu/member/manicka] has joined #ubuntu-doc === kgoetz [n=kgoetz@ppp201-142.lns1.adl4.internode.on.net] has joined #ubuntu-doc === zenrox [n=zenrox@71.115.198.118] has joined #ubuntu-doc === lakin [n=lakin@dsl-hill-66-18-228-60-cgy.nucleus.com] has joined #ubuntu-doc === lloydinho [n=andreas@rosinante.egmont-kol.dk] has joined #ubuntu-doc === ealden [n=ealden@203.76.211.90] has joined #ubuntu-doc === Pygi [n=mario@83-131-242-97.adsl.net.t-com.hr] has joined #ubuntu-doc === robitaille [n=daniel@ubuntu/member/robitaille] has joined #ubuntu-doc === WaterSevenUb [n=WaterSev@195-23-238-253.nr.ip.pt] has joined #ubuntu-doc === ompaul [n=ompaul@ubuntu/member/ompaul] has joined #ubuntu-doc === mkde [n=matt@r12.worc.ox.ac.uk] has joined #ubuntu-doc === mkde [n=matt@r154.worc.ox.ac.uk] has joined #ubuntu-doc [08:09] does anyone know where the admonition icons we use came from? I need some slightly larger versions [08:10] ah hell === mkde enlarges them in GIMP [08:11] let's see how that looks === LaserJock [n=mantha@ubuntu/member/laserjock] has joined #ubuntu-doc === mgalvin [n=mgalvin@ubuntu/member/mgalvin] has joined #ubuntu-doc === manicka [n=manicka@ubuntu/member/manicka] has joined #ubuntu-doc === Burgundavia [n=corey@S0106000fb085cc63.gv.shawcable.net] has joined #ubuntu-doc === LaserJock_ [n=mantha@ubuntu/member/laserjock] has joined #ubuntu-doc [10:51] trappist: I hope something develops fom your init scripts thread in u-devel === ompaul [n=ompaul@ubuntu/member/ompaul] has joined #ubuntu-doc === jjesse [i=user@69-87-141-30.async.iserv.net] has joined #ubuntu-doc === Burgundavia [n=corey@S0106000fb085cc63.gv.shawcable.net] has joined #ubuntu-doc === jjesse [i=user@69-87-141-30.async.iserv.net] has left #ubuntu-doc []