ubuntu-manual team mailing list archive

[Hannie Dumoleyn <lafeber-dumoleyn2@xxxxxxxxx>]

To all,
I see that revno 13 is merged by Tiffany, see [1]. This is something 
that can happen to all of us.
Here are some tips to avoid this problem.
To prevent getting diverged branches, it is best to do a "bzr pull" 
command before you add any changes to your local branch. You can check 
Launchpad [1] to see what is the last revision number (revno). In the 
terminal you can check your branch by typing the folowing command: bzr 
revno.
To get more information on diverged branches, type this command in the 
terminal: bzr help diverged-branches.

To be on the safe side, I usually copy the .tex file from 
~/Projects/ubuntu-manual-xenial to a temporary folder, make the changes 
there, and put the file back in ~/Projects/ubuntu-manual-xenial after 
having checked that no one else has uploaded changes to Launchpad in the 
meantime. If that is the case, I first give the bzr pull command.
Another advantage of this method is that, should something go wrong, I 
still have my changes in the temporary folder.

Another way of solving the problem is by deleting the xenial branch 
from  ~/Projects, and branch again with the command bzr branch 
lp:ubuntu-manual ubuntu-manual-xenial. Do not forget to save the .tex 
file with your changes to another folder first.
Hope this helps,
Hannie

[1] https://code.launchpad.net/~ubuntu-manual/ubuntu-manual/xenial



-------- Doorgestuurd bericht --------
Onderwerp: 	[Branch ~ubuntu-manual/ubuntu-manual/xenial] Rev 13: Cleaned 
up install from USB stick section.
Datum: 	Wed, 23 Mar 2016 02:39:21 -0000
Van: 	noreply@xxxxxxxxxxxxx
Antwoord-naar: 	noreply@xxxxxxxxxxxxx
Aan: 	Hannie Dumoleyn <hannie@xxxxxxxxxxxxx>



------------------------------------------------------------
revno: 13
committer: Eric Marsh <bits@xxxxxxxxxxx>
branch nick: ubuntu-manual-xenial
timestamp: Tue 2016-03-22 22:18:16 -0400
message:
  Cleaned up install from USB stick section.
modified:
  installation/installation.tex


--
lp:ubuntu-manual
https://code.launchpad.net/~ubuntu-manual/ubuntu-manual/xenial

You are subscribed to branch lp:ubuntu-manual.
To unsubscribe from this branch go to https://code.launchpad.net/~ubuntu-manual/ubuntu-manual/xenial/+edit-subscription



=== modified file 'installation/installation.tex'
--- installation/installation.tex	2016-03-23 01:37:56 +0000
+++ installation/installation.tex	2016-03-23 02:18:16 +0000
@@ -67,7 +67,7 @@
 
 \subsection{Creating a bootable \acronym{USB} drive}
 \indexstart{Ubuntu!bootable \acronym{USB} drive}
-If your \acronym{PC} is able to boot from a \acronym{USB} stick, you may prefer to use a \acronym{USB} memory stick instead of burning a \acronym{DVD}. Scroll down to ``Burn your \acronym{DVD} or create a \acronym{USB} drive,'' select \emph{\acronym{DVD}} or \emph{\acronym{USB} stick}, choose the \acronym{OS} you are using to create the \acronym{USB} drive, and then click \emph{Show me how}. If you select the ``\acronym{USB} Stick'' option, your installation will be running from the \acronym{USB} memory stick.  In this case, references to Live \acronym{DVD}, will refer to the \acronym{USB} memory stick.
+If your \acronym{PC} is able to boot from a \acronym{USB} stick, you may prefer to use a \acronym{USB} memory stick instead of burning a \acronym{DVD}. Scroll down on the download webpage to the "Easy ways to switch to Ubuntu" section and you will find a link to instructions on how to create a bootable \emph{\acronym{USB} stick} in your current operating system. If you select this option, your installation will be running from the \acronym{USB} memory stick.  In this case, references to Live \acronym{DVD}, will refer to the \acronym{USB} memory stick.
 \indexend{Ubuntu!bootable \acronym{USB} drive}
 
 \section{Trying out Ubuntu}