From afcdf2619fd7b55edadc2132b8d298d5d0d8ae8a Mon Sep 17 00:00:00 2001
From: Chantry Xavier <shiningxc@gmail.com>
Date: Sun, 13 Jan 2008 22:43:53 +0100
Subject: [PATCH] Rename --recursive to --deps, and update man page.

This hopefully fixes FS#9192.
Rename the --recursive option to --deps, as that might be more suggestive,
and attempt to clarify the -Rc and -Rs options in the man page.

Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
---
 contrib/bash_completion |    4 ++--
 doc/pacman.8.txt        |   14 ++++++++------
 src/pacman/pacman.c     |    4 ++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/contrib/bash_completion b/contrib/bash_completion
index 7719285..e235956 100644
--- a/contrib/bash_completion
+++ b/contrib/bash_completion
@@ -186,7 +186,7 @@ _pacman ()
           cascade) mod="${mod}c" ;;
           dbonly) mod="${mod}k" ;;
           nosave) mod="${mod}n" ;;
-          recursive) mod="${mod}s" ;;
+          deps) mod="${mod}s" ;;
         esac ;;
       *) toparse="${a}" ;;
     esac
@@ -241,7 +241,7 @@ _pacman ()
           -h --help \
           -k --dbonly \
           -n --nosave \
-          -s --recursive \
+          -s --deps \
           --config \
           --logfile \
           --noconfirm \
diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt
index 0da83a6..b5d6564 100644
--- a/doc/pacman.8.txt
+++ b/doc/pacman.8.txt
@@ -207,7 +207,8 @@ Remove Options[[RO]]
 --------------------
 *-c, \--cascade*::
 	Remove all target packages, as well as all packages that depend on one
-	or more target packages. This operation is recursive.
+	or more target packages. This operation is recursive, and has to be used
+	with care, since it can remove a lot of potentially needed packages.
 
 *-k, \--keep*::
 	Removes the database entry only. Leaves all files in place.
@@ -217,11 +218,12 @@ Remove Options[[RO]]
 	file is removed from the system the database is checked to see if the
 	file should be renamed with a ``.pacsave'' extension.
 
-*-s, \--recursive*::
-	Remove each target specified including all dependencies, provided that
-	(A) they are not required by other packages; and (B) they were not
-	explicitly installed by the user. This option is analogous to a
-	backwards '\--sync' operation.
+*-s, \--deps*::
+	Remove each target specified including all their dependencies, provided
+	that (A) they are not required by other packages; and (B) they were not
+	explicitly installed by the user. This operation is recursive and analogous
+	to a backwards '\--sync' operation, and so helps keeping a clean system,
+	without orphans.
 
 
 Sync Options[[SO]]
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 1aa2968..4fb6906 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -88,7 +88,7 @@ static void usage(int op, const char * const myname)
 			printf(_("  -d, --nodeps         skip dependency checks\n"));
 			printf(_("  -k, --dbonly         only remove database entry, do not remove files\n"));
 			printf(_("  -n, --nosave         remove configuration files as well\n"));
-			printf(_("  -s, --recursive      remove dependencies also (that won't break packages)\n"));
+			printf(_("  -s, --deps           remove dependencies also (that won't break packages)\n"));
 		} else if(op == PM_OP_UPGRADE) {
 			printf("%s:  %s {-U --upgrade} [%s] <%s>\n", str_usg, myname, str_opt, str_file);
 			printf("%s:\n", str_opt);
@@ -322,7 +322,7 @@ static int parseargs(int argc, char *argv[])
 		{"print-uris", no_argument,       0, 'p'},
 		{"quiet",      no_argument,       0, 'q'},
 		{"root",       required_argument, 0, 'r'},
-		{"recursive",  no_argument,       0, 's'},
+		{"deps",       no_argument,       0, 's'},
 		{"search",     no_argument,       0, 's'},
 		{"unrequired", no_argument,       0, 't'},
 		{"upgrades",   no_argument,       0, 'u'},
-- 
1.5.4.rc3