Merge branch 'pfrields-work'HEADmaster

6 files changed, 190 insertions, 34 deletions

diff --git a/gnome-help/C/printing-setup-default-printer.page b/gnome-help/C/printing-setup-default-printer.page
index 9a301c8..c0a7d5a 100644
--- a/gnome-help/C/printing-setup-default-printer.page
+++ b/gnome-help/C/printing-setup-default-printer.page
@@ -7,18 +7,44 @@
 
     <desc>Pick the printer that you use most often.</desc>
 
-    <revision pkgversion="3.0" version="0.1" date="2011-03-18" status="stub"/>
+    <revision pkgversion="3.0" version="0.1" date="2011-03-18" status="draft"/>
     <credit type="author">
       <name>Jim Campbell</name>
       <email>jwcampbell@gmail.com</email>
-    </credit>    
+    </credit>
+    <credit type="author">
+      <name>Paul W. Frields</name>
+      <email>stickster@gmail.com</email>
+    </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
     </license>
 
   </info>
 
-<title>Set the default printer</title>
+  <title>Set the default printer</title>
+  <p>If you have more than one printing device available, you can select which will be your default printer. You may want to pick the printer you use most often.</p>
+  <note>
+    <p>You need administrative privileges on the system to set up a new default printer.</p>
+  </note>
 
+  <steps>
+    <item>
+      <p>Select your user name in the upper right-hand corner of the screen, then choose "System Settings" to open the control panel.</p>
+    </item>
+    <item>
+      <p>Select the Printers tool from the control panel.</p>
+    </item>
+    <item>
+      <p>Select your desired default printer from the list of available printers.</p>
+    </item>
+    <item>
+      <p>Select the Unlock button at the bottom left-hand corner of the Printers tool. You may be required to authenticate to the system with a password to complete this step.</p>
+    </item>
+    <item>
+      <p>Enable the Default checkbox, and then select the Lock button.</p>
+    </item>
+  </steps>
 
+  <p>When you print in another application, the default printer is automatically used, unless you choose a different printer for that specific output.</p>
 </page>
diff --git a/gnome-help/C/printing-setup-networked.page b/gnome-help/C/printing-setup-networked.page
index 3327958..ba43198 100644
--- a/gnome-help/C/printing-setup-networked.page
+++ b/gnome-help/C/printing-setup-networked.page
@@ -4,13 +4,18 @@
 
   <info>
     <link type="guide" xref="hardware#printing-get-setup" />
+    <link type="topic" xref="printing" />
 
     <desc>Set up a printer on the network.</desc>
 
-    <revision pkgversion="3.0" version="0.1" date="2011-03-18" status="stub"/>
+    <revision pkgversion="3.0" version="0.1" date="2011-03-18" status="draft"/>
     <credit type="author">
       <name>Jim Campbell</name>
       <email>jwcampbell@gmail.com</email>
+    </credit>
+    <credit>
+      <name>Paul W. Frields</name>
+      <email>stickster@gmail.com</email>
     </credit>    
     <license>
       <p>Creative Commons Share Alike 3.0</p>
@@ -18,7 +23,44 @@
 
   </info>
 
-<title>Set up a networked printer</title>
+  <title>Set up a networked printer</title>
+  <p>Your home or office network may include a printer. Many modern, inexpensive printers can be directly attached to your network. If you're in an office environment, your system administration staff should be able to provide details about the available network printers.</p>
 
