Commit 3407fc9e by Kyle Fiedler

merge

parents bd570bee 134165fe
......@@ -7,31 +7,32 @@
<ul>
<li>
<h2>Videos and Ungraded Exercises</h2>
<p><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-sa/3.0/80x15.png" /></a><br />The videos on this page are licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-ShareAlike 3.0 Unported License</a>.</p>
</li>
<li>
<h2>Graded Exercises</h2>
<p>Graded exercises are All Rights Reserved until the due date. Past the due date, they are licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-ShareAlike 3.0 Unported License</a>.</p>
<h2>Videos and Exercises</h2>
<p> Copyright &copy; 2012 MIT. All rights reserved. In order to
further MIT's goal of making education accessible and affordable
to the world, MIT is planning to make <i>MITx</i> course content
available under open source licenses.
</p>
</li>
<li>
<h2>Textbook</h2>
<p>Textbook is All Rights Reserved Elsevier. We are using it with permission. We apologize for the inclusion of proprietary work. </p>
<p> Copyright &copy; 2005 Elsevier Inc. All Rights
Reserved. Used with permission. While our goal is to build
courses with as much free and open content as possible, we
apologize that we do not have the ability to do so
entirely. </p>
</li>
<li>
<h2>Student-generated content</h2>
<td>Due to privacy concerns, all forum posts, wiki etc, and other student-created works are All Rights Reserved until released otherwise by MIT. </td></li>
<li>
<h2>Source Code</h2>
<p>Source code is All Rights Reserved during the beta offering. We expect to release it under a free and open license shortly thereafter. </p>
</li>
<td>Copyright &copy; 2012. All Rights Reserved. Due to privacy
concerns, we do not know what portion of these will be released
under open licenses. </td></li>
</ul>
<p>MIT and MITx are trademarks of the Massachusetts Institute of Technology, and may not be used without permission.</p>
<p>MIT and <i>MITx</i> are trademarks of the Massachusetts Institute
of Technology, and may not be used without permission.</p>
</div>
</section>
......@@ -2,12 +2,48 @@
<section class="honor-code">
<div>
<h1> Honor Code </h1>
<h1> Collaboration Policy </h1>
<ul>
<li> I agree to not engage in any activities that would dishonestly improve my results, or improve or hurt those of others.</li>
<li> I agree to never post answers to problems.</li>
<li> I agree to maintain only one account.</li>
</ul>
<p> By enrolling in a course on <i>MITx</i>, you are joining a
special worldwide community of learners. The aspiration
of <i>MITx</i> is to provide anyone in the world who has the
motivation and ability to engage MIT coursework the opportunity
to attain the best MIT-based educational experience that
Internet technology enables. You are part of the community who
will help <i>MITx</i> achieve this goal.
<p> <i>MITx</i> depends upon your motivation to learn the material
and to do so with honesty. In order to participate
in <i>MITx</i>, you must agree to the Honor Code below and any
additional terms specific to a class. This Honor Code, and any
additional terms, will be posted on each class website.
<div style="color:darkred;">
<h2> <i>MITx</i> Honor Code Pledge</h2>
<p> By enrolling in an <i>MITx</i> course, I agree that I will:
<ul>
<li> Complete all mid-terms and final exams with my own work
and only my own work. I will not submit the work of any
other person.
<li> Maintain only one user account and not let anyone else
use my username and/or password.
<li> Not engage in any activity that would dishonestly improve
my results, or improve or hurt the results of others.
<li> Not post answers to problems that are being used to
assess student performance.
</ul>
</div>
<p> Unless otherwise indicated by the instructor of an <i>MITx</i>
course, learners on <i>MITx</i> are encouraged to:
<ul>
<li> Collaborate with others on the lecture videos, exercises,
homework and labs.
<li> Discuss with others general concepts and materials in
each course.
<li> Present ideas and written work to fellow <i>MITx</i>
learners or others for comment or criticism.
</ul>
</div>
</section>
......@@ -2,11 +2,290 @@
<section class="tos">
<div>
<h1>MITx Terms of Service</h1>
<p>Welcome to MITx. You must read and agree to these Terms of Service ("TOS") prior to using any portion of this site (&rdquo;Site&ldquo;), including accessing any chat room, mailing list, or other electronic service. These TOS, MITx&rsquo;s Privacy Policy [link] and Honor Code [link] are an agreement between you and the Massachusetts Institute of Technology ("MIT"). By registering for, accessing, browsing, or using any portion of the Site, you acknowledge that you have read, understood and agree to be bound by these TOS, the Privacy Policy and Honor Code. </p>
<p>MITx reserves the right to modify these TOS at any time and will publish notice of any such modifications online on the Site&rsquo;s homepage for a reasonable period of time following such modifications, and by changing the effective date of these TOS. By continuing to access the Site after notice of such modifications has been published, you signify your agreement to be bound by them. </p>
<h2>Description of MITx </h2>
<p>MITx offers online courses, professor-to-student and student-to-student interactivity, individual assessment of a student&rsqyo;s work, and the opportunity for students who demonstrate their mastery of subjects to earn a certificate or credential awarded by MITx. </p>
</div>
<h1>MITx Terms of Service</h1>
<p>Welcome to MITx. You must read and agree to these Terms of Service
(&quot;TOS&quot;), MITx&rsquo;s <a href="/t/privacy.html">Privacy
Policy</a>, and <a href="/t/honor.html">Honor Code</a> prior to
registering for this Site or using any portion of this site
(&ldquo;Site&rdquo;) , including accessing any course materials, chat
room, mailing list, or other electronic service. These TOS, the
Privacy Policy and the Honor Code are agreements (the
&ldquo;Agreements&rdquo;) between you and the Massachusetts Institute
of Technology (&ldquo;MIT&rdquo;). If you do not understand or do not
agree to be bound by the terms of the Agreements, please immediately
exit this site. </p>
<p>MITx reserves the right to modify these TOS at any time and will
publish notice of any such modifications online on the
Site <a href="/t/tos.html">Terms of Service page</a> for a reasonable
period of time following such modifications, and by changing the
effective date of these TOS. By continuing to access the Site
after notice of such modifications has been published, you signify
your agreement to be bound by them. </p>
<h2>Description of MITx </h2>
<p>MITx offers online courses, professor-to-student and
student-to-student interactivity, individual assessment of a
student&rsquo;s work, and the opportunity for students who demonstrate
their mastery of subjects to earn a certificate or credential awarded
by MITx. </p>
<h2>Rules for Online Conduct</h2>
<p>You agree that you are responsible for your own use of the Site and
for your User Postings. &ldquo;User Postings&rdquo; include all
content submitted, posted, published or distributed on the Site by you
or other users of the Site, including but not limited to all forum
posts, notes, questions, and comments. You agree that you will use the
Site in compliance with these TOS and all applicable local, state,
national, and international laws, rules and regulations, including any
laws regarding the transmission of technical data exported from your
country of residence and all United States export control laws.
<p>As a condition of your use of the Services, you will not use the
Site in any manner that could damage, disable, overburden, or impair
any MITx server, or the network(s) connected to any MITx server, or
interfere with any other party&#39;s use and enjoyment of the
Site. You may not attempt to gain unauthorized access to the Site,
other accounts, computer systems or networks connected to any MITx
server through hacking, password mining or any other means. You may
not obtain or attempt to obtain any materials or information through
any means not intentionally made available through the Site. </p>
<h2>The following list of items is strictly prohibited on the Site:</h2>
<ol>
<li>Content that defames or threatens others
<li>Harassing statements or content
<li>Content that discusses illegal activities with the intent to commit them.
<li>Content that infringes another&#39;s intellectual property,
including, but not limited to, copyrights, trademarks, or trade
secrets
<li>Any inappropriate, profane, pornographic, defamatory, obscene,
indecent, or unlawful content
<li>Advertising or any form of commercial solicitation
<li>Political content or content related to partisan political
activities
<li>Viruses, trojan horses, worms, time bombs, corrupted files,
malware, spyware, or any other similar software that may damage the
operation of another&rsquo;s computer or property
<li>Content that contains intentional inaccurate information with the
intent of misleading others.
<li>You, furthermore, agree not to scrape, or otherwise download in
bulk, user-contributed content, a list or directory of users on the
system, or other material including but not limited to on-line
textbooks, User Postings, or user information. You agree not to store
more than 5 pages of the electronic textbook or 5 forum posts in any
permanent medium (hard drive, optical disk, etc., flash drive, etc.).
<lu>You agree to not misrepresent or attempt to misrepresent your
identity while using the Sites (although you are welcome and
encouraged to use an anonymous username in the forums).
</ol>
<h2>User Accounts and Authority</h2>
<p>In order to participate in Site activities, you must provide an
email address (&quot;Email Address&quot;) and a user password
(&quot;User Password&quot;) in order to create a user account
(&ldquo;User Account&rdquo;). You agree that you will never divulge or
share access or access information to your User Account with any third
party for any reason. In setting up your User Account, you may be
prompted or required to enter additional information, including your
name. You understand and agree that all information provided by you is
accurate and current. You agree to maintain and update your
information to keep it accurate and current. </p>
<p>We consider the confidentiality and security of your information to
be of the utmost importance. Please see
our <a href="/t/privacy.html">Privacy Policy</a> for more information
about what information about you MITx collects and how MITx uses that
information.</p>
<h2>Your Right to Use Content on the Site</h2>
<p>Unless indicated as being in the public domain, all content on the
Site is protected by United States copyright. The texts, exams and
other instructional materials provided with the courses offered on
this Site are for your personal use in connection with those courses
only. MIT is planning to make MITx course content and software
infrastructure available under open source licenses that will help
create a vibrant ecosystem of contributors and further MIT&rsquo;s
goal of making education accessible and affordable to the world. </p>
<p>Certain reference documents, digital textbooks, articles and other
information on the Site are used with the permission of third parties
and use of that information is subject to certain rules and
conditions, which will be posted along with the information. By using
this Site you agree to abide by all such terms and conditions. Due to
privacy concerns, student-created content, including all forum posts,
is all Rights Reserved until released under other terms by MITx. </p>
<h2>USER POSTINGS</h2>
<p><strong>User Postings Representations and Warranties.</strong> By
uploading and publishing your User Postings, you affirm, represent,
and warrant that you are the creator and owner of or have the
necessary licenses, rights, consents, and permissions to use and to
authorize MIT and MITx&rsquo;s Users to use and distribute your User
Postings as necessary to exercise the licenses granted by you in these
TOS and in the manner contemplated by MITx. You, and not MITx, are
solely responsible for your User Postings and the consequences of
posting or publishing them.</p>
<p><strong>Limited License Grant to MIT.</strong> By submitting or distributing
User Postings through the Site, you hereby grant to MIT a worldwide,
non-exclusive, transferable, assignable, fully paid-up, royalty-free,
perpetual, irrevocable right and license to host, transfer, display,
perform, reproduce, modify, distribute and re-distribute, relicense,
and otherwise exploit your User Postings, in whole or in part, in any
form, and in any media formats and through any media channels (now
known or hereafter developed).</p>
<p><strong>Limited License Grant to MITx Users.</strong> By submitting
or distributing User Postings through the Site, you hereby grant to
each User of the Site a non-exclusive license to access and use your
User Postings in connection with their use of the Site for their own
personal purposes. </p>
<h2>Use of MITx and MIT Names, Trademarks and Service Marks</h2>
<p>&ldquo;MITx,&rdquo; &quot;MIT&quot;, &quot;Massachusetts Institute
of Technology&quot;, and its logos and seal are trademarks of the
Massachusetts Institute of Technology. You may not use MIT&rsquo;s
names or logos, or any variations thereof, without prior written
consent of MIT. You may not use the MIT name in any of its forms nor
MIT seals or logos for promotional purposes, or in any way that
deliberately or inadvertently claims, suggests, or in MIT&#39;s sole
judgment gives the appearance or impression of a relationship with or
endorsement by MIT.
<p>All Trademarks not owned by MIT that appear on the Site or on or
through the services made available on or through the Site, if any,
are the property of their respective owners. Nothing contained
on the Site should be construed as granting, by implication, estoppel,
or otherwise, any license or right to use any such Trademark displayed
on the Site without the written permission of the third party that may
own the applicable Trademark.
name="id.7dd2c542f51d"></a>
<h2>Digital Millennium Copyright Act</h2>
<p>It is MIT&rsquo;s policy to respond to notices of alleged copyright
infringement that comply with the Digital Millennium Copyright
Act. For more information, please go to MIT&rsquo;s DMCA Notification
Guidelines <a href="http://web.mit.edu/copyright/dmca-notices.html">http://web.mit.edu/copyright/dmca-notices.html</a>,
incorporated herein by reference.</p>
<h2>Disclaimer of Warranty / Indemnification/Limitation of Liabilities</h2>
<p>THE SITE, INCLUDING, WITHOUT LIMITATION, ALL SERVICES, CONTENT,
FUNCTIONS AND MATERIALS PROVIDED ON OR THROUGH THE SITE AND ANY
INFORMATION THEREIN ARE PROVIDED &quot;AS IS&quot; WITHOUT WARRANTY OF
ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION, THE
IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR USE FOR A
PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT AND MIT HEREBY DISCLAIMS
ANY AND ALL SUCH WARRANTIES, EXPRESS OR IMPLIED. MIT does not warrant
the Site will operate in an uninterrupted or error-free manner or that
the Site is free of viruses or other harmful components. Use of
information obtained from or through this Site is at your own
risk. Your access to or download of information, materials, or data
through the Site or any reference sites is at your own discretion and
risk and that you will be solely responsible for any damage to your
property (including your computer system) or loss of data that results
from the download or use of such material or data.</p>
<p><strong>User Postings Disclaimer.</strong> You understand that when
using the Site you will be exposed to User Postings from a variety of
sources, and that MIT is not responsible for the accuracy, usefulness,
reliability, or intellectual property rights of or relating to such
User Postings. You further understand and acknowledge that you may be
exposed to User Postings that are inaccurate, offensive, defamatory,
indecent or objectionable, and you agree to waive, and hereby do
waive, any legal or equitable rights or remedies you have or may have
against MIT with respect thereto. MIT does not endorse any User
Postings or any opinion, recommendation or advice expressed
therein. MITx has no obligation to monitor any User Postings or
any other user communications through the Site. However, MITx reserves
the right to review User Postings and to edit or remove, in whole or
in part, such User Postings in its sole discretion. If notified by a
User or a content owner of a User Posting that allegedly does not
conform to the TOS, MIT may investigate the allegation and determine
in its sole discretion whether to remove the User Posting, which it
reserves the right to do at any time and without notice. </p>
<p><strong>Links to Other Sites.</strong> The Site may include
hyperlinks to sites maintained or controlled by others. MIT is not
responsible for and does not routinely screen, approve, review or
endorse the contents of or use of any of the products or services that
may be offered at these sites. MIT does MIT make any warranty or
representation regarding any linked third party web sites or the
information or materials appearing thereon or any of the products or
services described thereon. Hyperlinks do not imply that MIT is
affiliated or associated with, the linked-third party site. If
you decide to access linked third party web sites, you do so at your
own risk.</p>
<strong>
<p>YOU AGREE THAT MIT WILL NOT BE LIABLE TO YOU FOR ANY LOSS OR
DAMAGES, EITHER ACTUAL OR CONSEQUENTIAL, ARISING OUT OF OR RELATING TO
THESETOS, OR TO YOUR (OR ANY THIRD PARTY&#39;S) USE OR INABILITY TO
USE THE SITE, OR TO YOUR PLACEMENT OF CONTENT ON THE SITE, OR TO YOUR
RELIANCE UPON INFORMATION OBTAINED FROM OR THROUGH THE SITE WHETHER
BASED IN CONTRACT, TORT, STATUTORY OR OTHER LAW, EXCEPT ONLY IN THE
CASE OF DEATH OR PERSONAL INJURY WHERE AND ONLY TO THE EXTENT THAT
APPLICABLE LAW REQUIRES SUCH LIABILITY. </p>
<p>IN PARTICULAR, MIT WILL HAVE NO LIABILTY FOR ANY CONSEQUENTIAL,
INDIRECT, PUNITIVE, SPECIAL, EXEMPLARY OR INCIDENTAL DAMAGES, WHETHER
FORESEEABLE OR UNFORESEEABLE, (INCLUDING, BUT NOT LIMITED TO, CLAIMS
FOR DEFAMATION, ERRORS, LOSS OF DATA, OR INTERRUPTION IN AVAILABILITY
OF DATA).</p>
</strong>
<h2>Indemnification</h2>
<p>You agree to defend, hold harmless and indemnify MIT, and its
subsidiaries, affiliates, officers, agents, and employees from and
against any third-party claims, actions or demands arising out of,
resulting from or in any way related to your use of the Site,
including any liability or expense arising from any and all claims,
losses, damages (actual and consequential), suits, judgments,
litigation costs and attorneys&#39; fees, of every kind and nature. In
such a case, MIT will provide you with written notice of such claim,
suit or action.</p>
<h2>Miscellaneous</h2>
<p><strong>Termination Rights.</strong> You agree that MIT, in its sole
discretion, may terminate your use of the Site or your participation
in it thereof, for any reason or no reason. If you no longer desire to
participate in the Site, you may terminate your participation therein
upon notice to MIT.</p>
<p><strong>Entire Agreement.</strong> This Agreement constitutes the entire agreement
between you and MIT with respect to your use of the Site, superseding
any prior agreements between you and MIT regarding your use of the
Site. </p>
<p><strong>Waiver and Severability of TOS.</strong> The failure of MIT to exercise or
enforce any right or provision of the TOS of Site shall not constitute
a waiver of such right or provision. If any provision of the TOS is
found by a court of competent jurisdiction to be invalid, the parties
nevertheless agree that the court should endeavor to give effect to
the parties&#39; intentions as reflected in the provision, and the
other provisions of the TOS remain in full force and effect.</p>
<p><strong>Choice of Law/Forum Selection.</strong> You agree that any dispute
arising out of or relating to these Terms or any content posted to a
Site will be governed by the laws of the Commonwealth of
Massachusetts, excluding its conflicts of law provisions. You further
consent to the personal jurisdiction of and exclusive venue in the
federal and state courts located in and serving Boston, Massachusetts
as the legal forum for any such dispute.</p>
<p><strong>Effective Date:</strong> January 30, 2012</p><div>
</div>
</section>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment