@@ -9,7 +9,7 @@ {{ if .LoggedIn }}
 	<a {{ if eq .Title "user" }}style="font-weight: bold;"{{ end }} href="/{{ .Username }}">home</a>
 	| <a {{ if eq .Title "saves" }}style="font-weight: bold;"{{ end }} href="/saves">saves</a>
 	| <a {{ if eq .Title "finger" }}style="font-weight: bold;"{{ end }} href="/finger">finger</a>
-	| <a {{ if eq .Title "settings" }}style="font-weight: bold;"{{ end }} href="/settings">settings</a>
+	| <a {{ if eq .Title "feeds" }}style="font-weight: bold;"{{ end }} href="/feeds">feeds</a>
 	| <a href="/logout">logout</a>
 	{{ else }}
 	<a {{ if eq .Title "login" }}style="font-weight: bold;"{{ end }}href="/login">login/register</a>

@@ -1,12 +1,12 @@ 
-{{ define "settings" }}
+{{ define "feeds" }}
 {{ template "head" . }}
 {{ template "nav" . }}
-<h3>Settings</h3>
+<h3>Feeds</h3>
 <p>your public homepage: <a href="/{{ .Username }}">vore.website/{{ .Username }}</a>
 
-{{ len .Data }} subscriptions:
+subscribed to {{ len .Data }} feeds:
 </p>
-<form method="POST" action="/settings/submit">
+<form method="POST" action="/feeds/submit">
 <textarea name="submit" rows="10" cols="50">
 {{ range .Data -}}
 {{ .UpdateURL }}

@@ -7,7 +7,7 @@ {{ if .LoggedIn }}
 <p>
 you don't seem to have any feeds yet.
 
-go to <a href="/settings">/settings</a> to add your first feed!
+go to <a href="/feeds">/feeds</a> to add your first feed!
 </p>
 {{ end }}
 {{ end }}

@@ -14,8 +14,8 @@ http.HandleFunc("GET /saves", s.userSavesHandler)
 	http.HandleFunc("GET /static/{file}", s.staticHandler)
 	http.HandleFunc("GET /finger", s.fingerHandler)
 	http.HandleFunc("POST /finger", s.fingerHandler)
-	http.HandleFunc("GET /settings", s.settingsHandler)
-	http.HandleFunc("POST /settings/submit", s.settingsSubmitHandler)
+	http.HandleFunc("GET /feeds", s.settingsHandler)
+	http.HandleFunc("POST /feeds/submit", s.settingsSubmitHandler)
 	http.HandleFunc("GET /login", s.loginHandler)
 	http.HandleFunc("POST /login", s.loginHandler)
 	http.HandleFunc("GET /logout", s.logoutHandler)
@@ -24,9 +24,9 @@ http.HandleFunc("POST /register", s.registerHandler)
 	http.HandleFunc("GET /save/{url}", s.saveHandler)
 	http.HandleFunc("GET /feeds/{url}", s.feedDetailsHandler)
 
-	// left in-place for backwards compat
-	http.HandleFunc("GET /feeds", s.settingsHandler)
-	http.HandleFunc("POST /feeds/submit", s.settingsSubmitHandler)
+	// backwards compatibility redirect
+	http.HandleFunc("GET /settings", s.settingsRedirectHandler)
+	http.HandleFunc("POST /settings/submit", s.settingsSubmitRedirectHandler)
 
 	log.Println("main: listening on http://localhost:5544")
 	log.Fatal(http.ListenAndServe(":5544", nil))

@@ -207,7 +207,7 @@ }
 
 	var feeds []*rss.Feed
 	feeds = s.reaper.GetUserFeeds(s.username(r))
-	s.renderPage(w, r, "settings", feeds)
+	s.renderPage(w, r, "feeds", feeds)
 }
 
 // TODO: show diff before submission (like tf plan)
@@ -263,7 +263,7 @@ s.renderErr(w, e, http.StatusInternalServerError)
 		return
 	}
 
-	http.Redirect(w, r, "/settings", http.StatusSeeOther)
+	http.Redirect(w, r, "/feeds", http.StatusSeeOther)
 }
 
 func (s *Site) feedDetailsHandler(w http.ResponseWriter, r *http.Request) {
@@ -566,6 +566,14 @@ prefix += "500 internal server error\n"
 	}
 	log.Println(prefix + error)
 	http.Error(w, prefix+error, code)
+}
+
+func (s *Site) settingsRedirectHandler(w http.ResponseWriter, r *http.Request) {
+	http.Redirect(w, r, "/feeds", http.StatusMovedPermanently)
+}
+
+func (s *Site) settingsSubmitRedirectHandler(w http.ResponseWriter, r *http.Request) {
+	http.Redirect(w, r, "/feeds/submit", http.StatusMovedPermanently)
 }
 
 func (s *Site) randomCutePhrase() string {