+  <comment>
+    <cite date="2011-03-20" href="mailto:gnome-docs-list@gnome.org">GNOME Documentation Project</cite>
+    <p>Let's assume that the printer is shared out correctly in a way that makes it discoverable (via mDNS/avahi) and that it's providing CUPS/IPP service over port 631. These capabilities are typical in most modern printers that have cross-platform support.</p>
+    <p>Perhaps installing a printer in that way on GNOME should be covered elsewhere, but the capability doesn't currently exist in the GNOME 3 Printers tool, meaning it would need to be covered by distros.</p>
+  </comment>
+
+  <p>Depending on how you installed GNOME, you may need to set your system's firewall to permit connections to the network printer.</p>
+
+  <steps>
+    <item>
+      <p>To locate your system's firewall tool, open the Overview, and type "firewall".</p>
+      <note>
+	<p>If this step doesn't locate the appropriate tool, consult the documentation for your overall operating system for the correct application name. To open the application, hit <keyseq type="combo"><key>Alt</key><key>F2</key></keyseq>, type that name, and hit <key>Enter</key>.</p>
+      </note>
+    </item>
+    <item>
+      <p>In your system's firewall tool, check that the mDNS (5353/UDP) and IPP printing client (631/UDP) ports are open or enabled.</p>
+    </item>
+    <item>
+      <p>Save or apply the changes.</p>
+    </item>
+  </steps>
+
+  <p>To make sure the new printer is available to your GNOME system, visit the Printers tool.</p>
+
+  <steps>
+    <item>
+      <p>Select your user name in the upper right-hand corner of the screen. Then choose "System Settings" to open the control panel.</p>
+    </item>
+    <item>
+      <p>Select the Printers tool from the control panel.</p>
+    </item>
+    <item>
+      <p>If the printer is correctly broadcasting, it will appear in the list. You can now <link xref="printing-setup-default-printer">make it your default printer</link> if desired. You may be able to perform other tasks depending on how your system is administered.</p>
+    </item>
+  </steps>
 
 </page>
diff --git a/gnome-help/C/printing-setup.page b/gnome-help/C/printing-setup.page
index 55c0d35..c20b287 100644
--- a/gnome-help/C/printing-setup.page
+++ b/gnome-help/C/printing-setup.page
@@ -7,7 +7,7 @@
 
     <desc>Set up a printer that is connected to your computer.</desc>
 
-    <revision pkgversion="3.0" version="0.1" date="2011-03-18" status="stub"/>
+    <revision pkgversion="3.0" version="0.1" date="2011-03-18" status="draft"/>
     <credit type="author">
       <name>Phil Bull</name>
       <email>philbull@gmail.com</email>
@@ -15,14 +15,31 @@
     <credit type="author">
       <name>Jim Campbell</name>
       <email>jwcampbell@gmail.com</email>
-    </credit>    
+    </credit>
+    <credit type="author">
+      <name>Paul W. Frields</name>
+      <email>stickster@gmail.com</email>
+    </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
     </license>
 
   </info>
 
-<title>Set up a local printer</title>
+  <title>Set up a local printer</title>
+  <p>Your system can recognize many types of printers automatically once they're connected. Most printers are connected with a USB cable that attaches to your computer.</p>
 
+  <steps>
+    <item>
+      <p>Make sure the printer is turned on.</p>
+    </item>
+    <item>
+      <p>Connect the printer to your system via the appropriate cable. You may see activity on the screen as the system searches for drivers, and you may be asked to authenticate to install them.</p>
+    </item>
+    <item>
+      <p>A message will appear when the system is finished installing the printer. Select Print Test Page to print a test page, or Configure to make additional changes in the printer setup.</p>
+    </item>
+  </steps>
 
+  <p>After you install the printer, you may wish to <link xref="printing-setup-default-printer">change your default printer</link>.</p>
 </page>
