From: Don Armstrong <don@donarmstrong.com>
Date: Thu, 20 Feb 2014 19:53:30 +0000 (-0800)
Subject: merge master into scale brochure
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=002623c07e7c5e116d6df5aa96bccdda93e199a9;p=neurodebian.git

merge master into scale brochure
---

002623c07e7c5e116d6df5aa96bccdda93e199a9
diff --cc artwork/brochure/brochure_debian-neurodebian.tex
index e3ca10d,d192799..4a2852d
--- a/artwork/brochure/brochure_debian-neurodebian.tex
+++ b/artwork/brochure/brochure_debian-neurodebian.tex
@@@ -231,8 -231,9 +231,9 @@@ teams, such as Debian-Science or Debian
  \begin{description}[nolistsep,leftmargin=1pc,style=nextline]
  \item[Install on a hard-drive] \url{http://www.debian.org/distrib/}
  \item[Live CD/DVD] \url{http://www.debian.org/CD/live/}
 -\item[Run in a Virtual Machine] \url{http://neuro.debian.net/vm.html}
 +%\item[Run in a Virtual Machine] \url{http://neuro.debian.net/vm.html}
  \item[Development version] \url{http://www.debian.org/devel/debian-installer}
+ \item[Use in a cloud] \url{https://wiki.debian.org/Cloud}
  \end{description}
  
  % \ndsubsection{Get \emph{Testing/Unstable} Debian}