[LON-CAPA-cvs] cvs: loncom /html/adm/help/tex BridgeTask_About.tex BridgeTask_Create.tex

[rezaferry]

rezaferry		Wed May 30 13:13:26 2007 EDT

  Modified files:              
    /loncom/html/adm/help/tex	BridgeTask_About.tex 
                             	BridgeTask_Create.tex 
  Log:
  Updated the BridgeTask about and BridgeTask Create so that they do not show the conflict
  
  
Index: loncom/html/adm/help/tex/BridgeTask_About.tex
diff -u loncom/html/adm/help/tex/BridgeTask_About.tex:1.3 loncom/html/adm/help/tex/BridgeTask_About.tex:1.4
--- loncom/html/adm/help/tex/BridgeTask_About.tex:1.3	Wed May 30 11:36:15 2007
+++ loncom/html/adm/help/tex/BridgeTask_About.tex	Wed May 30 13:13:26 2007
@@ -2,12 +2,8 @@
 
 Bridge Tasks (BTs) are open-ended, performance-based assessments.  BTs are based on a mastery-model of assessment and evaluated on a pass-fail basis.  You may use BTs in a variety of ways, from supporting the scoring of a final project, to individual lab assignments. See Introduction to Bridge Task {\ref{BridgeTask_Intro}) for a more in-depth explanation to Bridge Tasks. The main features of a bridge task (\ref{BridgeTask_Features}) section gives the differences between BTs and other assessments.
 
-<<<<<<< BridgeTask_About.tex
-An author creates a bridge task either by writing the XML code or by using the edit mode.  The course coordinator must then place the Bridge Task resource on his/her course's document list. The section on Bridge Task Creation (\ref{BridgeTask_Create}) describes how to author as well as set up these Bridge Tasks.
+An author creates a bridge task either by writing the XML code or by using the edit mode and publishing it.  A course coordinator must then place the Bridge Task resource in his/her course's document list. The section on Bridge Task Creation (\ref{BridgeTask_Create}) describes how to author as well as set up these Bridge Tasks.      
 
 Once the bridge task is created and published, the course coordinator must insert the resource in the course's document list (See Setting Up a Bridge Task \ref{BridgeTask_SetupResource}). The course coordinator may also create slots to limit the place/time the bridge task may be opened (See Using Slots in Bridge Task \ref{BridgeTask_Slot}). This resource may also be placed inside conditionals resources so that it is accessible only after a particular condition has been met (see Bridge Task and Conditional Resources \ref{BridgeTask_Conditions}).  
-=======
-An author creates a bridge task either by writing the XML code or by using the edit mode and publishing it.  A course coordinator must then place the Bridge Task resource in his/her course's document list. The section on Bridge Task Creation (\ref{BridgeTask_Create}) describes how to author as well as set up these Bridge Tasks.      
->>>>>>> 1.2
 
 Once the course coordinator has set up the Bridge Task the student is able to open and use the bridge task. A Bridge Task handin process using portfolio files may be used by the instructors or students if they wish (See Handing In Bridge Task Files \ref{BridgeTask_Portfolio})..      
Index: loncom/html/adm/help/tex/BridgeTask_Create.tex
diff -u loncom/html/adm/help/tex/BridgeTask_Create.tex:1.3 loncom/html/adm/help/tex/BridgeTask_Create.tex:1.4
--- loncom/html/adm/help/tex/BridgeTask_Create.tex:1.3	Wed May 30 11:36:15 2007
+++ loncom/html/adm/help/tex/BridgeTask_Create.tex	Wed May 30 13:13:26 2007
@@ -8,12 +8,8 @@
 \caption{Bridge Task creation flowchart\label{BT_flowchart}}
 \end{figure}
 
-<<<<<<< BridgeTask_Create.tex
 There are two ways of creating the bridge task. The first method is to directly edit the XML file being used (See Bridge Task XML Editing \ref{BridgeTask_XML}). The second method is to use the LON-CAPA online edit mode (See Bridge Task Mode Editing \ref{BridgeTask_EditMode}).
-=======
-There are two ways of creating the bridge task. The first method is to directly edit the XML file being used (See Bridge Task XML Editing \ref{BridgeTask_XML}). The second method is to use the LON-CAPA online edit mode (See Bridge Task Mode Editing).
 
 Once the bridge task is created and published, the course coordinator must insert the resource in the course's document list (See Setting Up Bridge Task \ref{BridgeTask_SetupResource}). The course coordinator may also create slots to allow for multiple place/time the bridge task may be opened or to allow for multiple separate attempts at the bridgetask (See Using Slots in Bridge Task \ref{BridgeTask_Slot}). As with any resource, the map it is in may use conditionals to control access to the resources based on other information in the course. (For example, the section of a user, the passing of a prior bridgetask, etc.)
->>>>>>> 1.2