summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2012-05-20 17:41:21 -0500
committerDan McGee <dan@archlinux.org>2012-05-20 17:41:21 -0500
commit9f6a67fee71a63848f958212c1b5a2abd0f735a5 (patch)
treee33a982bca695119eb4ffe938e5b5acf42dad554 /doc
parentfc9002188b588cda1f5362d6d15bd6996c532982 (diff)
parent5de465d63efbb82da6127ac927ad29b9c8b1b542 (diff)
downloadpacman-9f6a67fee71a63848f958212c1b5a2abd0f735a5.tar.xz
Merge branch 'maint'
Conflicts: scripts/pacman-key.sh.in
Diffstat (limited to 'doc')
-rw-r--r--doc/index.txt26
-rw-r--r--doc/pacman.8.txt7
2 files changed, 2 insertions, 31 deletions
diff --git a/doc/index.txt b/doc/index.txt
index d0ac8bac..5d93bb71 100644
--- a/doc/index.txt
+++ b/doc/index.txt
@@ -218,7 +218,7 @@ 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://www.archlinux.org/[Arch Linux]. Most of these utilities
are available in the Arch Linux projects
link:http://projects.archlinux.org/[code browser].
@@ -238,31 +238,9 @@ 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 Arch Linux bug tracker
-link:http://bugs.archlinux.org/index.php?project=3[Flyspray]. Be sure to file
+link:https://bugs.archlinux.org/index.php?project=3[Flyspray]. Be sure to file
bugs under the Pacman project.
-Pacman/libalpm in the Wild
---------------------------
-Although Arch Linux is the primary user of pacman and libalpm, other
-distributions and projects also use pacman as a package management tool. In
-addition, there have been several projects started to provide a frontend GUI to
-pacman and/or libalpm.
-
-Arch derivatives:
-
-* link:http://archie.dotsrc.org/[Archie] - Arch Live on steroids
-* link:http://www.faunos.com/[FaunOS] - A portable, fully integrated operating system based on Arch Linux
-* link:http://larch.berlios.de/[larch] - A live CD/DVD/USB-stick construction kit for Arch Linux
-
-Other distributions:
-
-* link:http://www.delilinux.org/[DeLi Linux] - "Desktop Light" Linux, a Linux distribution for old computers
-* link:http://www.frugalware.org/[Frugalware Linux] - A general purpose Linux distribution for intermediate users (pacman is forked and maintained separately)
-
-Pacman/libalpm frontends:
-
-* link:http://shaman.iskrembilen.com/[Shaman] - A GUI frontend using Qt and libalpm
-
Copyright
---------
pacman is Copyright (C) 2006-2012 Pacman Development Team
diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt
index 3b858037..0ad81882 100644
--- a/doc/pacman.8.txt
+++ b/doc/pacman.8.txt
@@ -232,13 +232,6 @@ Upgrade Options (apply to '-S' and '-U')[[UO]]
*\--needed*::
Do not reinstall the targets that are already up to date.
-*\--recursive*::
- Recursively reinstall all dependencies of the targets. This forces upgrades
- or reinstalls of all dependencies without requiring explicit version
- requirements. This is most useful in combination with the '\--needed' flag,
- which will induce a deep dependency upgrade without any unnecessary
- reinstalls.
-
Query Options[[QO]]
-------------------