Merge branch 'maint'

2 files changed, 19 insertions, 14 deletions

diff --git a/NEWS b/NEWS
index df0b64c8..89201114 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@ VERSION         DESCRIPTION
 -----------------------------------------------------------------------------
 3.4.2         - fix progress bar display with empty packages
               - make pactest testsuite Python 2.7 compatible
+              - write epoch values in preparation for 3.5.X releases
+              - fix null pointer dereference in architecture check (FS#21668)
               - documentation: remove unnecessary "|| return 1"
               - contrib/bacman: update package compression selection
               - contrib/PKGBUILD.vim: add a few more license options
diff --git a/doc/index.txt b/doc/index.txt
index 1f25a884..d336e773 100644
--- a/doc/index.txt
+++ b/doc/index.txt
@@ -47,11 +47,11 @@ configuration files dealing with pacman.
 Changelog
 ~~~~~~~~~
 For a good idea of what is going on in pacman development, take a look at the
-link:http://projects.archlinux.org/?p=pacman.git[Gitweb] summary
-page for the project.
+link:http://projects.archlinux.org/pacman.git/[Git summary page] for the
+project.
 
 See the most recent
-link:http://projects.archlinux.org/?p=pacman.git;a=blob_plain;f=NEWS;hb=HEAD[NEWS]
+link:http://projects.archlinux.org/pacman.git/tree/NEWS[NEWS]
 file for a not-as-frequently-updated list of changes. However, this should
 contain the biggest changes in a format more concise than the commit log.
 
@@ -62,6 +62,8 @@ Releases
 `------------`-------
 Date         Version
 ---------------------
+2010-12-29   v3.4.2
+2010-09-03   v3.4.1
 2010-06-16   v3.4.0
 2009-11-10   v3.3.3
 2009-10-05   v3.3.2
@@ -111,8 +113,8 @@ Development
 Mailing List
 ~~~~~~~~~~~~
 There is a mailing list devoted to pacman development, hosted by Arch Linux.
-link:http://www.archlinux.org/mailman/listinfo/pacman-dev/[Subscribe] or
-link:http://www.archlinux.org/pipermail/pacman-dev/[view the archives].
+link:http://mailman.archlinux.org/mailman/listinfo/pacman-dev/[Subscribe] or
+link:http://mailman.archlinux.org/pipermail/pacman-dev/[view the archives].
 
 Source Code
 ~~~~~~~~~~~
@@ -127,7 +129,8 @@ The current development tree can be fetched with the following command:
 
 which will fetch the full development history into a directory named pacman.
 You can browse the source as well using
-link:http://projects.archlinux.org/?p=pacman.git[Gitweb].
+link:http://projects.archlinux.org/pacman.git/[cgit]. HTTP/HTTPS URLs are also
+available for cloning purposes; these URLs are listed at the above page.
 
 If you are interested in hacking on pacman, it is highly recommended you join
 the mailing list mentioned above, as well as take a quick glance at our
@@ -143,17 +146,17 @@ Other Utilities
 ~~~~~~~~~~~~~~~
 Although the package manager itself is quite simple, many scripts have been
 developed that help automate building and installing packages. These are used
-extensively in link:http://archlinux.org[Arch Linux]. Most of these utilities
+extensively in link:http://archlinux.org/[Arch Linux]. Most of these utilities
 are available in the Arch Linux projects
-link:http://projects.archlinux.org/[Gitweb browser].
+link:http://projects.archlinux.org/[code browser].
 
 Utilities available:
 
-* link:http://projects.archlinux.org/?p=abs.git[abs] - ABS (Arch Build System), scripts to download  & use the Arch Linux PKGBUILD tree
-* link:http://projects.archlinux.org/?p=devtools.git[devtools] - tools to assist in packaging and dependency checking
-* link:http://projects.archlinux.org/?p=namcap.git[namcap] - a package analysis utility written in python
-* link:http://projects.archlinux.org/?p=pacbuild.git[pacbuild] - a package building system utilizing a daemon
-* link:http://projects.archlinux.org/?p=srcpac.git[srcpac] - a bash build-from-source pacman wrapper
+* link:http://projects.archlinux.org/abs.git/[abs] - ABS (Arch Build System), scripts to download  & use the Arch Linux PKGBUILD tree
+* link:http://projects.archlinux.org/dbscripts.git/[dbscripts] - scripts used by Arch Linux to manage the main package repositories
+* link:http://projects.archlinux.org/devtools.git/[devtools] - tools to assist in packaging and dependency checking
+* link:http://projects.archlinux.org/namcap.git/[namcap] - a package analysis utility written in python
+* link:http://projects.archlinux.org/srcpac.git/[srcpac] - a bash build-from-source pacman wrapper
 
 Bugs
 ----
@@ -162,7 +165,7 @@ mailing last at mailto:pacman-dev@archlinux.org[] with specific information
 such as your commandline, the nature of the bug, and even the package database
 if it helps.
 
-You can also post a bug to the Archlinux bug tracker
+You can also post a bug to the Arch Linux bug tracker
 link:http://bugs.archlinux.org/index.php?project=3[Flyspray]. Be sure to file
 bugs under the Pacman project.