Merge remote-tracking branch 'upstream/master'

Conflicts:
	boot.php
	include/dba/dba_driver.php
	include/diaspora.php
	include/follow.php
	include/session.php
	include/zot.php
	mod/photos.php
	mod/ping.php

1 files changed, 10 insertions, 2 deletions

diff --git a/doc/faq_admins.bb b/doc/faq_admins.bb
index e4541035b..ec4f8d969 100644
--- a/doc/faq_admins.bb
+++ b/doc/faq_admins.bb
@@ -38,12 +38,20 @@ valid SSL certificate rather than disabling port 443.
 [b]What do I need to do when moving my hub to a different server[/b]
 
 1) Git clone on the new server.  Repeat the process for any custom themes, and addons.
-2) Copy .htconfig.php
+2) Rsync .htconfig.php
 3) Rsync everything in store/
-4) Rsync everything in custom/ (this will only exist if you have custom modules)
+4) Rsync everything in mod/site/ and view/site (these will only exist if you have custom modules)
 5) Dump and restore DB.
 
 [*]
+[b]How do I reinstall an existing hub on the same server?[/b]
+
+1) [code]git reset --hard HEAD[/code] will reset all files to their upstream defaults.  This will not reset any local files that do not also exist upstream.  Eg, if you have local changes to mod/channel.php, this will reset them - but will not reset any changes in mod/site/channel.php
+2) If you absolutely must reinstall - for example, if you need to upgrade operating system - follow the steps for moving to a different server, but instead of using rsync, backup and restore some other way.
+
+Do not reinstall a hub with a fresh database and fresh .htconfig.php unless as a very last resort.  Creating a temporary account and ask for help via a support channel for non-trivial reinstalls is preferable to reinstalling fresh.
+
+[*]
 [b]How do I set the default homepage for logged out viewers?[/b]
 
 Use the custom_home addon available in the main addons repository.