Merge commit '91c451'

Conflicts:
	devel/views.py
	feeds.py
	local_settings.py.example
	packages/management/commands/signoff_report.py
	packages/views/flag.py
	public/views.py
	templates/404.html
	templates/base.html
	templates/devel/clock.html
	templates/devel/index.html
	templates/devel/packages.html
	templates/devel/profile.html
	templates/general_form.html
	templates/mirrors/mirror_details.html
	templates/mirrors/mirrorlist.txt
	templates/mirrors/mirrorlist_generate.html
	templates/mirrors/mirrorlist_status.txt
	templates/mirrors/mirrors.html
	templates/mirrors/status.html
	templates/news/add.html
	templates/news/delete.html
	templates/news/list.html
	templates/news/view.html
	templates/packages/details.html
	templates/packages/differences.html
	templates/packages/files.html
	templates/packages/flag.html
	templates/packages/flag_confirmed.html
	templates/packages/flagged.html
	templates/packages/flaghelp.html
	templates/packages/groups.html
	templates/packages/opensearch.xml
	templates/packages/packages_list.html
	templates/packages/search.html
	templates/packages/signoff_options.html
	templates/packages/signoffs.html
	templates/packages/stale_relations.html
	templates/public/about.html
	templates/public/art.html
	templates/public/blank.html
	templates/public/donate.html
	templates/public/download.html
	templates/public/feeds.html
	templates/public/index.html
	templates/public/keys.html
	templates/public/svn.html
	templates/public/userlist.html
	templates/registration/login.html
	templates/registration/logout.html
	templates/releng/add.html
	templates/releng/results.html
	templates/releng/thanks.html
	templates/todolists/list.html
	templates/todolists/public_list.html
	templates/todolists/todolist_confirm_delete.html
	templates/todolists/view.html
	templates/visualize/index.html
	todolists/views.py

1 files changed, 71 insertions, 0 deletions

diff --git a/README.BRANDING b/README.BRANDING
new file mode 100644
index 00000000..00d2d1b0
--- /dev/null
+++ b/README.BRANDING
@@ -0,0 +1,71 @@
+It is now fairly easy to re-brand archweb.
+Replacing logos is still a bit of work.
+Here is a summary of the text files that need to be changed to
+re-brand it.
+
+Files used to configure branding/url stuff
+------------------------------------------
+
+ * `settings.py`
+ * `templates/templatetags/package_extras.py`
+ * `main/templatetags/wiki.py`
+
+Files with minor Arch stuff that's just easier to patch
+-------------------------------------------------------
+
+`releng/views.py`
+ * link to `https://bugs.archlinux.org/index.php?project=6`
+
+`templates/packages/opensearch.xml`
+ * `<Tags>` includes `archlinux`
+
+`templates/packages/flaghelp.html`
+ * link to "arch-general" mailing list
+
+`templates/packages/flag.html`
+ * link to "arch-general" mailing list
+
+`templates/packages/search.html`
+ * link to AUR
+
+`templates/public/feeds.html`
+ * links to AUR
+ * links to feeds on `bugs.archlinux.org`
+
+Files with a significant amount of Arch-specific content:
+---------------------------------------------------------
+
+`templates/base.html`
+ * main navbar
+   * link to `bbs.archlinux.org`
+   * link to the AUR
+ * logged in navbar
+   * link to "arch-dev" mailing list
+   * link to `stats.archlinux.org/munin`
+ * copyright statement is Arch-specific.
+
+`templates/public/index.html`
+ * The text in the intro box describes Arch Linux.
+ * sidebar
+   * Community
+     * link to `planet.archlinux.org`
+   * Support
+     * link to `schwag.archlinux.ca`
+     * link to `www.zazzle.com/archlinux*`
+     * link to `www.freewear.org/?page=list_items&org=Archlinux`
+   * Development
+     * link to `projects.archlinux.org` ("Official Arch projects")
+   * More Resources
+     * link to wiki article "Arch Linux Press Review"
+ * Below sidebar
+   * Arch's donate button
+   * Arch's sponsors
+
+Files with totally Arch-specific content:
+-----------------------------------------
+
+ * `templates/public/about.html`
+ * `templates/public/art.html`
+ * `templates/public/donate.html`
+ * `templates/public/download.html`
+ * `templates/public/svn.html`