[Surfraw-commits] [SCM] surfraw - a fast unix command line interface to WWW branch, master, updated. surfraw_2-2-5_1-113-gf2bf98d

[Ian Beckwith]

The following commit has been merged in the master branch:
commit 8185496ff396f53dbf3ffdb6733eec6e21307c5b
Author: Ian Beckwith <ianb at erislabs.net>
Date:   Thu Apr 22 23:00:16 2010 +0100

    debwiki: remove -w, Debian Women wiki is now being merged into main wiki. Thanks to Simone Fittabile.

diff --git a/ChangeLog b/ChangeLog
index 160f554..1a1a541 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-22  Ian Beckwith  <ianb at erislabs.net>
+
+	* debwiki: remove -w, Debian Women wiki is now being merged
+	  into main wiki. Thanks to Simone Fittabile.
+
 2010-04-21  Ian Beckwith  <ianb at erislabs.net>
 
 	* New elvi: jamendo - Search Jamendo: free music with Creative
diff --git a/NEWS b/NEWS
index 4dc7ea5..8462fbc 100644
--- a/NEWS
+++ b/NEWS
@@ -35,6 +35,8 @@ Wed Apr 21 18:43:12 BST 2010  - surfraw 2.2.7
 	  + bbcnews (thanks to Sumant Oemrawsingh and James Rowe)
 	* aur: added options (thanks to Ivy Foster)
 	* wikipedia, ixquick: support https. Thanks to Simone Fittabile.
+	* debwiki: remove -w, Debian Women wiki is being merged into main
+	  Debian wiki.
 	* Improved support for screen(1). Thanks to Ivy Foster:
 	  + Support for using tmux as $SURFRAW_screen.
 	  + Added `-ns|-newscreen' switch for setting $SURFRAW_new_screen.
diff --git a/elvi/debwiki b/elvi/debwiki
index 7dab7e8..c3841ef 100755
--- a/elvi/debwiki
+++ b/elvi/debwiki
@@ -5,7 +5,6 @@
 . surfraw || exit 1
 
 w3_config_hook () {
-defyn SURFRAW_debwiki_women   0
 defyn SURFRAW_debwiki_title   0
 defyn SURFRAW_debwiki_context 1
 defyn SURFRAW_debwiki_case    0
@@ -16,9 +15,8 @@ w3_usage_hook () {
     cat <<EOF
 Usage: $w3_argv0 [options] [search words]...
 Description:
-  Surfraw search the Debian Wikis (wiki.debian.org & women.debian.org/wiki)
+  Surfraw search the Debian Wiki (wiki.debian.org)
 Local options:
-  -w                            Search the Debian Women wiki.
   -c                            Make search case-sensitive.
   -n                            Don't show context of search result.
   -t                            Limit search to title.
@@ -31,7 +29,6 @@ w3_parse_option_hook () {
     opt="$1"
     optarg="$2"
     case "$opt" in
-    -w)        setoptyn SURFRAW_debwiki_women   1       ;;
     -c)        setoptyn SURFRAW_debwiki_case    1       ;;
     -n)        setoptyn SURFRAW_debwiki_context 0       ;;
     -d)        setoptyn SURFRAW_debwiki_direct  1       ;;
@@ -46,10 +43,6 @@ w3_parse_args "$@"
 # w3_args now contains a list of arguments
 
 url="http://wiki.debian.org"
-if ifyes SURFRAW_debwiki_women
-then
-    url="http://women.debian.org/wiki"
-fi
 
 if test -z "$w3_args"
 then

-- 
surfraw -  a fast unix command line interface to WWW