Merge branch 'organize' of github.com:vermiculus/sx.el into organize

Conflicts:
	sx-cache.el
	sx-encoding.el
	sx-favorites.el
	sx-filter.el
	sx-interaction.el
	sx-method.el
	sx-question-list.el
	sx-question-mode.el
	sx-question-print.el
	sx-question.el
	sx-tab.el
	sx-time.el
	sx.el

11 files changed, 15 insertions, 11 deletions

diff --git a/sx-auth.el b/sx-auth.el
index f35cca1..3cb7217 100644
--- a/sx-auth.el
+++ b/sx-auth.el
@@ -1,4 +1,4 @@
-;;; sx-auth.el --- user authentication  -*- lexical-binding: t; -*-
+;;; sx-auth.el --- user authentication               -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2014  Sean Allred
 
diff --git a/sx-button.el b/sx-button.el
index 0824026..4c0666b 100644
--- a/sx-button.el
+++ b/sx-button.el
@@ -1,4 +1,4 @@
-;;; sx-button.el --- defining buttons -*- lexical-binding: t; -*-
+;;; sx-button.el --- defining buttons                -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2014  Artur Malabarba
 
diff --git a/sx-cache.el b/sx-cache.el
index 5f37d84..3a5bd3b 100644
--- a/sx-cache.el
+++ b/sx-cache.el
@@ -1,4 +1,4 @@
-;;; sx-cache.el --- caching -*- lexical-binding: t; -*-
+;;; sx-cache.el --- caching                          -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2014  Sean Allred
 
diff --git a/sx-compose.el b/sx-compose.el
index c5b8f78..f4fcd0a 100644
--- a/sx-compose.el
+++ b/sx-compose.el
@@ -1,4 +1,4 @@
-;;; sx-compose.el --- major-mode for coposing questions and answers -*- lexical-binding: t; -*-
+;;; sx-compose.el --- major-mode for composing questions and answers  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2014  Artur Malabarba
 
diff --git a/sx-encoding.el b/sx-encoding.el
index dad8a53..d8ad2ba 100644
--- a/sx-encoding.el
+++ b/sx-encoding.el
@@ -1,4 +1,4 @@
-;;; sx-encoding.el --- encoding -*- lexical-binding: t; -*-
+;;; sx-encoding.el --- encoding                      -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2014  Sean Allred
 
diff --git a/sx-favorites.el b/sx-favorites.el
index e8155ea..7fdc772 100644
--- a/sx-favorites.el
+++ b/sx-favorites.el
@@ -1,4 +1,4 @@
-;;; sx-favorites.el --- starred questions          -*- lexical-binding: t; -*-
+;;; sx-favorites.el --- starred questions            -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2014  Sean Allred
 
diff --git a/sx-interaction.el b/sx-interaction.el
index acb4a77..4d71c17 100644
--- a/sx-interaction.el
+++ b/sx-interaction.el
@@ -1,4 +1,4 @@
-;;; sx-interaction.el --- voting, commenting, and otherwise interacting with questions  -*- lexical-binding: t; -*-
+;;; sx-interaction.el --- voting, commenting, and other interaction  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2014  Artur Malabarba
 
@@ -443,3 +443,7 @@ context at point. "
 
 (provide 'sx-interaction)
 ;;; sx-interaction.el ends here
+
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; End:
diff --git a/sx-method.el b/sx-method.el
index 84a17db..9d61e60 100644
--- a/sx-method.el
+++ b/sx-method.el
@@ -1,4 +1,4 @@
-;;; sx-method.el --- main interface for API method calls  -*- lexical-binding: t; -*-
+;;; sx-method.el --- method calls                    -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2014  Sean Allred
 
diff --git a/sx-networks.el b/sx-networks.el
index f2b0a22..2695689 100644
--- a/sx-networks.el
+++ b/sx-networks.el
@@ -1,4 +1,4 @@
-;;; sx-networks.el --- user network information  -*- lexical-binding: t; -*-
+;;; sx-networks.el --- user network information      -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2014  Sean Allred
 
diff --git a/sx-question-mode.el b/sx-question-mode.el
index 4eee2af..f702822 100644
--- a/sx-question-mode.el
+++ b/sx-question-mode.el
@@ -1,4 +1,4 @@
-;;; sx-question-mode.el --- major-mode for displaying a question  -*- lexical-binding: t; -*-
+;;; sx-question-mode.el --- major-mode for displaying questions  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2014  Artur Malabarba
 
diff --git a/sx-question.el b/sx-question.el
index 5222576..b9fc78a 100644
--- a/sx-question.el
+++ b/sx-question.el
@@ -1,4 +1,4 @@
-;;; sx-question.el --- base question logic           -*- lexical-binding: t; -*-
+;;; sx-question.el --- question logic                -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2014  Sean Allred