7 files changed, 23 insertions, 17 deletions
diff --git a/doc/tips/Synology_NAS_and_git_annex.mdwn b/doc/tips/Synology_NAS_and_git_annex.mdwn
index 50c604483..8a6d282c9 100644
--- a/doc/tips/Synology_NAS_and_git_annex.mdwn
+++ b/doc/tips/Synology_NAS_and_git_annex.mdwn
@@ -19,7 +19,7 @@ This is known to work with DSM 4.3-3810 Update 1 and git-annex standalone versio
 
 (2) Setup ssh key based authentication with the Synology for each computer you want to sync with it. You want a specific key that is used only by git-annex, for each computer. Again, many good guides online.
 
-(3) In the Synology .ssh/authorized_keys file for your account, add (substituing your username)
+(3) In the Synology .ssh/authorized_keys file for your account, add (substituting your username)
 [[!format sh """
 command="/home/$yourusername/.ssh/git-annex-shell"
 """]]
diff --git a/doc/tips/centralized_git_repository_tutorial.mdwn b/doc/tips/centralized_git_repository_tutorial.mdwn
index 8088e7d23..e646ed0ee 100644
--- a/doc/tips/centralized_git_repository_tutorial.mdwn
+++ b/doc/tips/centralized_git_repository_tutorial.mdwn
@@ -1,13 +1,13 @@
 The [[walkthrough]] builds up a decentralized git repository setup, but
 git-annex can also be used with a centralized bare repository, just like
 git can. This tutorial shows how to set up a centralized repository hosted on
