diff options
| -rw-r--r-- | templates/base.html | 6 | ||||
| -rw-r--r-- | templates/mirrors/url_details.html | 2 | ||||
| -rw-r--r-- | templates/public/about.html | 16 | ||||
| -rw-r--r-- | templates/public/art.html | 8 | ||||
| -rw-r--r-- | templates/public/donate.html | 12 | ||||
| -rw-r--r-- | templates/public/index.html | 2 | ||||
| -rw-r--r-- | templates/releng/archlinux.ipxe | 14 | ||||
| -rw-r--r-- | templates/releng/netboot.html | 10 | ||||
| -rw-r--r-- | templates/releng/release_list.html | 4 | ||||
| -rw-r--r-- | templates/sitemaps/news_sitemap.xml.jinja | 2 |
10 files changed, 38 insertions, 38 deletions
diff --git a/templates/base.html b/templates/base.html index c981f02c..a5e747a8 100644 --- a/templates/base.html +++ b/templates/base.html @@ -23,7 +23,7 @@ <li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li> <li id="anb-wiki"><a href="{% wiki_url %}" title="Community documentation">Wiki</a></li> <li id="anb-bugs"><a href="{{ BUGTRACKER_URL }}" title="Report and track bugs">Bugs</a></li> - <li id="anb-aur"><a href="https://aur.archlinux.org/" title="Arch Linux User Repository">AUR</a></li> + <li id="anb-aur"><a href="https://aur.archlinux.org/" title="{{ BRANDING_DISTRONAME }} User Repository">AUR</a></li> <li id="anb-download"><a href="{% url 'page-download' as pdl %}{{ pdl }}" title="Get {{ BRANDING_DISTRONAME }}">Download</a></li> </ul> </div> @@ -73,9 +73,9 @@ title="Contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org" title="Contact Aaron Griffin">Aaron Griffin</a>.</p> - <p>The Arch Linux name and logo are recognized + <p>The {{ BRANDING_DISTRONAME }} name and logo are recognized <a href="{% wiki_url 'DeveloperWiki:TrademarkPolicy' %}" - title="Arch Linux Trademark Policy">trademarks</a>. Some rights reserved.</p> + title="{{ BRANDING_DISTRONAME }} Trademark Policy">trademarks</a>. Some rights reserved.</p> <p>The registered trademark Linux® is used pursuant to a sublicense from LMI, the exclusive licensee of Linus Torvalds, owner of the mark on a world-wide basis.</p> diff --git a/templates/mirrors/url_details.html b/templates/mirrors/url_details.html index b61033cd..96fcc49d 100644 --- a/templates/mirrors/url_details.html +++ b/templates/mirrors/url_details.html @@ -3,7 +3,7 @@ {% load mirror_status %} {% load flags %} -{% block title %}Arch Linux - {{ url.url }} - URL Details{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - {{ url.url }} - URL Details{% endblock %} {% block head %}<link rel="stylesheet" type="text/css" href="{% static "flags/fam.css" %}" media="screen, projection" />{% endblock %} diff --git a/templates/public/about.html b/templates/public/about.html index f5751d42..0c4c0d8b 100644 --- a/templates/public/about.html +++ b/templates/public/about.html @@ -2,9 +2,9 @@ {% block title %}{{ BRANDING_DISTRONAME }} - About{% endblock %} {% block content %} <div class="box"> - <h2 class="title">About Arch Linux</h2> + <h2 class="title">About {{ BRANDING_DISTRONAME }}</h2> <p> -Arch Linux is an independently developed, i686/x86-64 general purpose GNU/Linux +{{ BRANDING_DISTRONAME }} is an independently developed, i686/x86-64 general purpose GNU/Linux distribution versatile enough to suit any role. Development focuses on simplicity, minimalism, and code elegance. Arch is installed as a minimal base system, configured by the user upon which their own ideal @@ -15,7 +15,7 @@ simple text files. Arch strives to stay bleeding edge, and typically offers the latest stable versions of most software. </p> <p> -Arch Linux uses its own Pacman package manager, which couples simple binary +{{ BRANDING_DISTRONAME }} uses its own Pacman package manager, which couples simple binary packages with an easy-to-use package build system. This allows users to easily manage and customize packages ranging from official Arch software to the user's own personal packages to packages from 3rd party sources. The repository @@ -27,14 +27,14 @@ contribution. The minimal Arch base package set resides in the streamlined [core] repository. In addition, the official [extra], [community], and [testing] repositories provide several thousand high-quality, packages to meet your software demands. -Arch also offers an [unsupported] section in the Arch Linux User Repository +Arch also offers an [unsupported] section in the {{ BRANDING_DISTRONAME }} User Repository (AUR), which contains over 9,000 build scripts, for compiling installable -packages from source using the Arch Linux makepkg application. +packages from source using the {{ BRANDING_DISTRONAME }} makepkg application. </p> <p> -Arch Linux uses a "rolling release" system which allows one-time installation +{{ BRANDING_DISTRONAME }} uses a "rolling release" system which allows one-time installation and perpetual software upgrades. It is not generally necessary to reinstall -or upgrade your Arch Linux system from one "version" to the next. +or upgrade your {{ BRANDING_DISTRONAME }} system from one "version" to the next. By issuing one command, an Arch system is kept up-to-date and on the bleeding edge. </p> @@ -45,7 +45,7 @@ compiles and runs correctly with the other packages installed on an up-to-date Arch system. </p> <p> -To summarize: Arch Linux is a versatile, and simple distribution designed to +To summarize: {{ BRANDING_DISTRONAME }} is a versatile, and simple distribution designed to fit the needs of the competent Linux® user. It is both powerful and easy to manage, making it an ideal distro for servers and workstations. Take it in any direction you like. If you share this vision of what a GNU/Linux diff --git a/templates/public/art.html b/templates/public/art.html index b8b1d886..c8a79a03 100644 --- a/templates/public/art.html +++ b/templates/public/art.html @@ -22,7 +22,7 @@ title="Download scalable SVG format">SVG</a> formats.</em></p> <img src="{% static "logos/archlinux-logo-dark-90dpi.png" %}" - alt="Arch Linux PNG logo @ 90dpi" title="Arch Linux PNG logo @ 90dpi" /> + alt="{{ BRANDING_DISTRONAME }} PNG logo @ 90dpi" title="{{ BRANDING_DISTRONAME }} PNG logo @ 90dpi" /> <p><strong>Two-color inverted version</strong> (for dark backgrounds)<br /> <em>Also available in print-quality @@ -32,7 +32,7 @@ title="Download scalable SVG format">SVG</a> formats.</em></p> <img src="{% static "logos/archlinux-logo-light-90dpi.png" %}" - alt="Arch Linux PNG logo @ 90dpi" title="Arch Linux PNG logo @ 90dpi" class="inverted" /> + alt="{{ BRANDING_DISTRONAME }} PNG logo @ 90dpi" title="{{ BRANDING_DISTRONAME }} PNG logo @ 90dpi" class="inverted" /> <p><strong>One-color standard version</strong><br /> <em>Also available in print-quality @@ -42,7 +42,7 @@ title="Download scalable SVG format">SVG</a> formats.</em></p> <img src="{% static "logos/archlinux-logo-black-90dpi.png" %}" - alt="Arch Linux PNG logo @ 90dpi" title="Arch Linux PNG logo @ 90dpi" /> + alt="{{ BRANDING_DISTRONAME }} PNG logo @ 90dpi" title="{{ BRANDING_DISTRONAME }} PNG logo @ 90dpi" /> <p><strong>One-colour inverted version</strong> (for dark backgrounds)<br /> <em>Also available in print-quality @@ -52,7 +52,7 @@ title="Download scalable SVG format">SVG</a> formats.</em></p> <img src="{% static "logos/archlinux-logo-white-90dpi.png" %}" - alt="Arch Linux PNG logo @ 90dpi" title="Arch Linux PNG logo @ 90dpi" class="inverted" /> + alt="{{ BRANDING_DISTRONAME }} PNG logo @ 90dpi" title="{{ BRANDING_DISTRONAME }} PNG logo @ 90dpi" class="inverted" /> <h3>Logos and Artwork for the Community</h3> diff --git a/templates/public/donate.html b/templates/public/donate.html index 2bb2a53e..b0d6868f 100644 --- a/templates/public/donate.html +++ b/templates/public/donate.html @@ -10,12 +10,12 @@ <h2>Donate to {{ BRANDING_SHORTNAME }}</h2> - <p>Arch Linux survives because of the tireless efforts of many people in + <p>{{ BRANDING_DISTRONAME }} survives because of the tireless efforts of many people in the community and the core development circle. None of us are paid for our work, and we don't have the personal funds to sustain server costs ourselves.</p> - <p>There are many ways to help support Arch Linux. If technical development, + <p>There are many ways to help support {{ BRANDING_DISTRONAME }}. If technical development, documentation, or support aren't your strong points, you could certainly help us by dropping a few bucks our way.</p> @@ -23,15 +23,15 @@ <h3>Monetary donations</h3> - <p>Financial contributions are accepted via <a href="https://co.clickandpledge.com/Default.aspx?WID=47294" title="Donate via Click&Pledge to Arch Linux">Click&Pledge</a>. - Arch Linux is a member project of the + <p>Financial contributions are accepted via <a href="https://co.clickandpledge.com/Default.aspx?WID=47294" title="Donate via Click&Pledge to {{ BRANDING_DISTRONAME }}">Click&Pledge</a>. + {{ BRANDING_DISTRONAME }} is a member project of the <a href="http://www.spi-inc.org/">Software in the Public Interest, Inc.</a> non-profit corporation. Funds are used for hosting costs, server hardware upgrades, and more. You are encouraged to learn more about the SPI, as well as <a href="http://www.spi-inc.org/donations/">how donations work</a>.</p> <a href="https://co.clickandpledge.com/Default.aspx?WID=47294"> - <img width="210" height="34" src="{% static "click_and_pledge.png" %}" alt="Donate via Click&Pledge to Arch Linux" title="Donate via Click&Pledge to Arch Linux"/> + <img width="210" height="34" src="{% static "click_and_pledge.png" %}" alt="Donate via Click&Pledge to {{ BRANDING_DISTRONAME }}" title="Donate via Click&Pledge to {{ BRANDING_DISTRONAME }}"/> </a> <h3>Commercial sponsors and contributions</h3> @@ -44,7 +44,7 @@ title="velocity network"><img width="252" height="58" src="{% static "vnet_button.png" %}" class="sponsor-btn-vnet" title="" alt="velocity network - it's about time" /></a> - <p>We would also like to thank Kartenzia for sponsoring a dedicated Arch Linux Server. + <p>We would also like to thank Kartenzia for sponsoring a dedicated {{ BRANDING_DISTRONAME }} Server. Kartenzia.de is a new Start-Up based in Germany and specializes in eco-friendly invitations like <a href="http://www.kartenzia.de/weihnachtskarten/">Weihnachten</a>.</p> diff --git a/templates/public/index.html b/templates/public/index.html index 0898a6cd..516f10c4 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -193,7 +193,7 @@ <div id="home-donate-button" class="widget"> <a href="https://co.clickandpledge.com/Default.aspx?WID=47294"> - <img width="210" height="34" src="{% static "click_and_pledge.png" %}" alt="Donate via Click&Pledge to Arch Linux" title="Donate via Click&Pledge to Arch Linux"/> + <img width="210" height="34" src="{% static "click_and_pledge.png" %}" alt="Donate via Click&Pledge to {{ BRANDING_DISTRONAME }}" title="Donate via Click&Pledge to {{ BRANDING_DISTRONAME }}"/> </a> </div> diff --git a/templates/releng/archlinux.ipxe b/templates/releng/archlinux.ipxe index 4945868c..81767f32 100644 --- a/templates/releng/archlinux.ipxe +++ b/templates/releng/archlinux.ipxe @@ -15,14 +15,14 @@ set extrabootoptions ip=dhcp net.ifnames=0 set countrycode :main -menu Arch Linux Netboot +menu {{ BRANDING_DISTRONAME }} Netboot item --gap Settings item set_architecture Architecture: ${bootarch} item set_release Release: ${release} isset ${mirrorurl} && item set_mirror Mirror: ${mirrorurl} || item set_mirror Choose a mirror item set_options Boot options: ${extrabootoptions} item -isset ${mirrorurl} && item boot Boot Arch Linux || item --gap Boot Arch Linux +isset ${mirrorurl} && item boot Boot {{ BRANDING_DISTRONAME }} || item --gap Boot {{ BRANDING_DISTRONAME }} item shell Drop to iPXE shell item reboot Reboot item exit Exit iPXE @@ -41,7 +41,7 @@ reboot exit :set_architecture -menu Arch Linux Netboot: Select Architecture +menu {{ BRANDING_DISTRONAME }} Netboot: Select Architecture item back back item item --gap Available architectures: @@ -53,7 +53,7 @@ set bootarch ${selected} goto main :set_release -menu Arch Linux Netboot: Select Release +menu {{ BRANDING_DISTRONAME }} Netboot: Select Release item back back item item --gap Available releases: @@ -68,7 +68,7 @@ goto main goto select_mirror_country :select_mirror_country -menu Arch Linux Netboot: Select Mirror +menu {{ BRANDING_DISTRONAME }} Netboot: Select Mirror item back back item item --gap Custom Configuration: @@ -107,7 +107,7 @@ set countryname Global :select_mirror_url_{{ mirrorgroup.grouper }} set countryname {{ mirrorgroup.grouper.name }} {% endif %} -menu Arch Linux Netboot: Select Mirror +menu {{ BRANDING_DISTRONAME }} Netboot: Select Mirror item back back item item --gap Available mirrors in ${countryname} @@ -124,7 +124,7 @@ echo -n Boot options: ${} && read extrabootoptions || goto main :boot -echo Booting Arch Linux ${bootarch} ${release} from ${mirrorurl} +echo Booting {{ BRANDING_DISTRONAME }} ${bootarch} ${release} from ${mirrorurl} echo kernel ${mirrorurl}iso/${release}/arch/boot/${bootarch}/vmlinuz || goto failed_download imgverify vmlinuz ${mirrorurl}iso/${release}/arch/boot/${bootarch}/vmlinuz.ipxe.sig || goto failed_verify diff --git a/templates/releng/netboot.html b/templates/releng/netboot.html index 36404588..1b87244b 100644 --- a/templates/releng/netboot.html +++ b/templates/releng/netboot.html @@ -1,20 +1,20 @@ {% extends "base.html" %} {% load staticfiles %} -{% block title %}Arch Linux - Netboot{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Netboot{% endblock %} {% block content %} <div id="arch-netboot" class="box"> -<h2>Arch Linux Netboot</h2> +<h2>{{ BRANDING_DISTRONAME }} Netboot</h2> <h3>About Netboot</h3> -<p>Netboot images are small (<1MB) images that can be used to download the latest Arch Linux release on the fly upon system boot. +<p>Netboot images are small (<1MB) images that can be used to download the latest {{ BRANDING_DISTRONAME }} release on the fly upon system boot. It is unnecessary to update the netboot image, the newest release will be available automatically.</p> <p>Netboot uses customized <a href="http://ipxe.org">iPXE</a> builds. -The Linux kernel, initramfs and squashfs files for the live system are downloaded from an Arch Linux mirror. +The Linux kernel, initramfs and squashfs files for the live system are downloaded from an {{ BRANDING_DISTRONAME }} mirror. The integrity of all downloaded files is verified with cryptographic signatures.</p> <h3>Requirements</h3> @@ -48,7 +48,7 @@ For details, check out the <a href="https://aur.archlinux.org/packages/ipxe-netb <h3>More information</h3> -<p>For detailed usage instructions, check out the <a href="https://wiki.archlinux.org/index.php/Netboot">netboot wiki page</a>. +<p>For detailed usage instructions, check out the <a href="{% wiki_url 'Netboot' %}">netboot wiki page</a>. </div> {% endblock %} diff --git a/templates/releng/release_list.html b/templates/releng/release_list.html index 1f4a7887..3092ddc9 100644 --- a/templates/releng/release_list.html +++ b/templates/releng/release_list.html @@ -12,14 +12,14 @@ <div id="release-list" class="box"> <h2>Releases</h2> - <p>This is a list of ISO releases made by the Arch Linux release + <p>This is a list of ISO releases made by the {{ BRANDING_DISTRONAME }} release engineering team. These are typically done on a monthly cadence, containing the latest kernel and base packages from the package repositories. Click the version of each release to read any additional notes or details about each release.</p> <p>Torrents and magnet URIs are available to download the releases. Releases listed as not available may still be seeded by peers, but are no - longer registered via the official Arch Linux torrent tracker. We always + longer registered via the official {{ BRANDING_DISTRONAME }} torrent tracker. We always recommend running the latest available release.</p> <table id="release-table" class="results"> diff --git a/templates/sitemaps/news_sitemap.xml.jinja b/templates/sitemaps/news_sitemap.xml.jinja index 97dd17b5..cbd86578 100644 --- a/templates/sitemaps/news_sitemap.xml.jinja +++ b/templates/sitemaps/news_sitemap.xml.jinja @@ -6,7 +6,7 @@ {% if url.changefreq %}<changefreq>{{ url.changefreq }}</changefreq>{% endif %} {% if url.priority %}<priority>{{ url.priority }}</priority>{% endif %} <news:news> - <news:publication><news:name>Arch Linux News</news:name><news:language>en</news:language></news:publication> + <news:publication><news:name>{{ BRANDING_DISTRONAME }} News</news:name><news:language>en</news:language></news:publication> {% if url.item.postdate %}<news:publication_date>{{ url.item.postdate|date("c") }}</news:publication_date>{% endif %} {% if url.item.title %}<news:title>{{ url.item.title }}</news:title>{% endif %} </news:news> |