* doc/help.txt: Updated to reflect new F-key mappings

* keybindings/common: Map F6 to detach session
  * select-screen-profile: Test link against arg
  * bin/cpu-count: remove whitespace
  * bin/release: get rid of "(development branch)" string

bin/cpu-count

@@ -4,5 +4,5 @@ count=`grep -c "^processor.*:" /proc/cpuinfo`
 if [ "$count" = "1" ]; then
 	echo
 else
-	echo "$count x "
+	echo $count"x "
 fi

bin/release

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-/usr/bin/lsb_release -d -s
+/usr/bin/lsb_release -d -s | sed 's/\s*(.*)$//'

debian/changelog

@@ -1,8 +1,13 @@
 screen-profiles (1.3) UNRELEASED; urgency=low
 
-  * 
+  [ Dustin Kirkland ]
+  * doc/help.txt: Updated to reflect new F-key mappings
+  * keybindings/common: Map F6 to detach session
+  * select-screen-profile: Test link against arg
+  * bin/cpu-count: remove whitespace
+  * bin/release: get rid of "(development branch)" string
 
- -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 06 Jan 2009 19:46:35 -0600
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Wed, 07 Jan 2009 12:39:57 -0600
 
 screen-profiles (1.2-0ubuntu1) jaunty; urgency=low
 

doc/help.txt

@@ -1,17 +1,16 @@
-Screen is a powerful program that allows your terminal session to have
+Screen is a powerful program that allows your terminal session to use
-multiple windows and retain context between multiple logins. This
+multiple windows and retain context among multiple logins.
-version of screen is configured with a task bar at the bottom of the
+This version of screen is configured with a task bar at the bottom of
-window that shows system status, pending updates, and which window you
+the window that shows system status, pending updates, and which window
-are currently viewing.
+you are currently viewing.
 
-Common mappings (where C- means ctrl):
+Key mappings:
-------------------------------------------------------------------------
+F2    Create new window      |  F6    Detach from session
-C-PgUp/Shift-Tab  Goto next window            | F1  Basic help (this)
+F3    Go to prev window      |  F7    --
-C-PgDown          Goto previous window        | F2  Advanced help
+F4    Go to next window      |  F8    Advanced help
-C-Shift-Del       Detach screen               | F4  Create new window
+F5    Close this window      |  F9    Basic help (this)
-C-g Esc           Use scrollback (Esc exits)  | F6  Close current window
-------------------------------------------------------------------------
 
-Use 'screen -r' to reattach to a detached screen. Complete help on
+Commands:
-screen can be obtained using the 'man screen' command. Please note that
+'screen -r'  - reattach      | 'man screen' - complete help
-screen is configured to remap the escape prefix from ctrl-A to ctrl-G.
+
+Note that the escape key has been changed from <ctrl-a> to <ctrl-g>.

keybindings/common

@@ -39,7 +39,7 @@ bindkey -k k2 process n	# F2 | Create new window (and name it)
 bindkey -k k3 prev	# F3 | Previous Window
 bindkey -k k4 next	# F4 | Next Window
 bindkey -k k5 kill	# F5 | Close window
-			# F6
+bindkey -k k6 detach	# F6 | Detach from this session
 			# F7
 bindkey -k k8 help	# F8 | Advanced help/keybindings
 bindkey -k k9 screen -t help 0 screen-profiles-helper # F9 | Welcome screen

select-screen-profile

@@ -43,7 +43,7 @@ selected=-1
 
 assert_symlink() {
 	if [ -e "$1" ]; then
-		if [ ! -L "$HOME/.screenrc-profile" ]; then
+		if [ ! -L "$1" ]; then
 			echo `gettext 'Error:'` $1 `gettext ' file exists, but is not a symlink'`
 			exit 1
 		fi