Merge remote-tracking branch 'savannah/master'

As part of the merge, fix some typos, add copyright and licensing headers, and
a few more minor changes.

1 files changed, 25 insertions, 0 deletions

diff --git a/faq/debian/apt_umount.mdwn b/faq/debian/apt_umount.mdwn
new file mode 100644
index 00000000..db0dbfd1
--- /dev/null
+++ b/faq/debian/apt_umount.mdwn
@@ -0,0 +1,25 @@
+[[!meta copyright="Copyright © 2007, 2008 Free Software Foundation, Inc."]]
+
+[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
+id="license" text="Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License, Version 1.2 or
+any later version published by the Free Software Foundation; with no Invariant
+Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license
+is included in the section entitled
+[[GNU Free Documentation License|/fdl]]."]]"""]]
+
+[[!meta title="apt: unmount cdroms"]]
+
+You can add a shell script umount so that apt can automatically unmount cdroms.
+
+    #!/bin/sh
+    # Filename: /usr/bin/umount
+    
+    settrans -fg "$@"
+
+Give executable permission to the script.
+
+    # chmod +x /usr/bin/umount
+
+In `/etc/fstab` add a trailing `/` after cdrom like `/cdrom/` since apt uses a
+trailing `/`.