Changeset 36516f5 in fedora-web


Ignore:
Timestamp:
10/24/09 19:43:14 (4 years ago)
Author:
Paul W. Frields <stickster@…>
Branches:
master, f13-alpha, f13-beta, f14-alpha, f14-beta, f15-alpha, f15-beta, f16-alpha, f16-beta, f17-alpha, f17-beta, f18-alpha, f18-beta, f19, f19-alpha, f19-beta, f20, f20-alpha, f20-beta, fudcon-redesign, newchrome, sopablackout, startfpo-redesign, stg
Children:
8c07824
Parents:
2558e79
git-author:
Paul W. Frields <stickster@…> (10/24/09 19:43:14)
git-committer:
Paul W. Frields <stickster@…> (10/24/09 19:43:14)
Message:

Reindent document for even more clarity

File:
1 edited

Legend:

Unmodified
Added
Removed
  • talk.fedoraproject.org/data/content/client-twinkle.html

    r2558e79 r36516f5  
    1111  <body> 
    1212    <h2>${_('Configuring Twinkle for Fedora Talk')}</h2> 
    13  
    14         <p>${Markup(_('There is a &lt;a href="http://fedorapeople.org/groups/web/fedoratalk-twinkle-screencast.ogg"&gt;useful video tutorial&lt;/a&gt; for configuring Twinkle with Fedora Talk. Useful content may be added to the &lt;a href="http://fedoraproject.org/wiki"&gt;Fedora Project wiki&lt;/a&gt;, possibly even by &lt;em&gt;you&lt;/em&gt;.'))}</p>  
    15         <ol> 
    16           <li> 
    17             <p>${Markup(_('Install the twinkle package using PackageKit. From the main menu, select System &rarr; Administration &rarr; Add/Remove Software.'))}</p> 
    18             <p><img alt="${_('Selecting PackageKit from the main menu')}" border="0" src="/static/images/menu-pk.png"/></p> 
    19             <p>${_('Type "twinkle" into the "find" box and click find.  Then check the box for the "twinkle" package and click "Apply."')}</p> 
    20             <p><img alt="${_('Finding Twinkle using PackageKit')}" border="0" src="/static/images/packagekit-find.png"/></p> 
    21           </li> 
    22           <li> 
    23             <p>${Markup(_('Select Applications &rarr; Internet &rarr; Twinkle from the main menu.'))}</p> 
    24           </li> 
    25           <li> 
    26             <p>${_('Select "Ok" to create a profile.')}</p> 
    27             <p><img alt="${_('Twinkle profile editor')}" src="./static/images/twinkle-before-using.png"  border="0" /></p> 
    28           </li> 
    29           <li> 
    30             <p>${_('Select "Profile Editor."')}</p> 
    31             <p><img alt="${_('Twinkle profile editor')}" src="./static/images/twinkle-profile-option.png"  border="0" /></p> 
    32           </li> 
    33           <li> 
    34             <p>${_('Give the profile a name, such as "FedoraTalk." Spaces are not allowed.')}</p> 
    35             <p><img alt="${_('Twinkle profile name')}" src="./static/images/twinkle-profile-name.png" border="0" /></p> 
    36           </li> 
    37 <!--<p><img alt="${_('Twinkle profile name')}" src="./static/images/twinkle-profile-edit-alt.png"  border="0" /></p>--> 
     13    <p>${Markup(_('There is a &lt;a href="http://fedorapeople.org/groups/web/fedoratalk-twinkle-screencast.ogg"&gt;useful video tutorial&lt;/a&gt; for configuring Twinkle with Fedora Talk. Useful content may be added to the &lt;a href="http://fedoraproject.org/wiki"&gt;Fedora Project wiki&lt;/a&gt;, possibly even by &lt;em&gt;you&lt;/em&gt;.'))}</p>  
     14    <ol> 
     15      <li> 
     16        <p>${Markup(_('Install the twinkle package using PackageKit. From the main menu, select System &rarr; Administration &rarr; Add/Remove Software.'))}</p> 
     17        <p><img alt="${_('Selecting PackageKit from the main menu')}" border="0" src="/static/images/menu-pk.png"/></p> 
     18        <p>${_('Type "twinkle" into the "find" box and click find.  Then check the box for the "twinkle" package and click "Apply."')}</p> 
     19        <p><img alt="${_('Finding Twinkle using PackageKit')}" border="0" src="/static/images/packagekit-find.png"/></p> 
     20      </li> 
     21      <li> 
     22        <p>${Markup(_('Select Applications &rarr; Internet &rarr; Twinkle from the main menu.'))}</p> 
     23      </li> 
     24      <li> 
     25        <p>${_('Select "Ok" to create a profile.')}</p> 
     26        <p><img alt="${_('Twinkle profile editor')}" src="./static/images/twinkle-before-using.png"  border="0" /></p> 
     27      </li> 
     28      <li> 
     29        <p>${_('Select "Profile Editor."')}</p> 
     30        <p><img alt="${_('Twinkle profile editor')}" src="./static/images/twinkle-profile-option.png"  border="0" /></p> 
     31      </li> 
     32      <li> 
     33        <p>${_('Give the profile a name, such as "FedoraTalk." Spaces are not allowed.')}</p> 
     34        <p><img alt="${_('Twinkle profile name')}" src="./static/images/twinkle-profile-name.png" border="0" /></p> 
     35      </li> 
     36      <!--<p><img alt="${_('Twinkle profile name')}" src="./static/images/twinkle-profile-edit-alt.png"  border="0" /></p>--> 
     37      <li> 
     38        <p>${_('Edit the profile details as shown below.')}</p> 
     39        <p>${_('First, select "User" in the left pane and fill in the following information:')}</p> 
     40        <p><img alt="${_('Twinkle profile name')}" src="./static/images/twinkle-profile-edit.png"  border="0" /></p> 
     41        <ul> 
    3842          <li> 
    39             <p>${_('Edit the profile details as shown below.')}</p> 
    40             <p>${_('First, select "User" in the left pane and fill in the following information:')}</p> 
    41             <p><img alt="${_('Twinkle profile name')}" src="./static/images/twinkle-profile-edit.png"  border="0" /></p> 
     43            <p>${_('In the "SIP Account" section complete these entries:')}</p> 
    4244            <ul> 
    43               <li> 
    44                 <p>${_('In the "SIP Account" section complete these entries:')}</p> 
    45                 <ul> 
    46                   <li>${Markup(_('Your Name (optional): &lt;em&gt;Firstname Lastname&lt;/em&gt;'))}</li> 
    47                   <li>${Markup(_('User Name: &lt;em&gt;FAS Account name&lt;/em&gt;'))}</li> 
    48                   <li>${Markup(_('Domain: &lt;em&gt;talk.fedoraproject.org&lt;/em&gt;'))}</li> 
    49                 </ul> 
    50               </li><!-- SIP account subsection --> 
    51               <li> 
    52                 <p>${_('In the "SIP Authentication" section complete these entries:')}</p> 
    53                 <ul> 
    54                   <li>${Markup(_('Realm (optional): &lt;em&gt;LEAVE BLANK&lt;/em&gt;'))}</li> 
    55                   <li>${Markup(_('Authentication name: &lt;em&gt;FAS Account name&lt;/em&gt;'))}</li> 
    56                   <li>${Markup(_('Password: &lt;em&gt;VOIP Password (this can be found in your fas account and is NOT your FAS account password)&lt;/em&gt;'))}</li> 
    57                 </ul> 
    58               </li><!-- SIP authentication subsection --> 
     45              <li>${Markup(_('Your Name (optional): &lt;em&gt;Firstname Lastname&lt;/em&gt;'))}</li> 
     46              <li>${Markup(_('User Name: &lt;em&gt;FAS Account name&lt;/em&gt;'))}</li> 
     47              <li>${Markup(_('Domain: &lt;em&gt;talk.fedoraproject.org&lt;/em&gt;'))}</li> 
    5948            </ul> 
    60           </li><!-- User details section --> 
     49          </li><!-- SIP account subsection --> 
    6150          <li> 
    62             <p>${_('In the "SIP Server" section complete these entries:')}</p> 
    63             <img alt="${_('Twinkle profile name')}" src="./static/images/twinkle-profile-edit-sip.png"  border="0" /> 
     51            <p>${_('In the "SIP Authentication" section complete these entries:')}</p> 
    6452            <ul> 
    65               <li>Registrar: talk.fedoraproject.org (You can leave this blank.)</li> 
    66               <li>Choose OK</li> 
     53              <li>${Markup(_('Realm (optional): &lt;em&gt;LEAVE BLANK&lt;/em&gt;'))}</li> 
     54              <li>${Markup(_('Authentication name: &lt;em&gt;FAS Account name&lt;/em&gt;'))}</li> 
     55              <li>${Markup(_('Password: &lt;em&gt;VOIP Password (this can be found in your fas account and is NOT your FAS account password)&lt;/em&gt;'))}</li> 
    6756            </ul> 
    68           </li><!-- SIP server details section --> 
    69           <li>To receive a call you must be registered, this should happen automatically if the above settings are correct. 
    70         <ul> 
    71             <li>To verify your registration click on "Registration/Show Registrations" 
    72             <img alt="${_('Twinkle profile name')}" src="./static/images/twinkle-main-show-registrations.png"  border="0" /></li> 
    73             <li>your firewall should allow inbound connections on port 5060</li> 
     57          </li><!-- SIP authentication subsection --> 
     58        </ul> 
     59      </li><!-- User details section --> 
     60      <li> 
     61        <p>${_('In the "SIP Server" section complete these entries:')}</p> 
     62        <img alt="${_('Twinkle profile name')}" src="./static/images/twinkle-profile-edit-sip.png"  border="0" /> 
     63        <ul> 
     64          <li>Registrar: talk.fedoraproject.org (You can leave this blank.)</li> 
     65          <li>Choose OK</li> 
     66        </ul> 
     67      </li><!-- SIP server details section --> 
     68      <li> 
     69        <p>${_('To receive a call you must be registered, this should happen automatically if the above settings are correct.')}</p> 
     70        <ul> 
     71          <li>To verify your registration click on "Registration/Show Registrations" 
     72          <img alt="${_('Twinkle profile name')}" src="./static/images/twinkle-main-show-registrations.png"  border="0" /></li> 
     73          <li>your firewall should allow inbound connections on port 5060</li> 
    7474        </ul> 
    75     </li> 
    76     <li>Verify that your audio setup is working by calling the Echo Test line on the Fedora Talk system</li> 
    77     <li><b>FIXME: link to ftalk-verify-setup document</b></li> 
    78 </ol> 
     75      </li> 
     76      <li>Verify that your audio setup is working by calling the Echo Test line on the Fedora Talk system</li> 
     77      <li><b>FIXME: link to ftalk-verify-setup document</b></li> 
     78    </ol> 
    7979 
    8080  </body> 
Note: See TracChangeset for help on using the changeset viewer.