tahoe-lafs · exarkun · Apr 16, 2020 · Feb 13, 2020 · Feb 13, 2020 · Feb 13, 2020
diff --git a/.gitignore b/.gitignore
@@ -43,7 +43,6 @@ zope.interface-*.egg
 /.tox/
 /docs/_build/
 /coverage.xml
-/smoke_magicfolder/
 /.hypothesis/
 
 # This is the plaintext of the private environment needed for some CircleCI

diff --git a/Makefile b/Makefile
@@ -42,12 +42,6 @@ upload-osx-pkg:
 	#   echo not uploading tahoe-lafs-osx-pkg because this is not trunk but is branch \"${BB_BRANCH}\" ; \
 	# fi
 
-.PHONY: smoketest
-smoketest:
-	-python ./src/allmydata/test/check_magicfolder_smoke.py kill
-	-rm -rf smoke_magicfolder/
-	python ./src/allmydata/test/check_magicfolder_smoke.py
-
 # code coverage-based testing is disabled temporarily, as we switch to tox.
 # This will eventually be added to a tox environment. The following comments
 # and variable settings are retained as notes for that future effort.

diff --git a/docs/configuration.rst b/docs/configuration.rst
@@ -82,7 +82,6 @@ Client/server nodes provide one or more of the following services:
 * web-API service
 * SFTP service
 * FTP service
-* Magic Folder service
 * helper service
 * storage service.
 
@@ -719,12 +718,6 @@ SFTP, FTP
     for instructions on configuring these services, and the ``[sftpd]`` and
     ``[ftpd]`` sections of ``tahoe.cfg``.
 
-Magic Folder
-
-    A node running on Linux or Windows can be configured to automatically
-    upload files that are created or changed in a specified local directory.
-    See :doc:`frontends/magic-folder` for details.
-
 
 Storage Server Configuration
 ============================

diff --git a/docs/frontends/magic-folder.rst b/docs/frontends/magic-folder.rst
diff --git a/docs/index.rst b/docs/index.rst
@@ -20,7 +20,6 @@ Contents:
    frontends/CLI
    frontends/webapi
    frontends/FTP-and-SFTP
-   frontends/magic-folder
    frontends/download-status
 
    known_issues
@@ -37,7 +36,6 @@ Contents:
    expenses
    cautions
    write_coordination
-   magic-folder-howto
    backupdb
 
    anonymity-configuration

diff --git a/docs/magic-folder-howto.rst b/docs/magic-folder-howto.rst
diff --git a/docs/magic-wormhole-invites.rst b/docs/magic-wormhole-invites.rst
@@ -19,9 +19,7 @@ Invites and Joins
 
 Inside Tahoe-LAFS we are using a channel created using `magic
 wormhole`_ to exchange configuration and the secret fURL of the
-Introducer with new clients. In the future, we would like to make the
-Magic Folder (:ref:`Magic Folder HOWTO <magic-folder-howto>`) invites and joins work this way
-as well.
+Introducer with new clients.
 
 This is a two-part process. Alice runs a grid and wishes to have her
 friend Bob use it as a client. She runs ``tahoe invite bob`` which