=== ChanServ changed the topic of #ubuntu-classroom to: Welcome to the Ubuntu Classroom - https://wiki.ubuntu.com/Classroom || Support in #ubuntu || Upcoming Schedule: http://is.gd/8rtIi || Questions in #ubuntu-classroom-chat || Event: Ubuntu Documentation Day - Current Session: Introduction to Docs - Instructors: pleia2 [16:02] * pleia2 waves [16:02] hello everyone :) bright and early here in California [16:03] (actually, not so bright, it's raining) [16:03] welcome to Ubuntu Documentation Day! We'll have 6.5 hours of sessions here in the Classroom about Ubuntu Documentation [16:04] if you're not already, you may join #ubuntu-classroom-chat as well to ask questions and chat with other attendees [16:04] questions should be in the form of: [16:04] QUESTION: Do you like Ubuntu? [16:04] so the ClassBot can pick them up :) [16:04] anyone want to give it a try? [16:04] knome asked: Is Xubuntu the best flavor? [16:05] haha, it depends on who you ask :) [16:05] belkinsa asked: What favor of Ubuntu is the best? [16:05] they're all wonderful! [16:05] alright, so that's questions [16:05] the schedule today is as follows: [16:06] 17:00 UTC Getting started contributing to Desktop docs with godbyk [16:06] 18:00 UTC Getting started contributing to Server docs with dsmythies [16:06] 19:00 UTC Getting started contributing to the Wiki docs with belkinsa [16:06] 20:00 UTC Getting started contributing to Manual with godbyk (again! busy guy) [16:07] 21:00 UTC Ubuntu Manual versions explained with tacorwin and patrickdickey [16:07] the full schedule is here, along with time zone conversions from UTC: https://wiki.ubuntu.com/DocumentationTeam/Classroom [16:08] now, this session is an introduction to docs, which shall serve as sort of a quick start to everything else that folks will be exploring today [16:08] I'll go through each of them quickly, syncing up with where they land on the schedule [16:08] feel free to ask questions, but anything complicated is probably best left for the person giving the session about that particular topic, since they're the experts :) [16:09] first up, Desktop docs! [16:09] the Desktop docs are shipped on every Ubuntu Desktop install [16:10] they're also published to help.ubuntu.com, so the latest official desktop docs can be found here: https://help.ubuntu.com/13.10/ubuntu-help/index.html [16:10] this makes them pretty important to get right, and since everyone who works on documentation in Ubuntu is an unpaid volunteer, we could always use the help with all aspects [16:11] the team commits to updating this documentation every cycle [16:12] on the technical side, the documentation is written in a markup language called "Mallard" (the same as what GNOME uses) and it lives at lp:ubuntu-docs which can be accessed via the revision control system bazaar (bzr) [16:12] godbyk will be giving the full tour in about 38 minutes [16:13] next up we have server documentation [16:13] this documentation is specific to servers running Ubuntu and is separate from the desktop documentation [16:14] just like desktop docs, the team is committed to releasing this every cycle [16:14] knome asked: Do flavors ship documentation, are they published online and do they also use Mallard and BZR? [16:14] many flavors do ship documentation, but they select the tools they use to write and publish, I'll get to that toward the end :) [16:15] unlike desktop docs, server docs are not shipped with installed versions of Ubuntu server and instead are just published on help.ubuntu.com [16:15] they're available there as html and pdf as you can see in the latest release here: https://help.ubuntu.com/13.10/index.html [16:16] these docs are written in DocBook, and are also available via bzr at lp:serverguide [16:16] DocBook is a pretty standard tool for writing documentation in open source projects, so many folks are already familiar with it [16:18] now, beyond these "official" documentation types in the core Docuemtation team, we also have docuementation that's maintained on the wiki [16:18] everything under /community at help.ubuntu.com is actually a wiki [16:18] starting here: https://help.ubuntu.com/community [16:18] this can be edited by anyone in the community, at any time, and there are no set deadlines or freezes for when it should be completed [16:19] as such, it's a much more "living" document that the community maintains, and while there is a team to keep an eye on things, it's not strictly updated every cycle [16:20] it's also not shipped with Ubuntu or anything, so it's more of an online reference [16:20] to get started working with this, all you need is a web browser and a launchpad account :) see here for getting started: https://wiki.ubuntu.com/DocumentationTeam/Wiki [16:21] wiki syntax is easier to learn than DocBook or Mallard, so a lot of folks enjoy starting here [16:22] ah, should clarify, a launchpad account linked to Ubuntu One account (if you sign up for launchpad today it's automatic, but if you have an older account it might not be), see: https://help.ubuntu.com/community/WikiGuide/Registration [16:23] the wiki also allows you to create new articles for things that aren't documented, and improve existing documents when you find errors, so it's a low barrier way to get involved [16:23] there's also the Ubuntu Manual project [16:23] the work the Ubuntu Manual does is to present a low-cost (or free pdf) printable Ubuntu book for users, their site is at http://ubuntu-manual.org/ [16:24] it's structured differently than the official desktop documentation because it's in book form, but the manual covers similar topics [16:24] the manual team has also been committed to releasing every cycle [16:25] the Manual is written in LaTeX and then exported to pdf and to online book print shops in whatever format they require [16:26] they also use bzr to track revisions [16:26] one of the things this team did early on was work to make it as easy as possible for contributors can help out, as you can see from their nice, clean get involved page: http://ubuntu-manual.org/getinvolved [16:27] so that's all the documentation that's focused on Ubuntu specifically - it's a lot! and we have a pretty small team for all of these [16:28] beyond that, some of the flavors of Ubuntu maintain their own documentation too [16:29] Xubuntu, for instance, has documentation that's written in DocBook and also lives on launchpad [16:29] ahoneybun asked: are other flavors of ubuntu going to talk? [16:30] unfortunately not! but from my experience xubuntu and kubuntu (the two that maintain docs) are friendly folks and can point you in the right direction [16:31] we'll work to get some flavor representatives in for our next Doc day :) [16:31] these documentation teams run pretty independently from Ubuntu, so they can choose their tools and publishing mechanisms [16:32] for Xubuntu the documentation is published on http://docs.xubuntu.org/ and shipped with each release [16:35] oh and xubuntu docs live on lp at lp:xubuntu-docs [16:36] and since we don't have a specific session for flavors, ahoneybun is here to give us some info about kubuntu documentation :) [16:36] Hello all I am here for the Kubuntu Docs Team [16:36] 'Docs" = Documentation [16:37] Currently we have moved out docs over to http://userbase.kde.org/Kubuntu where you would need to log in here https://userbase.kde.org/index.php?title=Special:OpenIDLogin&returnto=Kubuntu [16:38] It is based on MediaWiki vs MoinMoin that wiki.ubuntu.com uses [16:39] Once we get the docs nice, perfect for release we export it into HTML then to DocBook for the khelpcenter to import [16:40] we do use launchpad for a few things but not as much as say xubuntu at lp:kubuntu-docs [16:41] and we have a docs website at http://docs.kubuntu.org/Kubuntu/KubuntuDocs.html but we are working on getting a way to create a snapshot at each release to push to that site [16:42] Right now at http://userbase.kde.org/Kubuntu we need translators to make the docs the best and most available to everyone :) [16:43] thanks ahoneybun [16:43] no problem :) [16:44] other flavors tend to either rely upon upstream, or have minimal documentation for specific tasks either on the wiki or on their website, like Edubuntu: https://edubuntu.org/documentation [16:44] so participating in upstream documentation is highly recommended as well :) [16:45] upstream == from projects that the distribution uses, like lxde or gnome [16:46] they also rely heavily (or exclusvely) on volunteers, so documentation everywhere always needs help from the community [16:47] finally, I also want to mention that the Ubuntu community also has wiki.ubuntu.com - which is not for user documentation, this tends to be confusing for a lot of people, it's actually a teams wiki that should be used by community members for project coordination and how-tos related to getting involved with their projects [16:49] and that's all I have for this whirlwind tour of documentation :) in 10 minutes or so we'll have godbyk give you a more in depth tour of the desktop docs, and again the full schedule is here: https://wiki.ubuntu.com/DocumentationTeam/Classroom [16:49] I was asked by dsmythies that if you are attending the server session later, that you install some packages with: [16:50] sudo apt-get install bzr docbook docbook-xsl xsltproc libxml2-utils yelp-tools yelp-xsl fop gnome-doc-utils make [16:50] There are 10 minutes remaining in the current session. [16:51] this will pull in what you need to contribute to server docs, and pulls in a bunch of dependencies so it'll take a few minutes [16:55] There are 5 minutes remaining in the current session. [16:57] gulundin asked: is some deadline set on the official documentation for the Trusty Tahr release? [16:58] great question, and there is! [16:58] grabbing the link for our release schedule [16:59] https://wiki.ubuntu.com/DocumentationTeam/ReleaseSchedule [16:59] DocumentationStringFreeze is coming up quick, on March 20th, so it needs to be done by then === ChanServ changed the topic of #ubuntu-classroom to: Welcome to the Ubuntu Classroom - https://wiki.ubuntu.com/Classroom || Support in #ubuntu || Upcoming Schedule: http://is.gd/8rtIi || Questions in #ubuntu-classroom-chat || Event: Ubuntu Documentation Day - Current Session: Getting started contributing to Desktop docs - Instructors: godbyk [17:00] Logs for this session will be available at http://irclogs.ubuntu.com/2014/03/02/%23ubuntu-classroom.html following the conclusion of the session. [17:00] Hello, everyone, and welcome to the classroom session for Ubuntu desktop documentation. [17:01] If you have any questions during this session, please ask in #ubuntu-classroom-chat. Don't forget to prefix your question with "QUESTION:" [17:01] The upcoming sessions are: [17:01] 18:00 UTC Getting started contributing to Server docs with dsmythies [17:01] 19:00 UTC Getting started contributing to the Wiki docs with belkinsa [17:01] 20:00 UTC Getting started contributing to Manual with godbyk [17:01] 21:00 UTC Ubuntu Manual versions explained with tacorwin and patrickdickey [17:02] As pleia2 mentioned in the previous session, the Ubuntu desktop docs are published each cycle along with Ubuntu. [17:02] They are present in two places: [17:02] 1. On your desktop (just search for 'help' in the Dash), and [17:02] 2. Online at https://help.ubuntu.com/13.10/ubuntu-help/index.html. [17:03] In this session, I'll give you a brief overview of how you can help contribute to the desktop documentation. [17:04] For those of you who are eager to dive right in (and not wait on my slow typing!), you can follow our getting started guide at https://wiki.ubuntu.com/DocumentationTeam/SystemDocumentation/UbuntuDesktopGuide. [17:05] To start working with the desktop documentation, you should first join our contributors team: https://launchpad.net/~ubuntu-doc-contributors [17:05] And subscribe to our mailing list. [17:05] You can help us by reviewing the current documentation online at https://help.ubuntu.com/13.10/ubuntu-help/index.html. [17:06] If you find an error—incorrect information or typos—there are a few ways of correcting it: [17:07] 1. Email the list. This is probably the easiest way as others will do most of the work. Just notifying us of these errors helps us enormously! [17:07] 2. File a bug on Launchpad. You can file a bug against the ubuntu-docs project at https://bugs.launchpad.net/ubuntu/+source/ubuntu-docs/+filebug. [17:08] Be sure to include a link to the page you found the bug in and be specific about what the error is. [17:08] 3. Create a patch and file a merge proposal. [17:08] If you're feeling adventurous (and we hope you are!), you can download the documentation code yourself, fix the error, and submit a patch. [17:09] After you've contributed to the project for a while, you can apply to become a "committer". [17:09] Committers can commit code directly to the main bzr repository without having to create a merge proposal. [17:09] They also help review and approve merge proposals from contributors. [17:10] The Ubuntu desktop documentation is written in a markup language called Mallard. [17:10] Mallard is designed specifically for topic-based documentation (as opposed to say, books or lengthier publications). [17:11] En example Mallard document looks like this: http://bazaar.launchpad.net/~ubuntu-core-doc/ubuntu-docs/trusty/view/head:/ubuntu-help/C/unity-launcher-intro.page [17:11] When we convert this Mallard document to HTML, it looks like this: https://help.ubuntu.com/13.10/ubuntu-help/unity-launcher-intro.html [17:11] If you search the Dash for 'help', it will bring up an offline viewer known as Yelp. [17:11] Yelp can read and display Mallard pages directly without converting them to HTML first. [17:13] Next, I'd like to walk you through the process of downloading our documentation source code. This process will also give you a head start on any server guide work you'd like to do. [17:13] But first, are there any questions so far? [17:15] Okay, let's dive in! If you have questions along the way, feel free to ask them in #ubuntu-classroom-chat. Don't forget to prefix your question with "QUESTION:". [17:15] We've written a short guide to getting started with the desktop docs at . [17:15] I'll be walking you through this process. [17:16] !q [17:16] jose: You can find out all about Mallard at http://projectmallard.org/. [17:17] jose asked: where can I learn Mallard? [17:17] jose: We may not have time to cover much of Mallard in this sessions, but if there's interest, we could hold a future classroom session about it. [17:19] Okay, for the first step, you'll need to install a few packages: [17:19] $ sudo apt-get install bzr xsltproc libxml2-utils yelp-tools yelp-xsl [17:19] ahoneybun asked: how well does mallard handles translations? [17:20] ahoneybun: Mallard handles translations pretty well. When we're finished updating the docs, we generate a translation template file and upload it to Launchpad. [17:21] ahoneybun: Translators can then translate the documentation. The docs team will periodically upload the translations to the help.ubuntu.com website. [17:21] Next, we'll need to generate an SSH key. [17:21] First, check to see if you already have an SSH key: [17:22] Open a terminal, and type: [17:22] $ ls ~/.ssh/id_rsa.pub [17:22] If it lists the file, then you already have an ssh key and can skip the next step. [17:23] If you don't already have a key (it says "No such file or directory"), then we'll create one with the following command: [17:23] $ ssh-keygen -t rsa [17:23] It's easiest to just press Enter to accept the defaults to all of the questions. [17:23] You may enter a password for additional security if you like, but it's not required. [17:24] jose asked: how do I open a terminal? [17:24] jose: You can open a terminal by searching the Dash for 'Terminal' or by pressing Ctrl+Alt+T on your keyboard. [17:24] belkinsa asked: Is there a way to copy and paste those commands in the terminal for the ese? [17:25] belkinsa: You can copy and paste these commands from the chat window or from our web page at https://wiki.ubuntu.com/DocumentationTeam/SystemDocumentation/UbuntuDesktopGuide. [17:25] belkinsa: In your terminal, press Ctrl+Shift+V to paste the text. [17:25] belkinsa: Be sure to leave out the initial $. That's just showing the prompt. [17:26] Next, we'll need to upload the SSH key to Launchpad. [17:26] Open your favorite web browser and head to https://launchpad.net/~/+editsshkeys [17:27] If you don't yet have a Launchpad account, create one and then revisit the URL. [17:28] If you already have a Launchpad account, log in. [17:28] Scroll down to the bottom of the page and you'll see a large text box below the "Add an SSH key" heading. [17:29] We'll need to paste the SSH key we just created into this box. [17:29] In your terminal, run: [17:29] $ gedit ~/.ssh/id_rsa.pub [17:30] Copy the entire contents of this file and paste them into the textbox on the Launchpad page. Click the Import Public Key button. [17:30] This SSH key allows us to communicate securely with Launchpad. [17:30] Next, we'll set up bzr. [17:31] bzr (Bazaar) is the version control system that Ubuntu uses for its projects. [17:31] bzr maintains a history of all the changes we make to the documentation. [17:31] This allows us to roll back any accidental changes and to see our progress as we update the documentation. [17:32] First, we'll need to tell bzr who we are. [17:32] We'll tell bzr which name and email address we'd like it to show when we submit code to Launchpad. [17:33] Run the following command: [17:33] $ bzr whoami "Kevin Godby Replace 'Kevin Godby' with your full name and 'kevin@godby.org' with your own email address. [17:33] Don't forget the quotation marks. [17:33] And don't forget to put your email address in < and > (like I failed to). [17:33] $ bzr whoami "Kevin Godby " [17:34] Next, we'll need to tell bzr what our Launchpad username is: [17:34] $ bzr launchpad-login godbyk [17:34] If you've forgotten your Launchpad username, you can find it by visiting https://launchpad.net/~ in your web browser. [17:35] Launchpad will redirect you to your Launchpad account page. The part of the address after the tilde (~) is your username. [17:35] Finally, we can download a copy of the documentation using bzr. [17:35] This step can take a little bit of time because we're downloading the entire history of all of the changes made to the documentation over the years. [17:36] In your terminal, run the following command: [17:36] $ bzr branch lp:ubuntu-docs [17:37] Are there any questions so far? [17:39] Since it will take a little while to download the documentation, we'll explore the files online. [17:39] If you visit http://bazaar.launchpad.net/~ubuntu-core-doc/ubuntu-docs/trusty/files with your web browser, you can see a list of all of the files and directories in the bzr repository. [17:39] These are the files that are being downloaded by bzr. [17:40] The Mallard files that we write for the desktop documentation live in the ubuntu-help/C/ subdirectory. [17:40] Click on ubuntu-help and then C to find .page files. [17:41] The .page files contain the Mallard markup for the documentation. [17:42] Let's take another look at the example Mallard file I showed you earlier: http://bazaar.launchpad.net/~ubuntu-core-doc/ubuntu-docs/trusty/view/head:/ubuntu-help/C/unity-launcher-intro.page [17:42] Once bzr has finished downloading all the files, you can open this file on your computer by running the following command in your terminal: [17:43] $ gedit ubuntu-docs/ubuntu-help/C/unity-launcher-intro.page [17:43] If you spot an error in this file, you have a few options for correcting it: [17:44] 1. Email the ubuntu-docs mailing list about it and someone there will fix it. [17:44] 2. File a bug report at https://bugs.launchpad.net/ubuntu/+source/ubuntu-docs/+filebug and someone there will fix it. [17:45] 3. Make the changes yourself. [17:45] The first two options are fairly self-explanatory, so let's explore the third option. [17:45] You can open the offending .page file in gedit, make the desired changes, and save the file. [17:45] Now you have the corrected .page file on your own computer. [17:46] The next step is to get your changes back to Launchpad so they can be incorporated into the main documentation repository. [17:47] First, you'll need to commit your changes to the bzr repository. [17:47] Run the following command: [17:47] $ cd ~/ubuntu-docs [17:47] $ bzr commit -m 'A brief description of your changes goes here' [17:48] The 'bzr commit' command will commit your changes. The text between the apostrophes should be a short description of the changes you've made. [17:48] Next, you'll need to upload your changes to Launchpad. [17:48] Run the following command: [17:49] $ bzr push lp:~username/ubuntu/trusty/ubuntu-doc/my-first-change [17:49] where you've replaced 'username' with your own username and 'my-first-change' with a couple words describing your change (no spaces allowed). [17:50] There are 10 minutes remaining in the current session. [17:50] Finally, you'll need to create a 'merge proposal' to alert the ubuntu-docs team of your proposed changes so they can be reviewed. [17:50] Run: [17:50] $ bzr lp-propose [17:51] This command will open your web browser to the merge proposal page on Launchpad. Provide a brief description of your proposed changes and submit the merge proposal. [17:51] The ubuntu-docs team will be notified of your merge proposal. [17:51] They will review your proposed changes and either accept them or discuss them with you. [17:52] We've only had a short time to get an overview of the Ubuntu desktop documentation and how you can join the team. [17:53] If you'd like more information, feel free to email us on our mailing list at ubuntu-doc@lists.ubuntu.com or chat with us in our IRC channel at #ubuntu-doc. [17:53] We hope to hear from you soon! [17:53] We have a few minutes for some questions. [17:54] In our next session, dsmythies will discuss the server documentation. [17:55] There are 5 minutes remaining in the current session. [17:58] to help save time in the sererguide session please do this (if you didn't already), as it might take over 15 minutes: [17:58] $ sudo apt-get install bzr docbook docbook-xsl xsltproc libxml2-utils yelp-tools yelp-xsl fop gnome-doc-utils make === ChanServ changed the topic of #ubuntu-classroom to: Welcome to the Ubuntu Classroom - https://wiki.ubuntu.com/Classroom || Support in #ubuntu || Upcoming Schedule: http://is.gd/8rtIi || Questions in #ubuntu-classroom-chat || Event: Ubuntu Documentation Day - Current Session: Getting started contributing to Server docs - Instructors: dsmythies [18:00] Logs for this session will be available at http://irclogs.ubuntu.com/2014/03/02/%23ubuntu-classroom.html following the conclusion of the session. [18:00] Hello everyone, my name is Doug Smythies and this is the "Getting Started Contributing to the Serverguide" session. [18:00] Over the next hour, and for the Ubuntu Serverguide, we will learn: How to setup a working environment; How to build and verify the HTML and PDF versions; How to create and submit a merge proposal. [18:00] Note that I am IRC challenged, and have asked for help from invisbile to you classroom volunteers, whom I would like to thank now, because I will forget at the end. [18:01] Could everybody participating please comment in #ubuntu-classroom-chat. And please say if you intend to "participate" or just follow along but not actually "do", as the numbers will dictate how I deliever the material. [18:02] Questions are O.K. during this session, but I might not see them right away. Please ask in #ubuntu-classroom-chat. Be sure to prefix it with 'QUESTION:' to ensure that it gets noticed by the classroom robot. [18:03] Prerequisites: You should already have a launchpad account, with an uploaded ssh key for the computer you will be using. You should already have bzr installed and setup. Is this O.K or is it a problem for anyone? [18:04] Hmmm.... [18:05] I guess I'll move along then... [18:06] We will work on 3 real bug reports, but don't worry they are simple typo bug reports. At this stage we are here to learn about the process and not get lost in some detailed overhaul of a chapter or section. [18:06] While what we are covering shouldn't take too long, there might be download delays and such which could result in time pressures for the hour. [18:07] First and foremost, we should always have the serverguide "quick how to" page open somewhere on our desktop and as our main reference. [18:07] Please open: https://wiki.ubuntu.com/DocumentationTeam/SystemDocumentation/UbuntuServerGuide [18:07] and go to the kickstart section. [18:07] Second, things are done via the command line, so we always need some sort of terminal window or session open. Go ahead and make a terminal window or open an ssh session now. [18:08] Cut and paste the install the software line (even if you think you already have everything installed, there is no harm in checking): [18:09] Note: Lyz asked you to do this earlier and I asked awhile ago also. [18:09] $ sudo apt-get install bzr docbook docbook-xsl xsltproc libxml2-utils yelp-tools yelp-xsl fop gnome-doc-utils make [18:10] This step might take 15 minutes or more, if you do not already have anything installed. [18:10] (I am hoping you have done this already, as pleia2 mentioned the command at the end of her session. Although I know some of you might not have been here then.) [18:10] O.K.? comment on #ubuntu-classroom-chat as to progress. And note that even if you took Kevin's session just prior to this one, there are an extra couple of packages needed for Serverguide. [18:13] Now we are ready to get a local copy of the master files for the Ubuntu Servverguide: [18:13] 1.) make a working directory and change to it: [18:13] $ mkdir sguide-1404 [18:13] $ cd squide-1404 [18:14] 2.) make a local copy (branch) of the master Serverguide files: (put it in the subdirectory called "classroom")(this will take at least 4 minutes.) [18:14] $ bzr branch lp:serverguide classroom [18:15] If it is your first bzr/launchpad interaction, you will see: [18:15] The authenticity of host 'bazaar.launchpad.net (91.189.95.84)' can't be established. [18:15] RSA key fingerprint is bla bla bla. [18:15] Are you sure you want to continue connecting (yes/no)? [18:15] enter "yes" [18:15] This step might take 4 minutes or more. [18:16] O.K.? comment on #ubuntu-classroom-chat as to progress. [18:17] 3.) Now, before we make any changes, check to make sure everything is O.K..That the code builds and that the code validates: [18:18] $ cd classroom [18:18] $ scripts/validate.sh serverguide/C/serverguide.xml [18:18] $ make serverguide-html [18:18] $ make serverguide-pdf [18:20] While we have worked hard to get rid of exranious messages during compile, there are still a few. [18:20] Now have a look at the compiled serverguide. How you actually do this will depend on your setup. I do things on a server and have the drive shared with my Laptop via Samba. If you are using a desktop computer you can use it directly. [18:21] The built serverguide will be in the build/serverguide/C sub-directory. Navegate there and open the index.html file. Similarly for the serverguide.pdf file. In both the HTML and the PDF, browse to the Zyntal section. [18:21] Note: in the new (Red) theme, sometimes it is not obvious where stuff is in the HTML. With the old (Brown) theme it was easier. (It is under "Remote administration") [18:22] If you are just following along and not actually building on your local machine, then go to https://help.ubuntu.com/13.10/index.html and proceed from there. [18:22] TIP: Sometimes it is easier to find stuff in the .PDF because you can search the whole document, and then you know where to look in the HTML. [18:23] Once we have determined that the unaltered code validates and compiles, we are ready to start making changes. [18:23] Let's look at the first bug report we intend to tackle: Please all open a new broswer page and go to bug 1278146 [18:24] https://bugs.launchpad.net/serverguide/+bug/1278146 [18:24] O.K.? comment on #ubuntu-classroom-chat that you have opened and read the bug report. [18:25] I'll set the bug report status to "In progress". I already assigned myself so as to hold the bug report for this class, but typically you would assign yourself, or maybe you were previously assigned. [18:25] I want everybody to click and add themselves to get every e-mail about this bug report (over on the right about 4 or 5 groups down). [18:26] First we check our compiled HTML and PDF, so we can verify before and after we fix it. Search for "a serie of" [18:28] Now, we have the context of the bug report. This will be useful later. [18:28] Close the PDF Serverguide, because (at least on my computer) we can not rebuild it while it is open. Keep the HTML open. [18:28] Now we have to figure out where the referenced error is in the source code. (ignoring for the moment, that I already did that and made an entry in the bug report.): [18:29] $ cd serverguide [18:29] $ cd C [18:29] $ grep -n "a serie of" *.xml [18:29] you should get this: [18:29] remote-administration.xml:451: Zentyal consists of a serie of packages [18:29] So you know line 451 of remote-administration.xml is the line to fix. [18:30] O.K.? Was everyone able to identify the issue in the source code? [18:30] TIP: Sometimes our grep search fails. Why? Because sometimes there are line breaks in the source code that interfere with the search pattern. If that happens, just move the search pattern a little. [18:30] TIP: Notice that in the HTML "Zyntal" is in italics. That likley means that it is surrounded by docbook tags in the source code, and we should not include it in the grep search pattern. [18:31] We are ready to make a change to the source code. Use your preferred editor to open remote-administration.xml and go to line 451, make the required change and save the file. I use nano. [18:33] O.K.? We'll wait for everybody. (I'm dropping the "comment on #ubuntu-classroom-chat" from here on, assuming you know to. (nobody seems to be doing this anyhow)) [18:34] moving on... [18:34] Always, always validate: [18:34] $ cd .. [18:34] $ cd .. [18:34] $ scripts/validate.sh serverguide/C/serverguide.xml [18:34] $ make serverguide-html [18:35] $ make serverguide-pdf [18:35] And refresh your browser and observe the fixed code. Open the serverguide.pdf file, and observe there also. [18:35] Let's do some bzr checks: [18:35] $ bzr status [18:35] $ bzr diff [18:36] aghhh... I see that someone did add themselves to the bug report. Great. [18:37] So onto the second bug, one submitted by a translator. bug 1272984 . Flaipe always submits very nice typo bugs with a reference to the source file and line. However, often reports from translators only contain the string reference, and you'll have to figure it out for yourself. [18:37] https://bugs.launchpad.net/serverguide/+bug/1272984 [18:39] The process is the same as the last one. Add your names to be notified about changes to this bug report. [18:39] Find the typo in the HTML and PDF documents. [18:39] (Hint try the TIP from earlier and find it in the PDF first.) [18:40] Ugh Oh.... I have a confusing note in my script. What on earth was I thinking? .... [18:41] $ grep -n repostory serverguide/C/*.xml [18:41] $ serverguide/C/vcs.xml:199: Or add the server's project as a remote for an existing git repostory: [18:41] $ nano serverguide/C/vcs.xml (you use whatever editor you prefer) [18:43] Always, always validate: [18:43] $ scripts/validate.sh serverguide/C/serverguide.xml [18:43] $ make serverguide-html [18:43] $ make serverguide-pdf [18:44] And refresh your browser and observe the fixed code. Open the serverguide.pdf file, and observe there also. [18:44] Again, let's do some bzr checks: [18:44] $ bzr status [18:44] $ bzr diff [18:45] One more, another one from Flaipe: bug 1272064 [18:45] https://bugs.launchpad.net/serverguide/+bug/1272064 [18:46] Go ahead and do this one yoursleves, without any input from me. (However note that when I sreached the PDF for "the the", I found some other occurances. Normally we would stop and fix those also, but we don't have time right now.) [18:48] ... I am doing it also ... [18:49] O.K.? Is everybody done? [18:49] Did everyone do the bzr checks as the last step? and does everyone get this: http://paste.ubuntu.com/7023049/ [18:50] Now it is time to wrap this up and put our branch into launchpad. Starting with a commit line. Use the wiki page as a reference. (and use your name and your launchpad account name): [18:50] There are 10 minutes remaining in the current session. [18:50] $ bzr commit --fixes lp:1278146 --fixes lp:1272984 --fixes lp:1272064 -m 'simple typos; LP: #1278146; LP: #1272984; LP: #1272064; by Doug Smythies' [18:52] $ bzr push lp:~dsmythies/serverguide/classroom [18:53] this is taking ahile and I might run out of time... [18:53] You should also be getting e-mails from the bug reports saying that branches are linked to them. [18:53] Now go to your launchpad account under the "code tab" and you should see your code there. Click on it to go there. [18:53] You should see the bug reports under "Related bugs" with links to them. [18:53] Under recent revisions you should see your just uploaded revision. Click on the revision number, 188. [18:55] ... my upload is taking awhile... I'll add my remaining notes here and we'll come back to this is there is time. [18:55] There are 5 minutes remaining in the current session. [18:55] Click on each of the modified files listed to expand the color differences. Do they make sense? (they should). [18:55] Go back to branch summary, either via the link in the top left corner or via the browser back button. [18:55] Under "Branch merges" clcik on "Propose for merging" [18:56] Enter a description. "Simple typos" will do in this case [18:56] Leave blank the spots where it says "optional", they will autofill with the correct information. [18:56] Click on the "Propose Merge" radio button at the bottom of the page. [18:56] After a short delay you should see a Merge Proposal page with a MP number. [18:57] I'll add a comment and "approve" and then also set the status to "approve" [18:57] I go to my up to date working branch, and merge in the MP: [18:57] $ bzr merge lp:~jdoe/serverguide/classroom [18:57] $ bzr commit --fixes lp:1278146 --fixes lp:1272984 --fixes lp:1272064 -m 'simple typos per MP: #XXXXXX; LP: #1278146; LP: #1272984; LP: #1272064; by Jane Doe' [18:57] $ bzr push lp:serverguide [18:57] Notice the MP automatically got set to a status of "merged" [18:58] ( or woul dhave if we actually did this part) [18:58] We should also now set the bug reports status' to "fix committed". (which I will complete after the class.) [18:59] ... my upload continues... I shdould have done one before and had it ready. Sorry. === ChanServ changed the topic of #ubuntu-classroom to: Welcome to the Ubuntu Classroom - https://wiki.ubuntu.com/Classroom || Support in #ubuntu || Upcoming Schedule: http://is.gd/8rtIi || Questions in #ubuntu-classroom-chat || Event: Ubuntu Documentation Day - Current Session: Getting started contributing to the Wiki docs - Instructors: belkinsa [19:00] Thank you, dsmythies, for your session. I hope that helps everyone who wants to help out. [19:00] The class will switch over in a moment. Thanks. [19:00] Logs for this session will be available at http://irclogs.ubuntu.com/2014/03/02/%23ubuntu-classroom.html following the conclusion of the session. [19:00] Hey all from snowy Southwest Ohio, welcome to the, "Getting started contributing to the Wiki docs", session. My name is Svetlana Belkin (A.K.A. belkinsa) and I'm your instructor. [19:01] If you have any questions during this session, please ask in #ubuntu-classroom-chat. Don't forget to prefix your question with "QUESTION:" [19:01] The upcoming sessions are: [19:01] 20:00 UTC Getting started contributing to Manual with godbyk [19:01] 21:00 UTC Ubuntu Manual versions explained with tacorwin and patrickdickey [19:01] Before I start with my lesson: If you'd like more information, feel free to email us on our mailing list at ubuntu-doc@lists.ubuntu.com or chat with us in our IRC channel at #ubuntu-doc. Please use the prefixes: [Desktop],[Server], and [Wiki] when you mail the list. Each of them are for the three types of docs that we have. [19:03] Like what pleia2 said about the Wiki. We have two types of wikis: the wiki.ubuntu.com where our teams hold pages, and for you the ones who are active and wish to seek the Ubuntu Membership. The Community Help Wiki contains all of the support pages that don't go into our guides that we have. [19:03] The link to the Community Help Wiki is: https://help.ubuntu.com/community [19:05] The great thing about the Community Help Wiki is that anyone with a LaunchPad account can edit pages and there is no fear of doing anything wrong since we have wiki admins that approve the changes and the rollback feature. [19:05] How to get a Launchpad Account? Here is how: https://help.ubuntu.com/community/WikiGuide/Registration [19:05] Any questions? [19:07] Okay, our example that will be used is that you all (those who wants to learn how to wiki edit) will be creating your every own Userpage that you can use to show when you apply to the Ubuntu Membership. [19:08] To do this, first you need to log into the wiki by going to wiki.ubuntu.com. [19:09] You should see a Ubuntu logo banner and below it, a menu bar that says "Log in" or "edit", if you are logged in. [19:09] If you are not logged in, please click that "Log in" and proceeded to log in with your LaunchPad account. [19:09] jose asked: Do both wikis use moinmoin? [19:10] Yes, both do. [19:10] MoinMoin is a wiki syntax that both wikis use and it's easy to learn. [19:11] This link has the syntaxes: https://help.ubuntu.com/community/WikiGuide/Formatting [19:12] Okay, once you are logged in. Go to this page: https://wiki.ubuntu.com/MembershipTemplate [19:12] This page contains the template that we will use. [19:12] There are two ways to copy and paste this template into a new page. [19:13] The first one is to "Edit" the page. You do this by hitting "edit" on the menu bar under the Ubuntu banner and it should take you to a text editor with the text for the template. Copy that. [19:14] Or you can go to the drop down menu and select "copy". This should take you a page that says where to copy the page. [19:14] I think the first method is the easiest. [19:15] Because you need to know where to copy the page. [19:15] In the address bar: type in https://wiki.ubuntu.com/. is your username that you use in LaunchPad. [19:16] Thanks, jose. Don't use edit to view the source, use the drop down and select 'view raw' [19:16] This is for the first method. ^^^ [19:17] Once you are at your page, you should see a dialogue telling you that it is not created yet. Click "create a new page". This should take you to the editor. [19:19] At the editor, paste the template. There is a menu above the editor. Select "preview" and it will show you what you have done or you can select "Save" and the page will be saved and you should see a normal looking page without the editor. [19:19] Any questions? [19:20] Oh, as an example: https://wiki.ubuntu.com/belkinsa This is my page, please use "view raw" to see what I have done. [19:21] You can write anything about yourself. ;) [19:21] Okay, now you have the basics of the syntax and how to edit a page. [19:22] Now, when you find a page to work on, you can do it right on that page or you can use a page called a "sandbox" page. [19:23] These sandboxes are used to play around with pages with out effecting the main one. [19:24] To create one, the easiest way to https://wiki.ubuntu.com//sandbox ( is your username that you use in LaunchPad). Follow the directions as for your userpage to create a blank page to fill. [19:25]