[00:17] knome: http://paste.openstack.org/show/8O5dwKe08rdEFB94vUzr/ make sense? Thinking that here or not much later would be good so it doesn't pile up. [00:23] is @DNS-HERE a keyword? [00:26] Unit193, ^ [00:26] No, that's why I said "and one section I know is iffy, but figured I'd add and it can be removed later." [00:27] i would just drop "or ..." then [00:27] otherwise, it looks good [00:27] http://vanir.unit193.tk/xubuntu/desktop-guide/internet-networks.html#network-troubleshooting-advanced [00:28] yeah [00:28] oh yeah, how do we generate the html again? [00:28] btw, "bound to xxx.xxx.xxx.xxx" should be or sth [00:29] I will do it now [00:29] pleia2, dl the branch, then type "make" in the docs root [00:29] k [00:29] then look under build/ [00:29] knome: I didn't add that bit, but I could change it. You read the ENTITY changes? [00:30] Unit193, i did, they are good. i know you didn't add it, but i thought while you are there... [00:30] i suppose same with NOERROR too actually [00:31] what about the wording in "should be working"? [00:31] how common it is that DNS isn't working if that command runs as expected? [00:31] actually, i'd probably go: [00:32] "If you see the word NOERROR in the header section of the output, your DNS is working." [00:33] or "your DNS server is working." [00:33] Domain Name Server server is working. [00:34] we're talking about DNS before [00:35] maybe change the section title to "Check Domain Name Servers (DNS)" [00:35] DNS is Domain Name Server. [00:35] Alright. [00:35] yes, but literally we've been using "DNS" [00:35] so if we didn't think it's needed to write it out before, why now [00:36] I don't know, I just used "DNS" as that's what you see with nm-tool [00:36] guitext isn't a thing. [00:36] hmm [00:36] http://docs.xubuntu.org/ has raring docs now [00:36] pleia2, cool [00:37] the quantal ones are at http://docs.xubuntu.org/1210/ [00:37] (not linked anywhere really though) [00:37] agh, i need to work on the startpage for that [00:37] ? [00:38] Unit193, i'll check the tag in a minute [00:38] eth1 was using that. Sure. [00:38] * Unit193 doesn't know docbook. [00:38] in that case it's probably fine [00:38] as long as we are consisten [00:38] +t [00:40] pleia2, want to draft a text for that? [00:41] startpage text? [00:41] pleia2, should we use "Xubuntu Desktop Guide" instead of "Xubuntu Offline Documentation" [00:41] pleia2, for docs.x.o [00:41] yeah [00:41] but that's what it generates with magic [00:42] yeah, but i was considering doing that with the actual docs as well [00:42] good [00:42] the top part is an image so I can't change that [00:42] or just "Xubuntu Documentation" ? [00:42] "Xubuntu Documentation" is nice [00:42] okay [00:43] then i can probably fix the image as well [00:43] :) [00:43] the makefile needs some love for html too, it doesn't do it right :) [00:43] what's wrong? [00:43] common/ and about/ should be in the desktop-guide/ directory [00:43] instead they are all in the same directory [00:44] i'm not sure i'm following; let me make as well [00:45] http://paste.ubuntu.com/5675805/ [00:46] hmm. [00:46] Updated and online. [00:46] (of course ignore the 1210 directory) [00:46] i'm wondering if that breaks the offline docs part. [00:46] * knome looks [00:46] it's not a huge deal if it's too much of a pain to fix [00:48] i'll fix that as we go [00:48] i mean, at a stage when i'm ready to fix the docbook stuff and see if that turns out right [00:49] http://paste.openstack.org/show/sYSGzXs205cZ5UwCKFPe/ latest. [00:54] pleia2, if you pull now, it should be fixed [00:54] Unit193, goodie. gonna make a merge request of that? [00:55] Now I have to explain what I did. :( [00:55] * Reflect default application changes (GIMP and Gnumeric) [00:55] * Update the network troubleshooting section [00:56] that should be it [00:56] and you can mention that you updated the irc channel name, but -testing still works, so no need to [00:58] meh at pastebins not supporting word wrap! [00:58] pleia2, fix that and get paid for it! [00:59] knome: what should be fixed? [00:59] Whoops. Well I suppose verbose isn't bad... Should I add myself to whatever credits file there is? :P [00:59] Unit193, changelog. [00:59] Yes, but credits too? [00:59] knome: oh, pull of trunk? [00:59] Unit193, sure, if you're not in there :) [01:00] pleia2, yup lp:xubuntu- [01:00] docs [01:00] ah gotcha [01:00] why would you think i'd push anywhere else since i have the powers to puah there? :P [01:00] http://docs.xubuntu.org/ln-idp3702784.html if it wasn't 404ing http://vanir.unit193.tk/xubuntu/desktop-guide/ln-idp1938936.html [01:00] push too [01:01] Unit193, it's docs.xubuntu.org/ln-idp5598192.html now ... [01:01] Unit193, and definitely, go ahead [01:08] bzr: ERROR: No such file: u'/home/unit193/Documents/xubuntu-docs/.bzr/repository/indices/c85a7715032106aa74b0a9eeb8c109ab.six': [Errno 2] No such file or directory: u'/home/unit193/Documents/xubuntu-docs/.bzr/repository/indices/c85a7715032106aa74b0a9eeb8c109ab.six [01:09] gah, copyright [01:09] I have no idea what to do with that. [01:09] huh? [01:09] wth. [01:09] bzr fix-it-now ? :P [01:10] uhhh.. i'm stumped. [01:10] that sounds stupid [01:12] why on earth are we being idiots with the legal notice [01:13] the Canonical nonsense? [01:13] I don't know what it should say [01:14] :D [01:14] no, just the technical way we're including it and making it a pain in the lower back [01:15] Ok, I really, really, really hate this. [01:16] Unit193: What do you hate? [01:16] Unit193, still stuck? [01:17] knome: Oh, no. Not stuck anymore, the changes aren't there anymore. [01:17] ugh [01:26] Note, I still greatly dislike bzr. [01:27] noted. [01:27] Done, now lets see if I mess with that again. :P [01:27] you fixed bzr? wooo [01:27] ;) [01:27] I'm not God, I can't do that. [01:28] boo :( [01:28] https://code.launchpad.net/~unit193/xubuntu-docs/saucy/+merge/164566 anyway. [01:29] Ummm... [01:29] nvm the conflicts. [01:29] i'll handle that.. [01:29] Alright, so I'm done? [01:29] yup! [01:29] thanks [01:29] Whew, great! [01:29] Thanks. [01:33] (I pulled from the pastebin, it wasn't too old.) [01:34] :) [01:37] pushed to lp:xubuntu-docs [01:37] thanks again [01:47] Sure thing, glad it helps. [02:06] Dowh, I was going to correct the /home/username section... [02:07] pleia2, oi princess! [02:08] pleia2, bzr branch lp:xubuntu-website/docs-startpage [02:09] ooh [02:10] * pleia2 does so [02:10] 12.10 is still supported :) [02:11] I'm thinking we use the same wording as on help.ubuntu.com [02:11] Ubuntu 13.04 - the current stable version, released in April 2013, codenamed Raring Ringtail. [02:11] Ubuntu 12.10 - a previous stable version, released in October 2012, codenamed Quantal Quetzal. [02:11] well, you know, feel free to update the branch.. [02:11] (ignore LTS until we fix the docs) [02:11] okie [02:11] it's just a simple html file [02:15] I did bzr wrong \o/ [02:15] heh [02:15] i wonder if doing it right is possible... [02:15] crap, how was I supposed to merge this thing? [02:15] merge? :D [02:16] how can you be in a situation to merge when you only have one commit before your work? [02:16] Merging from remembered parent location bzr+ssh://bazaar.launchpad.net/+branch/xubuntu-website/docs-startpage/ [02:16] Nothing to do. [02:16] oh [02:16] push? [02:16] yes [02:16] commit first. [02:16] then push [02:16] yeah did commit [02:17] I need to stop switching between RCSs all day, I end up not knowing how to use any of them [02:17] anyway, done [02:17] boo, bad whitespace [02:17] \o/ [02:18] hmm [02:18] there, better [02:19] btw [02:19] it's quantal, not quantum [02:20] haha [02:20] too much openstack :( [02:22] "We require that all translations made in Launchpad are BSD licensed. This does not apply to translations imported from elsewhere. Read more about translation licensing.", from https://help.launchpad.net/Translations/YourProject [02:22] just FYI [02:22] ok [02:22] seems fine [02:22] i thought so as well, but wanted to share [02:25] pleia2: I don't ping you with every paste, do I? ;) [02:26] should we write a blog post about compiz on xubuntu? [02:26] knome: ugh, just noticed the docs look for /common/ rather than common/ so they're looking in the docroot for those files (which change between versions) [02:27] actually [02:27] ../common/ [02:27] bah [02:27] did you get the latest commit? [02:27] that's probably wrong though [02:27] not pulling trunk [02:28] for 1210 and 1304 [02:28] let me go fix that [02:28] right [02:28] uploaded splash page and moved some stuff around [02:40] if you run out of things to do to the websites, the upgrade page needs upgradeinh and distrowatch should link to more than just Xubuntu [02:42] pleia2, trunk should be now a bit nicer to you [02:42] pleia2, for the future [02:43] anyway, i'm running out of battery (laptop) and it's soon 6am. [02:43] night! [02:43] and see you later [02:43] :) --< [02:43] --> [02:46] thank you :) good night! [12:01] skellat, did you have some changes you wanted to merge to xubuntu-docs? [12:33] knome: Nope. Just spent time rebasing my working tree to match the upstream tree [12:33] knome: Changes will be made eventually. I have some sort of family event today to attend to. [12:33] oki [12:59] i will start watching the FIN-SWE ice hockey match now as well :) [13:13] knome: i just received some screenshots from elfy of gnome's mixer [13:13] i think the way things are arranged there is much more useful than what we have in pavucontrol atm [13:13] that'd lead to 3 tabs basically: output | input | applications [13:14] apps shouldn't be the first/default tab, as it is now, cause most ppl don't need this fine level of control [13:16] that's my first impression/assessment, i'll look into it more next week when/if i have time [15:04] ochosi, sounds sensible [15:24] ochosi, does this mean xfce is redoing it's mixer app? [15:24] or is this a new project? [15:27] len-1310, they aren't; this is something we want to do for xubuntu [15:28] len-1310, xfce4-mixer doesn't support pulseaudio anyway, so it's not a good fit for us [15:28] so it is a new project then [15:28] well, kind of [15:28] I understand [15:28] we're not adding any features [15:28] we're just looking to revamp the pavucontrol UI [15:28] Wil there still be a way of doing card config if not on a tab? [15:29] most definitely - we're not looking to drop features either [15:29] The ability to turn cards off is really important if the user has multiple cards. [15:30] I have to do so on two machines for different reasons. [15:30] i understand US generally has different needs [15:30] or users of US [15:31] Also, I have had many people ask if it is possible to record the output of another app instead of a physical input. It is possible with PA but the pavucontrol kind of hids this :) [15:32] That is actually a feature that is more useful outside of US. [15:32] if the feature exists in pavucontrol even if it's hidden... then be in touch with ochosi to get it more visible [15:32] OK [15:33] A connections window/dialog (if not tab) like qjackctl has. Would be nice. [15:33] But may be too much work. [15:33] well again, we're not planning on writing new features [15:34] It would be the easiest to explain to the new user. [15:34] if somebody from US wants to do that, we're ok with that :) [15:34] Its not really a new feature. [15:34] new feature for pavucontrol i mean [15:35] all of that info is there in pavucontrol, it is just spread over all the tabs. [15:35] in that case it's probably doable. [15:36] I can record youtube audio with audacity now (for example and not the best way to do things) with pavucontrol. [15:36] With most people it is wanting to record a skype call to make a podcast. [15:55] knome, I've been following the IRC logs. I'm ready for the docs effort whenever you guys are. [15:59] jjfrv8, if you see something lacking in the 13.10 docs, we're fine to go ahead with that already [16:00] Okay. Should I file bugs or what? [16:07] knome, just playing around with pavucontrol (13.10 alphaish) and some of the features that used to be there are gone and there are some new ones as well. Current functionality is adequate for any use I see. I can no longer choose the ouput of an app as an input, but I can choose an output to a device. [16:07] I can do so in an easy to explain way. [16:12] okay [16:13] jjfrv8, sure, or if you are familiar with merge requests, those are even better [16:13] jjfrv8, if you want, i can go through that with you [16:13] knome, yeah, I think I'll need some guidance there. [16:13] jjfrv8, want to do that now or later? [16:14] I've got time now if you do. [16:14] sure :) [16:14] are you familiar with bzr, eg. have you worked with the actual documentation markup yet? [16:14] negative [16:14] okay, let's start with that then [16:15] first, you need to install bzr [16:15] sudo apt-get install bzr [16:15] done [16:16] the next step is to download the branch to your pc [16:16] you might want to create a directory for that, but it's purely optional. i have /data/knome/Repositories/ for branches [16:16] in a directory where you are comfortable getting the branch, type: [16:17] bzr branch lp:xubuntu-docs [16:17] that will get you the latest source markup for the docs [16:18] let me know when you've done that or if you need more help with that [16:19] I think I messed it up. I got a message "You have not informed bzr of your lp id... [16:19] oh, okay :) [16:19] When I tried to copy that message I interrupted the process [16:19] Now I get an error when I re-run it [16:19] hmm [16:19] what's the error? [16:19] "already have a branch: xubuntu-docs [16:20] you can do 'rm -rf xubuntu-docs' and then redo the bzr branch command [16:20] that should guarantee you have the correct stuff [16:20] running it again... [16:21] "Branched 34 revisions" but still says I need to inform lp about id. [16:22] then type 'bzr launchpad-login jjfrv8-gmail' [16:22] that should make the message disappear [16:23] says I have not registered any SSH keys with lp. [16:24] right. let's go through that soon... :) [16:24] alrighty [16:25] type 'ssh-keygen -t rsa' [16:26] "Enter file in which to save the key". Take default? [16:26] yup, the default is fine [16:27] looks like it worked [16:27] great! [16:27] now you need to register the key with launchpad [16:27] if you look at ~/.ssh with thunar, you'll see a .pub file [16:28] i imagine the default is id_rsa.pub [16:28] that's you public ssh key [16:28] I see it [16:28] the file id_rsa is your private key; don't let others touch it :) [16:28] now open the .pub file [16:28] ok [16:29] then go to https://launchpad.net/~jjfrv8-gmail/+editsshkeys [16:29] you should have a textbox where you can insert the public key - just paste the whole .pub file contents there [16:30] pasted. Click Import button? [16:30] yup [16:30] SSH key added. [16:30] yes, and i can see that now as well [16:30] in https://launchpad.net/~jjfrv8-gmail [16:31] now let's get back to the docs source [16:31] cd into the xubuntu-docs directory [16:32] k [16:32] if you want to update the branch (eg. get the latest changes from launchpad) at a later time, you don't need to do bzr branch [16:32] just cd to this directory and type 'bzr pull' [16:32] ls [16:33] whoops [16:33] if you want to make sure you have the latest things when you start working on the docs, you can do that when you start working [16:33] bzr will simply tell you there's nothing to pull if you're at the latest version [16:33] Yup. See that. [16:33] I use bzr clone. :P [16:33] Unit193, isn't that deprecated? :) [16:34] now to get you familiar with the docbook markup [16:34] So it keeps telling me. [16:34] inside the branch directory, navigate to desktop-guide/C/ [16:34] you'll find several .xml files, one for each section in the docs [16:35] open one in your favorite text editor to see how the markup looks like [16:35] (recommended to open something else than index.xml) [16:35] ok [16:36] (or cc-by-sa.xml to that matter :P) [16:37] looking at command-line.xml [16:38] ok, so you'll notice that the documentation follows a specific structure [16:38] i would say the best way to get your head around something new is to look for examples in the existing docs [16:38] we're covering pretty much every situation there [16:41] (just a sec, i'm checking a thing) [16:41] ok, now to build the docs [16:41] you will need some packages: [16:42] sudo apt-get install docbook docbook-xsl docbook-utils xsltproc [16:42] BTW, my main install is still 12.04. Is that a problem? [16:42] nope [16:45] finished [16:46] ok, great [16:46] now in the root directory of the branch [16:46] type *drumroll*.... [16:46] make [16:46] that should build the documentation [16:46] (don't worry, your installed packages are untouched) [16:47] Looks like it worked. [16:47] good! [16:47] now if you look into the 'build' directory, you should see the built docs [16:47] you'll also have the desktop-guide directory there [16:48] and inside that, all the .html files for the sections you saw as .xml files before [16:48] got 'em. [16:48] great [16:49] now you got the basics on how to get the source, and how to build and test the docs [16:49] now go back to the .xml files and edit something [16:49] it can be a real bug you are willing to fix, or something silly [16:51] remember that you are browsing the latest version, so this is effectively the docs that will be in 13.10 [16:52] Woohoo. [16:53] tell me when you've changed something and i'll continue [16:53] That was the "woohoo" :) [16:53] oh, ok :) [16:54] now you have a change you want us to merge to the docs source that eventually gets to the installed docs [16:54] if you had added new files, you would want to type 'bzr add .', which marks all new files to be included [16:54] usually you don't have to do that, but it's good to know [16:55] now let's commit your change to your local copy: [16:55] bzr commit [16:55] that'll open a text editor where you can write the description of the changes you made [16:55] eg. "Fixed a typo in section X." or "Added more information on X." [16:56] try to be accurate and thorough in the commit messages, since that's the only way somebody can easily see what we've changed [16:57] bzr commit says to "set your name with the whoami command" [16:57] ok, that's fair enough :) [16:57] you should do 'bzr whoami "Jack Fromm " [16:57] -', or +' :) [16:58] that'll make sure others know who did all the awesome fixes [16:59] Ok, got the text editor up now and am adding description. [16:59] after you've done that, redo 'bzr commit' [16:59] great [16:59] when you've done, simply save the file and exit the editor [16:59] then bzr will go on and add the commit [17:00] if you want to cancel the commit, don't write anything and close the editor - bzr cancels the commit due to an empty commit message [17:00] Okay, that's what I did. [17:01] which one? :) [17:01] cancelled [17:01] oh, please go ahead [17:01] it can be silly [17:01] we won't be uploading silly commits the the installed docs :) [17:02] What's silly is I don't know how to save a file with nano :) [17:02] oh! :) [17:02] ctrl+o [17:02] and enter [17:02] ah! [17:03] so now you've done a change in the docs, (and in a real situation, you would want to build the docs in between and see if it's ok), and then committed locally [17:03] now we're ready to push the commit to launchad! [17:03] launchpad too! [17:04] So the 'bzr commit' is just local? [17:04] yes [17:04] you can even prepare several local commits before pushing [17:04] ok [17:05] so now what we need to do [17:05] you don't have the permissions to push to lp:xubuntu-docs (very few people do) [17:05] so you will need to push the branch under your own username [17:05] to be able to do a merge request, you will need to push to a specific location [17:06] to do that, type: [17:06] bzr push lp:~jjfrv8-gmail/xubuntu-docs/branchname [17:06] where branchname is anything you think is appropriate/descriptive [17:06] it can be "network-section-fixes" [17:06] or "saucy-applications" [17:07] or as i said, anything you wish [17:07] to do that, you will need the password from your ssh key if you set one [17:07]