From 43b3bd31b8c15473b479abc298c04e72d6bdba39 Mon Sep 17 00:00:00 2001 From: Martin Castner Date: Wed, 2 Mar 2011 03:04:18 -0500 Subject: [PATCH 01/30] Change the next page links at the bottom of each page to large arrow buttons. --- basic/index.html | 2 +- branching/index.html | 2 +- creating/index.html | 2 +- css/layout.css | 59 ++++++++++++++++++++++++++++++++++++++++++++ index.html | 2 +- remotes/index.html | 2 +- 6 files changed, 64 insertions(+), 5 deletions(-) diff --git a/basic/index.html b/basic/index.html index 4f8327b..271ca14 100644 --- a/basic/index.html +++ b/basic/index.html @@ -747,5 +747,5 @@ M hello.rb -

On to Branching and Merging »

+

On to Branching and Merging »

diff --git a/branching/index.html b/branching/index.html index 21ca658..e1eadff 100644 --- a/branching/index.html +++ b/branching/index.html @@ -775,5 +775,5 @@ ab5ab4c added erlang -

On to Sharing and Updating Projects »

+

On to Sharing and Updating Projects »

diff --git a/creating/index.html b/creating/index.html index eebacd3..5d5bf52 100644 --- a/creating/index.html +++ b/creating/index.html @@ -134,4 +134,4 @@ config index objects -

On to Basic Snapshotting »

+

On to Basic Snapshotting »

