diff options
author | Laura Arjona Reina <larjona@debian.org> | 2021-08-26 23:58:32 +0200 |
---|---|---|
committer | Laura Arjona Reina <larjona@debian.org> | 2021-08-26 23:58:57 +0200 |
commit | 0691e0b35ed0aa5df10a4b47799051f77e519d25 (patch) | |
tree | 05b64a25a922b81ad8d421a22ba66cd29b1306a1 /english/distrib | |
parent | 0038842afef2714858f5ab75a3f6339b9554f471 (diff) |
reorder items for better appearance
Diffstat (limited to 'english/distrib')
-rw-r--r-- | english/distrib/index.wml | 72 |
1 files changed, 38 insertions, 34 deletions
diff --git a/english/distrib/index.wml b/english/distrib/index.wml index f1a75beb3d1..b8be75cc0dd 100644 --- a/english/distrib/index.wml +++ b/english/distrib/index.wml @@ -51,43 +51,26 @@ And, the release notes can be found <a href="../releases/stable/releasenotes">he <p>An official <a href="https://cloud.debian.org/images/cloud/"><strong>cloud image</strong></a>, built by the cloud team, can be used on:</p> <ul> <li>your OpenStack provider, in qcow2 or raw formats. - <ul class="quicklist downlist"> - <li>64-bit AMD/Intel (<a title="OpenStack image for 64-bit AMD/Intel qcow2" href="https://cloud.debian.org/images/cloud/bullseye/latest/debian-11-generic-amd64.qcow2">qcow2</a>, <a title="OpenStack image for 64-bit AMD/Intel raw" href="https://cloud.debian.org/images/cloud/bullseye/latest/debian-11-generic-amd64.raw">raw</a>)</li> - <li>64-bit ARM (<a title="OpenStack image for 64-bit ARM qcow2" href="https://cloud.debian.org/images/cloud/bullseye/latest/debian-11-generic-arm64.qcow2">qcow2</a>, <a title="OpenStack image for 64-bit ARM raw" href="https://cloud.debian.org/images/cloud/bullseye/latest/debian-11-generic-arm64.raw">raw</a>)</li> - <li>64-bit Little Endian PowerPC (<a title="OpenStack image for 64-bit Little Endian PowerPC qcow2" href="https://cloud.debian.org/images/cloud/bullseye/latest/debian-11-generic-ppc64el.qcow2">qcow2</a>, <a title="OpenStack image for 64-bit Little Endian PowerPC raw" href="https://cloud.debian.org/images/cloud/bullseye/latest/debian-11-generic-ppc64el.raw">raw</a>)</li> - </ul> + <ul class="quicklist downlist"> + <li>64-bit AMD/Intel (<a title="OpenStack image for 64-bit AMD/Intel qcow2" href="https://cloud.debian.org/images/cloud/bullseye/latest/debian-11-generic-amd64.qcow2">qcow2</a>, <a title="OpenStack image for 64-bit AMD/Intel raw" href="https://cloud.debian.org/images/cloud/bullseye/latest/debian-11-generic-amd64.raw">raw</a>)</li> + <li>64-bit ARM (<a title="OpenStack image for 64-bit ARM qcow2" href="https://cloud.debian.org/images/cloud/bullseye/latest/debian-11-generic-arm64.qcow2">qcow2</a>, <a title="OpenStack image for 64-bit ARM raw" href="https://cloud.debian.org/images/cloud/bullseye/latest/debian-11-generic-arm64.raw">raw</a>)</li> + <li>64-bit Little Endian PowerPC (<a title="OpenStack image for 64-bit Little Endian PowerPC qcow2" href="https://cloud.debian.org/images/cloud/bullseye/latest/debian-11-generic-ppc64el.qcow2">qcow2</a>, <a title="OpenStack image for 64-bit Little Endian PowerPC raw" href="https://cloud.debian.org/images/cloud/bullseye/latest/debian-11-generic-ppc64el.raw">raw</a>)</li> + </ul> </li> <li>Amazon EC2, either as a machine image or via the AWS Marketplace. - <ul class="quicklist downlist"> - <li><a title="Amazon Machine Images" href="https://wiki.debian.org/Cloud/AmazonEC2Image/">Amazon Machine Images</a></li> - <li><a title="AWS Marketplace" href="https://aws.amazon.com/marketplace/seller-profile?id=4d4d4e5f-c474-49f2-8b18-94de9d43e2c0">AWS Marketplace</a></li> - </ul> + <ul class="quicklist downlist"> + <li><a title="Amazon Machine Images" href="https://wiki.debian.org/Cloud/AmazonEC2Image/">Amazon Machine Images</a></li> + <li><a title="AWS Marketplace" href="https://aws.amazon.com/marketplace/seller-profile?id=4d4d4e5f-c474-49f2-8b18-94de9d43e2c0">AWS Marketplace</a></li> + </ul> </li> <li>Microsoft Azure, on the Azure Marketplace. - <ul class="quicklist downlist"> - <li><a title="Debian 11 on Azure Marketplace" href="https://azuremarketplace.microsoft.com/en-us/marketplace/apps/debian.debian-11?tab=PlansAndPrice">Debian 11 ("Bullseye")</a></li> - <li><a title="Debian 10 on Azure Marketplace" href="https://azuremarketplace.microsoft.com/en-us/marketplace/apps/debian.debian-10?tab=PlansAndPrice">Debian 10 ("Buster")</a></li> - </ul> + <ul class="quicklist downlist"> + <li><a title="Debian 11 on Azure Marketplace" href="https://azuremarketplace.microsoft.com/en-us/marketplace/apps/debian.debian-11?tab=PlansAndPrice">Debian 11 ("Bullseye")</a></li> + <li><a title="Debian 10 on Azure Marketplace" href="https://azuremarketplace.microsoft.com/en-us/marketplace/apps/debian.debian-10?tab=PlansAndPrice">Debian 10 ("Buster")</a></li> + </ul> </li> </ul> - <h2><a href="../CD/live/">Try Debian live before installing</a></h2> - <p> - You can try Debian by booting a live system from a CD, DVD or USB key - without installing any files to the computer. When you are ready, you can - run the included installer (starting from Debian 10 Buster, this is the - end-user-friendly <a href="https://calamares.io">Calamares Installer</a>). - Provided the images meet your size, language, - and package selection requirements, this method may be suitable for you. - Read more <a href="../CD/live#choose_live">information about this method</a> - to help you decide. - </p> - <ul class="quicklist downlist"> - <li><a title="Download live torrents for 64-bit Intel and AMD PC" - href="<live-images-url/>/amd64/bt-hybrid/">64-bit PC live torrents</a></li> - <li><a title="Download live torrents for normal 32-bit Intel and AMD PC" - href="<live-images-url/>/i386/bt-hybrid/">32-bit PC live torrents</a></li> - </ul> - </div> + </div> </div> <div class="line"> <div class="item col50"> @@ -111,9 +94,8 @@ And, the release notes can be found <a href="../releases/stable/releasenotes">he all packages yourself.</li> <li>The CD can be used to more easily rescue a damaged Debian system.</li> </ul> - </div> - <div class="item col50 lastcol"> - <h2><a href="pre-installed">Buy a computer with Debian + + <h2><a href="pre-installed">Buy a computer with Debian pre-installed</a></h2> <p>There are a number of advantages to this:</p> <ul> @@ -122,8 +104,30 @@ And, the release notes can be found <a href="../releases/stable/releasenotes">he <li>The vendor may provide technical support.</li> </ul> </div> + + <div class="item col50 lastcol"> + <h2><a href="../CD/live/">Try Debian live before installing</a></h2> + <p> + You can try Debian by booting a live system from a CD, DVD or USB key + without installing any files to the computer. When you are ready, you can + run the included installer (starting from Debian 10 Buster, this is the + end-user-friendly <a href="https://calamares.io">Calamares Installer</a>). + Provided the images meet your size, language, + and package selection requirements, this method may be suitable for you. + Read more <a href="../CD/live#choose_live">information about this method</a> + to help you decide. + </p> + <ul class="quicklist downlist"> + <li><a title="Download live torrents for 64-bit Intel and AMD PC" + href="<live-images-url/>/amd64/bt-hybrid/">64-bit PC live torrents</a></li> + <li><a title="Download live torrents for normal 32-bit Intel and AMD PC" + href="<live-images-url/>/i386/bt-hybrid/">32-bit PC live torrents</a></li> + </ul> + </div> + </div> + # Translators: the following paragraph exists (in this or a similar form) several times in webwml, # so please try to keep translations consistent. See: # ./CD/http-ftp/index.wml |