Merge branch 'release-1.11.0'
Merge branch 'release-1.11.0'

* release-1.11.0:
  Resolve favicon.ico, which is in dw-nonfree
  (Bug 4385) Don't force a width for small icons with no meta text
Merge branch 'release-1.11.0'

* release-1.11.0:
  (Bug 4666) Fix expected URL for textcaptcha
  (Bug 4638) Trigger a tooltipout event on mouseout
  (Bug 4654) Additional ?user=parameter for supporthelps
Merge branch 'release-1.11.0'

* release-1.11.0:
  (Bug 647) Switch to siteviews always
  (Bug 4666) Split up registering of URL between site and journal
Merge branch 'release-1.11.0'

* release-1.11.0:
  (Bug 647) Minor CSS display tweaks based on feetback so far
  (bug 4669) Fix FAQ category titles not showing up
Merge branch 'release-1.11.0'

* release-1.11.0:
  (Bug 4017) Don't use the raw property for tags
  (Bug 4017) Don't adjust for minsec when editing
  (Bug 4017) Change the page title when editing the entry
  (Bug 4017) Populate beta community variable in all views
  (Bug 3710) Added better icon styling to PPaper Me, particularly when a post has no icon.
  (Bug 647) Add the class to the plain form of the subject
  (Bug 647) Fix comment hiearchy styling
  (Bug 4671) Move divider outside of span for expand-all
  (Bug 647) Make entry subjects a bit larger.
  Revert "Merge pull request #23 from dunvi/bug-4294"
  (Bug 647) Un-link comment subjects; allow Lynx/style=light to access the underlying structural CSS files in siteviews
  (Bug 4626) Change the option to "format" => "text"
  (Bug 4626) Add a new option "plain" for formatted_subject
Merge branch 'release-1.11.0'

* release-1.11.0:
  (Bug 4675) Link to https versions if we're on https
Merge branch 'release-1.11.0'

* release-1.11.0:
  (Bug 4667) Make the user confirm before deleting.
  Bug 4668 - Librarian's Dream: unclosed div in profile module when opts are hidden http://bugs.dwscoalition.org/show_bug.cgi?id=4668 Only display DIV if we have something to display in it (userpic or name) Display website separately, as intended Add space between name and border/userpic
(Bug 4385) Don't force a width for small icons with no meta text
Resolve favicon.ico, which is in dw-nonfree
(Bug 4654) Additional ?user=parameter for supporthelps

Debugging aid.
(Bug 4638) Trigger a tooltipout event on mouseout

Browser inconsistency: mouseout in Firefox always has returns true
for e.isDefaultPrevented() which was preventing the popup from
disappearing (rather annoyingly)

So instead of using the raw mouseout event, let's have this trigger our
custom tooltipout event, so we have more of the state under our control.
(Bug 4666) Fix expected URL for textcaptcha

We want /exampleuseranme/__rpc_captcha, not just /__rpc_captcha
(Bug 4666) Split up registering of URL between site and journal

One goes: www.dreamwidth.org/__rpc_captcha... the other goes
exampleusername.dreamiwdth.org/exampleusername/__rpc_captcha

This could be handled by just one regex, but let's go with this.
Cleaner.
(Bug 647) Switch to siteviews always

Was only using siteviews when we forced it to using style=site/light.
This detects it better
Merge branch 'release-1.11.0'

* release-1.11.0:
  (Bug 4722) Expose the userpic root config variable to JS
  (bug 4718) Undoes previous change to allow people to import more icons than they have slots for.
  Fix syntax error
  Add timeout to XMLRPC::Lite module
  (Bug 4631) Fix process privacy worker
Merge branch 'master' of github.com:dreamwidth/dw-free
Merge branch 'develop'

* develop: (211 commits)
  (bug 1716) Merge near-identical sections.
  (bug 4804) Swap dw_lounge for dw_volunteers on sitemap
  (bug 1716) More work on the feed canonicalizer
  Bug 4690 - Librarian's Dream: fix module heading links colors http://bugs.dwscoalition.org/show_bug.cgi?id=4690 -- Restore original code -- Make sure hover and visited colors are what they used to be too
  (Bug 4805) Don't enforce the same rules for posting and editing
  More 5.14 updates
  Add extlib/ support to standard scripts
  Fix Perl 5.14.0 warnings
  (Bug 4721) Whitelist Goodreads updates widget
  (Bug 3523) CSS tweaks for ContextualPopup
  (Bug 1960) Test LJ::Tags:is_valid_tagstring
  (Bug 4799) : Fixed tyop as per bug.
  Bug 4801 - Rename Second Module Section to Secondary Module Section http://bugs.dwscoalition.org/show_bug.cgi?id=4801 -- replace 'second' with 'secondary' in all styles
  (Bug 4796) Use the correct option value for showlocation
  Customize: display' active entries' module to all users Customize: add note for paid-only modules http://bugs.dwscoalition.org/show_bug.cgi?id=4794 http://bugs.dwscoalition.org/show_bug.cgi?id=4793 -- display active entries module option to all users for style-mine purpose -- add note for paid-only module options -- add note for paid-only module heading options
  Bug 4798 - SUPPORT: Remove red text box on requests for users with viewinternal http://bugs.dwscoalition.org/show_bug.cgi?id=4798 -- Dont't display info box to users with viewinternal priv
  (Bug 4788) If we guessed the anum, then save it as "untrusted_anum"
  (Bug 4788) Add test for entry lookup.
  Resolve case conflict by removing extra file
  Bug 3798 - Rename Group One/Two to Main Module Section/Second Module Section http://bugs.dwscoalition.org/show_bug.cgi?id=3798 -- rename module sections to Main/Second in Brittle -- rename module section to Sidebar in Bases
  ...
(Bug 5067) Recognize "-" in potential usernames in markdown

So @dw-suggestions and @dw_suggestions will both work.
(Bug 4726) move /bin/styles to /styles
-- also edit update-db to point to new location