From 477d54ca51f568a3910b62189b7bde26fc587542 Mon Sep 17 00:00:00 2001
From: John Kaul <john.kaul@live.com>
Date: Fri, 26 Jun 2015 13:28:40 -0500
Subject: [PATCH 1/2] .gitignore:

1. Added sections and comments to gitignore file for better readability.
2. Added more entries to the Vim list (there was already two entries
   for Vim.)
3. Added entries for the following sections/areas: OS &
   Package formats.

jlk
---
 .gitignore | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index eb2da28..c7ed116 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,35 @@
-*.sw*
+# Local stuff
+# This section is devoted to this project
+##############################
 doc/tags
+
+# Vim stuff
+##############################
+*.s[a-w][a-z]
+*.un~
+Session.vim
 .netrwhist
+*~
+
+# Packages
+##############################
+# it's better to unpack these files and commit the raw source
+# git has its own built in compression methods
+*.7z
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.zip
+
+# OS generated files
+##############################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db

From d502d653f7e55c620bc5071111398754e38ca99a Mon Sep 17 00:00:00 2001
From: John Kaul <john.kaul@live.com>
Date: Fri, 26 Jun 2015 13:47:28 -0500
Subject: [PATCH 2/2] vimwiki.txt:

1. I corrected the webpage links to the github site instead of the old
   code.google.com.
2. Added note the changelog section
---
 doc/vimwiki.txt | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index 19a530b..3c98f03 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -773,7 +773,7 @@ which opens up a popup menu with all the wiki files starting with "ind".
 Raw URLs~
 
 Raw URLs are also supported: >
-  http://code.google.com/p/vimwiki
+  https://github.com/vimwiki/vimwiki.git
   mailto:habamax@gmail.com
   ftp://vim.org
 
@@ -2623,7 +2623,7 @@ Your help in making vimwiki better is really appreciated!
 Any help, whether it is a spelling correction or a code snippet to patch --
 everything is welcomed.
 
-Issues can be filed at http://code.google.com/p/vimwiki/issues .
+Issues can be filed at https://github.com/vimwiki/vimwiki.git .
 
 
 ==============================================================================
@@ -2632,10 +2632,12 @@ Issues can be filed at http://code.google.com/p/vimwiki/issues .
     - Maxim Kim <habamax@gmail.com> as original author.
     - Stuart Andrews
     - Tomas Pospichal
-    - See the http://code.google.com/p/vimwiki/people/list for the others.
+    - See the following sites for more: 
+        https://github.com/vimwiki/vimwiki/graphs/contributors
+        http://code.google.com/p/vimwiki/people/list
 
-Web: http://code.google.com/p/vimwiki/
-Mail-List: https://groups.google.com/forum/#!forum/vimwiki
+Web: https://github.com/vimwiki/vimwiki.git
+Issues: https://github.com/vimwiki/vimwiki/issues
 Vim plugins: http://www.vim.org/scripts/script.php?script_id=2226
 
 
@@ -2671,6 +2673,7 @@ Vim plugins: http://www.vim.org/scripts/script.php?script_id=2226
     * Always jump to previous link on <S-Tab>, not to beginning of link
     * Issue #27: Fix <CR> on a visual selection sometimes not working
     * Various small fixes
+    * Corrected website links in documentation
 
 2.1~