-GitHub.
+GitHub on GitLab or your own git server.
 
 ## set up the repository, and make a checkout
 
 I've created a repository for technical talk videos, which you can
 [fork on Github](https://github.com/joeyh/techtalks).
-Or make your own repository on GitHub (or elsewhere) now.
+Or make your own repository on GitHub (or GitLab elsewhere) now.
 
 On your laptop, [[install]] git-annex, and clone the repository:
 
@@ -21,12 +21,14 @@ located:
 	init my laptop ok
 
 Let's tell git-annex that GitHub doesn't support running git-annex-shell there.
+
+	# git config remote.origin.annex-ignore true
+
 This means you can't store annexed file *contents* on GitHub; it would
 really be better to host the bare repository on your own server, which
 would not have this limitation. (If you want to do that, check out
-[[using_gitolite_with_git-annex]].)
-
-	# git config remote.origin.annex-ignore true
+[[using_gitolite_with_git-annex]].) Or, you could use GitLab, which
+*does* [support git-annex on their servers](https://about.gitlab.com/2015/02/17/gitlab-annex-solves-the-problem-of-versioning-large-binaries-with-git/).
 
 ## add files to the repository
 
@@ -53,9 +55,9 @@ Feel free to rename the files, etc, using normal git commands:
 	# git mv kitenet.net_~joey_screencasts_git-annex_coding_in_haskell.ogg git-annex_coding_in_haskell.ogg
 	# git commit -m 'better filenames'
 
-Now push your changes back to the central repository. This first time,
-remember to push the git-annex branch, which is used to track the file
-contents.
+Now push your changes back to the central repository. As well as pushing
+the master branch, remember to push the git-annex branch, which is used to
+track the file contents.
 
 	# git push origin master git-annex
 	To git@github.com:joeyh/techtalks.git
@@ -126,7 +128,7 @@ desired.
 After you use git-annex to move files around, remember to push, 
 which will broadcast its updated location information.
 
-	# git push
+	# git push origin master git-annex
 
 ## take it farther
 
diff --git a/doc/tips/downloading_podcasts.mdwn b/doc/tips/downloading_podcasts.mdwn
index fb875180d..e11825420 100644
--- a/doc/tips/downloading_podcasts.mdwn
+++ b/doc/tips/downloading_podcasts.mdwn
@@ -75,6 +75,10 @@ If your git-annex is also built with quvi support, you can also use
 `git annex importfeed` on youtube playlists. It will automatically download
 the videos linked to by the playlist.
 
+For this you need an rss file containing links to the videos.
+For example, this url currently works:
+<http://gdata.youtube.com/feeds/api/playlists/PLz8ZG1e9MPlzefklz1Gv79icjywTXycR->
+
 ## metadata
 
 As well as storing the urls for items imported from a feed, git-annex can
diff --git a/doc/tips/file_manager_integration.mdwn b/doc/tips/file_manager_integration.mdwn
index 4429b9093..cd4218ff2 100644
--- a/doc/tips/file_manager_integration.mdwn
+++ b/doc/tips/file_manager_integration.mdwn
@@ -24,9 +24,9 @@ Even more recent git-annex comes with built-in integration with Konqueror.
 This is set up by git-annex creating a 
 `~/.kde/share/kde4/services/ServiceMenus/git-annex.desktop file.
 
-## XFCE (Thunar)
+## Xfce (Thunar)
 
-XFCE uses the Thunar file manager, which can also be easily configured to
+Xfce uses the Thunar file manager, which can also be easily configured to
 allow for custom actions. Just go to the "Configure custom actions..." item
 in the "Edit" menu, and create a custom action for get, drop, and undo with the
 following commands:
@@ -72,12 +72,12 @@ This gives me the resulting config on disk, in `.config/Thunar/uca.xml`:
         <video-files/>
     </action>
 
-The complete instructions on how to setup actions is [in the XFCE documentation](http://docs.xfce.org/xfce/thunar/custom-actions).
+The complete instructions on how to setup actions is [in the Xfce documentation](http://docs.xfce.org/xfce/thunar/custom-actions).
 
 ## OS X (Finder)
 
 For OS X, it is possible to get context menus in Finder. Due to how OS X
-deals with sym links, one needs to operate on folders if using indirect
+deals with symlinks, one needs to operate on folders if using indirect
 mode. Direct mode operation has not been tested.
 
 1. Open Automator and create a new Service.
diff --git a/doc/tips/megaannex.mdwn b/doc/tips/megaannex.mdwn
index 46bab4aef..b547aaa5c 100644
--- a/doc/tips/megaannex.mdwn
+++ b/doc/tips/megaannex.mdwn
@@ -1,7 +1,7 @@
 megaannex 0.2.0
 =========
 
-Hook program for gitannex to use mega.co.nz as backend
+Hook program for git-annex to use mega.co.nz as backend
 
 # Requirements:
 
diff --git a/doc/tips/using_gitolite_with_git-annex.mdwn b/doc/tips/using_gitolite_with_git-annex.mdwn
index 31f34c6fb..0d20c9372 100644
--- a/doc/tips/using_gitolite_with_git-annex.mdwn
+++ b/doc/tips/using_gitolite_with_git-annex.mdwn
@@ -92,7 +92,7 @@ Make the ADC directory, and a "ua" subdirectory.
 mkdir -p /usr/local/lib/gitolite/adc/ua
 </pre>
 
-Install the git-annex-shell ADC into the "ua" subdirectory from the gitolie repository.
+Install the git-annex-shell ADC into the "ua" subdirectory from the gitolite repository.
 
 <pre>   
 cd /usr/local/lib/gitolite/adc/ua/
diff --git a/doc/tips/using_the_web_as_a_special_remote.mdwn b/doc/tips/using_the_web_as_a_special_remote.mdwn
index 087d2e24b..2dc3419ad 100644
--- a/doc/tips/using_the_web_as_a_special_remote.mdwn
+++ b/doc/tips/using_the_web_as_a_special_remote.mdwn
@@ -81,7 +81,7 @@ it is a video and download the video content for offline viewing.
 Later, in another clone of the repository, you can run `git annex get` on
 the file and it will also be downloaded with the help of quvi. This works
 even if the video host has transcoded or otherwise changed the video
-in the meantime; the assumption is that these video files are equivilant.
+in the meantime; the assumption is that these video files are equivalent.
 
 There is an `annex.quvi-options` configuration setting that can be used
 to pass parameters to quvi. For example, you could set `git config