diff --git a/css/layout.css b/css/layout.css index 3d1bbe7..19cda29 100755 --- a/css/layout.css +++ b/css/layout.css @@ -123,6 +123,65 @@ a { a:hover { color:#333; } +a.page-button { + background: #e4eafa none 0 0 repeat-x; + border: solid 1px #c9172e; + color: #c9172e; + cursor: pointer; + display: inline-block; + font-weight: bold; + font-size: 12px; + line-height: 100%; + margin: 1px; + padding: 0.8em 1em; + position: relative; + text-decoration: none; + text-shadow: #fff 0 1px 0; + vertical-align: middle; + white-space: nowrap; + float:right; + background-image: -moz-linear-gradient(-90deg, + #eeeeee 1%, + #fdf6f7 5%, + #fae9eb 70%, + #f7dcdf 100%); + background-image: -webkit-gradient(linear,left top,left bottom, + color-stop(0.01, #eee), + color-stop(0.05, #fdf6f7), + color-stop(0.70, #fae9eb), + color-stop(1, #f7dcdf)); +} +a.next-page { + border-right: none; + margin-right: 26px; + padding-right: 0; +} +a.next-page:after, a.prev-page:after { + border: solid 1px #c9172e; + content: ''; + display: block; + position: absolute; + top: .37em; + width: 1.7em; + height: 1.7em; + text-shadow: none; + z-index: -1; +} +a.next-page:after { + right: -.97em; + -moz-transform: rotate(-45deg); + background-image: -moz-linear-gradient(-135deg, + #eeeeee 1%, + #fdf6f7 5%, + #fae9eb 70%, + #f7dcdf 100%); + -webkit-transform:rotate(-45deg); + background-image: -webkit-gradient(linear,100% 0%, 0% 100%, + color-stop(0.1, #eee), + color-stop(0.05, #fdf6f7), + color-stop(0.70, #fae9eb), + color-stop(1, #f7dcdf)); +} /* headings ----------------------------------------------- */ diff --git a/index.html b/index.html index 2e95c73..07449e9 100644 --- a/index.html +++ b/index.html @@ -109,4 +109,4 @@ layout: reference -

On to Getting and Creating Projects »

+

On to Getting and Creating Projects »

diff --git a/remotes/index.html b/remotes/index.html index df16b27..560709a 100644 --- a/remotes/index.html +++ b/remotes/index.html @@ -340,4 +340,4 @@ fast-forwards' section of 'git push --help' for details. -

On to Inspection and Comparison »

+

On to Inspection and Comparison »

From de6236c22dc7de5151dee73466ceaf0baea65bd8 Mon Sep 17 00:00:00 2001 From: Martin Castner Date: Wed, 2 Mar 2011 03:14:04 -0500 Subject: [PATCH 02/30] Fixed typo in CSS for webkit-gradient on the arrow tip --- css/layout.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/layout.css b/css/layout.css index 19cda29..1c324ab 100755 --- a/css/layout.css +++ b/css/layout.css @@ -177,7 +177,7 @@ a.next-page:after { #f7dcdf 100%); -webkit-transform:rotate(-45deg); background-image: -webkit-gradient(linear,100% 0%, 0% 100%, - color-stop(0.1, #eee), + color-stop(0.01, #eee), color-stop(0.05, #fdf6f7), color-stop(0.70, #fae9eb), color-stop(1, #f7dcdf)); From fdc2cc52b411312d31338497e0b5b29e97881944 Mon Sep 17 00:00:00 2001 From: Michael Lehenbauer Date: Sun, 3 Apr 2011 16:17:00 -0700 Subject: [PATCH 03/30] Add note that ^ is a special character in windows. --- branching/index.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/branching/index.html b/branching/index.html index 21ca658..7d01b4d 100644 --- a/branching/index.html +++ b/branching/index.html @@ -665,6 +665,9 @@ b7ae93b added from ruby front of the branch that we don't want to see. For instance, if we want to see the commits that are in the 'erlang' branch that are not in the 'master' branch, we can do erlang ^master, or vice versa. + Note that the Windows command-line treats ^ as a special + character, in which case you'll need to surround ^master + in quotes. 


From 39dbc55a493b46f3a9631af99ff84ff54cd9f119 Mon Sep 17 00:00:00 2001
From: Michael Lehenbauer 
Date: Sun, 3 Apr 2011 16:25:13 -0700
Subject: [PATCH 04/30] Fix "elses" to "else's"

---
 remotes/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/remotes/index.html b/remotes/index.html
index df16b27..1b5b371 100644
--- a/remotes/index.html
+++ b/remotes/index.html
@@ -94,7 +94,7 @@ origin	git@github.com:schacon/git-reference.git (push)
     
 
     
If you want to share a locally created repository, or you want to take
-    contributions from someone elses repository - if you want to interact in
+    contributions from someone else's repository - if you want to interact in
     any way with a new repository, it's generally easiest to add it as a remote.
     You do that by running git remote add [alias] [url].  That
     adds [url] under a local remote named [alias].


From 0ff60161a0567dbe065e3b3fb496798b7f5d8e14 Mon Sep 17 00:00:00 2001
From: Gautier Nilhcem 
Date: Wed, 21 Sep 2011 20:10:13 +0800
Subject: [PATCH 05/30] Typo fixing

---
 remotes/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/remotes/index.html b/remotes/index.html
index df16b27..403e6cf 100644
--- a/remotes/index.html
+++ b/remotes/index.html
@@ -193,7 +193,7 @@ github	git@github.com:schacon/hw.git (push)
     immediately followed by a git merge of the branch on that remote
     that is tracked by whatever branch you are currently in.  I personally don't much
     like this command - I prefer running fetch and merge
-    seperately.  Less magic, less problems.  However, if you like this idea, you
+    separately.  Less magic, less problems.  However, if you like this idea, you
     can read about it in more detail in the
     official docs.
     


From edadb621041e26e0c0c69d3ad90c67a85f7fc90e Mon Sep 17 00:00:00 2001
From: dstine 
Date: Wed, 14 Dec 2011 15:30:05 -0500
Subject: [PATCH 06/30] fixed typo

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 2e95c73..cc715ef 100644
--- a/index.html
+++ b/index.html
@@ -15,7 +15,7 @@ layout: reference
     

     Each section will link to the next section, so it can be used
     as a tutorial.  Every page will also link to more in-depth
-    Git documentation such as the offical manual pages and relevant
+    Git documentation such as the official manual pages and relevant
     sections in the Pro Git book, 
     so you can learn more about any of 
     the commands. First, we'll start with thinking about source code 

From d9f8826bed0fce0a4d4f20f077a242be5b43633b Mon Sep 17 00:00:00 2001
From: Hristo Hristov 
Date: Mon, 16 Jan 2012 13:41:14 +0200
Subject: [PATCH 07/30] fix typo on the main page

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 2e95c73..3da25bb 100644
--- a/index.html
+++ b/index.html
@@ -28,7 +28,7 @@ layout: reference
   
How to Think Like Git

   

     

-    This first thing that is important to understand about Git is
+    The first thing that is important to understand about Git is
     that it thinks about version control very differently than 
     Subversion or Perforce or whatever SCM you may be used to. It
     is often easier to learn Git by trying to forget your assumptions

From 5d4495f0136a2f208a7c2d3bd003b7d89c642c85 Mon Sep 17 00:00:00 2001
From: CzBiX 
Date: Sun, 19 Feb 2012 23:17:00 +0800
Subject: [PATCH 08/30] fix typo

---
 zh/basic/index.html     | 32 ++++++++++++++++----------------
 zh/branching/index.html | 10 +++++-----
 zh/creating/index.html  | 12 ++++++------
 zh/index.html           |  6 +++---
 zh/inspect/index.html   |  4 ++--
 zh/remotes/index.html   |  8 ++++----
 6 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/zh/basic/index.html b/zh/basic/index.html
index 8b30612..6626a71 100644
--- a/zh/basic/index.html
+++ b/zh/basic/index.html
@@ -7,19 +7,19 @@ layout: zh_reference
     
       书
     
-    基本的快照
+    基本快照
   
   

     

-    Git 的所有工作就是创建与保存您的项目的快照以及之后的快照对比等工作。本章将对有关创建与提交您的项目的快照的命令作介绍。
+    Git 的工作就是创建和保存您的项目的快照并和之后的快照进行对比。本章将对有关创建与提交您的项目的快照的命令作介绍。
     

 
     

-    这里有个重要的概念，Git 有一个叫做“索引”的东东，有点像是您的快照的缓存区。这就使您能够从更改的文件中创建出一系列组织良好的快照，而不是一次提交所有的更改。
+    这里有个重要的概念，Git 有一个叫做“索引”的东东，有点像是您的快照的缓存区。这使得Git能够很方便的从更改的文件中创建出一系列的快照，而不是一次提交所有的更改。
     

 
     

-	一言以蔽之，使用 git add 添加需要追踪的新文件和待提交的更改，然后使用 git status 和 git diff 查看有何改动，最后用 git commit 将您的快照记录。这就是您要用的基本流程，绝大部分时候都是这样的。
+	简而言之，使用 git add 添加需要追踪的新文件和待提交的更改，然后使用 git status 和 git diff 查看有何改动，最后用 git commit 将您的快照记录。这就是您要用的基本流程，绝大部分时候都是这样的。
     

 
   

@@ -37,7 +37,7 @@ layout: zh_reference
 
   

 	

-	在 Git 中，在提交您修改的文件之前，您需要把它们添加到缓存。如果该文件是新的，您可以执行 git add 将该文件添加到缓存，但是，即使该文件已经被追踪了 —— 也就是说，曾经提交过了 —— 你仍然需要执行 git add 将新更改的文件添加到缓存去。让我们看几个例子：
+	在 Git 中，在提交您修改的文件之前，您需要把它们添加到缓存。如果该文件是新创建的，您可以执行 git add 将该文件添加到缓存，但是，即使该文件已经被追踪了 —— 也就是说，曾经提交过了 —— 你仍然需要执行 git add 将新更改的文件添加到缓存去。让我们看几个例子：
     

 
 	
回到我们的 Hello World 示例，初始化该项目之后，我们就要用 git add 将我们的文件添加进去了。我们可以用 git status 看看我们的项目的当前状态。
@@ -76,12 +76,12 @@ layout: zh_reference

- “AM” 状态的意思是，这个文件在我们将它添加到缓存之后又有改动。这意味着如果我们现在提交快照，我们记录的将是上次跑 git add 的时候的文件版本，而不是现在在磁盘中的这个。Git 并不认为磁盘中的文件与您想快照的文件必须是一致的 —— （如果您需要它们一致，）得用 git add 命令告诉它。 + “AM” 状态的意思是，这个文件在我们将它添加到缓存之后又有改动。这意味着如果我们现在提交快照，我们提交的将是上次执行 git add 的时候的文件版本，而不是现在在磁盘中的这个。Git 并不认为磁盘中的文件与您想快照的文件必须是一致的 —— （如果您需要它们一致，）得用 git add 命令告诉它。

- 一言以蔽之， - 当您要将您的修改包含在即将提交的快照里的时候，执行 git add。任何您没有添加的改动都不会被包含在内 —— 这意味着您可以比绝大多数其他源代码版本控制系统更精确地归置您的快照。 + 简而言之， + 当您想要将您的修改包含在即将提交的快照里的时候，执行 git add。任何您没有添加的改动都不会被包含在内 —— 这意味着您可以比其他的绝大多数源代码版本控制系统更精确地控制您的快照。

请查看《Pro Git》中 git add 的 “-p” 参数，以了解更多关于提交文件的灵活性的例子。 @@ -102,7 +102,7 @@ layout: zh_reference

-

正如您在 git add 小节中所看到的，您可以执行 git status 命令查看您的代码在缓存与当前工作目录的状态。我演示该命令的时候加了 -s 参数，以获得简短的结果输出。若没有这个标记，命令 git status 将告诉您更多的提示与上下文欣喜。以下便是同样状态下，有跟没有 -s 参数的输出对比。简短的输出如下： +

正如您在 git add 小节中所看到的，您可以执行 git status 命令查看您的代码在缓存与当前工作目录的状态。我演示该命令的时候加了 -s 参数，以获得简短的结果输出。若没有这个标记，命令 git status 将告诉您更多的提示与上下文信息。以下便是同样状态下，有跟没有 -s 参数的输出对比。简短的输出如下： 

@@ -153,7 +153,7 @@ layout: zh_reference

- 一言以蔽之，执行 git status 以查看在您上次提交之后有啥被修改或者临时提交了，从而决定自己是否需要提交一次快照，同时也能知道有什么改变被记录进去了。 + 简而言之，执行 git status 以查看在您上次提交之后有啥被修改或者临时提交了，从而决定自己是否需要提交一次快照，同时也能知道有什么改变被记录进去了。

@@ -327,7 +327,7 @@ index 2aabb6e..2ae9ba4 100644

- 一言以蔽之， + 简而言之， 执行 git diff 来查看执行 git status 的结果的详细信息 —— 一行一行地显示这些文件是如何被修改或写入缓存的。

@@ -466,7 +466,7 @@ nothing to commit (working directory clean)

- 一言以蔽之，执行 git commit 记录缓存区的快照。这个快照就可以用来做比较、分享以及，如果需要，恢复。 + 简而言之，执行 git commit 记录缓存区的快照。如果需要的话，这个快照可以用来做比较、共享以及恢复。

@@ -513,7 +513,7 @@ M hello.rb

- 如果您好奇，它实际的操作是将该文件在“索引”中的校验和重置为最近一次提交中的值。git add 会计算一个文件的校验和，将它添加到“索引”中，而 git reset HEAD 将它改写回原先的，从而取消缓存。 + 如果您好奇，它实际的操作是将该文件在“索引”中的校验和重置为最近一次提交中的值。git add 会计算一个文件的校验和，将它添加到“索引”中，而 git reset HEAD 将它改写回原先的，从而取消缓存操作。

@@ -535,7 +535,7 @@ M hello.rb

- 一言以蔽之，执行 git reset HEAD 以取消之前 git add 添加，但不希望包含在下一提交快照中的缓存。 + 简而言之，执行 git reset HEAD 以取消之前 git add 添加，但不希望包含在下一提交快照中的缓存。

@@ -571,11 +571,11 @@ M hello.rb

- 我自己不会用此命令的普通形式 —— 删除文件。通常直接从硬盘删除文件，然后执行 git commit -a 会简单些。它会自动将删除的文件从索引中移除。 + 我自己并不使用此命令的普通形式 —— 删除文件。通常直接从硬盘删除文件，然后执行 git commit -a 会简单些。它会自动将删除的文件从索引中移除。

- 一言以蔽之， + 简而言之， 执行 git rm 来删除 Git 追踪的文件。它还会删除您的工作目录中的相应文件。

diff --git a/zh/branching/index.html b/zh/branching/index.html index 0d3ec51..b79ae65 100644 --- a/zh/branching/index.html +++ b/zh/branching/index.html @@ -14,7 +14,7 @@ layout: zh_reference

- 一言以蔽之，您可以执行 git branch (branchname) 来创建分支，使用 git checkout (branchname) 命令切换到该分支，在该分支的上下文环境中，提交快照等，之后可以很容易地来回切换。当您切换分支的时候，Git 会用该分支的最后提交的快照替换您的工作目录的内容，所以多个分支不需要多个目录。使用 git merge 来合并分支。您可以多次合并到统一分支，也可以选择在合并之后直接删除被并入的分支。 + 简而言之，您可以执行 git branch (branchname) 来创建分支，使用 git checkout (branchname) 命令切换到该分支，在该分支的上下文环境中，提交快照等，之后可以很容易地来回切换。当您切换分支的时候，Git 会用该分支的最后提交的快照替换您的工作目录的内容，所以多个分支不需要多个目录。使用 git merge 来合并分支。您可以多次合并到统一分支，也可以选择在合并之后直接删除被并入的分支。

@@ -50,7 +50,7 @@ layout: zh_reference 列出可用的分支 -

没有参数是，git branch 会列出您在本地的分支。您所在的分支的行首会有个星号作标记。如果您开启了彩色模式，当前分支会用绿色显示。 +

没有参数是，git branch 会列出您在本地的分支。您当前所在的分支的行首会有个星号作标记。如果您开启了彩色模式，当前分支会用绿色显示。 

@@ -167,7 +167,7 @@ Deleted branch testing (was 78b2670).

- 一言以蔽之 使用 git branch 列出现有的分支、创建新分支以及删除不必要或者已合并的分支。 + 简而言之 使用 git branch 列出现有的分支、创建新分支以及删除不必要或者已合并的分支。

@@ -377,7 +377,7 @@ M README

- 一言以蔽之 使用 git merge 将另一个分支并入当前的分支中去。Git 会自动以最佳方式将两个不同快照中独特的工作合并到一个新快照中去。 + 简而言之 使用 git merge 将另一个分支并入当前的分支中去。Git 会自动以最佳方式将两个不同快照中独特的工作合并到一个新快照中去。

@@ -551,7 +551,7 @@ ab5ab4c added erlang

- 一言以蔽之 使用 git log 列出促成当前分支目前的快照的提交历史记录。这使您能够看到项目是如何到达现在的状况的。 + 简而言之 使用 git log 列出促成当前分支目前的快照的提交历史记录。这使您能够看到项目是如何到达现在的状况的。

diff --git a/zh/creating/index.html b/zh/creating/index.html index c1c4b70..a866cce 100644 --- a/zh/creating/index.html +++ b/zh/creating/index.html @@ -51,7 +51,7 @@ Initialized empty Git repository in /opt/konichiwa/.git/ 恭喜，现在您就有了一个 Git 仓库的架子，可以开始快照您的项目了。

- 一言以蔽之，用 git init 来在目录中创建新的 Git 仓库。您可以在任何时候、任何目录中这么做，完全是本地化的。 + 简而言之，用 git init 来在目录中创建新的 Git 仓库。您可以在任何时候、任何目录中这么做，完全是本地化的。

@@ -68,7 +68,7 @@ Initialized empty Git repository in /opt/konichiwa/.git/

- 如果您需要与他人合作一个项目，或者想要拷贝一个项目，看看代码，您就可以克隆那个项目。执行 git clone [url]，[url] 为您想要拷贝的项目，就可以了。 + 如果您需要与他人合作一个项目，或者想要复制一个项目，看看代码，您就需要克隆那个项目。执行 git clone [url]，[url] 为您想要拷贝的项目，就可以了。 

@@ -85,7 +85,7 @@ README   Rakefile lib

- 上述操作将拷贝该项目的全部记录，让您本地拥有这些。并且该操作将拷贝该项目的主分支，是您能够查看代码，或编辑修改。进到该目录中，您会看到 .git 子目录。所有的项目数据都存在那里。 + 上述操作将拷贝该项目的全部记录，让您本地拥有这些。并且该操作将拷贝该项目的主分支，使您能够查看代码，或进行编辑和修改。进到该目录中，您会看到 .git 子目录。所有的项目数据都存在这里。 

@@ -99,14 +99,14 @@ config      index       objects

- 默认情况下，Git 会按照您提供的 URL 所指示的项目的名称创建您的本地项目目录。通常就是该 URL 最后一个 / 之后的任何东西。如果你想要一个不一样的名字，您可以在该命令后加上它，就在那个 URL 后面。 + 默认情况下，Git 会按照您提供的 URL 所指示的项目的名称创建您的本地项目目录。通常就是该 URL 最后一个 / 之后的任何东西。您可以在该命令后(即那个 URL 后面)加上它你想要的目录名。

- 一言以蔽之，使用 git clone 本地拷贝一个 Git 仓库，让自己能够查看该项目，或者动手修改 + 简而言之，使用 git clone 拷贝一个 Git 仓库到本地，让自己能够查看该项目，或者进行修改。

-

接下来：简单快照 »

+

接下来：基本快照 »

diff --git a/zh/index.html b/zh/index.html index 87ff301..050044a 100644 --- a/zh/index.html +++ b/zh/index.html @@ -45,9 +45,9 @@ layout: zh_reference $ unzip project.2010-06-01.zip $ cp -R project.2010-06-01 project-my-copy $ cd project-my-copy - $ (改了些东西) + $ (做了某些修改) $ diff project-my-copy project.2010-06-01 > change.patch - $ (email change.patch) + $ (通过E-mail发送修改补丁)

以此方式，原先的开发者就能将其他人的改动应用到他的项目中去，其他开发者也能了解您做的变更。其实这便是许多开源项目采用过多年的协作方式。 @@ -64,7 +64,7 @@ layout: zh_reference

- 如果您可以将 Git 看作一个排序、对比以及合并项目更新的工具，那就容易理解状况和正确做事了。 + 如果您将 Git 看作一个排序、对比以及合并项目更新的工具，那就很容易理解并正确做事了。

diff --git a/zh/inspect/index.html b/zh/inspect/index.html index 8beb832..5ec9b4b 100644 --- a/zh/inspect/index.html +++ b/zh/inspect/index.html @@ -15,7 +15,7 @@ layout: zh_reference

- 一言以蔽之 执行 git log 找到您的项目历史中的特定提交 —— 按作者、日期、内容或者历史记录。执行 git diff 比较历史记录中的两个不同的点 —— 通常是为了看看两个分支有啥区别，或者从某个版本到另一个版本，您的软件都有啥变化。 + 简而言之 执行 git log 找到您的项目历史中的特定提交 —— 按作者、日期、内容或者历史记录。执行 git diff 比较历史记录中的两个不同的点 —— 通常是为了看看两个分支有啥区别，或者从某个版本到另一个版本，您的软件都有啥变化。

@@ -405,7 +405,7 @@ index bb86f00..192151c 100644

- 一言以蔽之 使用 git diff 查看某一分支自它偏离出来起与过去某一点之间项目的改动。总是使用 git diff branchA...branchB 来查看 branchB 与 branchA 的相对差值，这会让事情简单点。 + 简而言之 使用 git diff 查看某一分支自它偏离出来起与过去某一点之间项目的改动。总是使用 git diff branchA...branchB 来查看 branchB 与 branchA 的相对差值，这会让事情简单点。

diff --git a/zh/remotes/index.html b/zh/remotes/index.html index 5ea6dcb..61bad34 100644 --- a/zh/remotes/index.html +++ b/zh/remotes/index.html @@ -23,7 +23,7 @@ layout: zh_reference

- 一言以蔽之 使用 git fetch 更新您的项目，使用 git push 分享您的改动。您可以用 git remote 管理您的远程仓库。 + 简而言之 使用 git fetch 更新您的项目，使用 git push 分享您的改动。您可以用 git remote 管理您的远程仓库。

@@ -118,7 +118,7 @@ github git@github.com:schacon/hw.git (push)

- 一言以蔽之 您可以用 git remote 列出您的远端仓库和那些仓库的链接。您可以使用 git remote add 添加新的远端仓库，用 git remote rm 删掉已存在的那些。 + 简而言之 您可以用 git remote 列出您的远端仓库和那些仓库的链接。您可以使用 git remote add 添加新的远端仓库，用 git remote rm 删掉已存在的那些。

@@ -186,7 +186,7 @@ From github.com:schacon/hw

- 一言以蔽之 执行 git fetch [alias] 来将您的仓库与远端仓库同步，提取所有它独有的数据到本地分支以合并或者怎样。 + 简而言之 执行 git fetch [alias] 来将您的仓库与远端仓库同步，提取所有它独有的数据到本地分支以合并或者怎样。

@@ -265,7 +265,7 @@ fast-forwards' section of 'git push --help' for details.

- 一言以蔽之 执行 git push [alias] [branch] 将您的本地改动推送到远端仓库。如果可以的话，它会依据您的 [branch] 的样子，推送到远端的 [branch] 去。如果在您上次提取、合并之后，另有人推送了，Git 服务器会拒绝您的推送，知道您是最新的为止。 + 简而言之 执行 git push [alias] [branch] 将您的本地改动推送到远端仓库。如果可以的话，它会依据您的 [branch] 的样子，推送到远端的 [branch] 去。如果在您上次提取、合并之后，另有人推送了，Git 服务器会拒绝您的推送，知道您是最新的为止。

From 571b99207cb2515f2e9d93bc923353146864edc5 Mon Sep 17 00:00:00 2001 From: Shezan Baig Date: Wed, 4 Apr 2012 19:23:34 -0400 Subject: [PATCH 09/30] remove erroneous status line for hello.rb --- branching/index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/branching/index.html b/branching/index.html index 21ca658..dcfceb3 100644 --- a/branching/index.html +++ b/branching/index.html @@ -292,7 +292,6 @@ HelloWorld.hello 
 $ git checkout -b change_class
-M hello.rb
 Switched to a new branch 'change_class'
 $ vim hello.rb 
 $ head -1 hello.rb 

From d65f630d79e255808110cc9d893974de9156318e Mon Sep 17 00:00:00 2001
From: James Sadler 
Date: Tue, 10 Apr 2012 12:06:13 +1000
Subject: [PATCH 10/30] Correct the doc for git log --since --before
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

"By default, “git log” displays author dates as “Date” but then uses commit
dates when given a –since option. That seems like broken defaults to me."
    - http://www.alexpeattie.com/blog/working-with-dates-in-git/

 filter commits by date authored

should be

 filter commits by date committed
---
 inspect/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inspect/index.html b/inspect/index.html
index c8b3f48..ebd3eec 100644
--- a/inspect/index.html
+++ b/inspect/index.html
@@ -73,7 +73,7 @@ b532581 make "git unpack-file" a built-in
 
     

       git log --since --before
-      filter commits by date authored
+      filter commits by date committed
     

 
     


From c3164a32f7f4f217bb5836e2f4a767f5e6adeffb Mon Sep 17 00:00:00 2001
From: Ping Yin 
Date: Sat, 14 Apr 2012 20:36:24 +0800
Subject: [PATCH 11/30] Fix broken links in zh layout

---
 _layouts/zh_reference.html | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/_layouts/zh_reference.html b/_layouts/zh_reference.html
index b756ff2..91e0f85 100755
--- a/_layouts/zh_reference.html
+++ b/_layouts/zh_reference.html
@@ -3,13 +3,13 @@
 	
 		
 		Git 参考手册
-		
-		
-		
-		
-		
-		
-		
+		
+		
+		
+		
+		
+		
+		
 		
 		
 		
@@ -24,10 +24,10 @@
 			

 				
         

          
@@ -84,13 +84,13 @@
 
           

From 7fa5d14fcb9660cc6810c8ef51f367eda671208c Mon Sep 17 00:00:00 2001
From: Jeffrey Guenther 
Date: Tue, 15 May 2012 21:59:36 -0700
Subject: [PATCH 12/30] Fixed docs link to link to git-scm/docs pages

---
 creating/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/creating/index.html b/creating/index.html
index eebacd3..78c3127 100644
--- a/creating/index.html
+++ b/creating/index.html
@@ -23,7 +23,7 @@ layout: reference
 

   

     
-      docs  
+      docs  
       book
     
     git init
@@ -74,7 +74,7 @@ Initialized empty Git repository in /opt/konichiwa/.git/
 

   

     
-      docs  
+      docs  
       book
     
     git clone

From f7fb27242bc3087403815f24defd6ad09a6b2ec9 Mon Sep 17 00:00:00 2001
From: Jeffrey Guenther 
Date: Tue, 15 May 2012 22:02:49 -0700
Subject: [PATCH 13/30] Fixed links to refer to git-scm docs

---
 basic/index.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/basic/index.html b/basic/index.html
index 4f8327b..9f4b47e 100644
--- a/basic/index.html
+++ b/basic/index.html
@@ -38,7 +38,7 @@ layout: reference
 

   

     
-      docs  
+      docs  
       book
     
     git add
@@ -130,7 +130,7 @@ layout: reference
 

   

     
-      docs  
+      docs  
       book
     
     git status
@@ -214,7 +214,7 @@ layout: reference
 

   

     
-      docs  
+      docs  
       book
     
     git diff
@@ -416,7 +416,7 @@ index 2aabb6e..2ae9ba4 100644
 

   

     
-      docs  
+      docs  
       book
     
     git commit
@@ -596,7 +596,7 @@ Further paragraphs come after blank lines.
 

   

     
-      docs  
+      docs  
       book
     
     git reset HEAD
@@ -694,7 +694,7 @@ M hello.rb
 

   

     
-      docs  
+      docs  
       book
     
     git rm

From ea759dbf93636d2c148b929b0974450885f7689f Mon Sep 17 00:00:00 2001
From: Jeffrey Guenther 
Date: Tue, 15 May 2012 22:06:49 -0700
Subject: [PATCH 14/30] Fixed docs links to link to git-scm/docs

---
 branching/index.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/branching/index.html b/branching/index.html
index 21ca658..ce5bc3f 100644
--- a/branching/index.html
+++ b/branching/index.html
@@ -38,7 +38,7 @@ layout: reference
 

   

     
-      docs  
+      docs  
       book
     
     git branch
@@ -49,7 +49,7 @@ layout: reference
 
   

     
-      docs  
+      docs  
       book
     
     git checkout
@@ -226,7 +226,7 @@ Deleted branch testing (was 78b2670).
 

   

     
-      docs  
+      docs  
       book
     
     git merge
@@ -421,7 +421,7 @@ nearly every programming language.
     
You can see that Git inserts standard merge conflict markers, much like
       Subversion, into files when it gets a merge conflict.  Now it's up to us
       to resolve them.  We will do it manually here, but check out
-      git mergetool
+      git mergetool
       if you want Git to fire up a graphical mergetool
       (like kdiff3, emerge, p4merge, etc) instead.
     

@@ -473,7 +473,7 @@ M  README
 

   

     
-      docs  
+      docs  
       book
     
     git log
@@ -693,7 +693,7 @@ ab5ab4c added erlang
 

   

     
-      docs  
+      docs  
       book
     
     git tag

From 629b181421e8b90aef4a3f529e3f0fa8cdae7295 Mon Sep 17 00:00:00 2001
From: Jeffrey Guenther 
Date: Tue, 15 May 2012 22:09:16 -0700
Subject: [PATCH 15/30] Fixed docs links to point to git-scm/docs

---
 inspect/index.html |  4 ++--
 remotes/index.html | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/inspect/index.html b/inspect/index.html
index c8b3f48..c882b52 100644
--- a/inspect/index.html
+++ b/inspect/index.html
@@ -30,7 +30,7 @@ layout: reference
 

   

     
-      docs  
+      docs  
       book
     
     git log
@@ -309,7 +309,7 @@ Date:   Fri Jun 4 12:58:53 2010 +0200
 

   

     
-      docs  
+      docs  
       book
     
     git diff
diff --git a/remotes/index.html b/remotes/index.html
index 403e6cf..a3487c2 100644
--- a/remotes/index.html
+++ b/remotes/index.html
@@ -43,7 +43,7 @@ layout: reference
 

   

     
-      docs  
+      docs  
       book
     
     git remote
@@ -159,7 +159,7 @@ github	git@github.com:schacon/hw.git (push)
 

   

     
-      docs  
+      docs  
       book
     
     git fetch
@@ -170,7 +170,7 @@ github	git@github.com:schacon/hw.git (push)
 
   

     
-      docs  
+      docs  
       book
     
     git pull
@@ -195,7 +195,7 @@ github	git@github.com:schacon/hw.git (push)
     like this command - I prefer running fetch and merge
     separately.  Less magic, less problems.  However, if you like this idea, you
     can read about it in more detail in the
-    official docs.
+    official docs.
     

 
     
Assuming you have a remote all set up and you want to pull in updates, you
@@ -254,7 +254,7 @@ From github.com:schacon/hw
 

   

     
-      docs  
+      docs  
       book
     
     git push

From c2b5d2d0cafcdc247833334482b1e8e7ebb91988 Mon Sep 17 00:00:00 2001
From: Mike Henke 
Date: Fri, 18 May 2012 13:43:56 -0500
Subject: [PATCH 16/30] change to &

---
 NOTES | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NOTES b/NOTES
index 67552ff..0d79389 100644
--- a/NOTES
+++ b/NOTES
@@ -1,7 +1,7 @@
 Introduction
 (how git is different)
 
-Getting and Creating Projects 
+Getting & Creating Projects 
 * init
 * clone
 

From 35d6a3e6c69b8d08c7901a50fcc706cb69c0c169 Mon Sep 17 00:00:00 2001
From: yicai 
Date: Mon, 11 Apr 2011 09:35:13 +0800
Subject: [PATCH 17/30] 1) do not track vim swap files; 2) stylesheet link href
 fix

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index a16c005..26d517e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 _site
 *~
+\.*.swp

From 79ba115ffb51ebc04266f09f964e8f9569df0101 Mon Sep 17 00:00:00 2001
From: yicai 
Date: Mon, 11 Apr 2011 09:38:45 +0800
Subject: [PATCH 18/30] git repo link fix

---
 _layouts/zh_reference.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_layouts/zh_reference.html b/_layouts/zh_reference.html
index 91e0f85..e26130b 100755
--- a/_layouts/zh_reference.html
+++ b/_layouts/zh_reference.html
@@ -27,7 +27,7 @@
           
 					
  • 关于
    • 
 					
  • §
    • 
-					
  • 网站源码
    • 
+					
  • 网站源码
    • 
         
         
    
          

From 5baac9cfcb1df16774b4a38c6ea6961f7fa967b0 Mon Sep 17 00:00:00 2001
From: yicai 
Date: Sat, 23 Apr 2011 16:21:07 +0800
Subject: [PATCH 19/30] fix typo; ignore .DS_Store

---
 .gitignore          | 2 ++
 zh/basic/index.html | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 26d517e..18fbd42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 _site
 *~
 \.*.swp
+.gitignore
+.DS_Store
diff --git a/zh/basic/index.html b/zh/basic/index.html
index 6626a71..c4d2eb2 100644
--- a/zh/basic/index.html
+++ b/zh/basic/index.html
@@ -458,7 +458,7 @@ nothing to commit (working directory clean)
  1 files changed, 2 insertions(+), 1 deletions(-)
    -

    注意，如果您如果您不缓存改动，直接执行 git commit，Git 会直接给出 git status 命令的输出，提醒您啥也没缓存。我已将该消息中的重要部分高亮，它说没有添加需要提交的缓存。如果您使用 -a，它会缓存并提交每个改动（不含新文件）。 +

    注意，如果您不缓存改动，直接执行 git commit，Git 会直接给出 git status 命令的输出，提醒您啥也没缓存。我已将该消息中的重要部分高亮，它说没有添加需要提交的缓存。如果您使用 -a，它会缓存并提交每个改动（不含新文件）。

    @@ -562,7 +562,7 @@ M hello.rb

    - git mv + git rm git rm --cached orig; mv orig new; git add new

    From b4085899c785b9bf1315a85d763457fa7b668ba5 Mon Sep 17 00:00:00 2001 From: yicai Date: Tue, 26 Apr 2011 16:06:58 +0800 Subject: [PATCH 20/30] fix typo --- zh/basic/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh/basic/index.html b/zh/basic/index.html index c4d2eb2..c0a7c72 100644 --- a/zh/basic/index.html +++ b/zh/basic/index.html @@ -562,7 +562,7 @@ M hello.rb

    - git rm + git mv git rm --cached orig; mv orig new; git add new

    From 9ac90d9106a0baff30885192b3068fa15fb17810 Mon Sep 17 00:00:00 2001 From: Jake Chen Date: Tue, 12 Jul 2011 10:33:18 +0800 Subject: [PATCH 21/30] github might require a push to remind itself that there's a gh-pages branch let's see if this will work --- CNAME | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CNAME b/CNAME index d12aa3f..f060bdb 100644 --- a/CNAME +++ b/CNAME @@ -1 +1 @@ -gitref.org +gitref.cyj.me From 5dea510cea15af27ceab04ad64078de7213cf244 Mon Sep 17 00:00:00 2001 From: Jake Chen Date: Wed, 29 Feb 2012 16:08:27 +0800 Subject: [PATCH 22/30] =?UTF-8?q?=E5=BF=BD=E8=A7=86=20Vim=20swap=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 18fbd42..b508919 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ _site *~ -\.*.swp +.*.swp .gitignore .DS_Store From 6906a995d1a5bfe95b32bfc3b869d9e5adbeefbe Mon Sep 17 00:00:00 2001 From: Matthew McCullough Date: Mon, 1 Oct 2012 10:02:57 -0600 Subject: [PATCH 23/30] Ignore swap files and .DS_Stores --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index b508919..8c57b68 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ _site *~ .*.swp -.gitignore .DS_Store From f381994ef2f0b6fd926287538b748bae5a8a7a03 Mon Sep 17 00:00:00 2001 From: Matthew McCullough Date: Mon, 1 Oct 2012 10:24:06 -0600 Subject: [PATCH 24/30] Replaces broken Kernel.org links with git-scm links. Fixes #30 --- zh/remotes/index.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/zh/remotes/index.html b/zh/remotes/index.html index 61bad34..fbffe4f 100644 --- a/zh/remotes/index.html +++ b/zh/remotes/index.html @@ -31,7 +31,7 @@ layout: zh_reference

    - 文档   + 文档   书 git remote @@ -127,7 +127,7 @@ github git@github.com:schacon/hw.git (push)

    - 文档   + 文档   书 git fetch @@ -138,7 +138,7 @@ github git@github.com:schacon/hw.git (push)

    - 文档   + 文档   书 git pull @@ -152,7 +152,7 @@ github git@github.com:schacon/hw.git (push)

    - 第二个会从远端服务器提取新数据的命令是 git pull。基本上，该命令就是在 git fetch 之后紧接着 git merge 远端分支到您所在的任意分支。我个人不太喜欢这命令 —— 我更喜欢 fetch 和 merge 分开来做。少点魔法，少点问题。不过，如果您喜欢这主意，您可以看一下 git pull 的 官方文档。 + 第二个会从远端服务器提取新数据的命令是 git pull。基本上，该命令就是在 git fetch 之后紧接着 git merge 远端分支到您所在的任意分支。我个人不太喜欢这命令 —— 我更喜欢 fetch 和 merge 分开来做。少点魔法，少点问题。不过，如果您喜欢这主意，您可以看一下 git pull 的 官方文档。

    @@ -196,7 +196,7 @@ From github.com:schacon/hw

    - 文档   + 文档   书 git push From 8ff0637a5cc485d6b1187abdf8619eefe894cfb7 Mon Sep 17 00:00:00 2001 From: Matthew McCullough Date: Mon, 1 Oct 2012 14:28:19 -0600 Subject: [PATCH 25/30] Remotes and links updated to reflect that GitHub as the owning organization --- _layouts/reference.html | 2 +- remotes/index.html | 4 ++-- zh/remotes/index.html | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/_layouts/reference.html b/_layouts/reference.html index 061f21c..8f9bd55 100755 --- a/_layouts/reference.html +++ b/_layouts/reference.html @@ -27,7 +27,7 @@
  • About
  • §
    • -
  • Site Source
    • +
  • Site Source

    •   diff --git a/remotes/index.html b/remotes/index.html index 94f41ec..62a1531 100644 --- a/remotes/index.html +++ b/remotes/index.html @@ -80,8 +80,8 @@ layout: reference $ git remote origin $ git remote -v -origin git@github.com:schacon/git-reference.git (fetch) -origin git@github.com:schacon/git-reference.git (push) +origin git@github.com:github/git-reference.git (fetch) +origin git@github.com:github/git-reference.git (push)

    You see the URL there twice because Git allows you to have different diff --git a/zh/remotes/index.html b/zh/remotes/index.html index fbffe4f..b5f5e7c 100644 --- a/zh/remotes/index.html +++ b/zh/remotes/index.html @@ -60,8 +60,8 @@ layout: zh_reference $ git remote origin $ git remote -v -origin git@github.com:schacon/git-reference.git (fetch) -origin git@github.com:schacon/git-reference.git (push) +origin git@github.com:github/git-reference.git (fetch) +origin git@github.com:github/git-reference.git (push)

    在此您看到了该链接两次，是因为 Git 允许您为每个远端仓库添加不同的推送与获取的链接，以备您读写时希望使用不同的协议。 From f1e74cb76a60bdb18a64f3f4540db1cfb7562ef6 Mon Sep 17 00:00:00 2001 From: Matthew McCullough Date: Mon, 1 Oct 2012 14:29:20 -0600 Subject: [PATCH 26/30] Restoring CNAME to gitref.org domain name after accidental merge pointed it to cyj.me domain --- CNAME | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CNAME b/CNAME index f060bdb..d12aa3f 100644 --- a/CNAME +++ b/CNAME @@ -1 +1 @@ -gitref.cyj.me +gitref.org From cc75e98bd5546f4eaa6b684bef57a8f529056544 Mon Sep 17 00:00:00 2001 From: Matthew McCullough Date: Mon, 1 Oct 2012 14:50:32 -0600 Subject: [PATCH 27/30] Matching colors to the training.github.com site --- css/layout.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/css/layout.css b/css/layout.css index 1c324ab..123a293 100755 --- a/css/layout.css +++ b/css/layout.css @@ -13,7 +13,7 @@ body { .info { background: #fff; padding: 10px;} -.article { border-bottom: 5px solid #c9182f; padding-bottom: 10px; margin-bottom: 15px;} +.article { border-bottom: 5px solid rgb(20,120,200); padding-bottom: 10px; margin-bottom: 15px;} .non_home_box { display: none; @@ -24,7 +24,7 @@ body { background: #fff; } #reflist h3 a { - color: #c9182f; + color: rgb(20,120,200); } #reflist h4 { font-size: 0.9em; } #reflist .block { margin: 0; padding: 0; } @@ -87,7 +87,7 @@ pre b { color: #111; } } ul#menu { - background: #c9182f; + background: rgb(20,120,200); padding: .5em; display: inline; color: #fff; @@ -189,7 +189,7 @@ h1, h2, h3, h4, h5, h6 {line-height:1.2em; margin-bottom:.3em;} h2 {margin-top:1em; } h5 {font-size:1.2em;} h6 {font-size:1em; text-transform:uppercase;} -h3 { color: #c9182f; } +h3 { color: rgb(20,120,200); } h1 a { font-weight:normal; From 395077b8e99df6a43fd0d0ecd04273f15d08fc1e Mon Sep 17 00:00:00 2001 From: Matthew McCullough Date: Mon, 1 Oct 2012 15:06:06 -0600 Subject: [PATCH 28/30] Removing execute bit from CSS files (unnecessary) --- css/960.css | 0 css/grid.css | 0 css/ie.css | 0 css/ie6.css | 0 css/layout.css | 0 css/nav.css | 0 css/reset.css | 0 css/text.css | 0 8 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 css/960.css mode change 100755 => 100644 css/grid.css mode change 100755 => 100644 css/ie.css mode change 100755 => 100644 css/ie6.css mode change 100755 => 100644 css/layout.css mode change 100755 => 100644 css/nav.css mode change 100755 => 100644 css/reset.css mode change 100755 => 100644 css/text.css diff --git a/css/960.css b/css/960.css old mode 100755 new mode 100644 diff --git a/css/grid.css b/css/grid.css old mode 100755 new mode 100644 diff --git a/css/ie.css b/css/ie.css old mode 100755 new mode 100644 diff --git a/css/ie6.css b/css/ie6.css old mode 100755 new mode 100644 diff --git a/css/layout.css b/css/layout.css old mode 100755 new mode 100644 diff --git a/css/nav.css b/css/nav.css old mode 100755 new mode 100644 diff --git a/css/reset.css b/css/reset.css old mode 100755 new mode 100644 diff --git a/css/text.css b/css/text.css old mode 100755 new mode 100644 From 8cdd61160188ccbd4634d70ca780fc0d2925f112 Mon Sep 17 00:00:00 2001 From: Matthew McCullough Date: Mon, 1 Oct 2012 15:17:55 -0600 Subject: [PATCH 29/30] Normalized styles with GitHub.com for code and training.github.com for Sans-Serif --- css/layout.css | 1376 ++++++++++++++++++++++++------------------------ 1 file changed, 688 insertions(+), 688 deletions(-) diff --git a/css/layout.css b/css/layout.css index 123a293..af99af3 100644 --- a/css/layout.css +++ b/css/layout.css @@ -1,688 +1,688 @@ -/* ------------------------------------------------ -Grey Box Method - Layout CSS ------------------------------------------------ */ - -body { - border-top: 5px solid #000; - color: #333; - padding: 0 0 40px; -} - -#about_me img { border: 5px solid #333; margin: 3px; } - -.info { background: #fff; padding: 10px;} - -.article { border-bottom: 5px solid rgb(20,120,200); padding-bottom: 10px; margin-bottom: 15px;} - -.non_home_box { - display: none; -} - -#reflist h3 { - font-size: 1.1em; - background: #fff; -} -#reflist h3 a { - color: rgb(20,120,200); -} -#reflist h4 { font-size: 0.9em; } -#reflist .block { margin: 0; padding: 0; } - -code { background: #ffe; padding: 2px 5px; } - -p.nutshell { - background: #ddd; - padding: 5px; -} - -.box pre { - margin-top: 10px; - padding: 8px; - background: #ffe; - color: #555; -} - -.box code.code { - white-space:pre; - font-family:monospace; - padding: 8px; - background: #ffe; - display: block; - margin: 10px; - color: #555; -} -pre b { color: #111; } -.red { color: #d33; } -.green { color: #383; } -.umber { color: #8A3324; } -.lblue { color: #55a; } -.blue { color: #447; } -.yellow { color: #993; } -.hl { background: #eea; } - -.box h4 { - font-family:monospace; - margin-top: 20px; - color: #833; -} -.box h4 small { - color: #888; - font-size: 0.8em; - margin-left: 10px; - font-weight: normal; -} - -.note { - float: right; - border: 10px; - padding: 8px; - background: #dfd; - border: 1px solid #8a8; - width: 120px; -} -.note h3 { - font-size: 1.1em; - color: #353; -} - -ul#menu { - background: rgb(20,120,200); - padding: .5em; - display: inline; - color: #fff; -} -ul#menu li { - border: 0; - margin: 0; - padding: 0; - padding-right: 10px; - padding-left: 10px; - display:inline; - font-family: "inconsolata-1","inconsolata-2"; - font-size: 1.1em; -} - -ul#menu li a { color: #fff; } - -.scribble-preview { - background: #ff9; - padding: 8px; - border: 1px solid #ee6; -} - -img#me { border: 8px solid #333; } - -/* anchors ------------------------------------------------ */ -a { - color: #000; - font-weight:bold; - text-decoration: none; -} -a:hover { - color:#333; -} -a.page-button { - background: #e4eafa none 0 0 repeat-x; - border: solid 1px #c9172e; - color: #c9172e; - cursor: pointer; - display: inline-block; - font-weight: bold; - font-size: 12px; - line-height: 100%; - margin: 1px; - padding: 0.8em 1em; - position: relative; - text-decoration: none; - text-shadow: #fff 0 1px 0; - vertical-align: middle; - white-space: nowrap; - float:right; - background-image: -moz-linear-gradient(-90deg, - #eeeeee 1%, - #fdf6f7 5%, - #fae9eb 70%, - #f7dcdf 100%); - background-image: -webkit-gradient(linear,left top,left bottom, - color-stop(0.01, #eee), - color-stop(0.05, #fdf6f7), - color-stop(0.70, #fae9eb), - color-stop(1, #f7dcdf)); -} -a.next-page { - border-right: none; - margin-right: 26px; - padding-right: 0; -} -a.next-page:after, a.prev-page:after { - border: solid 1px #c9172e; - content: ''; - display: block; - position: absolute; - top: .37em; - width: 1.7em; - height: 1.7em; - text-shadow: none; - z-index: -1; -} -a.next-page:after { - right: -.97em; - -moz-transform: rotate(-45deg); - background-image: -moz-linear-gradient(-135deg, - #eeeeee 1%, - #fdf6f7 5%, - #fae9eb 70%, - #f7dcdf 100%); - -webkit-transform:rotate(-45deg); - background-image: -webkit-gradient(linear,100% 0%, 0% 100%, - color-stop(0.01, #eee), - color-stop(0.05, #fdf6f7), - color-stop(0.70, #fae9eb), - color-stop(1, #f7dcdf)); -} - -/* headings ------------------------------------------------ */ -h1, h2, h3, h4, h5, h6 {line-height:1.2em; margin-bottom:.3em;} -h2 {margin-top:1em; } -h5 {font-size:1.2em;} -h6 {font-size:1em; text-transform:uppercase;} -h3 { color: rgb(20,120,200); } - -h1 a { - font-weight:normal; -} - - -/* branding ------------------------------------------------ */ -#branding { - font-weight:normal; - font-size:4em; - text-align:left; - padding:8px; - margin-bottom:0; - color: #333; - background: #fff; -} - - -/* page heading ------------------------------------------------ */ -#page-heading { - padding: 5px; - background: #000; - color: #eee; - font-size:2em; - letter-spacing: 8px; -} - - -/* boxes ------------------------------------------------ */ -.box { - background:#eee; - margin-bottom:20px; - padding:10px 10px 1px 10px; - font-size: 1.1em; -} -.box h2 { - font-size:1em; - font-weight:normal; - text-transform:uppercase; - color:#fff; - background:#333; - margin:-10px -10px 0 -10px; - padding:6px 12px; -} -.box h2 .desc { - margin-left: 20px; - text-transform:none; - color: #aaa; -} -.box h2 a, -.box h2 a.visible { - background-color:#111; - color:#fff; - display:inline; - padding:6px 12px; - margin:-6px -12px; - border:none; - text-transform:none; -} -.box h2 .docs { - color: #999; - display:inline; - float: right; - background-color:#333; -} -.box h2 .docs a { - background-color:#333; - padding:0; - margin:0; -} - -.grid_4 .box h2 a { - background-position: 97% 50%; -} -.grid_5 .box h2 a { - background-position: 98% 50%; -} -.grid_12 .box h2 a { - background-position: 99% 50%; -} - - -.box h2 a:hover { - background-color:#111; -} -.block { - padding-top:10px; -} -div.menu { - padding:0; -} -div.menu h2 { - margin:0; -} -div.menu .block { - padding-top:0; -} - - -/* paragraphs, quotes and lists ------------------------------------------------ */ -p { - margin-bottom:1em; -} -blockquote { - font-family: "inconsolata-1","inconsolata-2"; - padding-left:1em; - border-left:4px solid #ccc; -} -blockquote cite { - font-size:.9em; -} -ul, ol { - padding-top:0; -} - - -/* menus ------------------------------------------------ */ -ul.menu { - list-style:none; - border-top:1px solid #bbb; -} -ul.menu li { - margin:0; -} -ul.menu li a { - display:block; - padding:4px 10px; - border-bottom:1px solid #ccc; -} -ul.menu li a:hover { - background:#eee; -} -ul.menu li a:active { - background:#ccc; -} - - -/* submenus ------------------------------------------------ */ -ul.menu ul { - list-style:none; - margin:0; -} -ul.menu ul li a { - padding-left:30px; -} - - -/* section menus ------------------------------------------------ */ -ul.section { - border-top:0; - margin-bottom:0; -} -ul.section li { - text-transform:uppercase; -} -ul.section li a { - background:#bbb; -} -ul.section li a:hover { - background:#aaa; -} -ul.section li a:active { - color:#fff; - background:#666; -} -ul.section li li a { - background:#ddd; - border-bottom:1px solid #eee; -} -ul.section li li a:hover { - background:#ccc; -} -ul.section li li a:active { - color:#000; - background:#fff; -} -ul.section ul li { - text-transform:none; -} -ul.section ul.current li a { - background:#eee; - border-bottom:1px solid #fff; -} -ul.section ul.current li a:hover { - background:#ddd; -} -ul.section ul.current li a:active { - background:#fff; -} -ul.section li a.current { - color:#fff; - background:#666; -} -ul.section li a.current:hover { - background:#555; -} -ul.section li a.current:active { - background:#444; -} -ul.section li a.active { - background:#fff; - cursor:default; -} -ul.section li.current > a.active, -ul.section li.current > a.active:hover { - color:#fff; - background:#666; - cursor:default; -} - - -/* table ------------------------------------------------ */ -table { - width:100%; - border:1px solid #bbb; - margin-bottom:10px; -} -col.colC { - width:8em; -} -th, td { - padding:.2em 1em; - text-align:left; -} -thead th { - border-bottom:2px solid #888; - background:#bbb; - padding:.4em 1em .2em; -} -thead th.table-head { - font-size:1em; - font-weight:normal; - text-transform:uppercase; - color:#fff; - background:#555; - border:1px solid #555; -} -tbody th, -tbody td { - border-top:1px solid #bbb; - border-bottom:1px solid #bbb; - background:#eee; -} -tbody tr.odd th, -tbody tr.odd td { - background:#fff; -} -tfoot th, -tfoot td { - border-top:2px solid #666; - background:#eee; -} -tfoot tr.total th, -tfoot tr.total td { - border-top:6px double #666; -} -tfoot tr.total th { - text-transform:uppercase; -} -th.currency, -td.currency { - text-align:right; -} - - -/* forms ------------------------------------------------ */ -form { - overflow:hidden; -} -fieldset { - border:1px solid #bbb; - padding:10px; - position:relative; - background:#e9e9e9; - margin-bottom:10px; -} -legend { - font-size:1.1em; - padding:.4em .8em; - background:#fff; - border:1px solid #bbb; -} -fieldset.login p { - margin-bottom:1em; - margin-top:0pt; -} -fieldset p label { - width:98%; -} -fieldset p input { - width:98%; -} -fieldset p select { - width:99%; -} -fieldset.login p label { - float:left; - line-height:2em; - margin-right:3%; - text-align:right; - width:32%; -} -fieldset.login p input { - width:60%; -} -fieldset.login input.button { - margin-left:35%; -} -form p.notice { - font-weight:bold; -} -input.search.text { - width:66%; -} -input.search.button { - width:28%; - margin-left:2%; -} - - -/* articles ------------------------------------------------ */ -.articles { - padding:0; -} -.articles h2 { - margin:0; -} -#articles { - padding-top:0; -} -.article { - border-top:1px solid #666; - padding-top:.5em; -} -.box .article { - border-top:3px solid #fff; - padding:13px 10px 0 10px; - background: #fff; -} -.article h2 { - font-size:2em; - font-weight:normal; - text-transform:none; - color:#333; - background:transparent; - padding:0; - margin:0; - border:none; -} -.article h3 { - margin-bottom:.2em; - font-size:1.6em; -} -.box .first { - border-top:none; -} -.article h4 { - font-size:1.2em; - text-transform:uppercase; - margin-bottom:.5em; -} -.article a.image { - float:left; - margin:3px 10px 3px 0; - padding:4px; - border:1px solid #bbb; - background:#fff; -} -.article a.image:hover { - border:1px solid #666; -} -.article a.image img { - float:left; -} -.article p.meta { - color:#666; - border-top:1px dotted #999; - border-bottom:1px dotted #999; - padding:.3em 0; - margin-bottom:.8em; -} - - -/* site information ------------------------------------------------ */ -#site_info .box { - color:#ccc; - background:#666; - margin-bottom:10px; -} -#site_info a { - color:#fff; -} -#site_info a:hover { - color:#000; -} - - -/* AJAX sliding shelf ------------------------------------------------ */ -#loading {float:right; margin-right:14px; margin-top:-2px;} -.block {padding-bottom:1px;} - - -/* Accordian ------------------------------------------------ */ -.toggler { - color: #222; - margin: 0; - padding: 2px 5px; - background: #eee; - border-bottom: 1px solid #ddd; - border-right: 1px solid #ddd; - border-top: 1px solid #f5f5f5; - border-left: 1px solid #f5f5f5; - font-size:1.1em; - font-weight: normal; -} -.element h4 { - margin: 0; - padding:4px; - line-height:1.2em; -} -.element p { - margin: 0; - padding: 4px; -} -.float-right { - padding:10px 20px; - float:right; -} - -#accordian-block { - padding-bottom:10px; -} - - -/* Mootools Kwicks ------------------------------------------------ */ -#kwick-box { - padding:0; - overflow:hidden; -} -#kwick-box h2 { - margin:0; -} -#kwick { - position: relative; -} -#kwick .kwicks { - display: block; - background: #999; - height: 120px; - list-style:none; - margin:0; - overflow:hidden; -} -#kwick li { - float: left; - margin:0; - padding:0; -} -#kwick .kwick { - display: block; - cursor: pointer; - overflow: hidden; - height: 100px; - width: 215px; - padding: 10px; - background: #fff; -} -#kwick .kwick span { - color:#fff; -} -#kwick .one { - background: #666; -} -#kwick .two { - background: #777; -} -#kwick .three { - background: #888; -} -#kwick .four { - background: #999; -} +/* +----------------------------------------------- +Grey Box Method - Layout CSS +----------------------------------------------- */ + +html, body { + border-top: 5px solid #000; + color: #333; + padding: 0 0 40px; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; +} + +#about_me img { border: 5px solid #333; margin: 3px; } + +.info { background: #fff; padding: 10px;} + +.article { border-bottom: 5px solid rgb(20,120,200); padding-bottom: 10px; margin-bottom: 15px;} + +.non_home_box { + display: none; +} + +#reflist h3 { + font-size: 1.1em; + background: #fff; +} +#reflist h3 a { + color: rgb(20,120,200); +} +#reflist h4 { font-size: 0.9em; } +#reflist .block { margin: 0; padding: 0; } + +code { background: #ffe; padding: 2px 5px; } + +p.nutshell { + background: #ddd; + padding: 5px; +} + +.box pre { + margin-top: 10px; + padding: 8px; + background: #ffe; + color: #555; +} + +.box code.code { + white-space:pre; + font-family: Consolas, 'Liberation Mono', Courier, monospace; + padding: 8px; + background: #ffe; + display: block; + margin: 10px; + color: #555; +} +pre b { color: #111; } +.red { color: #d33; } +.green { color: #383; } +.umber { color: #8A3324; } +.lblue { color: #55a; } +.blue { color: #447; } +.yellow { color: #993; } +.hl { background: #eea; } + +.box h4 { + font-family: Consolas, 'Liberation Mono', Courier, monospace; + margin-top: 20px; + color: #833; +} +.box h4 small { + color: #888; + font-size: 0.8em; + margin-left: 10px; + font-weight: normal; +} + +.note { + float: right; + border: 10px; + padding: 8px; + background: #dfd; + border: 1px solid #8a8; + width: 120px; +} +.note h3 { + font-size: 1.1em; + color: #353; +} + +ul#menu { + background: rgb(20,120,200); + padding: .5em; + display: inline; + color: #fff; +} +ul#menu li { + border: 0; + margin: 0; + padding: 0; + padding-right: 10px; + padding-left: 10px; + display:inline; + font-size: 1.1em; +} + +ul#menu li a { color: #fff; } + +.scribble-preview { + background: #ff9; + padding: 8px; + border: 1px solid #ee6; +} + +img#me { border: 8px solid #333; } + +/* anchors +----------------------------------------------- */ +a { + color: #000; + font-weight:bold; + text-decoration: none; +} +a:hover { + color:#333; +} +a.page-button { + background: #e4eafa none 0 0 repeat-x; + border: solid 1px #c9172e; + color: #c9172e; + cursor: pointer; + display: inline-block; + font-weight: bold; + font-size: 12px; + line-height: 100%; + margin: 1px; + padding: 0.8em 1em; + position: relative; + text-decoration: none; + text-shadow: #fff 0 1px 0; + vertical-align: middle; + white-space: nowrap; + float:right; + background-image: -moz-linear-gradient(-90deg, + #eeeeee 1%, + #fdf6f7 5%, + #fae9eb 70%, + #f7dcdf 100%); + background-image: -webkit-gradient(linear,left top,left bottom, + color-stop(0.01, #eee), + color-stop(0.05, #fdf6f7), + color-stop(0.70, #fae9eb), + color-stop(1, #f7dcdf)); +} +a.next-page { + border-right: none; + margin-right: 26px; + padding-right: 0; +} +a.next-page:after, a.prev-page:after { + border: solid 1px #c9172e; + content: ''; + display: block; + position: absolute; + top: .37em; + width: 1.7em; + height: 1.7em; + text-shadow: none; + z-index: -1; +} +a.next-page:after { + right: -.97em; + -moz-transform: rotate(-45deg); + background-image: -moz-linear-gradient(-135deg, + #eeeeee 1%, + #fdf6f7 5%, + #fae9eb 70%, + #f7dcdf 100%); + -webkit-transform:rotate(-45deg); + background-image: -webkit-gradient(linear,100% 0%, 0% 100%, + color-stop(0.01, #eee), + color-stop(0.05, #fdf6f7), + color-stop(0.70, #fae9eb), + color-stop(1, #f7dcdf)); +} + +/* headings +----------------------------------------------- */ +h1, h2, h3, h4, h5, h6 {line-height:1.2em; margin-bottom:.3em;} +h2 {margin-top:1em; } +h5 {font-size:1.2em;} +h6 {font-size:1em; text-transform:uppercase;} +h3 { color: rgb(20,120,200); } + +h1 a { + font-weight:normal; +} + + +/* branding +----------------------------------------------- */ +#branding { + font-weight:normal; + font-size:4em; + text-align:left; + padding:8px; + margin-bottom:0; + color: #333; + background: #fff; +} + + +/* page heading +----------------------------------------------- */ +#page-heading { + padding: 5px; + background: #000; + color: #eee; + font-size:2em; + letter-spacing: 8px; +} + + +/* boxes +----------------------------------------------- */ +.box { + background:#eee; + margin-bottom:20px; + padding:10px 10px 1px 10px; + font-size: 1.1em; +} +.box h2 { + font-size:1em; + font-weight:normal; + text-transform:uppercase; + color:#fff; + background:#333; + margin:-10px -10px 0 -10px; + padding:6px 12px; +} +.box h2 .desc { + margin-left: 20px; + text-transform:none; + color: #aaa; +} +.box h2 a, +.box h2 a.visible { + background-color:#111; + color:#fff; + display:inline; + padding:6px 12px; + margin:-6px -12px; + border:none; + text-transform:none; +} +.box h2 .docs { + color: #999; + display:inline; + float: right; + background-color:#333; +} +.box h2 .docs a { + background-color:#333; + padding:0; + margin:0; +} + +.grid_4 .box h2 a { + background-position: 97% 50%; +} +.grid_5 .box h2 a { + background-position: 98% 50%; +} +.grid_12 .box h2 a { + background-position: 99% 50%; +} + + +.box h2 a:hover { + background-color:#111; +} +.block { + padding-top:10px; +} +div.menu { + padding:0; +} +div.menu h2 { + margin:0; +} +div.menu .block { + padding-top:0; +} + + +/* paragraphs, quotes and lists +----------------------------------------------- */ +p { + margin-bottom:1em; +} +blockquote { + font-family: Consolas, 'Liberation Mono', Courier, monospace; + padding-left:1em; + border-left:4px solid #ccc; +} +blockquote cite { + font-size:.9em; +} +ul, ol { + padding-top:0; +} + + +/* menus +----------------------------------------------- */ +ul.menu { + list-style:none; + border-top:1px solid #bbb; +} +ul.menu li { + margin:0; +} +ul.menu li a { + display:block; + padding:4px 10px; + border-bottom:1px solid #ccc; +} +ul.menu li a:hover { + background:#eee; +} +ul.menu li a:active { + background:#ccc; +} + + +/* submenus +----------------------------------------------- */ +ul.menu ul { + list-style:none; + margin:0; +} +ul.menu ul li a { + padding-left:30px; +} + + +/* section menus +----------------------------------------------- */ +ul.section { + border-top:0; + margin-bottom:0; +} +ul.section li { + text-transform:uppercase; +} +ul.section li a { + background:#bbb; +} +ul.section li a:hover { + background:#aaa; +} +ul.section li a:active { + color:#fff; + background:#666; +} +ul.section li li a { + background:#ddd; + border-bottom:1px solid #eee; +} +ul.section li li a:hover { + background:#ccc; +} +ul.section li li a:active { + color:#000; + background:#fff; +} +ul.section ul li { + text-transform:none; +} +ul.section ul.current li a { + background:#eee; + border-bottom:1px solid #fff; +} +ul.section ul.current li a:hover { + background:#ddd; +} +ul.section ul.current li a:active { + background:#fff; +} +ul.section li a.current { + color:#fff; + background:#666; +} +ul.section li a.current:hover { + background:#555; +} +ul.section li a.current:active { + background:#444; +} +ul.section li a.active { + background:#fff; + cursor:default; +} +ul.section li.current > a.active, +ul.section li.current > a.active:hover { + color:#fff; + background:#666; + cursor:default; +} + + +/* table +----------------------------------------------- */ +table { + width:100%; + border:1px solid #bbb; + margin-bottom:10px; +} +col.colC { + width:8em; +} +th, td { + padding:.2em 1em; + text-align:left; +} +thead th { + border-bottom:2px solid #888; + background:#bbb; + padding:.4em 1em .2em; +} +thead th.table-head { + font-size:1em; + font-weight:normal; + text-transform:uppercase; + color:#fff; + background:#555; + border:1px solid #555; +} +tbody th, +tbody td { + border-top:1px solid #bbb; + border-bottom:1px solid #bbb; + background:#eee; +} +tbody tr.odd th, +tbody tr.odd td { + background:#fff; +} +tfoot th, +tfoot td { + border-top:2px solid #666; + background:#eee; +} +tfoot tr.total th, +tfoot tr.total td { + border-top:6px double #666; +} +tfoot tr.total th { + text-transform:uppercase; +} +th.currency, +td.currency { + text-align:right; +} + + +/* forms +----------------------------------------------- */ +form { + overflow:hidden; +} +fieldset { + border:1px solid #bbb; + padding:10px; + position:relative; + background:#e9e9e9; + margin-bottom:10px; +} +legend { + font-size:1.1em; + padding:.4em .8em; + background:#fff; + border:1px solid #bbb; +} +fieldset.login p { + margin-bottom:1em; + margin-top:0pt; +} +fieldset p label { + width:98%; +} +fieldset p input { + width:98%; +} +fieldset p select { + width:99%; +} +fieldset.login p label { + float:left; + line-height:2em; + margin-right:3%; + text-align:right; + width:32%; +} +fieldset.login p input { + width:60%; +} +fieldset.login input.button { + margin-left:35%; +} +form p.notice { + font-weight:bold; +} +input.search.text { + width:66%; +} +input.search.button { + width:28%; + margin-left:2%; +} + + +/* articles +----------------------------------------------- */ +.articles { + padding:0; +} +.articles h2 { + margin:0; +} +#articles { + padding-top:0; +} +.article { + border-top:1px solid #666; + padding-top:.5em; +} +.box .article { + border-top:3px solid #fff; + padding:13px 10px 0 10px; + background: #fff; +} +.article h2 { + font-size:2em; + font-weight:normal; + text-transform:none; + color:#333; + background:transparent; + padding:0; + margin:0; + border:none; +} +.article h3 { + margin-bottom:.2em; + font-size:1.6em; +} +.box .first { + border-top:none; +} +.article h4 { + font-size:1.2em; + text-transform:uppercase; + margin-bottom:.5em; +} +.article a.image { + float:left; + margin:3px 10px 3px 0; + padding:4px; + border:1px solid #bbb; + background:#fff; +} +.article a.image:hover { + border:1px solid #666; +} +.article a.image img { + float:left; +} +.article p.meta { + color:#666; + border-top:1px dotted #999; + border-bottom:1px dotted #999; + padding:.3em 0; + margin-bottom:.8em; +} + + +/* site information +----------------------------------------------- */ +#site_info .box { + color:#ccc; + background:#666; + margin-bottom:10px; +} +#site_info a { + color:#fff; +} +#site_info a:hover { + color:#000; +} + + +/* AJAX sliding shelf +----------------------------------------------- */ +#loading {float:right; margin-right:14px; margin-top:-2px;} +.block {padding-bottom:1px;} + + +/* Accordian +----------------------------------------------- */ +.toggler { + color: #222; + margin: 0; + padding: 2px 5px; + background: #eee; + border-bottom: 1px solid #ddd; + border-right: 1px solid #ddd; + border-top: 1px solid #f5f5f5; + border-left: 1px solid #f5f5f5; + font-size:1.1em; + font-weight: normal; +} +.element h4 { + margin: 0; + padding:4px; + line-height:1.2em; +} +.element p { + margin: 0; + padding: 4px; +} +.float-right { + padding:10px 20px; + float:right; +} + +#accordian-block { + padding-bottom:10px; +} + + +/* Mootools Kwicks +----------------------------------------------- */ +#kwick-box { + padding:0; + overflow:hidden; +} +#kwick-box h2 { + margin:0; +} +#kwick { + position: relative; +} +#kwick .kwicks { + display: block; + background: #999; + height: 120px; + list-style:none; + margin:0; + overflow:hidden; +} +#kwick li { + float: left; + margin:0; + padding:0; +} +#kwick .kwick { + display: block; + cursor: pointer; + overflow: hidden; + height: 100px; + width: 215px; + padding: 10px; + background: #fff; +} +#kwick .kwick span { + color:#fff; +} +#kwick .one { + background: #666; +} +#kwick .two { + background: #777; +} +#kwick .three { + background: #888; +} +#kwick .four { + background: #999; +} From b46838f701eb64b05b8436414663b920b8f67e05 Mon Sep 17 00:00:00 2001 From: Matthew McCullough Date: Wed, 21 Nov 2012 10:59:47 -0500 Subject: [PATCH 30/30] Added CC BY-NC-SA 3.0 license. * License added * Chose Attribution-NonCommercial-ShareAlike 3.0 Unported (CC BY-NC-SA 3.0) * Desire community to benefit, but not profit off this endeavor * Fixes #44 --- LICENSE.md | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 LICENSE.md diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..82dea93 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,105 @@ +# License +The prose, course text, slide layouts, class outlines, diagrams, HTML, CSS, and Markdown code in the set of educational materials located in this repository are licensed as _CC BY-NC 3.0_. The Octocat, GitHub logo and other already-copyrighted and already-reserved trademarks and images are not covered by this license. + +------------------------ + +# Attribution-NonCommercial-ShareAlike 3.0 Unported (CC BY-NC-SA 3.0) +This is a [human-readable summary](http://creativecommons.org/licenses/by-nc-sa/3.0/) of the [Legal Code (the full license)](http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode). + + +## You are free: + +* to Share — to copy, distribute and transmit the work +* to Remix — to adapt the work + + +## Under the following conditions: + +* Attribution — You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work). +* Noncommercial — You may not use this work for commercial purposes. +* Share Alike — If you alter, transform, or build upon this work, you may distribute the resulting work only under the same or similar license to this one. + + +## With the understanding that: + +* Waiver — Any of the above conditions can be waived if you get permission from the copyright holder. +* Public Domain — Where the work or any of its elements is in the public domain under applicable law, that status is in no way affected by the license. +* Other Rights — In no way are any of the following rights affected by the license: + * Your fair dealing or fair use rights, or other applicable copyright exceptions and limitations; + * The author's moral rights; + * Rights other persons may have either in the work itself or in how the work is used, such as publicity or privacy rights. + +Notice — For any reuse or distribution, you must make clear to others the license terms of this work. The best way to do this is with a link to this web page. + +-------------------------------- + +# Attribution-NonCommercial-ShareAlike 3.0 Unported (CC BY-NC-SA 3.0) + +http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode + +CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE. +License + +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. + +1. Definitions + +"Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License. +"Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(g) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined above) for the purposes of this License. +"Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership. +"License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, Noncommercial, ShareAlike. +"Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License. +"Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast. +"Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work. +"You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. +"Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images. +"Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium. +2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws. + +3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: + +to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections; +to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified."; +to Distribute and Publicly Perform the Work including as incorporated in Collections; and, +to Distribute and Publicly Perform Adaptations. +The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved, including but not limited to the rights described in Section 4(e). + +4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: + +You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(d), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(d), as requested. +You may Distribute or Publicly Perform an Adaptation only under: (i) the terms of this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-NonCommercial-ShareAlike 3.0 US) ("Applicable License"). You must include a copy of, or the URI, for Applicable License with every copy of each Adaptation You Distribute or Publicly Perform. You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License. You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License. +You may not exercise any of the rights granted to You in Section 3 above in any manner that is primarily intended for or directed toward commercial advantage or private monetary compensation. The exchange of the Work for other copyrighted works by means of digital file-sharing or otherwise shall not be considered to be intended for or directed toward commercial advantage or private monetary compensation, provided there is no payment of any monetary compensation in con-nection with the exchange of copyrighted works. +If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and, (iv) consistent with Section 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(d) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties. +For the avoidance of doubt: + +Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; +Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License if Your exercise of such rights is for a purpose or use which is otherwise than noncommercial as permitted under Section 4(c) and otherwise waives the right to collect royalties through any statutory or compulsory licensing scheme; and, +Voluntary License Schemes. The Licensor reserves the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License that is for a purpose or use which is otherwise than noncommercial as permitted under Section 4(c). +Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise. +5. Representations, Warranties and Disclaimer + +UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING AND TO THE FULLEST EXTENT PERMITTED BY APPLICABLE LAW, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO THIS EXCLUSION MAY NOT APPLY TO YOU. + +6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. Termination + +This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. +Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. +8. Miscellaneous + +Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. +Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License. +If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. +No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. +This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. +The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law. +Creative Commons Notice + +Creative Commons is not a party to this License, and makes no warranty whatsoever in connection with the Work. Creative Commons will not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this license. Notwithstanding the foregoing two (2) sentences, if Creative Commons has expressly identified itself as the Licensor hereunder, it shall have all rights and obligations of Licensor. + +Except for the limited purpose of indicating to the public that the Work is licensed under the CCPL, Creative Commons does not authorize the use by either party of the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time. For the avoidance of doubt, this trademark restriction does not form part of this License. + +Creative Commons may be contacted at http://creativecommons.org/.