diff --git a/HACKING b/HACKING index 5e19d044f..21dc267dc 100644 --- a/HACKING +++ b/HACKING @@ -5,11 +5,11 @@ Developing on Windows is sometimes broken, but should work. Let us know if we broke something, or we accidentally depend on some Unix-specific build tool somewhere. -See http://camlistore.org/docs/contributing for information on how to +See https://camlistore.org/doc/contributing for information on how to contribute to the project and submit patches. Notably, we use Gerrit for code review. Our Gerrit instance is at https://camlistore.org/r/ -See architecture docs: https://camlistore.org/docs/ +See architecture docs: https://camlistore.org/doc/ You can view docs for Camlistore packages with local godoc, or godoc.org. @@ -22,7 +22,7 @@ $ git clone https://camlistore.googlesource.com/camlistore (We use github for distribution but its code review system is so poor, we don't use its Pull Request mechanism. The Gerrit git server & code review system is the main repo. See -http://camlistore.org/docs/contributing for how to use them. We might +https://camlistore.org/doc/contributing for how to use them. We might support github for pull requests in the future, once it's properly integrated with external code review tools. We had a meeting with Github to discuss the ways in which their code review tools are poor.) diff --git a/README b/README index a4b4d47f8..d030b4733 100644 --- a/README +++ b/README @@ -5,8 +5,8 @@ It's a way to store, sync, share, model and back up content. It stands for "Content-Addressable Multi-Layer Indexed Storage", for lack of a better name. For more, see: - http://camlistore.org/ - http://camlistore.org/docs/ + https://camlistore.org/ + https://camlistore.org/doc/ Other useful files: @@ -20,4 +20,4 @@ Mailing lists: Bugs and contributing: https://github.com/camlistore/camlistore/issues - http://camlistore.org/docs/contributing + https://camlistore.org/doc/contributing diff --git a/clients/osx/Camlistore/Camlistore/Credits.html b/clients/osx/Camlistore/Camlistore/Credits.html index b64159e35..4a962d08d 100644 --- a/clients/osx/Camlistore/Camlistore/Credits.html +++ b/clients/osx/Camlistore/Camlistore/Credits.html @@ -13,8 +13,8 @@ lack of a better name. For more, see:


diff --git a/make.go b/make.go index f04a087f4..c2d381745 100644 --- a/make.go +++ b/make.go @@ -709,7 +709,7 @@ func withSQLite() bool { case "linux": log.Printf("On Linux, run 'sudo apt-get install libsqlite3-dev' or equivalent.") case "windows": - log.Printf("SQLite is not easy on windows. Please see http://camlistore.org/docs/server-config#windows") + log.Printf("SQLite is not easy on windows. Please see https://camlistore.org/doc/server-config#windows") } os.Exit(2) } diff --git a/pkg/client/config.go b/pkg/client/config.go index d89ce2ff6..54fa2af7c 100644 --- a/pkg/client/config.go +++ b/pkg/client/config.go @@ -207,7 +207,7 @@ func printConfigChangeHelp(conf jsonconfig.Obj) { } } if oldConfig { - configChangedMsg += "Please see http://camlistore.org/docs/client-config, or use camput init to recreate a default one." + configChangedMsg += "Please see https://camlistore.org/doc/client-config, or use camput init to recreate a default one." log.Print(configChangedMsg) } } diff --git a/pkg/server/help.go b/pkg/server/help.go index 59dd6a14f..1bd749abe 100644 --- a/pkg/server/help.go +++ b/pkg/server/help.go @@ -50,13 +50,13 @@ const helpHTML string = `

-

You will need to use the following client configuration in order to access this server using the command line tools.

+

You will need to use the following client configuration in order to access this server using the command line tools.

{{ .ClientConfigJSON }}
{{ .SecringDownloadHint }}

Anything Else?

-

See the Camlistore online documentation and community contacts.

+

See the Camlistore online documentation and community contacts.

` @@ -168,7 +168,7 @@ func (hh *HelpHandler) serveHelpHTML(cc *clientconfig.Config, rw http.ResponseWr if strings.HasPrefix(hh.serverSecRing, "/gcs/") { bucketdir := strings.TrimPrefix(hh.serverSecRing, "/gcs/") bucketdir = strings.TrimSuffix(bucketdir, "/identity-secring.gpg") - hint = template.HTML(fmt.Sprintf("

Download your GnuPG secret ring from https://console.developers.google.com/storage/browser/%s/ and place it in your Camlistore client config directory. Keep it private. It's not encrypted or password-protected and anybody in possession of it can create Camlistore claims as your identity.

\n", + hint = template.HTML(fmt.Sprintf("

Download your GnuPG secret ring from https://console.developers.google.com/storage/browser/%s/ and place it in your Camlistore client config directory. Keep it private. It's not encrypted or password-protected and anybody in possession of it can create Camlistore claims as your identity.

\n", bucketdir, bucketdir)) } diff --git a/pkg/server/wizard-html.go b/pkg/server/wizard-html.go index 5d4673079..0843c1e64 100644 --- a/pkg/server/wizard-html.go +++ b/pkg/server/wizard-html.go @@ -29,7 +29,7 @@ const topWizard = `

[Back]

Setup Wizard

-

See Server Configuration for information on configuring the values below.

+

See Server Configuration for information on configuring the values below.

` diff --git a/pkg/server/wizard.go b/pkg/server/wizard.go index 7cb0bf9ec..a5260886f 100644 --- a/pkg/server/wizard.go +++ b/pkg/server/wizard.go @@ -264,7 +264,7 @@ func (sh *SetupHandler) ServeHTTP(rw http.ResponseWriter, req *http.Request) { "\n") return } - http.Redirect(rw, req, "http://camlistore.org/docs/server-config", http.StatusMovedPermanently) + http.Redirect(rw, req, "https://camlistore.org/doc/server-config", http.StatusMovedPermanently) return // TODO: this file and the code in wizard-html.go is outdated. Anyone interested enough diff --git a/pkg/types/camtypes/errors.go b/pkg/types/camtypes/errors.go index 0e96fab81..2098f4292 100644 --- a/pkg/types/camtypes/errors.go +++ b/pkg/types/camtypes/errors.go @@ -29,7 +29,7 @@ var camErrors = map[string]*camErr{} var ( ErrClientNoServer = addCamError("client-no-server", funcStr(func() string { - return fmt.Sprintf("No valid server defined. It can be set with the CAMLI_SERVER environment variable, or the --server flag, or in the \"servers\" section of %q (see https://camlistore.org/docs/client-config).", osutil.UserClientConfigPath()) + return fmt.Sprintf("No valid server defined. It can be set with the CAMLI_SERVER environment variable, or the --server flag, or in the \"servers\" section of %q (see https://camlistore.org/doc/client-config).", osutil.UserClientConfigPath()) })) ErrClientNoPublicKey = addCamError("client-no-public-key", str("No public key configured: see 'camput init'.")) ) diff --git a/website/camweb.go b/website/camweb.go index 7295bf495..c2df08658 100644 --- a/website/camweb.go +++ b/website/camweb.go @@ -768,7 +768,7 @@ func main() { mux.HandleFunc("/dl/", releaseRedirect) mux.HandleFunc("/debug/ip", ipHandler) mux.HandleFunc("/debug/uptime", uptimeHandler) - mux.Handle("/docs/contributing", redirTo("/code#contributing")) + mux.Handle("/doc/contributing", redirTo("/code#contributing")) mux.Handle("/lists", redirTo("/community")) mux.HandleFunc("/contributors", contribHandler())