diff --git a/gnome-help/C/session-authmethods.page b/gnome-help/C/session-authmethods.page
deleted file mode 100644
index 57aac1a..0000000
--- a/gnome-help/C/session-authmethods.page
+++ /dev/null
@@ -1,26 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="topic"
-      style="task"
-      id="session-authmethods">
-
-  <info>
-    <link type="guide" xref="session#login"/>
-    <desc>XXXXX</desc>
-    <revision pkgversion="3.0" version="0.1" date="2011-03-19" status="stub"/>
-    <credit type="author">
-      <name>GNOME Documentation Project</name>
-      <email>gnome-doc-list@gnome.org</email>
-    </credit>
-    
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-  </info>
-
-<title>Log-in using a smart card, fingerprint reader or similar</title>
-
-  <comment>
-   <cite date="2010-10-31" href="mailto:gnome-doc-list@gnome.org">GNOME Documentation Project</cite>
-   <p>This one is complicated!</p>
-   <p>Explain how to set-up and use different methods of authentication for when the user logs in, e.g. fingerprint readers and smart cards.</p>
-  </comment>
-	
-</page>
diff --git a/gnome-help/C/session-fingerprint.page b/gnome-help/C/session-fingerprint.page
new file mode 100644
index 0000000..3dddb15
--- /dev/null
+++ b/gnome-help/C/session-fingerprint.page
@@ -0,0 +1,73 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic"
+      id="session-fingerprint">
+
+  <info>
+    <link type="guide" xref="session#login"/>
+    <desc>You can log in to your system using a supported fingerprint scanner.</desc>
+    <revision pkgversion="3.0" version="0.2" date="2011-03-19" status="candidate"/>
+    <credit type="author">
+      <name>GNOME Documentation Project</name>
+      <email>gnome-doc-list@gnome.org</email>
+    </credit>
+    <credit type="author">
+      <name>Paul W. Frields</name>
+      <email>stickster@gmail.com</email>
+    </credit>
+
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Log in with a fingerprint</title>
+  <p>If your system has a supported fingerprint scanner, you can record your fingerprint and use it to log in. You must have administrative privileges to perform these steps.</p>
+  <p>First, record a fingerprint the system can use to identify you.</p>
+  <note style="tip">
+    <p>If your finger is too dry, you may have difficulty registering your fingerprint. If this happens, moisten your finger slightly, dry it with a clean, lint-free cloth, and retry.</p>
+  </note>
+  <steps>
+    <item>
+      <p>Select your user name in the upper right-hand corner, then choose "My Account".</p>
+    </item>
+    <item>
+      <p>Unlock your account using the "Unlock" button at the bottom left of the User Accounts tool.</p>
+    </item>
+    <item>
+      <p>Enter your password at the prompt.</p>
+    </item>
+    <item>
+      <p>Select the "Disabled" option next to "Fingerprint Login".</p>
+    </item>
+    <item>
+      <p>Select an option for the fingerprint you want to register. You may choose your right index finger, your left index finger, or a different finger. Then select "Forward".</p>
+    </item>
+    <item>
+      <p>Swipe the finger you selected three times at moderate speed over your fingerprint reader. Each time the fingerprint reader recognizes your fingerprint properly, the corresponding picture of a hand will transform into a picture of a fingerprint with a check mark. After the third swipe, you will see the message "Done!"</p>
+    </item>
+    <item>
+      <p>Select "Forward". You will see a confirmation message that your fingerprint was saved successfully. Select "Close" to finish.</p>
+    </item>
+  </steps>
+  <p>Now check that your new fingerprint login works. If you register a fingerprint, you still have the option to log in with your password.</p>
+  <steps>
+    <item>
+      <p>Save any open work, and then logout. Select your name in the upper right-hand corner and then select "Log Out...".</p>
+    </item>
+    <item>
+      <p>A confirmation message will appear. Select "Log Out" to confirm. The login screen appears.</p>
+    </item>
+    <item>
+      <p>At the login screen, select your user name from the list. The password entry form will appear.</p>
+    </item>
+    <item>
+      <p>Within 30 seconds, select the fingerprint button above and to the right of your name.</p>
+      <note>
+	<p>The fingerprint button is labeled with a picture of a hand. If the timer runs out, the button will disappear and you will only be permitted to login with a password. If you want to try again, select the "Cancel" button and return to the previous step.</p>
+      </note>
+    </item>
+    <item>
+      <p>Swipe the finger you registered over your fingerprint scanner. You will be logged in.</p>
+    </item>
+  </steps>
+  <p>If you previously created a login keyring, it is secured by your password. To unlock it, enter your password.</p>
+	
+</page>
diff --git a/gnome-help/C/session-smartcard.page b/gnome-help/C/session-smartcard.page
new file mode 100644
index 0000000..3a141bb
--- /dev/null
+++ b/gnome-help/C/session-smartcard.page
@@ -0,0 +1,24 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic"
+      id="session-smartcard">
+
+  <info>
+    <link type="guide" xref="session#login"/>
+    <desc>You can use a supported smartcard to log in to your system.</desc>
+    <revision pkgversion="3.0" version="0.2" date="2011-03-19" status="candidate"/>
+    <credit type="author">
+      <name>GNOME Documentation Project</name>
+      <email>gnome-doc-list@gnome.org</email>
+    </credit>
+
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Log in with a smartcard</title>
+
+  <comment>
+    <cite date="2011-03-19" href="mailto:gnome-doc-list@gnome.org">GNOME Documentation Project</cite>
+    <p>Explain how to set up and use a typical smart card for logging in. If methods differ by model, attempt to group into major classes and explain.</p>
+  </comment>
+
+</page>